From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
To: development@lists.ipfire.org
Subject: [PATCH 10/12] statusmail: Graph infrastructure changes
Date: Fri, 05 Apr 2019 18:29:38 +0100
Message-ID: <20190405172940.13168-11-ipfr@tfitzgeorge.me.uk>
In-Reply-To: <20190405172940.13168-1-ipfr@tfitzgeorge.me.uk>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2164189911596375170=="
List-Id: <development.lists.ipfire.org>

--===============2164189911596375170==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Modifies graphs.pl to expect the second parameter to include the number
as well as the unit, that is 1hour instead of hour. makegraphbox is
modified to pass the number.
The change to entropy.cgi as because it passes the period as the
first parameter instead of the second.

Signed-off-by: Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk>
---
 config/cfgroot/graphs.pl | 274 ++++++++++++++++++++++++++++++++++-----------=
--
 html/cgi-bin/entropy.cgi |   2 +-
 langs/de/cgi-bin/de.pl   |   1 +
 langs/es/cgi-bin/es.pl   |   1 +
 langs/it/cgi-bin/it.pl   |   1 +
 langs/nl/cgi-bin/nl.pl   |   1 +
 langs/pl/cgi-bin/pl.pl   |   1 +
 langs/tr/cgi-bin/tr.pl   |   1 +
 8 files changed, 207 insertions(+), 75 deletions(-)

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 1bed49fa3..25e62b4ac 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -3,7 +3,6 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2005-2010  IPFire Team                                      =
  #
+# Copyright (C) 2005-2019  IPFire Team                                      =
  #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -102,17 +103,17 @@ foreach (@sensorsdir){
=20
 sub makegraphbox {
 	print "<center>";
-	print "<a href=3D'".$_[0]."?".$_[1]."?hour' target=3D'".$_[1]."box'><b>".$L=
ang::tr{'hour'}."</b></a>";
+	print "<a href=3D'".$_[0]."?".$_[1]."?1hour' target=3D'".$_[1]."box'><b>".$=
Lang::tr{'hour'}."</b></a>";
 	print " - ";
-	print "<a href=3D'".$_[0]."?".$_[1]."?day' target=3D'".$_[1]."box'><b>".$La=
ng::tr{'day'}."</b></a>";
+	print "<a href=3D'".$_[0]."?".$_[1]."?1day' target=3D'".$_[1]."box'><b>".$L=
ang::tr{'day'}."</b></a>";
 	print " - ";
-	print "<a href=3D'".$_[0]."?".$_[1]."?week' target=3D'".$_[1]."box'><b>".$L=
ang::tr{'week'}."</b></a>";
+	print "<a href=3D'".$_[0]."?".$_[1]."?1week' target=3D'".$_[1]."box'><b>".$=
Lang::tr{'week'}."</b></a>";
 	print " - ";
-	print "<a href=3D'".$_[0]."?".$_[1]."?month' target=3D'".$_[1]."box'><b>".$=
Lang::tr{'month'}."</b></a>";
+	print "<a href=3D'".$_[0]."?".$_[1]."?1month' target=3D'".$_[1]."box'><b>".=
$Lang::tr{'month'}."</b></a>";
 	print " - ";
-	print "<a href=3D'".$_[0]."?".$_[1]."?year' target=3D'".$_[1]."box'><b>".$L=
ang::tr{'year'}."</b></a>";
+	print "<a href=3D'".$_[0]."?".$_[1]."?1year' target=3D'".$_[1]."box'><b>".$=
Lang::tr{'year'}."</b></a>";
 	print "<br></center>";
-	print "<iframe class=3D'graph' src=3D'".$_[0]."?".$_[1]."?".$_[2]."' scroll=
ing=3D'no' frameborder=3D'no' marginheight=3D'0' name=3D'".$_[1]."box'></ifra=
me>";
+	print "<iframe class=3D'graph' src=3D'".$_[0]."?".$_[1]."?1".$_[2]."' scrol=
ling=3D'no' frameborder=3D'no' marginheight=3D'0' name=3D'".$_[1]."box'></ifr=
ame>";
 }
=20
 # Generate the CPU Graph for the current period of time for values given by
