firewall: graphs: Add a line for the total number of hostile hits

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

config/cfgroot/graphs.pl

@@ -695,6 +695,14 @@ sub updatefwhitsgraph {
 		"DEF:spoofedmartian=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.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'}),
@@ -740,6 +748,11 @@ sub updatefwhitsgraph {
 		"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",
+		"GPRINT:hostile:LAST:%8.1lf %sBps\\j",
 		);
 		$ERROR = RRDs::error;
 		return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;

doc/language_issues.de

@@ -926,6 +926,7 @@ WARNING: untranslated string: guardian no entries = unknown string
 WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hostile networks in = Hostile networks in
 WARNING: untranslated string: hostile networks out = Hostile networks out
+WARNING: untranslated string: hostile networks total = Hostile networks total
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
 WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
 WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es)

doc/language_issues.en

@@ -1041,6 +1041,7 @@ WARNING: untranslated string: host ip = Host IP address
 WARNING: untranslated string: host to net vpn = Host-to-Net Virtual Private Network (RoadWarrior)
 WARNING: untranslated string: hostile networks in = Hostile networks in
 WARNING: untranslated string: hostile networks out = Hostile networks out
+WARNING: untranslated string: hostile networks total = Hostile networks total
 WARNING: untranslated string: hostname = Hostname
 WARNING: untranslated string: hostname cant be empty = Hostname cannot be empty.
 WARNING: untranslated string: hostname not set = Hostname not set.

doc/language_issues.es

@@ -992,6 +992,7 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks in = Hostile networks in
 WARNING: untranslated string: hostile networks out = Hostile networks out
+WARNING: untranslated string: hostile networks total = Hostile networks total
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks

doc/language_issues.fr

@@ -950,6 +950,7 @@ WARNING: untranslated string: guardian no entries = unknown string
 WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hostile networks in = Hostile networks in
 WARNING: untranslated string: hostile networks out = Hostile networks out
+WARNING: untranslated string: hostile networks total = Hostile networks total
 WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
 WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
 WARNING: untranslated string: pakfire ago = ago.

doc/language_issues.it

@@ -1070,6 +1070,7 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks in = Hostile networks in
 WARNING: untranslated string: hostile networks out = Hostile networks out
+WARNING: untranslated string: hostile networks total = Hostile networks total
 WARNING: untranslated string: ids add provider = Add provider
 WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply

doc/language_issues.nl

@@ -1075,6 +1075,7 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks in = Hostile networks in
 WARNING: untranslated string: hostile networks out = Hostile networks out
+WARNING: untranslated string: hostile networks total = Hostile networks total
 WARNING: untranslated string: ids add provider = Add provider
 WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply

doc/language_issues.pl

@@ -1215,6 +1215,7 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks in = Hostile networks in
 WARNING: untranslated string: hostile networks out = Hostile networks out
+WARNING: untranslated string: hostile networks total = Hostile networks total
 WARNING: untranslated string: ids add provider = Add provider
 WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply

doc/language_issues.ru

@@ -1212,6 +1212,7 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks in = Hostile networks in
 WARNING: untranslated string: hostile networks out = Hostile networks out
+WARNING: untranslated string: hostile networks total = Hostile networks total
 WARNING: untranslated string: ids add provider = Add provider
 WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply

doc/language_issues.tr

@@ -1012,6 +1012,7 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks in = Hostile networks in
 WARNING: untranslated string: hostile networks out = Hostile networks out
+WARNING: untranslated string: hostile networks total = Hostile networks total
 WARNING: untranslated string: ids add provider = Add provider
 WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply

doc/language_missings

@@ -60,6 +60,7 @@
 < g.lite
 < hostile networks in
 < hostile networks out
+< hostile networks total
 < ids automatic rules update
 < ids subscription code required
 < insert removable device
@@ -120,6 +121,7 @@
 < hardware vulnerabilities
 < hostile networks in
 < hostile networks out
+< hostile networks total
 < invalid ip or hostname
 < log drop hostile in
 < log drop hostile out
@@ -148,6 +150,7 @@
 < g.lite
 < hostile networks in
 < hostile networks out
+< hostile networks total
 < log drop hostile in
 < log drop hostile out
 < reiserfs warning1
@@ -375,6 +378,7 @@
 < hardware vulnerabilities
 < hostile networks in
 < hostile networks out
+< hostile networks total
 < ids add provider
 < ids adjust ruleset
 < ids apply
@@ -897,6 +901,7 @@
 < hardware vulnerabilities
 < hostile networks in
 < hostile networks out
+< hostile networks total
 < ids add provider
 < ids adjust ruleset
 < ids apply
@@ -1724,6 +1729,7 @@
 < hardware vulnerabilities
 < hostile networks in
 < hostile networks out
+< hostile networks total
 < ids add provider
 < ids adjust ruleset
 < ids apply
@@ -2718,6 +2724,7 @@
 < hardware vulnerabilities
 < hostile networks in
 < hostile networks out
+< hostile networks total
 < hour-graph
 < ids add provider
 < ids adjust ruleset
@@ -3306,6 +3313,7 @@
 < hardware vulnerabilities
 < hostile networks in
 < hostile networks out
+< hostile networks total
 < ids add provider
 < ids adjust ruleset
 < ids apply

langs/en/cgi-bin/en.pl

@@ -1411,6 +1411,7 @@
 'host to net vpn' => 'Host-to-Net Virtual Private Network (RoadWarrior)',
 'hostile networks in' => 'Hostile networks in',
 'hostile networks out' => 'Hostile networks out',
+'hostile networks total' => 'Hostile networks total',
 'hostname' => 'Hostname',
 'hostname and domain already in use' => 'Hostname and domain already in use.',
 'hostname cant be empty' => 'Hostname cannot be empty.',