X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Fcollectd%2Fcollectd.conf;h=a148b084a321ccad7c8cd966092b7ed27c8a9b56;hb=4c06c549c6ad50b24eda1686904c5061e3f567c8;hp=01b8a11ecbb79ba9f5fddb7d7558a60ecbb7a707;hpb=d1a809213eadce0cdd3c94427bac908a2d26c2ef;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 01b8a11ecb..a148b084a3 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -13,18 +13,20 @@ Interval     30
 ReadThreads  3
 
 LoadPlugin cpu
+#LoadPlugin cpufreq
 LoadPlugin disk
 LoadPlugin interface
 LoadPlugin iptables
 LoadPlugin load
 #LoadPlugin logfile
-LoadPlugin mbmon
 LoadPlugin memory
 LoadPlugin ping
 LoadPlugin processes
 LoadPlugin rrdtool
+LoadPlugin sensors
 LoadPlugin swap
 LoadPlugin syslog
+#LoadPlugin wireless
 
 <Plugin interface>
 	Interface "lo"
@@ -34,6 +36,11 @@ LoadPlugin syslog
 	IgnoreSelected true
 </Plugin>
 
+<Plugin "disk">
+	Disk "/[0-9]$/"
+	IgnoreSelected true
+</Plugin>
+
 <Plugin iptables>
 	Chain filter INPUT DROP_INPUT
 	Chain filter FORWARD DROP_OUTPUT
@@ -49,12 +56,6 @@ LoadPlugin syslog
 #	File STDOUT
 #</Plugin>
 
-<Plugin mbmon>
-	Host "127.0.0.1"
-	Port "411"
-</Plugin>
-
-
 <Plugin ping>
 	Host "gateway"
 </Plugin>
@@ -79,10 +80,10 @@ LoadPlugin syslog
 
 <Plugin rrdtool>
 	DataDir "/var/log/rrd/collectd"
-	CacheTimeout 300
-	CacheFlush   900
 </Plugin>
 
 <Plugin syslog>
 	LogLevel info
 </Plugin>
+
+#include "/etc/collectd.thermal"