Merge branch 'ls/shutdown'

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 0d63dffe95f9fada132327c8c969e4996c3d822a..b73278fc779e2c5e06fa32460f6dbbc7446e216d 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -28,6 +28,7 @@
 @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
@@ -58,6 +59,11 @@
 #      Port 3551
 #</Plugin>
 
+#<Plugin dns>
+#      Interface eth0
+#      IgnoreSource 192.168.0.1
+#</Plugin>
+
 #<Plugin hddtemp>
 #      Host 127.0.0.1
 #      Port 7634
@@ -83,27 +89,20 @@
 #      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>
-## Collect only required sensors.
-## 
-## Default sensors and .rrd files names
-## compatible with old .rrd files (temp and fan).
-##
 #      ExtendedSensorNaming false
 #      Sensor it8712-temp1
 #      Sensor it8712-fan3
 #      Sensor it8712-in8
-##
-## Extended sensors and .rrd files names break compatibility
-## with previous naming and .rrd files,
-## see collectd.conf(5) for detailed information.
-##
+## -- OR --
 #      ExtendedSensorNaming true
 #      Sensor it8712-isa-0290/temperature-temp1
 #      Sensor it8712-isa-0290/fanspeed-fan3
 #      Sensor it8712-isa-0290/voltage-in8
-##
-## Reverse sensors sellection?
+#
 #      IgnoreSelected false
 #</Plugin>