Forward Firewall: some changes in firewall script to make collectd work

[people/teissler/ipfire-2.x.git] / config / collectd / collectd.conf

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index e5bd3db438895f8ecf6866e1924f268af635ffaa..14dd568c2ffd3369a13ef48e78800a5063357d48 100644 (file)
--- 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,6 +26,10 @@ LoadPlugin rrdtool
 LoadPlugin sensors
 LoadPlugin swap
 LoadPlugin syslog
+#LoadPlugin wireless
+LoadPlugin match_regex
+
+include "/etc/collectd.precache"
 
 <Plugin interface>
        Interface "lo"
@@ -35,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>
@@ -50,14 +57,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>
@@ -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
 
 <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"