Merge branch 'ls/shutdown'

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index e1256f8126508efe796782b011e95bb23ed05dbd..b73278fc779e2c5e06fa32460f6dbbc7446e216d 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -4,7 +4,18 @@
 # http://collectd.org/
 #
 
-Mode    Local
+# Select one of the following modes:
+@BUILD_WITH_RRDTOOL_TRUE@Mode Local
+#Mode Server
+@BUILD_WITH_RRDTOOL_FALSE@Mode Client
+#Mode Log
+
+# Set the IP-address(es) and UDP-port(s) to send packets to. `Listen' can be
+# used as a synonym for `Server' to make the config file more readable when in
+# server mode. The port option is optional.
+#Server ff18::efc0:4a42 25826
+#Server 239.192.74.66 25826
+
 #DataDir   /opt/collectd/var/lib/collectd
 #PIDFile   /opt/collectd/var/run/collectd.pid
 #PluginDir /opt/collectd/lib/collectd
@@ -17,9 +28,11 @@ Mode    Local
 @BUILD_MODULE_CPUFREQ_TRUE@LoadPlugin cpufreq
 @BUILD_MODULE_DF_TRUE@LoadPlugin df
 @BUILD_MODULE_DISK_TRUE@LoadPlugin disk
+@BUILD_MODULE_DNS_TRUE@LoadPlugin dns
 @BUILD_MODULE_HDDTEMP_TRUE@LoadPlugin hddtemp
 @BUILD_MODULE_LOAD_TRUE@LoadPlugin load
 @BUILD_MODULE_MEMORY_TRUE@LoadPlugin memory
+@BUILD_MODULE_MULTIMETER_TRUE@LoadPlugin multimeter
 @BUILD_MODULE_MYSQL_TRUE@LoadPlugin mysql
 @BUILD_MODULE_NFS_TRUE@LoadPlugin nfs
 @BUILD_MODULE_NTPD_TRUE@LoadPlugin ntpd
@@ -46,6 +59,11 @@ Mode    Local
 #      Port 3551
 #</Plugin>
 
+#<Plugin dns>
+#      Interface eth0
+#      IgnoreSource 192.168.0.1
+#</Plugin>
+
 #<Plugin hddtemp>
 #      Host 127.0.0.1
 #      Port 7634
@@ -67,6 +85,27 @@ Mode    Local
 #      Host host.foo.bar
 #</Plugin>
 
+#<Plugin processes>
+#      Process name
+#</Plugin>
+
+## There are two different naming schemes for the sensors plugin, to preserver
+## backwards compatibility. The `extended naming' is prefered, but not the
+## default for this reason. See `collectd.conf(5)' for more information.
+#<Plugin sensors>
+#      ExtendedSensorNaming false
+#      Sensor it8712-temp1
+#      Sensor it8712-fan3
+#      Sensor it8712-in8
+## -- OR --
+#      ExtendedSensorNaming true
+#      Sensor it8712-isa-0290/temperature-temp1
+#      Sensor it8712-isa-0290/fanspeed-fan3
+#      Sensor it8712-isa-0290/voltage-in8
+#
+#      IgnoreSelected false
+#</Plugin>
+
 #<Plugin traffic>
 #      Interface eth0
 #      IgnoreSelected false