@@ -120,16 +121,22 @@ sub makegraphbox {
=20
 sub updatecpugraph {
 	my $cpucount =3D `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ =
2>/dev/null | wc -l`;
-	my $period    =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	my @command =3D (
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-l 0",
 		"-u 100",
 		"-r",
-		"-t ".$Lang::tr{'cpu usage per'}." ".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'cpu usage per'}.$numstr.$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'percentage'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -140,7 +147,7 @@ sub updatecpugraph {
 		"COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}),
 		"COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j"
 	);
-=09
+
 	my $nice =3D "CDEF:nice=3D";
 	my $interrupt =3D "CDEF:interrupt=3D";
 	my $steal =3D "CDEF:steal=3D";
@@ -150,7 +157,7 @@ sub updatecpugraph {
 	my $iowait =3D "CDEF:iowait=3D";
 	my $irq =3D "CDEF:irq=3D";
 	my $addstring =3D "";
-=09
+
 	for(my $i =3D 0; $i < $cpucount; $i++) {
 		push(@command,"DEF:iowait".$i."=3D".$mainsettings{'RRDLOG'}."/collectd/loc=
alhost/cpu-".$i."/cpu-wait.rrd:value:AVERAGE"
 				,"DEF:nice".$i."=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/cpu-".=
$i."/cpu-nice.rrd:value:AVERAGE"
@@ -170,7 +177,7 @@ sub updatecpugraph {
 		$iowait .=3D "iowait".$i.",";
 		$irq .=3D "irq".$i.",";
 	}
-=09
+
 	for(my $i =3D 2; $i < $cpucount; $i++) {
 		$addstring .=3D "+,";
 	}
@@ -248,15 +255,21 @@ sub updatecpugraph {
 # Generate the Load Graph for the current period of time for values given by=
 collecd
=20
 sub updateloadgraph {
-	my $period    =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	RRDs::graph(
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-l 0",
 		"-r",
-		"-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
+		"-t Load Average ".$Lang::tr{'graph per'}.$numstr.$Lang::tr{$period."-grap=
h"},
 		"-v ".$Lang::tr{'processes'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -280,16 +293,22 @@ sub updateloadgraph {
 # Generate the Memory Graph for the current period of time for values given =
by collecd
=20
 sub updatememorygraph {
-	my $period    =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	RRDs::graph(
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-l 0",
 		"-u 100",
 		"-r",
-		"-t ".$Lang::tr{'memory usage per'}." ".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'memory usage per'}.$numstr.$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'percentage'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -336,16 +355,22 @@ sub updatememorygraph {
 # Generate the Swap Graph for the current period of time for values given by=
 collecd
=20
 sub updateswapgraph {
-	my $period    =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	RRDs::graph(
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-l 0",
 		"-u 100",
 		"-r",
-		"-t ".$Lang::tr{'swap usage per'}." ".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'swap usage per'}.$numstr.$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'percentage'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -386,17 +411,23 @@ sub updateswapgraph {
=20
 sub updateprocessescpugraph {
 	my @processesgraph =3D getprocesses();
-	my $period    =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	my $count=3D"0";
=20
 	my @command =3D (
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-l 0",
 		"-r",
-		"-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$per=
iod."-graph"},
+		"-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}.$numstr.$Lang::tr{=
$period."-graph"},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
 		"--color=3DBACK".$color{"color21"}
@@ -433,17 +464,23 @@ sub updateprocessescpugraph {
=20
 sub updateprocessesmemorygraph {
 	my @processesgraph =3D getprocesses();
-	my $period    =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	my $count=3D"0";
=20
 	my @command =3D (
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-l 0",
 		"-r",
-		"-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph =
per'}." ".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph =
per'}.$numstr.$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -479,14 +516,20 @@ sub updateprocessesmemorygraph {
=20
 sub updatediskgraph {
 	my $disk    =3D $_[0];
-	my $period    =3D $_[1];
+	my ($number, $period) =3D $_[1] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	RRDs::graph(
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period."-graph=
"},
+		"-t ".$disk." ".$Lang::tr{'disk access per'}.$numstr.$Lang::tr{$period."-g=
raph"},
 		"-v ".$Lang::tr{'bytes per second'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -523,14 +566,20 @@ sub updatediskgraph {
=20
 sub updateifgraph {
 	my $interface =3D $_[0];
-	my $period    =3D $_[1];
+	my ($number, $period) =3D $_[1] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	RRDs::graph(
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." =
".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}.$n=
umstr.$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -560,14 +609,20 @@ sub updateifgraph {
=20
 sub updatevpngraph {
 	my $interface =3D $_[0];
-	my $period    =3D $_[1];
+	my ($number, $period) =3D $_[1] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	RRDs::graph(
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." =
".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}.$n=
umstr.$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -597,14 +652,20 @@ sub updatevpngraph {
=20
 sub updatevpnn2ngraph {
 	my $interface =3D $_[0];
-	my $period    =3D $_[1];
+	my ($number, $period) =3D $_[1] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	RRDs::graph(
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." =
".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}.$n=
umstr.$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -661,14 +722,20 @@ sub updatevpnn2ngraph {
 # Generate the Firewall Graph for the current period of time for values give=
n by collecd
=20
 sub updatefwhitsgraph {
-	my $period    =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	RRDs::graph(
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'firewall hits per'}.$numstr.$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -716,16 +783,22 @@ sub updatefwhitsgraph {
 # Generate the Line Quality Graph for the current period of time for values =
given by collecd
=20
 sub updatepinggraph {
-	my $period    =3D $_[1];
+	my ($number, $period) =3D $_[1] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	my $host    =3D $_[0];
 	RRDs::graph(
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-l 0",
 		"-r",
-		"-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::t=
r{$period."-graph"},
+		"-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}.$numstr.$Lan=
g::tr{$period."-graph"},
 		"-v ms",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -756,14 +829,20 @@ sub updatepinggraph {
 }
=20
 sub updatewirelessgraph {
-	my $period    =3D $_[1];
+	my ($number, $period) =3D $_[1] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	my $interface    =3D $_[0];
 	RRDs::graph(
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
-		"-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period=
."-graph"},
+		"-".$number.$period,
+		"-t Wireless ".$interface." ".$Lang::tr{'graph per'}.$numstr.$Lang::tr{$pe=
riod."-graph"},
 		"-v dBm",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -794,14 +873,20 @@ sub updatewirelessgraph {
=20
 sub updatehddgraph {
 	my $disk =3D $_[0];
-	my $period =3D $_[1];
+	my ($number, $period) =3D $_[1] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	RRDs::graph(
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per=
'}." ".$Lang::tr{$period."-graph"},
+		"-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per=
'}.$numstr.$Lang::tr{$period."-graph"},
 		"-v Celsius",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -827,15 +912,21 @@ sub updatehddgraph {
 # Generate the Temp Graph for the current period of time for values given by=
 collecd and lm_sensors
=20
 sub updatehwtempgraph {
-	my $period =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
=20
 	my @command =3D (
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$pe=
riod."-graph"},
+		"-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}.$numstr.$Lang::tr=
{$period."-graph"},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
 		"--color=3DBACK".$color{"color21"},
@@ -874,15 +965,21 @@ sub updatehwtempgraph {
 # Generate the Fan Graph for the current period of time for values given by =
collecd and lm_sensors
=20
 sub updatehwfangraph {
-	my $period =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
=20
 	my @command =3D (
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$per=
iod."-graph"},
+		"-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}.$numstr.$Lang::tr{=
$period."-graph"},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
 		"--color=3DBACK".$color{"color21"},
@@ -921,15 +1018,21 @@ sub updatehwfangraph {
 # Generate the Voltage Graph for the current period of time for values given=
 by collecd and lm_sensors
=20
 sub updatehwvoltgraph {
-	my $period =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
=20
 	my @command =3D (
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$pe=
riod."-graph"},
+		"-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}.$numstr.$Lang::tr=
{$period."-graph"},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
 		"--color=3DBACK".$color{"color21"},
@@ -969,8 +1072,13 @@ sub updatehwvoltgraph {
 # Generate the QoS Graph for the current period of time
=20
 sub updateqosgraph {
-
-	my $period =3D $_[1];
+	my ($number, $period) =3D $_[1] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	my %qossettings =3D ();
 	&General::readhash("${General::swroot}/qos/settings", \%qossettings);
=20
@@ -994,9 +1102,9 @@ sub updateqosgraph {
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{=
'graph per'}." ".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{=
'graph per'}.$numstr.$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -1042,14 +1150,20 @@ sub updateqosgraph {
=20
 sub updatecpufreqgraph {
 	my $cpucount =3D `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ =
2>/dev/null | wc -l`;
-	my $period    =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	my @command =3D (
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'cpu frequency per'}.$numstr.$Lang::tr{$period."-graph"},
 		"-v MHz",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -1081,14 +1195,20 @@ sub updatecpufreqgraph {
=20
 sub updatethermaltempgraph {
 	my $thermalcount =3D `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/the=
rmal-thermal_zone* 2>/dev/null | wc -l`;
-	my $period    =3D $_[0];
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
 	my @command =3D (
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
-		"-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"},
+		"-t "."ACPI Thermal-Zone Temperature"." -$numstr".$Lang::tr{$period."-grap=
h"},
 		"-v Grad Celsius",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -1134,12 +1254,18 @@ sub getprocesses {
 }
=20
 sub updateentropygraph {
-	my $period    =3D $_[0];
-	my @command =3D (
+	my ($number, $period) =3D $_[0] =3D~ m/(\d+)(\D+)s?/;
+	my $numstr =3D ' ';
+	if ($number > 1)
+	{
+      $period .=3D 's';
+      $numstr =3D " $number ";
+    }
+  my @command =3D (
 		@GRAPH_ARGS,
 		"-",
 		"--start",
-		"-1".$period,
+		"-".$number.$period,
 		"-r",
 		"--lower-limit","0",
 		"-t $Lang::tr{'entropy'}",
diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
index d7a9ca5d8..f8045db5a 100644
--- a/html/cgi-bin/entropy.cgi
+++ b/html/cgi-bin/entropy.cgi
@@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
 	&Header::openbigbox('100%', 'left');
=20
 	&Header::openbox('100%', 'center', $Lang::tr{'entropy'});
-	&Graphs::makegraphbox("entropy.cgi", "day");
+	&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
 	&Header::closebox();
=20
 	# Check for hardware support.
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 88b34d23b..855d8d33f 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1320,6 +1320,7 @@
 'hosts config changed' =3D> 'Hosts-Konfiguration ge=C3=A4ndert',
 'hour' =3D> 'Stunde',
 'hour-graph' =3D> 'Stunde',
+'hours-graph' =3D> 'Stunden',
 'hours' =3D> 'Stunden',
 'hours2' =3D> 'Stunden',
 'ibod for dual isdn only' =3D> 'iBOD kann nur bei ISDN-Kanalb=C3=BCndelung g=
enutzt werden.',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 23bc20727..cb0471f12 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -915,6 +915,7 @@
 'hosts config changed' =3D> 'Configuraci=C3=B3n de hosts ha cambiado',
 'hour' =3D> 'Hora',
 'hour-graph' =3D> 'Hora',
+'hours-graph' =3D> 'Horas',
 'hours' =3D> 'horas',
 'hours2' =3D> 'Horas',
 'ibod for dual isdn only' =3D> 'iBPD s=C3=B3lo puede usarse con ISDN dual',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index 6c9137c28..586ae882c 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -1217,6 +1217,7 @@
 'hosts config changed' =3D> 'Hosts config changed',
 'hour' =3D> 'Ora',
 'hour-graph' =3D> 'Ora',
+'hours-graph' =3D> 'Ore',
 'hours' =3D> 'Ore',
 'hours2' =3D> 'Ore',
 'ibod for dual isdn only' =3D> 'iBOD can only be used with Dual ISDN.',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 5fa89b1ac..75c2b63f4 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1198,6 +1198,7 @@
 'hosts config changed' =3D> 'Hosts configuratie gewijzigd',
 'hour' =3D> 'Uur',
 'hour-graph' =3D> 'Uur',
+'hours-graph' =3D> 'Uren',
 'hours' =3D> 'uren',
 'hours2' =3D> 'Uren',
 'ibod for dual isdn only' =3D> 'iBOD kan alleen gebruikt worden met Dual ISD=
N.',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index 521381af2..8742f0c29 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -914,6 +914,7 @@
 'hosts config changed' =3D> 'Zmieniona konfiguracja host=C3=B3w',
 'hour' =3D> 'Godzina',
 'hour-graph' =3D> 'Godzina',
+'hours-graph' =3D> 'Godziny',
 'hours' =3D> 'Godziny',
 'hours2' =3D> 'Godziny',
 'ibod for dual isdn only' =3D> 'iBOD can only be used with Dual ISDN.',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 1917b8241..0e7bb3219 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -1341,6 +1341,7 @@
 'hosts config changed' =3D> 'Ana bilgisayar yap=C4=B1land=C4=B1rmas=C4=B1 de=
=C4=9Fi=C5=9Ftirildi',
 'hour' =3D> 'Saat',
 'hour-graph' =3D> 'saat',
+'hours-graph' =3D> 'saat',
 'hours' =3D> 'saat',
 'hours2' =3D> 'saat',
 'ibod for dual isdn only' =3D> 'iBOD yaln=C4=B1zca =C3=A7ift ISDN ile kullan=
=C4=B1labilir.',
--=20
2.16.4


--===============2164189911596375170==--