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 977dde2ff9818c6da8cb8fd91974493c8c0892f0..c6ae3b364ddd616b7c9393f9fdc7cfdb02388ff3 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -26,6 +26,7 @@
 @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
@@ -39,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
@@ -95,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.