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

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 14dd568c2f..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>
 
@@ -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"