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=9c5ba2946d8dd340c5865dfd3bddb41a6ca93539;hb=b3cc1932e4afe74f450d3c05d630da16af5b3846;hpb=8a89eb91fc725767521cdef24cf2567d657e5643
diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 9c5ba2946d..aea72fc3f4 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -8,17 +8,18 @@ Hostname "localhost"
BaseDir "/var/log/rrd/collectd"
PIDFile "/var/run/collectd.pid"
PluginDir "/usr/lib/collectd"
-TypesDB "/usr/lib/collectd/types.db"
+TypesDB "/usr/share/collectd/types.db"
Interval 30
-ReadThreads 3
+ReadThreads 1
LoadPlugin cpu
+#LoadPlugin cpufreq
LoadPlugin disk
+LoadPlugin entropy
LoadPlugin interface
LoadPlugin iptables
LoadPlugin load
#LoadPlugin logfile
-#LoadPlugin mbmon
LoadPlugin memory
LoadPlugin ping
LoadPlugin processes
@@ -26,24 +27,30 @@ LoadPlugin rrdtool
LoadPlugin sensors
LoadPlugin swap
LoadPlugin syslog
-LoadPlugin wireless
+#LoadPlugin wireless
+LoadPlugin match_regex
+
+include "/etc/collectd.precache"
Interface "lo"
- Interface "ipsec1"
- Interface "ipsec2"
- Interface "ipsec3"
+ Interface "/[0-9]*phys$/"
+ Interface "/^macvtap[0-9]*$/"
+ Interface "/^vnet[0-9]*$/"
+ IgnoreSelected true
+
+
+
+ Disk "/[hs]d[a-z][0-9]$/"
IgnoreSelected true
- 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
#
@@ -53,6 +60,8 @@ LoadPlugin wireless
Host "gateway"
+ interval 30
+ timeout 10
@@ -61,7 +70,7 @@ LoadPlugin wireless
Process "nmbd"
Process "squid"
Process "squidguard"
- Process "pluto"
+ Process "charon"
Process "snort"
Process "openvpn"
Process "qemu"
@@ -69,16 +78,17 @@ LoadPlugin wireless
Process "mpd"
Process "asterisk"
Process "java"
- Process "mysqld"
Process "spamd"
DataDir "/var/log/rrd/collectd"
- CacheTimeout 300
- CacheFlush 900
LogLevel info
+
+#include "/etc/collectd.thermal"
+include "/etc/collectd.custom"
+include "/etc/collectd.vpn"