Merge branch 'ff/entropy' into collectd-4

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index b73278fc779e2c5e06fa32460f6dbbc7446e216d..c6ae3b364ddd616b7c9393f9fdc7cfdb02388ff3 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -26,11 +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
@@ -38,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
@@ -69,6 +72,11 @@
 #      Port 7634
 #</Plugin>
 
+#<Plugin mbmon>
+#      Host 127.0.0.1
+#      Port 411
+#</Plugin>
+
 #<Plugin ntpd>
 #      Host localhost
 #      Port 123
@@ -89,6 +97,10 @@
 #      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.