Fix disk (media/hardware) graphs with xen.

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

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index e5bd3db438895f8ecf6866e1924f268af635ffaa..b0166e5d639b301f136e2d6befe0c0673ecae5d7 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -8,17 +8,17 @@ 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
@@ -26,6 +26,7 @@ LoadPlugin rrdtool
 LoadPlugin sensors
 LoadPlugin swap
 LoadPlugin syslog
+#LoadPlugin wireless
 
 <Plugin interface>
        Interface "lo"
@@ -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"