X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fcollectd%2Fcollectd.conf;h=14dd568c2ffd3369a13ef48e78800a5063357d48;hp=8a9242f6dec465811377424edea751921aea67c4;hb=53f4c74d9bd0eebf70b4540b688be6d6c3e556ab;hpb=518f894b4a6967f0a22c2c966df6a64775c4a707
diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 8a9242f6d..14dd568c2 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -8,26 +8,30 @@ 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
LoadPlugin rrdtool
+LoadPlugin sensors
LoadPlugin swap
LoadPlugin syslog
+#LoadPlugin wireless
+LoadPlugin match_regex
+
+include "/etc/collectd.precache"
- Interface "ppp0"
Interface "lo"
Interface "ipsec1"
Interface "ipsec2"
@@ -35,14 +39,17 @@ LoadPlugin syslog
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
#
@@ -50,14 +57,10 @@ LoadPlugin syslog
# File STDOUT
#
-
- Host "127.0.0.1"
- Port "411"
-
-
-
Host "gateway"
+ interval 30
+ timeout 10
@@ -66,7 +69,7 @@ LoadPlugin syslog
Process "nmbd"
Process "squid"
Process "squidguard"
- Process "pluto"
+ Process "charon"
Process "snort"
Process "openvpn"
Process "qemu"
@@ -80,10 +83,11 @@ LoadPlugin syslog
DataDir "/var/log/rrd/collectd"
- CacheTimeout 300
- CacheFlush 900
LogLevel info
+
+#include "/etc/collectd.thermal"
+include "/etc/collectd.custom"