Merge branch 'ff/dns'

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 5e894de5a31c7023e8ea5fbe97de1d5e367ed686..f74a118539b4192ef0a57dc7a49df4c3b48aac11 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -31,6 +31,7 @@
 @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
@@ -82,6 +83,23 @@
 #      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