]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - config/cfgroot/graphs.pl
openssl: Update to 1.0.2k
[ipfire-2.x.git] / config / cfgroot / graphs.pl
index 5e6fddbf6e42355b5ff4b90a852b9e1623203ca7..c3fb43eeb83246e3a31efffb5ecf5503d85210ce 100644 (file)
@@ -257,11 +257,11 @@ sub updateloadgraph {
                "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE",
                "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE",
                "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE",
-               "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":",
+               "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'},
                "GPRINT:load1:LAST:%5.2lf",
-               "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":",
+               "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'},
                "GPRINT:load5:LAST:%5.2lf",
-               "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":",
+               "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'},
                "GPRINT:load15:LAST:%5.2lf\\j",
                "LINE1:load5".$color{"color13"},
                "LINE1:load1".$color{"color18"},
@@ -519,7 +519,7 @@ sub updatediskgraph {
                "CDEF:writen=write,-1,*",
                "DEF:standby=".$mainsettings{'RRDLOG'}."/hddshutdown-".$disk.".rrd:standby:AVERAGE",
                "CDEF:st=standby,INF,*",
-               "CDEF:st1=standby,-INF,*",
+               "CDEF:st1=standby,NEGINF,*",
                "COMMENT:".sprintf("%-25s",$Lang::tr{'caption'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
@@ -664,32 +664,32 @@ sub updatevpnn2ngraph {
                "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
-               "AREA:incoming#00dd00:".sprintf("%-20s",$Lang::tr{'incoming traffic in bytes per second'}),
+               "AREA:incoming#00dd00:".sprintf("%-23s",$Lang::tr{'incoming traffic in bytes per second'}),
                "GPRINT:incoming:MAX:%8.1lf %sBps",
                "GPRINT:incoming:AVERAGE:%8.1lf %sBps",
                "GPRINT:incoming:MIN:%8.1lf %sBps",
                "GPRINT:incoming:LAST:%8.1lf %sBps\\j",
-               "STACK:overhead_in#116B11:".sprintf("%-20s",$Lang::tr{'incoming overhead in bytes per second'}),
+               "STACK:overhead_in#116B11:".sprintf("%-23s",$Lang::tr{'incoming overhead in bytes per second'}),
                "GPRINT:overhead_in:MAX:%8.1lf %sBps",
                "GPRINT:overhead_in:AVERAGE:%8.1lf %sBps",
                "GPRINT:overhead_in:MIN:%8.1lf %sBps",
                "GPRINT:overhead_in:LAST:%8.1lf %sBps\\j",
-               "LINE1:compression_in#ff00ff:".sprintf("%-20s",$Lang::tr{'incoming compression in bytes per second'}),
+               "LINE1:compression_in#ff00ff:".sprintf("%-23s",$Lang::tr{'incoming compression in bytes per second'}),
                "GPRINT:compression_in:MAX:%8.1lf %sBps",
                "GPRINT:compression_in:AVERAGE:%8.1lf %sBps",
                "GPRINT:compression_in:MIN:%8.1lf %sBps",
                "GPRINT:compression_in:LAST:%8.1lf %sBps\\j",
-               "AREA:outgoingn#dd0000:".sprintf("%-20s",$Lang::tr{'outgoing traffic in bytes per second'}),
+               "AREA:outgoingn#dd0000:".sprintf("%-23s",$Lang::tr{'outgoing traffic in bytes per second'}),
                "GPRINT:outgoing:MAX:%8.1lf %sBps",
                "GPRINT:outgoing:AVERAGE:%8.1lf %sBps",
                "GPRINT:outgoing:MIN:%8.1lf %sBps",
                "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
-               "STACK:overhead_outn#870C0C:".sprintf("%-20s",$Lang::tr{'outgoing overhead in bytes per second'}),
+               "STACK:overhead_outn#870C0C:".sprintf("%-23s",$Lang::tr{'outgoing overhead in bytes per second'}),
                "GPRINT:overhead_out:MAX:%8.1lf %sBps",
                "GPRINT:overhead_out:AVERAGE:%8.1lf %sBps",
                "GPRINT:overhead_out:MIN:%8.1lf %sBps",
                "GPRINT:overhead_out:LAST:%8.1lf %sBps\\j",
-               "LINE1:compression_outn#000000:".sprintf("%-20s",$Lang::tr{'outgoing compression in bytes per second'}),
+               "LINE1:compression_outn#000000:".sprintf("%-23s",$Lang::tr{'outgoing compression in bytes per second'}),
                "GPRINT:compression_out:MAX:%8.1lf %sBps",
                "GPRINT:compression_out:AVERAGE:%8.1lf %sBps",
                "GPRINT:compression_out:MIN:%8.1lf %sBps",