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=67d9e19054da255ef327cd036496fed18f2b1411;hb=b3cc1932e4afe74f450d3c05d630da16af5b3846;hpb=92d75b2ed53e72427beab0dbda8f06577d42e4c5

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 67d9e19054..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,10 +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 POLICYFWD DROP_FORWARD
+	Chain filter POLICYOUT DROP_OUTPUT
+	Chain filter POLICYIN DROP_INPUT
 </Plugin>
 
 #<Plugin logfile>
@@ -76,7 +78,6 @@ include "/etc/collectd.precache"
 	Process "mpd"
 	Process "asterisk"
 	Process "java"
-	Process "mysqld"
 	Process "spamd"
 </Plugin>
 
@@ -90,3 +91,4 @@ include "/etc/collectd.precache"
 
 #include "/etc/collectd.thermal"
 include "/etc/collectd.custom"
+include "/etc/collectd.vpn"