X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Fcollectd%2Fcollectd.conf;h=aea72fc3f4c82d83aa7b2fc00cff0b46970bf09a;hb=380350300f4edf6c11cbfd9cc6f55c2a6a148981;hp=e222d5cb72c2ae535cf9c8e22633846cdd70879b;hpb=94ea1f03464ab9434189ec270baa83fc2f2dcadd;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index e222d5cb72..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
@@ -23,7 +24,7 @@ LoadPlugin memory
 LoadPlugin ping
 LoadPlugin processes
 LoadPlugin rrdtool
-#LoadPlugin sensors
+LoadPlugin sensors
 LoadPlugin swap
 LoadPlugin syslog
 #LoadPlugin wireless
@@ -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"