X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=a474fdcd0d39bf624c874f4db181bb4537213fe3;hb=ef7fec0c4e0bbbabb356e6a570ac6297ee06eb80;hp=ae4cde6b9bb48770fe0854927a2a7e21c2023e0b;hpb=ea78b1cbf46034df20ab3cfb3dabf255e5755264;p=collectd.git
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index ae4cde6b..a474fdcd 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -9,7 +9,7 @@ FQDNLookup true
#BaseDir "@prefix@/var/lib/@PACKAGE_NAME@"
#PIDFile "@prefix@/var/run/@PACKAGE_NAME@.pid"
#PluginDir "@prefix@/lib/@PACKAGE_NAME@"
-#TypesDB "@prefix@/lib/@PACKAGE_NAME@/types.db"
+#TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db"
#Interval 10
#ReadThreads 5
@@ -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,16 +171,6 @@ FQDNLookup true
#
#
-#
-#
-# Host "^mail\d+$"
-# Plugin "^tcpconns$"
-# TypeInstance "^SYN_"
-#
-# Action NoWrite
-#
-#
-
@BUILD_PLUGIN_HDDTEMP_TRUE@
# Host "127.0.0.1"
# Port "7634"
@@ -425,7 +414,7 @@ FQDNLookup true
#
# Regex "\\"
# DSType "CounterInc"
-# Type "email_count"
+# Type "counter"
# Instance "local_user"
#
#
@@ -463,3 +452,22 @@ FQDNLookup true
# Verbose false
#
+# * * * * * * * * * * * * *
+# * 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.
+
+#
+# Target "write"
+#