From 9468a6f71372b680f642cc2c71466db8ce30a186 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Mon, 15 Apr 2013 12:00:35 +0200 Subject: [PATCH] Forward Firewall: Firewall Hits graph now with stacked values --- config/cfgroot/graphs.pl | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 83cc60f26..f8b182b5e 100644 --- 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; -- 2.39.2