X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=c6ae3b364ddd616b7c9393f9fdc7cfdb02388ff3;hb=4f27b7128f48771fb28de092cf56759bf6cb7f45;hp=e4e3f06c605d46351c3633f31046872502411b4a;hpb=def529326cb326ccc6ce33bbd6b39b92edbc0b76;p=collectd.git

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index e4e3f06c..c6ae3b36 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -26,10 +26,13 @@
 @BUILD_MODULE_BATTERY_TRUE@LoadPlugin battery
 @BUILD_MODULE_CPU_TRUE@LoadPlugin cpu
 @BUILD_MODULE_CPUFREQ_TRUE@LoadPlugin cpufreq
+@BUILD_MODULE_CSV_TRUE@LoadPlugin csv
 @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_MBMON_TRUE@LoadPlugin mbmon
 @BUILD_MODULE_MEMORY_TRUE@LoadPlugin memory
 @BUILD_MODULE_MULTIMETER_TRUE@LoadPlugin multimeter
 @BUILD_MODULE_MYSQL_TRUE@LoadPlugin mysql
@@ -37,6 +40,7 @@
 @BUILD_MODULE_NTPD_TRUE@LoadPlugin ntpd
 @BUILD_MODULE_PING_TRUE@LoadPlugin ping
 @BUILD_MODULE_PROCESSES_TRUE@LoadPlugin processes
+@BUILD_WITH_RRDTOOL_TRUE@LoadPlugin rrdtool
 @BUILD_MODULE_SENSORS_TRUE@LoadPlugin sensors
 @BUILD_MODULE_SERIAL_TRUE@LoadPlugin serial
 @BUILD_MODULE_SWAP_TRUE@LoadPlugin swap
@@ -58,11 +62,21 @@
 #	Port 3551
 #</Plugin>
 
+#<Plugin dns>
+#	Interface eth0
+#	IgnoreSource 192.168.0.1
+#</Plugin>
+
 #<Plugin hddtemp>
 #	Host 127.0.0.1
 #	Port 7634
 #</Plugin>
 
+#<Plugin mbmon>
+#	Host 127.0.0.1
+#	Port 411
+#</Plugin>
+
 #<Plugin ntpd>
 #	Host localhost
 #	Port 123
@@ -83,27 +97,24 @@
 #	Process name
 #</Plugin>
 
+#<Plugin rrdtool>
+#	CacheTimeout 120
+#</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 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_sensor-temp1
-#	Sensor it8712-isa-0290/fanspeed_sensor-fan3
-#	Sensor it8712-isa-0290/voltage_sensor-in8
-##
-## Reverse sensors sellection?
+#	Sensor it8712-isa-0290/temperature-temp1
+#	Sensor it8712-isa-0290/fanspeed-fan3
+#	Sensor it8712-isa-0290/voltage-in8
+#
 #	IgnoreSelected false
 #</Plugin>