Ended core 5 and started core 6

[people/pmueller/ipfire-2.x.git] / config / cfgroot / graphs.pl

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 804b70a059de5b63e3408252df9fe1181c4f310c..c5caa6d043da91fc374ad33baf6f0036a19b6815 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -38,10 +38,10 @@ my $count = 0;
 use Encode 'from_to';
 
 my %tr=();
-if ((${Lang::language} eq 'el') || 
+if ((${Lang::language} eq 'el') ||
     (${Lang::language} eq 'fa') ||
     (${Lang::language} eq 'ru') ||
-    (${Lang::language} eq 'th') || 
+    (${Lang::language} eq 'th') ||
     (${Lang::language} eq 'vi') ||
     (${Lang::language} eq 'zh') ||
     (${Lang::language} eq 'zt')) {
@@ -112,7 +112,7 @@ sub updateloadgraph {
         RRDs::graph ("$graphs/load-$period.png",
         "--start", "-1$period", "-aPNG",
         "-w 600", "-h 100", "-i", "-z", "-W www.ipfire.org", "-l 0", "-r", "--alt-y-grid",
-        "-t Load Average",
+        "-t Load Average $Lang::tr{'graph per'} $Lang::tr{$period}",
         "--color", "SHADEA".$color{"color19"},
         "--color", "SHADEB".$color{"color19"},
         "--color", "BACK".$color{"color21"},
@@ -227,12 +227,12 @@ sub updatediskgraph {
         "--color", "SHADEA".$color{"color19"},
         "--color", "SHADEB".$color{"color19"},
         "--color", "BACK".$color{"color21"},
-        "-t $Lang::tr{'disk access per'} $Lang::tr{$period} $disk",
+        "-t $disk $Lang::tr{'disk access per'} $Lang::tr{$period}",
         "DEF:read=$rrdlog/disk-$disk.rrd:readsect:AVERAGE",
         "DEF:write=$rrdlog/disk-$disk.rrd:writesect:AVERAGE",
         "DEF:standby=$rrdlog/hddshutdown-$disk.rrd:standby:AVERAGE",
         "CDEF:st=standby,INF,*",
-        "AREA:st".$color{"color19"}.":standby\\j",
+        "AREA:st".$color{"color20"}.":standby\\j",
         "AREA:read".$color{"color11"}.":$Lang::tr{'sectors read from disk per second'}",
         "STACK:write".$color{"color12"}.":$Lang::tr{'sectors written to disk per second'}\\j",
         "COMMENT: \\j",
@@ -259,7 +259,7 @@ sub updateifgraph {
   "--color", "SHADEA".$color{"color19"},
   "--color", "SHADEB".$color{"color19"},
   "--color", "BACK".$color{"color21"},
-  "-t $Lang::tr{'traffic on'} $interface ($Lang::tr{'graph per'} $Lang::tr{$period})",
+  "-t $Lang::tr{'traffic on'} $interface $Lang::tr{'graph per'} $Lang::tr{$period}",
   "-v$Lang::tr{'bytes per second'}",
   "DEF:incoming=$rrdlog/$interface.rrd:incoming:AVERAGE",
   "DEF:outgoing=$rrdlog/$interface.rrd:outgoing:AVERAGE",
@@ -318,8 +318,8 @@ sub updatelqgraph {
   RRDs::graph ("$graphs/lq-$period.png",
   "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
   "--alt-y-grid", "-w 600", "-h 100", "-l 0", "-r",
-  "-t $Lang::tr{'linkq'} ($Lang::tr{'graph per'} $Lang::tr{$period})",
-  "--lazy", 
+  "-t $Lang::tr{'linkq'} $Lang::tr{'graph per'} $Lang::tr{$period}",
+  "--lazy",
   "--color", "SHADEA".$color{"color19"},
   "--color", "SHADEB".$color{"color19"},
   "--color", "BACK".$color{"color21"},
@@ -368,11 +368,11 @@ sub updatehddgraph {
   "--color", "SHADEA".$color{"color19"},
   "--color", "SHADEB".$color{"color19"},
   "--color", "BACK".$color{"color21"},
-  "-t $Lang::tr{'harddisk temperature'} ($Lang::tr{'graph per'} $Lang::tr{$period})",
+  "-t $disk $Lang::tr{'harddisk temperature'} $Lang::tr{'graph per'} $Lang::tr{$period}",
   "DEF:temperature=$rrdlog/hddtemp-$disk.rrd:temperature:AVERAGE",
   "DEF:standby=$rrdlog/hddshutdown-$disk.rrd:standby:AVERAGE",
   "CDEF:st=standby,INF,*",
-  "AREA:st".$color{"color19"}.":standby\\j",
+  "AREA:st".$color{"color20"}.":standby",
   "LINE2:temperature".$color{"color11"}.":$Lang::tr{'hdd temperature in'} C\\j",
   "COMMENT:$Lang::tr{'maximal'}",
   "COMMENT:$Lang::tr{'average'}",
@@ -383,7 +383,7 @@ sub updatehddgraph {
   "GPRINT:temperature:MIN:%3.0lf Grad C",
   "GPRINT:temperature:LAST:%3.0lf Grad C\\j",
   );
-  $ERROR = RRDs::error; 
+  $ERROR = RRDs::error;
   print "Error in RRD::graph for hdd-$disk: $ERROR\n" if $ERROR;
 }
 
@@ -392,7 +392,7 @@ sub updatetempgraph
   my $type   = "temp";
   my $period = $_[0];
   my $count = "11";
-  
+
   @args = ("$graphs/mbmon-$type-$period.png",
     "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
     "--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
@@ -405,8 +405,8 @@ sub updatetempgraph
     "COMMENT:$Lang::tr{'average'}",
     "COMMENT:$Lang::tr{'minimal'}",
     "COMMENT:$Lang::tr{'current'}\\j",);
-    
-  foreach $key ( sort(keys %mbmon_values) ) 
+
+  foreach $key ( sort(keys %mbmon_values) )
   {
     if ( (index($key, $type) != -1) && ($mbmon_settings{'LINE-'.$key} eq 'on') )
     {
@@ -423,8 +423,8 @@ sub updatetempgraph
     $count++;
    }
   }
-   
-  RRDs::graph ( @args );    
+
+  RRDs::graph ( @args );
     $ERROR = RRDs::error;
     print("Error in RRD::graph for temp: $ERROR\n")if $ERROR;
 }
@@ -447,7 +447,7 @@ sub updatefangraph
     "COMMENT:$Lang::tr{'minimal'}",
     "COMMENT:$Lang::tr{'current'}\\j",);
 
-  foreach $key ( sort(keys %mbmon_values) ) 
+  foreach $key ( sort(keys %mbmon_values) )
   {
     if ( (index($key, $type) != -1) && ($mbmon_settings{'LINE-'.$key} eq 'on') )
     {
@@ -488,7 +488,7 @@ sub updatevoltgraph
     "COMMENT:$Lang::tr{'minimal'}",
     "COMMENT:$Lang::tr{'current'}\\j",);
 
-  foreach $key ( sort(keys %mbmon_values) ) 
+  foreach $key ( sort(keys %mbmon_values) )
   {
     my $v = substr($key,0,1);
     if ( ($v eq 'v') && ($mbmon_settings{'LINE-'.$key} eq 'on') )
@@ -524,17 +524,17 @@ sub overviewgraph {
   my @classes = ();
   my @classline = ();
   my $classfile = "/var/ipfire/qos/classes";
-  
+
        $qossettings{'DEV'} = $_[1];
-       if ( $qossettings{'DEV'} eq $qossettings{'RED_DEV'} ) { 
+       if ( $qossettings{'DEV'} eq $qossettings{'RED_DEV'} ) {
                $qossettings{'CLASSPRFX'} = '1';
-       } else { 
+       } else {
                $qossettings{'CLASSPRFX'} = '2';
        }
-       
+
   if ( $period ne '3240' ){ $periodstring = "-1$period";}else{ $periodstring = "-".$period;}
   if ( $period ne '3240' ){ $description = "-t $Lang::tr{'Utilization on'} ($qossettings{'DEV'}) ($Lang::tr{'graph per'} $Lang::tr{$period})";}else{ $description = "-t $Lang::tr{'Utilization on'} ($qossettings{'DEV'})";}
-       
+
        my $ERROR="";
        my $count="1";
        my $color="#000000";