Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next

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

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 3785346bac0cabf5eb790d4ceb17f9a3763351cf..2f86f0795d10d5a637db2ffd2b38cdf409addfac 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
 
@@ -36,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