X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fcollectd%2Fcollectd.conf;h=b0166e5d639b301f136e2d6befe0c0673ecae5d7;hp=8a9242f6dec465811377424edea751921aea67c4;hb=fac92c6d25038f61430a4e872e720ba00b539385;hpb=518f894b4a6967f0a22c2c966df6a64775c4a707

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 8a9242f6de..b0166e5d63 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -8,26 +8,27 @@ Hostname    "localhost"
 BaseDir     "/var/log/rrd/collectd"
 PIDFile     "/var/run/collectd.pid"
 PluginDir   "/usr/lib/collectd"
-TypesDB     "/usr/lib/collectd/types.db"
+TypesDB     "/usr/share/collectd/types.db"
 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 "ppp0"
 	Interface "lo"
 	Interface "ipsec1"
 	Interface "ipsec2"
@@ -35,6 +36,11 @@ LoadPlugin syslog
 	IgnoreSelected true
 </Plugin>
 
+<Plugin "disk">
+	Disk "/[hs]d[a-z][0-9]$/"
+	IgnoreSelected true
+</Plugin>
+
 <Plugin iptables>
 	Chain filter INPUT DROP_INPUT
 	Chain filter FORWARD DROP_OUTPUT
@@ -50,12 +56,6 @@ LoadPlugin syslog
 #	File STDOUT
 #</Plugin>
 
-<Plugin mbmon>
-	Host "127.0.0.1"
-	Port "411"
-</Plugin>
-
-
 <Plugin ping>
 	Host "gateway"
 </Plugin>
@@ -80,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"