Updated collectd config

[people/pmueller/ipfire-2.x.git] / config / collectd / collectd.conf

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index f1c7e655d353179c0a7aa7b32483a9325c2ab728..a148b084a321ccad7c8cd966092b7ed27c8a9b56 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -13,21 +13,22 @@ 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 "/[0-9]$/"
+       IgnoreSelected true
+</Plugin>
+
 <Plugin iptables>
        Chain filter INPUT DROP_INPUT
        Chain filter FORWARD DROP_OUTPUT
@@ -50,19 +56,13 @@ LoadPlugin syslog
 #      File STDOUT
 #</Plugin>
 
-<Plugin mbmon>
-       Host "127.0.0.1"
-       Port "411"
-</Plugin>
-
-
 <Plugin ping>
        Host "gateway"
 </Plugin>
 
 <Plugin processes>
        Process "sshd"
-       Process "smdb"
+       Process "smbd"
        Process "nmbd"
        Process "squid"
        Process "squidguard"
@@ -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"