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 939dd4b30253ab9e535dd67c57f915af6a858717..e34a97da1ac67a5d4a01dadb916cd5575fb42ad3 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -12,9 +12,11 @@ TypesDB     "/usr/share/collectd/types.db"
 Interval     30
 ReadThreads  1
 
+LoadPlugin conntrack
 LoadPlugin cpu
 #LoadPlugin cpufreq
 LoadPlugin disk
+LoadPlugin entropy
 LoadPlugin interface
 LoadPlugin iptables
 LoadPlugin load
@@ -33,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>
 
@@ -45,10 +46,13 @@ include "/etc/collectd.precache"
 </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 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>
@@ -68,16 +72,10 @@ include "/etc/collectd.precache"
        Process "nmbd"
        Process "squid"
        Process "squidguard"
-       Process "pluto"
-       Process "snort"
+       Process "charon"
        Process "openvpn"
        Process "qemu"
-       Process "rtorrent"
        Process "mpd"
-       Process "asterisk"
-       Process "java"
-       Process "mysqld"
-       Process "spamd"
 </Plugin>
 
 <Plugin rrdtool>
@@ -90,3 +88,4 @@ include "/etc/collectd.precache"
 
 #include "/etc/collectd.thermal"
 include "/etc/collectd.custom"
+include "/etc/collectd.vpn"