[4/4] graphs.pl: use brackets instead of hypens

Message ID e822b5c2-a962-255d-d491-2ef586adbd3a@ipfire.org
State Accepted
Commit e01c49b4667d6b32da3ce646f8da86caa31edfaa
Headers
Series [1/4] graphs.pl: fix spelling of "SYN" |

Commit Message

Peter Müller April 27, 2020, 3:25 p.m. UTC
  This simply makes more sense in most languages, as INPUT, OUTPUT and
FORWARD are special cases of firewall hits in general.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/cfgroot/graphs.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
  

Comments

Michael Tremer April 27, 2020, 3:33 p.m. UTC | #1
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 27 Apr 2020, at 16:25, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> This simply makes more sense in most languages, as INPUT, OUTPUT and
> FORWARD are special cases of firewall hits in general.
> 
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
> config/cfgroot/graphs.pl | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
> index 872e9bd7c..7b056d117 100644
> --- a/config/cfgroot/graphs.pl
> +++ b/config/cfgroot/graphs.pl
> @@ -683,17 +683,17 @@ sub updatefwhitsgraph {
> 		"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
> 		"COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
> 		"COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
> -		"AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-OUTPUT"),
> +		"AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
> 		"GPRINT:output:MAX:%8.1lf %sBps",
> 		"GPRINT:output:AVERAGE:%8.1lf %sBps",
> 		"GPRINT:output:MIN:%8.1lf %sBps",
> 		"GPRINT:output:LAST:%8.1lf %sBps\\j",
> -		"STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-FORWARD"),
> +		"STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
> 		"GPRINT:forward:MAX:%8.1lf %sBps",
> 		"GPRINT:forward:AVERAGE:%8.1lf %sBps",
> 		"GPRINT:forward:MIN:%8.1lf %sBps",
> 		"GPRINT:forward:LAST:%8.1lf %sBps\\j",
> -		"STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-INPUT"),
> +		"STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
> 		"GPRINT:input:MAX:%8.1lf %sBps",
> 		"GPRINT:input:AVERAGE:%8.1lf %sBps",
> 		"GPRINT:input:MIN:%8.1lf %sBps",
> -- 
> 2.16.4
  

Patch

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 872e9bd7c..7b056d117 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -683,17 +683,17 @@  sub updatefwhitsgraph {
 		"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
 		"COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
 		"COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
-		"AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-OUTPUT"),
+		"AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
 		"GPRINT:output:MAX:%8.1lf %sBps",
 		"GPRINT:output:AVERAGE:%8.1lf %sBps",
 		"GPRINT:output:MIN:%8.1lf %sBps",
 		"GPRINT:output:LAST:%8.1lf %sBps\\j",
-		"STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-FORWARD"),
+		"STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
 		"GPRINT:forward:MAX:%8.1lf %sBps",
 		"GPRINT:forward:AVERAGE:%8.1lf %sBps",
 		"GPRINT:forward:MIN:%8.1lf %sBps",
 		"GPRINT:forward:LAST:%8.1lf %sBps\\j",
-		"STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-INPUT"),
+		"STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
 		"GPRINT:input:MAX:%8.1lf %sBps",
 		"GPRINT:input:AVERAGE:%8.1lf %sBps",
 		"GPRINT:input:MIN:%8.1lf %sBps",