[PATCH 1/2] collectd.conf: Change chain from HOSTILE to HOSTILE_DROP - fixes bug#12838

[PATCH 1/2] collectd.conf: Change chain from HOSTILE to HOSTILE_DROP - fixes bug#12838

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 920 bytes --]

From: Bernhard Bitsch <bbitsch(a)ipfire.org>

- Chain that was specified was HOSTILE but actual used is HOSTILE_DROP
- Using HOSTILE caused no update fro the hostile data used in the Firewall Hits graph

Fixes: bug#12838
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/collectd/collectd.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 2a0237100..e34a97da1 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -52,7 +52,7 @@ include "/etc/collectd.precache"
 	Chain filter POLICYOUT DROP_OUTPUT
 	Chain filter POLICYIN DROP_INPUT
 	Chain filter SPOOFED_MARTIAN DROP_SPOOFED_MARTIAN
-	Chain filter HOSTILE DROP_HOSTILE
+	Chain filter HOSTILE_DROP DROP_HOSTILE
 </Plugin>
 
 #<Plugin logfile>
-- 
2.35.1

[PATCH 2/2] graphs.pl: Change directory name to replace HOSTILE with HOSTILE_DROP - fixes bug#12838

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1503 bytes --]

From: Bernhard Bitsch <bbitsch(a)ipfire.org>

- The directory name for the hostile data was using HOSTILE while the chain was called
   HOSTILE_DROP. This resulted in the files in the directory not being updated.

Fixes: bug#12838
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/cfgroot/graphs.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index b964f1e80..3368e5aad 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -693,7 +693,7 @@ sub updatefwhitsgraph {
 		"DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE",
 		"DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE",
 		"DEF:spoofedmartian=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.rrd:value:AVERAGE",
-		"DEF:hostile=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+		"DEF:hostile=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
 		"COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}),
 		"COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
 		"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
-- 
2.35.1

Re: [PATCH 2/2] graphs.pl: Change directory name to replace HOSTILE with HOSTILE_DROP - fixes bug#12838

[Bernhard Bitsch]

[-- Attachment #1: Type: text/plain, Size: 1647 bytes --]

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 04.04.2022 um 22:33 schrieb Adolf Belka:
> From: Bernhard Bitsch <bbitsch(a)ipfire.org>
> 
> - The directory name for the hostile data was using HOSTILE while the chain was called
>     HOSTILE_DROP. This resulted in the files in the directory not being updated.
> 
> Fixes: bug#12838
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>   config/cfgroot/graphs.pl | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
> index b964f1e80..3368e5aad 100644
> --- a/config/cfgroot/graphs.pl
> +++ b/config/cfgroot/graphs.pl
> @@ -693,7 +693,7 @@ sub updatefwhitsgraph {
>   		"DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE",
>   		"DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE",
>   		"DEF:spoofedmartian=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.rrd:value:AVERAGE",
> -		"DEF:hostile=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
> +		"DEF:hostile=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
>   		"COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}),
>   		"COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
>   		"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),

Re: [PATCH 1/2] collectd.conf: Change chain from HOSTILE to HOSTILE_DROP - fixes bug#12838

[Bernhard Bitsch]

[-- Attachment #1: Type: text/plain, Size: 1113 bytes --]

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Acked-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 04.04.2022 um 22:33 schrieb Adolf Belka:
> From: Bernhard Bitsch <bbitsch(a)ipfire.org>
> 
> - Chain that was specified was HOSTILE but actual used is HOSTILE_DROP
> - Using HOSTILE caused no update fro the hostile data used in the Firewall Hits graph
> 
> Fixes: bug#12838
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>   config/collectd/collectd.conf | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
> index 2a0237100..e34a97da1 100644
> --- a/config/collectd/collectd.conf
> +++ b/config/collectd/collectd.conf
> @@ -52,7 +52,7 @@ include "/etc/collectd.precache"
>   	Chain filter POLICYOUT DROP_OUTPUT
>   	Chain filter POLICYIN DROP_INPUT
>   	Chain filter SPOOFED_MARTIAN DROP_SPOOFED_MARTIAN
> -	Chain filter HOSTILE DROP_HOSTILE
> +	Chain filter HOSTILE_DROP DROP_HOSTILE
>   </Plugin>
>   
>   #<Plugin logfile>