firewall hits graph: Fix order of values

The fields were mixed up and therefore graph showed incorrect
values.

Fixes: #12496
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 04f038be179e1fe6bc1fd9643209065818820440..aced991256675d6ccc29a8d4f4730d2a8300a83e 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -700,13 +700,13 @@ sub updatefwhitsgraph {
                "GPRINT:input:LAST:%8.1lf %sBps\\j",
                "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
                "GPRINT:newnotsyn:MAX:%8.1lf %sBps",
-               "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
                "GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
+               "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
                "GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j",
                "STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}),
                "GPRINT:portscan:MAX:%8.1lf %sBps",
-               "GPRINT:portscan:MIN:%8.1lf %sBps",
                "GPRINT:portscan:AVERAGE:%8.1lf %sBps",
+               "GPRINT:portscan:MIN:%8.1lf %sBps",
                "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
                );
                $ERROR = RRDs::error;

diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/core/152/filelists/files
index 367c4b56a46ad12d860883f9901db9999a3e4a69..ceb904c64ef6dca628b4cd85641846af2327c17b 100644 (file)
--- a/config/rootfiles/core/152/filelists/files
+++ b/config/rootfiles/core/152/filelists/files
@@ -10,3 +10,4 @@ etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/red
 srv/web/ipfire/cgi-bin/credits.cgi
 usr/local/bin/setaliases
+var/ipfire/graphs.pl