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 a148b084a321ccad7c8cd966092b7ed27c8a9b56..14dd568c2ffd3369a13ef48e78800a5063357d48 100644 (file)
--- 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
@@ -27,6 +27,9 @@ LoadPlugin sensors
 LoadPlugin swap
 LoadPlugin syslog
 #LoadPlugin wireless
+LoadPlugin match_regex
+
+include "/etc/collectd.precache"
 
 <Plugin interface>
        Interface "lo"
@@ -37,18 +40,16 @@ LoadPlugin syslog
 </Plugin>
 
 <Plugin "disk">
-       Disk "/[0-9]$/"
+       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>
@@ -58,6 +59,8 @@ LoadPlugin syslog
 
 <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"
@@ -87,3 +90,4 @@ LoadPlugin syslog
 </Plugin>
 
 #include "/etc/collectd.thermal"
+include "/etc/collectd.custom"