X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fcollectd%2Fcollectd.conf;h=aea72fc3f4c82d83aa7b2fc00cff0b46970bf09a;hp=530c81e7b3bb0ee413c5ddeb3591b364b33084bd;hb=b3cc1932e4afe74f450d3c05d630da16af5b3846;hpb=b122df877b176fceabae4e31549847cb849c8fed

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 530c81e7b3..aea72fc3f4 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -15,6 +15,7 @@ ReadThreads  1
 LoadPlugin cpu
 #LoadPlugin cpufreq
 LoadPlugin disk
+LoadPlugin entropy
 LoadPlugin interface
 LoadPlugin iptables
 LoadPlugin load
@@ -33,9 +34,9 @@ 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>
 
@@ -45,13 +46,11 @@ 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 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>
@@ -61,6 +60,8 @@ include "/etc/collectd.precache"
 
 <Plugin ping>
 	Host "gateway"
+	interval 30
+	timeout 10
 </Plugin>
 
 <Plugin processes>
@@ -69,7 +70,7 @@ include "/etc/collectd.precache"
 	Process "nmbd"
 	Process "squid"
 	Process "squidguard"
-	Process "pluto"
+	Process "charon"
 	Process "snort"
 	Process "openvpn"
 	Process "qemu"
@@ -77,7 +78,6 @@ include "/etc/collectd.precache"
 	Process "mpd"
 	Process "asterisk"
 	Process "java"
-	Process "mysqld"
 	Process "spamd"
 </Plugin>
 
@@ -91,3 +91,4 @@ include "/etc/collectd.precache"
 
 #include "/etc/collectd.thermal"
 include "/etc/collectd.custom"
+include "/etc/collectd.vpn"