graphs.pl: Standardize localization strings for disk access graphs

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

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 1bed49fa376a595b8c5e8ce114f77f2c1dd4817b..6abaacd7d0bc8bd92a31957b086a0a6c8e97ba41 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -172,7 +172,7 @@ sub updatecpugraph {
        }
        
        for(my $i = 2; $i < $cpucount; $i++) {
-               $addstring .= "+,";
+               $addstring .= "ADDNAN,";
        }
 
        if ( $cpucount > 1){
@@ -190,7 +190,7 @@ sub updatecpugraph {
                push(@command,$nice,$interrupt,$steal,$user,$system,$idle,$iowait,$irq);
        }
 
-       push(@command,"CDEF:total=user,system,idle,iowait,irq,nice,interrupt,steal,+,+,+,+,+,+,+"
+       push(@command,"CDEF:total=user,system,idle,iowait,irq,nice,interrupt,steal,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN"
                        ,"CDEF:userpct=100,user,total,/,*"
                        ,"CDEF:nicepct=100,nice,total,/,*"
                        ,"CDEF:interruptpct=100,interrupt,total,/,*"
@@ -225,7 +225,7 @@ sub updatecpugraph {
                        ,"GPRINT:stealpct:MIN:%3.2lf%%"
                        ,"GPRINT:stealpct:LAST:%3.2lf%%\\j"
                        ,"STACK:userpct".$color{"color11"}."A0:".sprintf("%-25s",$Lang::tr{'cpu user usage'})
-                       ,"GPRINT:userpct:MAX:%3.2lf%%"
+                       ,"GPRINT:userpct:MAX:%3.1lf%%"
                        ,"GPRINT:userpct:AVERAGE:%3.2lf%%"
                        ,"GPRINT:userpct:MIN:%3.2lf%%"
                        ,"GPRINT:userpct:LAST:%3.2lf%%\\j"
@@ -256,7 +256,7 @@ sub updateloadgraph {
                "-1".$period,
                "-l 0",
                "-r",
-               "-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
+               "-t ".$Lang::tr{'uptime load average'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
                "-v ".$Lang::tr{'processes'},
                "--color=SHADEA".$color{"color19"},
                "--color=SHADEB".$color{"color19"},
@@ -486,7 +486,7 @@ sub updatediskgraph {
                "--start",
                "-1".$period,
                "-r",
-               "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period."-graph"},
+               "-t ".$disk." ".$Lang::tr{'disk access'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
                "-v ".$Lang::tr{'bytes per second'},
                "--color=SHADEA".$color{"color19"},
                "--color=SHADEB".$color{"color19"},
@@ -683,22 +683,22 @@ sub updatefwhitsgraph {
                "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
                "COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
-               "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-OUTPUT"),
+               "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
                "GPRINT:output:MAX:%8.1lf %sBps",
                "GPRINT:output:AVERAGE:%8.1lf %sBps",
                "GPRINT:output:MIN:%8.1lf %sBps",
                "GPRINT:output:LAST:%8.1lf %sBps\\j",
-               "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-FORWARD"),
+               "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
                "GPRINT:forward:MAX:%8.1lf %sBps",
                "GPRINT:forward:AVERAGE:%8.1lf %sBps",
                "GPRINT:forward:MIN:%8.1lf %sBps",
                "GPRINT:forward:LAST:%8.1lf %sBps\\j",
-               "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-INPUT"),
+               "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
                "GPRINT:input:MAX:%8.1lf %sBps",
                "GPRINT:input:AVERAGE:%8.1lf %sBps",
                "GPRINT:input:MIN:%8.1lf %sBps",
                "GPRINT:input:LAST:%8.1lf %sBps\\j",
-               "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSyn"),
+               "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
                "GPRINT:newnotsyn:MAX:%8.1lf %sBps",
                "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
                "GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
@@ -810,15 +810,15 @@ sub updatehddgraph {
                "DEF:standby=".$mainsettings{'RRDLOG'}."/hddshutdown-$disk.rrd:standby:AVERAGE",
                "CDEF:st=standby,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'} °C\\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 °C",
+               "GPRINT:temperature:AVERAGE:%3.0lf °C",
+               "GPRINT:temperature:MIN:%3.0lf °C",
+               "GPRINT:temperature:LAST:%3.0lf °C\\j",
                );
                $ERROR = 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{$period."-graph"},
+               "-v Celsius",
                "--color=SHADEA".$color{"color19"},
                "--color=SHADEB".$color{"color19"},
                "--color=BACK".$color{"color21"},
@@ -862,7 +863,7 @@ sub updatehwtempgraph {
                                $_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
                                my $label = $2.$3;$label=~ 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:".$sensorsettings{'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:".$sensorsettings{'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",);
                        }
                }
 
@@ -1088,8 +1089,8 @@ sub updatethermaltempgraph {
                "--start",
                "-1".$period,
                "-r",
-               "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"},
-               "-v Grad Celsius",
+               "-t ".$Lang::tr{'acpitemp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
+               "-v Celsius",
                "--color=SHADEA".$color{"color19"},
                "--color=SHADEB".$color{"color19"},
                "--color=BACK".$color{"color21"},
@@ -1105,10 +1106,10 @@ sub updatethermaltempgraph {
                push(@command,"DEF:temp".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/thermal-thermal_zone".$i."/temperature-temperature.rrd:value:AVERAGE"
                                ,"CDEF:temp".$i."=temp".$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 °C"
+                               ,"GPRINT:temp".$i.":AVERAGE:%3.0lf °C"
+                               ,"GPRINT:temp".$i.":MIN:%3.0lf °C"
+                               ,"GPRINT:temp".$i.":LAST:%3.0lf °C\\j");
        }
 
        RRDs::graph (@command);
@@ -1160,3 +1161,31 @@ sub updateentropygraph {
 
        print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
 }
+
+sub updateconntrackgraph {
+       my $period = $_[0];
+       my @command = (
+               @GRAPH_ARGS,
+               "-",
+               "--start",
+               "-1" . $period,
+               "-r",
+               "--lower-limit","0",
+               "-t $Lang::tr{'connection tracking'}",
+               "-v $Lang::tr{'open connections'}",
+               "DEF:conntrack=$mainsettings{'RRDLOG'}/collectd/localhost/conntrack/conntrack.rrd:entropy:AVERAGE",
+               "LINE3:conntrack#ff0000:" . sprintf("%-15s", $Lang::tr{'open connections'}),
+               "VDEF:ctmin=conntrack,MINIMUM",
+               "VDEF:ctmax=conntrack,MAXIMUM",
+               "VDEF:ctavg=conntrack,AVERAGE",
+               "GPRINT:ctmax:" . sprintf("%15s\\: %%5.0lf", $Lang::tr{'maximum'}),
+               "GPRINT:ctmin:" . sprintf("%15s\\: %%5.0lf", $Lang::tr{'minimum'}),
+               "GPRINT:ctavg:" . sprintf("%15s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n",
+               "--color=BACK" . $color{"color21"},
+       );
+
+       RRDs::graph(@command);
+       $ERROR = RRDs::error;
+
+       print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
+}