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

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

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index f527447b5310bf6d7309184dda46842b06e713d1..a23e49c98093ff435b7b929df93f0a4abfe86ac8 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/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;

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 29bf5b8d79b876ac2ae75766ce191a0c167de2f9..51186be0832d824c319b94258534fa71678d2667 100644 (file)
--- a/doc/language_issues.de
+++ b/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)

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 4f37e43f77444ca6ed5d3e97025422150248eb00..7f35bbc36adfc16a103b8f53bda0954a61fb8210 100644 (file)
--- a/doc/language_issues.en
+++ b/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.

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 22b6efbc3649924881e862ae0a2307047a2d848c..cad67f5d373d6ba2831facd28aba618ce8edef9a 100644 (file)
--- a/doc/language_issues.es
+++ b/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

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 68514699dcbc244d36dc630225bc94a9bbe5ccb0..c72cf45ae5fe707f52b4c5ab170f390b328b2974 100644 (file)
--- a/doc/language_issues.fr
+++ b/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.

diff --git a/doc/language_issues.it b/doc/language_issues.it
index fed7f419506dd422f2ce3cd1b6507b15eae83a4a..d3341e285aa9268b87b500b405bdbe882aee1eb5 100644 (file)
--- a/doc/language_issues.it
+++ b/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

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 9f9fce6899e6bed259b0b530d082fca764625ba7..065cacc496f04bac5659ea9af14d0c4121923722 100644 (file)
--- a/doc/language_issues.nl
+++ b/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

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 48c0974e8b58c6bd688854228ccba43d688618ef..7c2425d57b59baff4fc470a31e4e3b91ed07987f 100644 (file)
--- a/doc/language_issues.pl
+++ b/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

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index a1112396cd7b5e453d0ba0d4ddfd4680eb0a7845..20d7afdffa48118ccac7bc6f04187ac05338eb9a 100644 (file)
--- a/doc/language_issues.ru
+++ b/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

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 649ebf6b4e0490b2c34db32d67171dc916e6d81c..d9a1891cb228315bac95ff3848a7bf835f7ce94f 100644 (file)
--- a/doc/language_issues.tr
+++ b/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

diff --git a/doc/language_missings b/doc/language_missings
index 8a92fde97f94a455f47e4dfb0dceac5ffded9b8e..eb58bd3859ccfe5981878bfdc26de0336a6af1b3 100644 (file)
--- a/doc/language_missings
+++ b/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

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 935217f0b4f7667bbe1cdb3824009eedbfeba2a3..303fc3d5ba5e8737f233a950db34342ee00eba70 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/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.',