Merge remote-tracking branch 'stevee/next-suricata' into next

[people/pmueller/ipfire-2.x.git] / config / collectd / collectd.conf

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 14dd568c2ffd3369a13ef48e78800a5063357d48..e336a9d3f6c470622029049e829e85c52b4a1f42 100644 (file)
--- 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>
 
@@ -70,14 +71,12 @@ include "/etc/collectd.precache"
        Process "squid"
        Process "squidguard"
        Process "charon"
-       Process "snort"
        Process "openvpn"
        Process "qemu"
        Process "rtorrent"
        Process "mpd"
        Process "asterisk"
        Process "java"
-       Process "mysqld"
        Process "spamd"
 </Plugin>
 
@@ -91,3 +90,4 @@ include "/etc/collectd.precache"
 
 #include "/etc/collectd.thermal"
 include "/etc/collectd.custom"
+include "/etc/collectd.vpn"