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 2ac99f6a669c4bb439ec9dbbee853a6ace3f5af3..b0166e5d639b301f136e2d6befe0c0673ecae5d7 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -8,7 +8,7 @@ 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
 
@@ -25,7 +25,6 @@ LoadPlugin processes
 LoadPlugin rrdtool
 LoadPlugin sensors
 LoadPlugin swap
-LoadPlugin thermal
 LoadPlugin syslog
 #LoadPlugin wireless
 
@@ -37,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
@@ -82,14 +86,4 @@ LoadPlugin syslog
        LogLevel info
 </Plugin>
 
-<Plugin thermal>
-       Device "cooling_device0"
-       Device "cooling_device1"
-       Device "cooling_device2"
-       Device "cooling_device3"
-       Device "cooling_device4"
-       Device "cooling_device5"
-       Device "cooling_device6"
-       Device "cooling_device7"
-       IgnoreSelected true
-</Plugin>
+#include "/etc/collectd.thermal"