X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fcollectd%2Fcollectd.conf;h=e9c9af4f121b724f86fb0b5a47342ef32b607319;hp=9c5ba2946d8dd340c5865dfd3bddb41a6ca93539;hb=48cad624e6b98867559ca7b35e88d76cb419c383;hpb=8a89eb91fc725767521cdef24cf2567d657e5643
diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 9c5ba2946d..e9c9af4f12 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -8,17 +8,17 @@ 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 interface
LoadPlugin iptables
LoadPlugin load
#LoadPlugin logfile
-#LoadPlugin mbmon
LoadPlugin memory
LoadPlugin ping
LoadPlugin processes
@@ -26,7 +26,10 @@ LoadPlugin rrdtool
LoadPlugin sensors
LoadPlugin swap
LoadPlugin syslog
-LoadPlugin wireless
+#LoadPlugin wireless
+LoadPlugin match_regex
+
+include "/etc/collectd.precache"
Interface "lo"
@@ -36,14 +39,16 @@ LoadPlugin wireless
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
#
@@ -75,10 +80,11 @@ LoadPlugin wireless
DataDir "/var/log/rrd/collectd"
- CacheTimeout 300
- CacheFlush 900
LogLevel info
+
+#include "/etc/collectd.thermal"
+include "/etc/collectd.custom"