Disabled and removed unused iptables rrds.

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

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 01b8a11ecbb79ba9f5fddb7d7558a60ecbb7a707..e9c9af4f121b724f86fb0b5a47342ef32b607319 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -8,23 +8,28 @@ 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
+ReadThreads  1
 
 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
+LoadPlugin match_regex
+
+include "/etc/collectd.precache"
 
 <Plugin interface>
        Interface "lo"
@@ -34,14 +39,16 @@ 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
        Chain filter PSCAN DROP_PScan
        Chain filter NEWNOTSYN DROP_NEWNOTSYN
-       Chain filter OUTGOINGFW DROP_OUTGOINGFW
-       Chain filter INPUT DROP_Wirelessinput
-       Chain filter FORWARD DROP_Wirelessforward
 </Plugin>
 
 #<Plugin logfile>
@@ -49,12 +56,6 @@ LoadPlugin syslog
 #      File STDOUT
 #</Plugin>
 
-<Plugin mbmon>
-       Host "127.0.0.1"
-       Port "411"
-</Plugin>
-
-
 <Plugin ping>
        Host "gateway"
 </Plugin>
@@ -79,10 +80,11 @@ LoadPlugin syslog
 
 <Plugin rrdtool>
        DataDir "/var/log/rrd/collectd"
-       CacheTimeout 300
-       CacheFlush   900
 </Plugin>
 
 <Plugin syslog>
        LogLevel info
 </Plugin>
+
+#include "/etc/collectd.thermal"
+include "/etc/collectd.custom"