Rootfile update

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

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 546c3194abb59c203264de8692d9dfca1b211989..aea72fc3f4c82d83aa7b2fc00cff0b46970bf09a 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -8,13 +8,14 @@ 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 entropy
 LoadPlugin interface
 LoadPlugin iptables
 LoadPlugin load
@@ -25,26 +26,31 @@ LoadPlugin processes
 LoadPlugin rrdtool
 LoadPlugin sensors
 LoadPlugin swap
-LoadPlugin thermal
 LoadPlugin syslog
 #LoadPlugin wireless
+LoadPlugin match_regex
+
+include "/etc/collectd.precache"
 
 <Plugin interface>
        Interface "lo"
-       Interface "ipsec1"
-       Interface "ipsec2"
-       Interface "ipsec3"
+       Interface "/[0-9]*phys$/"
+       Interface "/^macvtap[0-9]*$/"
+       Interface "/^vnet[0-9]*$/"
+       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
+       Chain filter POLICYFWD DROP_FORWARD
+       Chain filter POLICYOUT DROP_OUTPUT
+       Chain filter POLICYIN DROP_INPUT
 </Plugin>
 
 #<Plugin logfile>
@@ -54,6 +60,8 @@ LoadPlugin syslog
 
 <Plugin ping>
        Host "gateway"
+       interval 30
+       timeout 10
 </Plugin>
 
 <Plugin processes>
@@ -62,7 +70,7 @@ LoadPlugin syslog
        Process "nmbd"
        Process "squid"
        Process "squidguard"
-       Process "pluto"
+       Process "charon"
        Process "snort"
        Process "openvpn"
        Process "qemu"
@@ -70,7 +78,6 @@ LoadPlugin syslog
        Process "mpd"
        Process "asterisk"
        Process "java"
-       Process "mysqld"
        Process "spamd"
 </Plugin>
 
@@ -81,3 +88,7 @@ LoadPlugin syslog
 <Plugin syslog>
        LogLevel info
 </Plugin>
+
+#include "/etc/collectd.thermal"
+include "/etc/collectd.custom"
+include "/etc/collectd.vpn"