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

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index f92ecf2c8..e222d5cb7 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -8,9 +8,9 @@ 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
@@ -19,15 +19,17 @@ LoadPlugin interface
 LoadPlugin iptables
 LoadPlugin load
 #LoadPlugin logfile
-#LoadPlugin mbmon
 LoadPlugin memory
 LoadPlugin ping
 LoadPlugin processes
 LoadPlugin rrdtool
-LoadPlugin sensors
+#LoadPlugin sensors
 LoadPlugin swap
 LoadPlugin syslog
 #LoadPlugin wireless
+LoadPlugin match_regex
+
+include "/etc/collectd.precache"
 
 <Plugin interface>
 	Interface "lo"
@@ -37,14 +39,17 @@ LoadPlugin syslog
 	IgnoreSelected true
 </Plugin>
 
+<Plugin "disk">
+	Disk "/[hs]d[a-z][0-9]$/"
+	IgnoreSelected true
+</Plugin>
+
 <Plugin iptables>
-	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
 </Plugin>
 
 #<Plugin logfile>
@@ -54,6 +59,8 @@ LoadPlugin syslog
 
 <Plugin ping>
 	Host "gateway"
+	interval 30
+	timeout 10
 </Plugin>
 
 <Plugin processes>
@@ -62,7 +69,7 @@ LoadPlugin syslog
 	Process "nmbd"
 	Process "squid"
 	Process "squidguard"
-	Process "pluto"
+	Process "charon"
 	Process "snort"
 	Process "openvpn"
 	Process "qemu"
@@ -76,10 +83,11 @@ LoadPlugin syslog
 
 <Plugin rrdtool>
 	DataDir "/var/log/rrd/collectd"
-	CacheTimeout 300
-	CacheFlush   900
 </Plugin>
 
 <Plugin syslog>
 	LogLevel info
 </Plugin>
+
+#include "/etc/collectd.thermal"
+include "/etc/collectd.custom"