Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

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

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 384c9436009a48546fb031a4bac8e6641161edb6..e34a97da1ac67a5d4a01dadb916cd5575fb42ad3 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -12,6 +12,7 @@ TypesDB     "/usr/share/collectd/types.db"
 Interval     30
 ReadThreads  1
 
+LoadPlugin conntrack
 LoadPlugin cpu
 #LoadPlugin cpufreq
 LoadPlugin disk
@@ -34,9 +35,8 @@ include "/etc/collectd.precache"
 
 <Plugin interface>
        Interface "lo"
-       Interface "ipsec1"
-       Interface "ipsec2"
-       Interface "ipsec3"
+       Interface "/[0-9]*phys$/"
+       Interface "/^vnet[0-9]*$/"
        IgnoreSelected true
 </Plugin>
 
@@ -51,6 +51,8 @@ include "/etc/collectd.precache"
        Chain filter POLICYFWD DROP_FORWARD
        Chain filter POLICYOUT DROP_OUTPUT
        Chain filter POLICYIN DROP_INPUT
+       Chain filter SPOOFED_MARTIAN DROP_SPOOFED_MARTIAN
+       Chain filter HOSTILE_DROP DROP_HOSTILE
 </Plugin>
 
 #<Plugin logfile>
@@ -71,15 +73,9 @@ include "/etc/collectd.precache"
        Process "squid"
        Process "squidguard"
        Process "charon"
-       Process "snort"
        Process "openvpn"
        Process "qemu"
-       Process "rtorrent"
        Process "mpd"
-       Process "asterisk"
-       Process "java"
-       Process "mysqld"
-       Process "spamd"
 </Plugin>
 
 <Plugin rrdtool>