Forward Firewall: Firewall Hits graph now with stacked values

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 83cc60f2609297d6c0958b8c4d64c58e80905b36..f8b182b5e83d3168a5f7841c98cbe1d577b3d9b8 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -607,45 +607,36 @@ sub updatefwhitsgraph {
                "DEF:forward=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYFWD/ipt_bytes-DROP_FORWARD.rrd:value:AVERAGE",
                "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",
-               #"CDEF:amount=input",
                "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
                "COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
-               "AREA: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",
-               "GPRINT:input:LAST:%8.1lf %sBps\\j",
                "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",
-               "AREA: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",
-               "AREA:newnotsyn".$color{"color14"}."A0:".sprintf("%-24s","NewNotSyn"),
+               "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",
+               "GPRINT:input:LAST:%8.1lf %sBps\\j",
+               "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-24s","NewNotSyn"),
                "GPRINT:newnotsyn:MAX:%8.1lf %sBps",
                "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
                "GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
                "GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j",
-               "AREA:portscan".$color{"color16"}."A0:".sprintf("%-24s",$Lang::tr{'portscans'}),
+               "STACK:portscan".$color{"color16"}."A0:".sprintf("%-24s",$Lang::tr{'portscans'}),
                "GPRINT:portscan:MAX:%8.1lf %sBps",
                "GPRINT:portscan:MIN:%8.1lf %sBps",
                "GPRINT:portscan:AVERAGE:%8.1lf %sBps",
                "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
-                               
-               "LINE1:input".$color{"color24"},
-               "LINE1:output".$color{"color25"},
-               "LINE1:forward".$color{"color23"},
-               "LINE1:newnotsyn".$color{"color14"},
-               "LINE1:portscan".$color{"color16"},
-               
-               
                );
                $ERROR = RRDs::error;
                print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;