Merge branch 'next'

[people/pmueller/ipfire-2.x.git] / config / cfgroot / graphs.pl

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 9803dd12418a8c60683ce42d146639813413560a..a23e49c98093ff435b7b929df93f0a4abfe86ac8 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -693,7 +693,16 @@ 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_DROP/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+               "DEF:hostilein=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_IN/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+               "DEF:hostileout=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_OUT/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+               "DEF:hostilelegacy=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+
+               # This creates a new combined hostile segment.
+               # Previously we did not split into incoming/outgoing, but we cannot go back in time. This CDEF will take the values
+               # from the old RRD database unless those are UNKNOWN (i.e. we started collected IN/OUT). If the values are unknown,
+               # we replace them with them sum of IN + OUT.
+               "CDEF:hostile=hostilelegacy,UN,hostilein,hostileout,+,hostilelegacy,IF",
+
                "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
@@ -729,7 +738,17 @@ sub updatefwhitsgraph {
                "GPRINT:spoofedmartian:AVERAGE:%8.1lf %sBps",
                "GPRINT:spoofedmartian:MIN:%8.1lf %sBps",
                "GPRINT:spoofedmartian:LAST:%8.1lf %sBps\\j",
-               "STACK:hostile".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks'}),
+               "STACK:hostilein".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks in'}),
+               "GPRINT:hostilein:MAX:%8.1lf %sBps",
+               "GPRINT:hostilein:AVERAGE:%8.1lf %sBps",
+               "GPRINT:hostilein:MIN:%8.1lf %sBps",
+               "GPRINT:hostilein:LAST:%8.1lf %sBps\\j",
+               "STACK:hostileout".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks out'}),
+               "GPRINT:hostileout:MAX:%8.1lf %sBps",
+               "GPRINT:hostileout:AVERAGE:%8.1lf %sBps",
+               "GPRINT:hostileout:MIN:%8.1lf %sBps",
+               "GPRINT:hostileout:LAST:%8.1lf %sBps\\j",
+               "LINE:hostile#000000A0:".sprintf("%-25s",$Lang::tr{'hostile networks total'}),
                "GPRINT:hostile:MAX:%8.1lf %sBps",
                "GPRINT:hostile:AVERAGE:%8.1lf %sBps",
                "GPRINT:hostile:MIN:%8.1lf %sBps",