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 2f86f0795d10d5a637db2ffd2b38cdf409addfac..e34a97da1ac67a5d4a01dadb916cd5575fb42ad3 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -10,11 +10,13 @@ PIDFile     "/var/run/collectd.pid"
 PluginDir   "/usr/lib/collectd"
 TypesDB     "/usr/share/collectd/types.db"
 Interval     30
-ReadThreads  3
+ReadThreads  1
 
+LoadPlugin conntrack
 LoadPlugin cpu
 #LoadPlugin cpufreq
 LoadPlugin disk
+LoadPlugin entropy
 LoadPlugin interface
 LoadPlugin iptables
 LoadPlugin load
@@ -27,28 +29,30 @@ LoadPlugin sensors
 LoadPlugin swap
 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 "/^vnet[0-9]*$/"
        IgnoreSelected true
 </Plugin>
 
 <Plugin "disk">
-       Disk "/[0-9]$/"
+       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
+       Chain filter SPOOFED_MARTIAN DROP_SPOOFED_MARTIAN
+       Chain filter HOSTILE_DROP DROP_HOSTILE
 </Plugin>
 
 #<Plugin logfile>
@@ -58,6 +62,8 @@ LoadPlugin syslog
 
 <Plugin ping>
        Host "gateway"
+       interval 30
+       timeout 10
 </Plugin>
 
 <Plugin processes>
@@ -66,16 +72,10 @@ LoadPlugin syslog
        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>
@@ -87,3 +87,5 @@ LoadPlugin syslog
 </Plugin>
 
 #include "/etc/collectd.thermal"
+include "/etc/collectd.custom"
+include "/etc/collectd.vpn"