Merge branch 'collectd-4.4' into collectd-4.5

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 44103e9..9f14257 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -40,6 +40,7 @@ FQDNLookup   true
 @BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email
 @BUILD_PLUGIN_ENTROPY_TRUE@LoadPlugin entropy
 @BUILD_PLUGIN_EXEC_TRUE@LoadPlugin exec
+@BUILD_PLUGIN_FILECOUNT_TRUE@LoadPlugin filecount
 @BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp
 @BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface
 @BUILD_PLUGIN_IPTABLES_TRUE@LoadPlugin iptables
@@ -139,6 +140,15 @@ FQDNLookup   true
 #      NotificationExec "user:group" "/path/to/exec"
 #</Plugin>
 
+#<Plugin filecount>
+#      <Directory "/path/to/dir">
+#              Instance "foodir"
+#              Name "*.conf"
+#              MTime "-5m"
+#              Size "+10k"
+#      </Directory>
+#</Plugin>
+
 @BUILD_PLUGIN_HDDTEMP_TRUE@<Plugin hddtemp>
 #      Host "127.0.0.1"
 #      Port "7634"
@@ -253,6 +263,11 @@ FQDNLookup   true
 #      BaseName "Collectd::Plugin"
 #      EnableDebugger ""
 #      LoadPlugin foo
+#
+#      <Plugin foo>
+#              Foo "Bar"
+#              Qux "Baz"
+#      </Plugin>
 #</Plugin>
 
 #<Plugin ping>
@@ -370,7 +385,7 @@ FQDNLookup   true
 #    <Match>
 #      Regex "\\<R=local_user\\>"
 #      DSType "CounterInc"
-#      Type "email_count"
+#      Type "counter"
 #      Instance "local_user"
 #    </Match>
 #  </File>