Disabled and removed unused iptables rrds.

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 530c81e7b3bb0ee413c5ddeb3591b364b33084bd..e9c9af4f121b724f86fb0b5a47342ef32b607319 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -49,9 +49,6 @@ include "/etc/collectd.precache"
        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>

diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh
index 716c6a520616408ede8dea0f70971e6f7a8f09aa..244b188bd9a3aaee9145ccbb10a09095fb317f10 100644 (file)
--- a/config/rootfiles/core/38/update.sh
+++ b/config/rootfiles/core/38/update.sh
@@ -160,6 +160,10 @@ rm -rf /var/log/rrd*/collectd/localhost/interface/if_packets*
 rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_merged*
 rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_ops*
 rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_time*
+#
+rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-INPUT/*-DROP_Wirelessinput*
+rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-FORWARD/*-DROP_Wirelessforward*
+rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-OUTGOINGFW
 POSTCLEAN=`du -sh /var/log/rrd/collectd`
 #
 echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size.