From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 4/4] graphs.pl: Standardize temperature displays
Date: Sat, 05 Sep 2020 17:41:13 +0200
Message-ID: <20200905154113.3555-4-matthias.fischer@ipfire.org>
In-Reply-To: <20200905154113.3555-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1581925379244973331=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 config/cfgroot/graphs.pl | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 8473613a3..417da5cd7 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -810,15 +810,15 @@ sub updatehddgraph {
 		"DEF:standby=3D".$mainsettings{'RRDLOG'}."/hddshutdown-$disk.rrd:standby:A=
VERAGE",
 		"CDEF:st=3Dstandby,INF,*",
 		"AREA:st".$color{"color20"}."A0:standby",
-		"LINE3:temperature".$color{"color11"}."A0:$Lang::tr{'hdd temperature in'} =
C\\j",
+		"LINE3:temperature".$color{"color11"}."A0:$Lang::tr{'hdd temperature in'} =
=C2=B0C\\j",
 		"COMMENT:$Lang::tr{'maximal'}",
 		"COMMENT:$Lang::tr{'average'}",
 		"COMMENT:$Lang::tr{'minimal'}",
 		"COMMENT:$Lang::tr{'current'}\\j",
-		"GPRINT:temperature:MAX:%3.0lf Grad C",
-		"GPRINT:temperature:AVERAGE:%3.0lf Grad C",
-		"GPRINT:temperature:MIN:%3.0lf Grad C",
-		"GPRINT:temperature:LAST:%3.0lf Grad C\\j",
+		"GPRINT:temperature:MAX:%3.0lf =C2=B0C",
+		"GPRINT:temperature:AVERAGE:%3.0lf =C2=B0C",
+		"GPRINT:temperature:MIN:%3.0lf =C2=B0C",
+		"GPRINT:temperature:LAST:%3.0lf =C2=B0C\\j",
 		);
 		$ERROR =3D RRDs::error;
 		print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
@@ -836,6 +836,7 @@ sub updatehwtempgraph {
 		"-1".$period,
 		"-r",
 		"-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$pe=
riod."-graph"},
+		"-v Celsius",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
 		"--color=3DBACK".$color{"color21"},
@@ -862,7 +863,7 @@ sub updatehwtempgraph {
 				$_ =3D~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
 				my $label =3D $2.$3;$label=3D~ s/-//g;
 				if ( $sensorsettings{'LINE-'.$label} eq "off" ){next;}
-				push(@command,"LINE3:".$sensorsettings{'LABEL-'.$label}.random_hex_color=
(6)."A0:".sprintf("%-25s",$sensorsettings{'LABEL-'.$label}),"GPRINT:".$sensor=
settings{'LABEL-'.$label}.":MAX:%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.=
$label}.":AVERAGE:%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":MIN:=
%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":LAST:%3.2lf C\\j",);
+				push(@command,"LINE3:".$sensorsettings{'LABEL-'.$label}.random_hex_color=
(6)."A0:".sprintf("%-25s",$sensorsettings{'LABEL-'.$label}),"GPRINT:".$sensor=
settings{'LABEL-'.$label}.":MAX:%3.2lf =C2=B0C","GPRINT:".$sensorsettings{'LA=
BEL-'.$label}.":AVERAGE:%3.2lf =C2=B0C","GPRINT:".$sensorsettings{'LABEL-'.$l=
abel}.":MIN:%3.2lf =C2=B0C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":LAST=
:%3.2lf =C2=B0C\\j",);
 			}
 		}
=20
@@ -1089,7 +1090,7 @@ sub updatethermaltempgraph {
 		"-1".$period,
 		"-r",
 		"-t ".$Lang::tr{'acpitemp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$peri=
od."-graph"},
-		"-v Grad Celsius",
+		"-v Celsius",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
 		"--color=3DBACK".$color{"color21"},
@@ -1105,10 +1106,10 @@ sub updatethermaltempgraph {
 		push(@command,"DEF:temp".$i."_=3D".$mainsettings{'RRDLOG'}."/collectd/loca=
lhost/thermal-thermal_zone".$i."/temperature-temperature.rrd:value:AVERAGE"
 				,"CDEF:temp".$i."=3Dtemp".$i."_,1,/"
 				,"LINE3:temp".$i.$color{"color1$j"}."A0:Temp ".$i." "
-				,"GPRINT:temp".$i.":MAX:%3.0lf Grad C"
-				,"GPRINT:temp".$i.":AVERAGE:%3.0lf Grad C"
-				,"GPRINT:temp".$i.":MIN:%3.0lf Grad C"
-				,"GPRINT:temp".$i.":LAST:%3.0lf Grad C\\j");
+				,"GPRINT:temp".$i.":MAX:%3.0lf =C2=B0C"
+				,"GPRINT:temp".$i.":AVERAGE:%3.0lf =C2=B0C"
+				,"GPRINT:temp".$i.":MIN:%3.0lf =C2=B0C"
+				,"GPRINT:temp".$i.":LAST:%3.0lf =C2=B0C\\j");
 	}
=20
 	RRDs::graph (@command);
--=20
2.18.0


--===============1581925379244973331==--