X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Fcollectd%2Fcollectd.conf;h=939dd4b30253ab9e535dd67c57f915af6a858717;hb=d03334be56ab28f4b1ead47be49e6439b4350433;hp=8a9242f6dec465811377424edea751921aea67c4;hpb=518f894b4a6967f0a22c2c966df6a64775c4a707;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 8a9242f6de..939dd4b302 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"
 
 <Plugin interface>
-	Interface "ppp0"
 	Interface "lo"
 	Interface "ipsec1"
 	Interface "ipsec2"
@@ -35,14 +39,16 @@ 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
 </Plugin>
 
 #<Plugin logfile>
@@ -50,14 +56,10 @@ LoadPlugin syslog
 #	File STDOUT
 #</Plugin>
 
-<Plugin mbmon>
-	Host "127.0.0.1"
-	Port "411"
-</Plugin>
-
-
 <Plugin ping>
 	Host "gateway"
+	interval 30
+	timeout 10
 </Plugin>
 
 <Plugin processes>
@@ -80,10 +82,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"