Merge branch 'collectd-4.5'

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index cdbef5a..a474fdc 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -42,7 +42,6 @@ FQDNLookup   true
 @BUILD_PLUGIN_ENTROPY_TRUE@LoadPlugin entropy
 @BUILD_PLUGIN_EXEC_TRUE@LoadPlugin exec
 @BUILD_PLUGIN_FILECOUNT_TRUE@LoadPlugin filecount
-@BUILD_PLUGIN_FILTER_PCRE_TRUE@LoadPlugin filter_pcre
 @BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp
 @BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface
 @BUILD_PLUGIN_IPTABLES_TRUE@LoadPlugin iptables
@@ -83,7 +82,7 @@ FQDNLookup   true
 @BUILD_PLUGIN_THERMAL_TRUE@LoadPlugin thermal
 @BUILD_PLUGIN_UNIXSOCK_TRUE@LoadPlugin unixsock
 @BUILD_PLUGIN_USERS_TRUE@LoadPlugin users
-@BUILD_PLUGIN_UUID_TRUE@LoadPlugin uuid
+#LoadPlugin uuid
 @BUILD_PLUGIN_VMEM_TRUE@LoadPlugin vmem
 @BUILD_PLUGIN_VSERVER_TRUE@LoadPlugin vserver
 @BUILD_PLUGIN_WIRELESS_TRUE@LoadPlugin wireless
@@ -172,23 +171,6 @@ FQDNLookup   true
 #      </Directory>
 #</Plugin>
 
-#<Plugin filter_pcre>
-#      <RegEx>
-#              Host "^mail\d+$"
-#              Plugin "^tcpconns$"
-#              TypeInstance "^SYN_"
-#
-#              Action NoWrite
-#      </RegEx>
-#
-#      <RegEx>
-#              Plugin "^sensors$"
-#              PluginInstance "^Some Weird Sensor Chip Name Prefix"
-#
-#              SubstitutePluginInstance "foo"
-#      </RegEx>
-#</Plugin>
-
 @BUILD_PLUGIN_HDDTEMP_TRUE@<Plugin hddtemp>
 #      Host "127.0.0.1"
 #      Port "7634"
@@ -432,7 +414,7 @@ FQDNLookup   true
 #    <Match>
 #      Regex "\\<R=local_user\\>"
 #      DSType "CounterInc"
-#      Type "email_count"
+#      Type "counter"
 #      Instance "local_user"
 #    </Match>
 #  </File>
@@ -470,3 +452,22 @@ FQDNLookup   true
 #      Verbose false
 #</Plugin>
 
+# * * * * * * * * * * * * *
+# * FILTER CONFIGURATION  *
+# * * * * * * * * * * * * *
+
+# The following configures collectd's filtering mechanism. Before changing
+# anything in this section, please read the `FILTER CONFIGURATION' section in
+# the collectd.conf(5) manual page.
+
+# Load required matches:
+#@BUILD_PLUGIN_MATCH_REGEX_TRUE@LoadPlugin match_regex
+
+# Load required targets:
+ 
+# The following block demonstrates the default behavior if no filtering is
+# configured at all: All values will be sent to all available write plugins.
+
+#<Chain "Main">
+#  Target "write"
+#</Chain>