From 249dda69830ba8f08c4a047375e6d9626f5fca31 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Sun, 24 Jun 2007 16:57:33 +0000 Subject: [PATCH] Graphen ueberarbeitet git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@646 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/cfgroot/graphs.pl | 207 ++++++++++++++++++++++++--------------- doc/language_issues.de | 5 +- doc/language_issues.en | 2 + doc/language_missings | 2 - langs/de/cgi-bin/de.pl | 19 ++-- langs/en/cgi-bin/en.pl | 16 +-- src/scripts/makegraphs | 25 +++-- 7 files changed, 164 insertions(+), 112 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 30a9ad6296..a3bdac37d1 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -71,30 +71,36 @@ sub updatecpugraph { "CDEF:idlepct=100,idle,total,/,*", "CDEF:iowaitpct=100,iowait,total,/,*", "CDEF:irqpct=100,irq,total,/,*", - "AREA:iowaitpct".$color{"color14"}.":$tr{'iowait'}", - "STACK:userpct".$color{"color11"}.":$tr{'user cpu usage'}", - "STACK:irqpct".$color{"color23"}.":IRQ CPU", - "STACK:systempct".$color{"color13"}.":$tr{'system cpu usage'}", - "STACK:idlepct".$color{"color12"}.":$tr{'idle cpu usage'}\\j", - "COMMENT: \\j", + "COMMENT:$tr{'caption'}\\t\\t\\t ", "COMMENT:$tr{'maximal'}", "COMMENT:$tr{'average'}", + "COMMENT:$tr{'minimal'}", "COMMENT:$tr{'current'}\\j", - "GPRINT:userpct:MAX:$tr{'user cpu'}\\:%3.2lf%%", - "GPRINT:userpct:AVERAGE:$tr{'user cpu'}\\:%3.2lf%%", - "GPRINT:userpct:LAST:$tr{'user cpu'}\\:%3.2lf%%\\j", - "GPRINT:irqpct:MAX:IRQ CPU\\:%3.2lf%%", - "GPRINT:irqpct:AVERAGE:IRQ CPU\\:%3.2lf%%", - "GPRINT:irqpct:LAST:IRQ CPU\\:%3.2lf%%\\j", - "GPRINT:systempct:MAX:$tr{'system cpu'}\\:%3.2lf%%", - "GPRINT:systempct:AVERAGE:$tr{'system cpu'}\\:%3.2lf%%", - "GPRINT:systempct:LAST:$tr{'system cpu'}\\:%3.2lf%%\\j", - "GPRINT:idlepct:MAX:$tr{'idle cpu'}\\:%3.2lf%%", - "GPRINT:idlepct:AVERAGE:$tr{'idle cpu'}\\:%3.2lf%%", - "GPRINT:idlepct:LAST:$tr{'idle cpu'}\\:%3.2lf%%\\j", - "GPRINT:iowaitpct:MAX:$tr{'iowait'}\\:%3.2lf%%", - "GPRINT:iowaitpct:AVERAGE:$tr{'iowait'}\\:%3.2lf%%", - "GPRINT:iowaitpct:LAST:$tr{'iowait'}\\:%3.2lf%%\\j"); + "AREA:iowaitpct".$color{"color14"}.":$tr{'iowait'}", + "GPRINT:iowaitpct:MAX:%3.2lf%%", + "GPRINT:iowaitpct:AVERAGE:%3.2lf%%", + "GPRINT:iowaitpct:MIN:%3.2lf%%", + "GPRINT:iowaitpct:LAST:%3.2lf%%\\j", + "STACK:irqpct".$color{"color23"}.":$tr{'irq cpu usage'}", + "GPRINT:irqpct:MAX:%3.2lf%%", + "GPRINT:irqpct:AVERAGE:%3.2lf%%", + "GPRINT:irqpct:MIN:%3.2lf%%", + "GPRINT:irqpct:LAST:%3.2lf%%\\j", + "STACK:userpct".$color{"color11"}.":$tr{'user cpu usage'}", + "GPRINT:userpct:MAX:%3.2lf%%", + "GPRINT:userpct:AVERAGE:%3.2lf%%", + "GPRINT:userpct:MIN:%3.2lf%%", + "GPRINT:userpct:LAST:%3.2lf%%\\j", + "STACK:systempct".$color{"color13"}.":$tr{'system cpu usage'}", + "GPRINT:systempct:MAX:%3.2lf%%", + "GPRINT:systempct:AVERAGE:%3.2lf%%", + "GPRINT:systempct:MIN:%3.2lf%%", + "GPRINT:systempct:LAST:%3.2lf%%\\j", + "STACK:idlepct".$color{"color12"}.":$tr{'idle cpu usage'}", + "GPRINT:idlepct:MAX:%3.2lf%%", + "GPRINT:idlepct:AVERAGE:%3.2lf%%", + "GPRINT:idlepct:MIN:%3.2lf%%", + "GPRINT:idlepct:LAST:%3.2lf%%\\j"); $ERROR = RRDs::error; print "Error in RRD::graph for cpu: $ERROR\n" if $ERROR; } @@ -146,30 +152,36 @@ sub updatememgraph { "CDEF:bufferpct=100,buffer,total,/,*", "CDEF:cachepct=100,cache,total,/,*", "CDEF:freepct=100,free,total,/,*", + "COMMENT:$tr{'caption'}\\t\\t\\t", + "COMMENT:$tr{'maximal'}", + "COMMENT:$tr{'average'}", + "COMMENT:$tr{'minimal'}", + "COMMENT:$tr{'current'}\\j", "AREA:usedpct".$color{"color11"}.":$tr{'used memory'}", + "GPRINT:usedpct:MAX:%3.2lf%%", + "GPRINT:usedpct:AVERAGE:%3.2lf%%", + "GPRINT:usedpct:MIN:%3.2lf%%", + "GPRINT:usedpct:LAST:%3.2lf%%\\j", "STACK:sharedpct".$color{"color13"}.":$tr{'shared memory'}", + "GPRINT:sharedpct:MAX:%3.2lf%%", + "GPRINT:sharedpct:AVERAGE:%3.2lf%%", + "GPRINT:sharedpct:MIN:%3.2lf%%", + "GPRINT:sharedpct:LAST:%3.2lf%%\\j", "STACK:bufferpct".$color{"color23"}.":$tr{'buffered memory'}", + "GPRINT:bufferpct:MAX:%3.2lf%%", + "GPRINT:bufferpct:AVERAGE:%3.2lf%%", + "GPRINT:bufferpct:MIN:%3.2lf%%", + "GPRINT:bufferpct:LAST:%3.2lf%%\\j", "STACK:cachepct".$color{"color14"}.":$tr{'cached memory'}", - "STACK:freepct".$color{"color12"}.":$tr{'free memory'}\\j", - "COMMENT: \\j", - "COMMENT:$tr{'maximal'}", - "COMMENT:$tr{'average'}", - "COMMENT:$tr{'current'}\\j", - "GPRINT:usedpct:MAX:$tr{'used memory'}\\:%3.2lf%%", - "GPRINT:usedpct:AVERAGE:$tr{'used memory'}\\:%3.2lf%%", - "GPRINT:usedpct:LAST:$tr{'used memory'}\\:%3.2lf%%\\j", - "GPRINT:sharedpct:MAX:$tr{'shared memory'}\\:%3.2lf%%", - "GPRINT:sharedpct:AVERAGE:$tr{'shared memory'}\\:%3.2lf%%", - "GPRINT:sharedpct:LAST:$tr{'shared memory'}\\:%3.2lf%%\\j", - "GPRINT:bufferpct:MAX:$tr{'buffered memory'}\\:%3.2lf%%", - "GPRINT:bufferpct:AVERAGE:$tr{'buffered memory'}\\:%3.2lf%%", - "GPRINT:bufferpct:LAST:$tr{'buffered memory'}\\:%3.2lf%%\\j", - "GPRINT:cachepct:MAX:$tr{'cached memory'}\\:%3.2lf%%", - "GPRINT:cachepct:AVERAGE:$tr{'cached memory'}\\:%3.2lf%%", - "GPRINT:cachepct:LAST:$tr{'cached memory'}\\:%3.2lf%%\\j", - "GPRINT:freepct:MAX:$tr{'free memory'}\\:%3.2lf%%", - "GPRINT:freepct:AVERAGE:$tr{'free memory'}\\:%3.2lf%%", - "GPRINT:freepct:LAST:$tr{'free memory'}\\:%3.2lf%%\\j"); + "GPRINT:cachepct:MAX:%3.2lf%%", + "GPRINT:cachepct:AVERAGE:%3.2lf%%", + "GPRINT:cachepct:MIN:%3.2lf%%", + "GPRINT:cachepct:LAST:%3.2lf%%\\j", + "STACK:freepct".$color{"color12"}.":$tr{'free memory'}", + "GPRINT:freepct:MAX:%3.2lf%%", + "GPRINT:freepct:AVERAGE:%3.2lf%%", + "GPRINT:freepct:MIN:%3.2lf%%", + "GPRINT:freepct:LAST:%3.2lf%%\\j"); $ERROR = RRDs::error; print "Error in RRD::graph for mem: $ERROR\n" if $ERROR; @@ -185,18 +197,21 @@ sub updatememgraph { "CDEF:total=used,free,+", "CDEF:usedpct=100,used,total,/,*", "CDEF:freepct=100,free,total,/,*", - "AREA:usedpct".$color{"color11"}.":$tr{'used swap'}", - "STACK:freepct".$color{"color12"}.":$tr{'free swap'}\\j", - "COMMENT: \\j", + "COMMENT:$tr{'caption'}\\t\\t", "COMMENT:$tr{'maximal'}", "COMMENT:$tr{'average'}", + "COMMENT:$tr{'minimal'}", "COMMENT:$tr{'current'}\\j", - "GPRINT:usedpct:MAX:$tr{'used swap'}\\:%3.2lf%%", - "GPRINT:usedpct:AVERAGE:$tr{'used swap'}\\:%3.2lf%%", - "GPRINT:usedpct:LAST:$tr{'used swap'}\\:%3.2lf%%\\j", - "GPRINT:freepct:MAX:$tr{'free swap'}\\:%3.2lf%%", - "GPRINT:freepct:AVERAGE:$tr{'free swap'}\\:%3.2lf%%", - "GPRINT:freepct:LAST:$tr{'free swap'}\\:%3.2lf%%\\j"); + "AREA:usedpct".$color{"color11"}.":$tr{'used swap'}", + "GPRINT:usedpct:MAX:%3.2lf%%", + "GPRINT:usedpct:AVERAGE:%3.2lf%%", + "GPRINT:usedpct:MIN:%3.2lf%%", + "GPRINT:usedpct:LAST:%3.2lf%%\\j", + "STACK:freepct".$color{"color12"}.":$tr{'free swap'}", + "GPRINT:freepct:MAX:%3.2lf%%", + "GPRINT:freepct:AVERAGE:%3.2lf%%", + "GPRINT:freepct:MIN:%3.2lf%%", + "GPRINT:freepct:LAST:%3.2lf%%\\j"); $ERROR = RRDs::error; print "Error in RRD::graph for swap: $ERROR\n" if $ERROR; } @@ -249,12 +264,15 @@ sub updateifgraph { "COMMENT: \\j", "COMMENT:$tr{'maximal'}", "COMMENT:$tr{'average'}", + "COMMENT:$tr{'minimal'}", "COMMENT:$tr{'current'}\\j", "GPRINT:incoming:MAX:$tr{'in'}\\:%8.3lf %sBps", "GPRINT:incoming:AVERAGE:$tr{'in'}\\:%8.3lf %sBps", + "GPRINT:incoming:MIN:$tr{'in'}\\:%8.3lf %sBps", "GPRINT:incoming:LAST:$tr{'in'}\\:%8.3lf %sBps\\j", "GPRINT:outgoing:MAX:$tr{'out'}\\:%8.3lf %sBps", "GPRINT:outgoing:AVERAGE:$tr{'out'}\\:%8.3lf %sBps", + "GPRINT:outgoing:MIN:$tr{'out'}\\:%8.3lf %sBps", "GPRINT:outgoing:LAST:$tr{'out'}\\:%8.3lf %sBps\\j"); $ERROR = RRDs::error; print "Error in RRD::graph for $interface: $ERROR\n" if $ERROR; @@ -272,14 +290,21 @@ sub updatefwhitsgraph { "-t $tr{'firewall hits per'} $tr{$period}", "DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE", "DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE", + "COMMENT:$tr{'caption'}\\t\\t\\t", + "COMMENT:$tr{'maximal'}", + "COMMENT:$tr{'average'}", + "COMMENT:$tr{'minimal'}", + "COMMENT:$tr{'current'}\\j", "AREA:amount".$color{"color24"}.":$tr{'firewallhits'}/5 min", - "GPRINT:amount:MAX: $tr{'maximal'}\\: %2.2lf %S", - "GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S", - "GPRINT:amount:LAST: $tr{'current'}\\: %2.2lf %S\\j", - "AREA:portamount".$color{"color25"}.":$tr{'portscans'}/5 min", - "GPRINT:portamount:MAX: $tr{'maximal'}\\: %2.2lf %S", - "GPRINT:portamount:AVERAGE: $tr{'average'}\\: %2.2lf %S", - "GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %S\\j"); + "GPRINT:amount:MAX:%2.2lf %S", + "GPRINT:amount:AVERAGE:%2.2lf %S", + "GPRINT:amount:MIN:%2.2lf %S", + "GPRINT:amount:LAST:%2.2lf %S\\j", + "STACK:portamount".$color{"color25"}.":$tr{'portscans'}/5 min", + "GPRINT:portamount:MAX:%2.2lf %S", + "GPRINT:portamount:MIN:%2.2lf %S", + "GPRINT:portamount:AVERAGE:%2.2lf %S", + "GPRINT:portamount:LAST:%2.2lf %S\\j"); $ERROR = RRDs::error; print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR; } @@ -312,13 +337,16 @@ sub updatelqgraph { "COMMENT: \\j", "COMMENT:$tr{'maximal'}", "COMMENT:$tr{'average'}", + "COMMENT:$tr{'minimal'}", "COMMENT:$tr{'current'}\\j", "LINE1:roundtrip#707070:", "GPRINT:roundtrip:MAX:Time\\:%3.2lf ms", "GPRINT:roundtrip:AVERAGE:Time\\:%3.2lf ms", + "GPRINT:roundtrip:MIN:Time\\:%3.2lf ms", "GPRINT:roundtrip:LAST:Time\\:%3.2lf ms\\j", "GPRINT:loss:MAX:Loss\\:%3.2lf%%", "GPRINT:loss:AVERAGE:Loss\\:%3.2lf%%", + "GPRINT:loss:MIN:Loss\\:%3.2lf%%", "GPRINT:loss:LAST:Loss\\:%3.2lf%%\\j" ); $ERROR = RRDs::error; @@ -338,12 +366,17 @@ sub updatehddgraph { "--color", "BACK".$color{"color21"}, "-t $tr{'harddisk temperature'} ($tr{'graph per'} $tr{$period})", "DEF:temperature=$rrdlog/hddtemp-$disk.rrd:temperature:AVERAGE", - "LINE2:temperature".$color{"color11"}.":$tr{'hdd temperature in'} ?C", - "GPRINT:temperature:MAX:$tr{'maximal'}\\:%3.0lf ?C", - "GPRINT:temperature:AVERAGE:$tr{'average'}\\:%3.0lf ?C", - "GPRINT:temperature:LAST:$tr{'current'}\\:%3.0lf ?C", + "AREA:temperature".$color{"color11"}.":$tr{'hdd temperature in'} C\\j", + "COMMENT:$tr{'maximal'}", + "COMMENT:$tr{'average'}", + "COMMENT:$tr{'minimal'}", + "COMMENT:$tr{'current'}\\j", + "GPRINT:temperature:MAX:%2.0lf Grad C", + "GPRINT:temperature:AVERAGE:%2.0lf Grad C", + "GPRINT:temperature:MIN:%2.0lf Grad C", + "GPRINT:temperature:LAST:%2.0lf Grad C\\j", ); - $ERROR = RRDs::error; + $ERROR = RRDs::error; print "Error in RRD::graph for hdd-$disk: $ERROR\n" if $ERROR; } @@ -359,7 +392,12 @@ sub updatetempgraph "--color", "SHADEA".$color{"color19"}, "--color", "SHADEB".$color{"color19"}, "--color", "BACK".$color{"color21"}, - "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})",); + "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})", + "COMMENT:$tr{'caption'}\\t\\t", + "COMMENT:$tr{'maximal'}", + "COMMENT:$tr{'average'}", + "COMMENT:$tr{'minimal'}", + "COMMENT:$tr{'current'}\\j",); foreach $key ( sort(keys %mbmon_values) ) { @@ -370,14 +408,15 @@ sub updatetempgraph $mbmon_settings{'LABEL-'.$key} = $key; } push (@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE"); - push (@args, "LINE2:".$key.$color{"color$count"}.":$mbmon_settings{'LABEL-'.$key} $tr{'mbmon temp in'} C"); - push (@args, "GPRINT:$key:MAX:$tr{'maximal'}\\:%5.1lf C"); - push (@args, "GPRINT:$key:AVERAGE:$tr{'average'}\\:%5.1lf C"); - push (@args, "GPRINT:$key:LAST:$tr{'current'}\\:%5.1lf C\\j"); + push (@args, "LINE2:".$key.$color{"color$count"}.":$mbmon_settings{'LABEL-'.$key} Grad C"); + push (@args, "GPRINT:$key:MAX:%3.1lf"); + push (@args, "GPRINT:$key:AVERAGE:%3.1lf"); + push (@args, "GPRINT:$key:MIN:%3.1lf"); + push (@args, "GPRINT:$key:LAST:%3.1lf\\j"); $count++; } } - + RRDs::graph ( @args ); $ERROR = RRDs::error; print("Error in RRD::graph for temp: $ERROR\n")if $ERROR; @@ -394,7 +433,12 @@ sub updatefangraph "--color", "SHADEA".$color{"color19"}, "--color", "SHADEB".$color{"color19"}, "--color", "BACK".$color{"color21"}, - "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})" ); + "-t $tr{'mbmon fan'} ($tr{'graph per'} $tr{$period})", + "COMMENT:$tr{'caption'}\\t\\t", + "COMMENT:$tr{'maximal'}", + "COMMENT:$tr{'average'}", + "COMMENT:$tr{'minimal'}", + "COMMENT:$tr{'current'}\\j",); foreach $key ( sort(keys %mbmon_values) ) { @@ -406,10 +450,11 @@ sub updatefangraph } push(@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE"); - push(@args, "LINE2:".$key.$color{"color$count"}.":$mbmon_settings{'LABEL-'.$key} $tr{'mbmon fan in'} rpm"); - push(@args, "GPRINT:$key:MAX:$tr{'maximal'}\\:%5.0lf rpm"); - push(@args, "GPRINT:$key:AVERAGE:$tr{'average'}\\:%5.0lf rpm"); - push(@args, "GPRINT:$key:LAST:$tr{'current'}\\:%5.0lf rpm\\j"); + push(@args, "LINE2:".$key.$color{"color$count"}.":$mbmon_settings{'LABEL-'.$key} rpm"); + push(@args, "GPRINT:$key:MAX:%5.0lf"); + push(@args, "GPRINT:$key:AVERAGE:%5.0lf"); + push(@args, "GPRINT:$key:MIN:%5.0lf"); + push(@args, "GPRINT:$key:LAST:%5.0lf\\j"); $count++; } } @@ -429,7 +474,12 @@ sub updatevoltgraph "--color", "SHADEA".$color{"color19"}, "--color", "SHADEB".$color{"color19"}, "--color", "BACK".$color{"color21"}, - "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})" ); + "-t $tr{'mbmon volt'} ($tr{'graph per'} $tr{$period})", + "COMMENT:$tr{'caption'}\\t", + "COMMENT:$tr{'maximal'}", + "COMMENT:$tr{'average'}", + "COMMENT:$tr{'minimal'}", + "COMMENT:$tr{'current'}\\j",); foreach $key ( sort(keys %mbmon_values) ) { @@ -442,10 +492,11 @@ sub updatevoltgraph } push(@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE"); - push(@args, "LINE2:".$key.$color{"color$count"}.":$mbmon_settings{'LABEL-'.$key} V"); - push(@args, "GPRINT:$key:MAX:$tr{'maximal'}\\:%5.2lf V"); - push(@args, "GPRINT:$key:AVERAGE:$tr{'average'}\\:%5.2lf V"); - push(@args, "GPRINT:$key:LAST:$tr{'current'}\\:%5.2lf V\\j"); + push(@args, "LINE2:".$key.$color{"color$count"}.":$mbmon_settings{'LABEL-'.$key} Volt"); + push(@args, "GPRINT:$key:MAX:%3.2lf"); + push(@args, "GPRINT:$key:AVERAGE:%3.2lf"); + push(@args, "GPRINT:$key:MIN:%3.2lf"); + push(@args, "GPRINT:$key:LAST:%3.2lf\\j"); $count++; } } diff --git a/doc/language_issues.de b/doc/language_issues.de index 1ab1f1fa6a..e732b2682f 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -79,6 +79,7 @@ WARNING: translation string unused: could not download the available updates lis WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file +WARNING: translation string unused: cpu irq usage WARNING: translation string unused: cpu usage per WARNING: translation string unused: create WARNING: translation string unused: create new backup @@ -88,7 +89,6 @@ WARNING: translation string unused: current media WARNING: translation string unused: current ovpn WARNING: translation string unused: current profile WARNING: translation string unused: daily firewallhits -WARNING: translation string unused: daily firwallhits WARNING: translation string unused: dat without key WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy @@ -215,6 +215,7 @@ WARNING: translation string unused: mbmon settings WARNING: translation string unused: mbmon temp in WARNING: translation string unused: memory usage per WARNING: translation string unused: min size +WARNING: translation string unused: minimal WARNING: translation string unused: minutes WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz @@ -274,7 +275,7 @@ WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: polfile -WARNING: translation string unused: portscancs +WARNING: translation string unused: portscans WARNING: translation string unused: pots WARNING: translation string unused: profiles WARNING: translation string unused: proxy no proxy extend diff --git a/doc/language_issues.en b/doc/language_issues.en index 98784d620c..0bd17bc9b3 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -96,6 +96,7 @@ WARNING: translation string unused: could not download the available updates lis WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file +WARNING: translation string unused: cpu irq usage WARNING: translation string unused: cpu usage per WARNING: translation string unused: create WARNING: translation string unused: current @@ -226,6 +227,7 @@ WARNING: translation string unused: mbmon settings WARNING: translation string unused: mbmon temp in WARNING: translation string unused: memory usage per WARNING: translation string unused: min size +WARNING: translation string unused: minimal WARNING: translation string unused: minutes WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz diff --git a/doc/language_missings b/doc/language_missings index d12772635d..a3ddc4b1d6 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -9,7 +9,6 @@ < blue access use hint < could not connect to www ipcop org < create new backup -< daily firwallhits < ddns help dnsmadeeasy < ddns help freedns < ddns help plus @@ -22,7 +21,6 @@ < err bk 10 password < or < password crypting key -< portscancs < proxy no proxy extend < proxy no proxy local < removable device advice diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 3f8a9cec56..ff64bf5683 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -346,7 +346,7 @@ 'blue interface' => 'Blaues Interface', 'broadcast' => 'Broadcast', 'broken pipe' => 'Zerbrochene Pipe', -'buffered memory' => 'Gepuff. Speicher', +'buffered memory' => 'Gepuff. Speicher ', 'buffers' => 'Puffer', 'bytes per second' => 'Bytes pro Sekunde', 'bytes received' => 'Bytes Empfangen', @@ -356,7 +356,7 @@ 'cache management' => 'Cache Verwaltung', 'cache size' => 'Cache-Größe (MB):', 'cached' => 'zwischengespeichert', -'cached memory' => 'Cache Speicher', +'cached memory' => 'Cache Speicher ', 'calamaris available reports' => 'Verfügbare Berichte', 'calamaris byte unit' => 'Byte Einheit', 'calamaris create report' => 'Bericht erstellen', @@ -461,6 +461,7 @@ 'could not open update information file' => 'Datei mit den Update-Information konnte nicht geöffnet werden. Die Update-Datei ist beschädigt.', 'could not retrieve common name from certificate' => 'Der Gemeinsame Name (CN) konnte nicht aus dem Zertifikat gelesen werden.', 'country' => 'Land', +'cpu irq usage' => 'IRQ CPU Nutzung ', 'cpu usage per' => 'CPU-Nutzung pro', 'create' => 'Erzeuge', 'create mask' => 'UNIX Rechte für neue Dateien', @@ -482,7 +483,6 @@ 'custom networks' => 'Benutzerdefinierte Netzwerke', 'custom services' => 'Benutzerdefinierte Dienste', 'daily firewallhits' => 'tägliche Firewalltreffer', -'daily firwallhits' => 'tägliche Firewalltreffer', 'dat without key' => 'Ein verschlüsseltes Archiv kann ohne Schlüssel nicht wiederhergestellt werden.', 'date' => 'Datum', 'date not in logs' => 'Für den gesuchten Tag existiert kein (oder nur ein unvollständiges) Log', @@ -698,7 +698,7 @@ 'forwarding rule removed' => 'Weiterleitungsregel entfernt. Starte Weiterleitung neu', 'forwarding rule updated' => 'Weiterleitungsregel aktualisiert; starte Weiterleitung neu', 'free' => 'Frei', -'free memory' => 'Freier Speicher', +'free memory' => 'Freier Speicher ', 'free swap' => 'Freier Swap', 'friday' => 'Freitag', 'fritzdsl help' => 'Um eines der folgenden Fritz!DSL Modems (Fritz!Card DSL=fcdsl / Fritz!CardDSL SL=fcdslsl / Fritz!Card DSL V2.0=fcdsl2 / Fritz!Card DSL USB=fcdslusb / Fritz!Card DSL USB SL=fcdslslusb) nutzen zu können, müssen Sie ein Paket auf Ihre IPFire-Box laden. Bitte laden Sie den tarball entsprechend Ihrer Version von der IPFire-Webseite herunter und laden Sie dann die gesamte fcdsl-(ihre_version).tgz mit dem folgenden Formular hoch.', @@ -862,7 +862,7 @@ 'invalid vpi vpci' => 'Ungültige VPI/VPCI-Einstellungen', 'invalid wins address' => 'Ungültige WINS Server Addresse.', 'invert' => 'Invertieren', -'iowait' => 'CPU wartet auf IO', +'iowait' => 'CPU wartet auf IO ', 'ip address' => 'IP-Adresse', 'ip address in use' => 'IP-Adresse bereits vergeben', 'ip address outside subnets' => 'IP-Adresse ausserhalb der(s) lokalen Subnetze(s)', @@ -985,6 +985,7 @@ 'memory usage per' => 'Speichernutzung pro', 'method' => 'Methode:', 'min size' => 'Min. Objektgröße (kB):', +'minimal' => 'Minimal', 'minutes' => 'Minuten', 'misc-options' => 'Sonstige Optionen', 'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden', @@ -1162,7 +1163,7 @@ 'port' => 'Port', 'port forwarding configuration' => 'Konfiguration der Port-Weiterleitung', 'ports' => 'Ports', -'portscancs' => 'Portscans', +'portscans' => 'Portscans ', 'pots' => 'Analoges Telefon', 'ppp setup' => 'PPP-Einstellungen', 'pppoe' => 'PPPoE', @@ -1304,7 +1305,7 @@ 'settings' => 'Konfiguration', 'shaping list options' => 'Datenflußkontrolldienste', 'shared' => 'shared', -'shared memory' => 'Gemeins. Speicher', +'shared memory' => 'Gemeins. Speicher ', 'sharename' => 'Freigabename', 'shares' => 'Freigaben', 'show ajax speedmeter in footer' => 'Ajax Speed Anzeige', @@ -1402,7 +1403,7 @@ 'swap usage per' => 'Nutzung von Auslagerungsspeicher (Swap) pro', 'system' => 'System', 'system cpu' => 'System CPU', -'system cpu usage' => 'System CPU Nutzung', +'system cpu usage' => 'System CPU Nutzung ', 'system graphs' => 'System-Diagramme', 'system log viewer' => 'Betrachter der System-Logdateien', 'system logs' => 'System-Logdateien', @@ -1761,7 +1762,7 @@ 'used memory' => 'Genutzter Speicher', 'used swap' => 'Genutzter Swap', 'user' => 'Benutzer', -'user cpu' => 'Benutzer CPU', +'user cpu' => 'Benutzer CPU Nutzung', 'user cpu usage' => 'Benutzer CPU', 'user log' => 'Benutzer Log', 'user proxy logs' => 'Benutzer Proxy Log', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 705bac13ef..1820ea3dd2 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -372,7 +372,7 @@ 'cache management' => 'Cache management', 'cache size' => 'Cache size (MB):', 'cached' => 'cached', -'cached memory' => 'Cached Memory', +'cached memory' => 'Cached Memory ', 'calamaris available reports' => 'Available reports', 'calamaris byte unit' => 'Byte unit', 'calamaris create report' => 'Create report', @@ -478,6 +478,7 @@ 'could not open update information file' => 'Could not open update information file. The update file is corrupt.', 'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.', 'country' => 'Country', +'cpu irq usage' => 'IRQ CPU Usage ', 'cpu usage per' => 'CPU Usage per', 'create' => 'Create', 'create mask' => 'UNIX rights for new created files', @@ -706,7 +707,7 @@ 'forwarding rule removed' => 'Forwarding rule removed; restarting forwarder', 'forwarding rule updated' => 'Forwarding rule updated; restarting forwarder', 'free' => 'Free', -'free memory' => 'Free Memory', +'free memory' => 'Free Memory ', 'free swap' => 'Free Swap', 'friday' => 'Friday', 'fritzdsl help' => 'To utilise one of Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb modem, you must upload a package to your IPFire box. Please download the tarball corresponding to your version from the IPFire Website and then upload the entire fcdsl-(your_version).tgz using the form below.', @@ -771,7 +772,7 @@ 'id' => 'ID', 'idle' => 'Idle', 'idle cpu' => 'Idle CPU', -'idle cpu usage' => 'Idle CPU Usage', +'idle cpu usage' => 'Idle CPU Usage ', 'idle timeout' => 'Idle timeout (mins; 0 to disable):', 'idle timeout not set' => 'Idle timeout not set.', 'ids log viewer' => 'IDS log viewer', @@ -996,6 +997,7 @@ 'memory usage per' => 'Memory Usage per', 'method' => 'Method:', 'min size' => 'Min object size (KB):', +'minimal' => 'Minimal', 'minutes' => 'Minutes', 'misc-options' => 'Miscellaneous options', 'missing dat' => 'Encrypted archive not found', @@ -1310,7 +1312,7 @@ 'shaping add options' => 'Add service', 'shaping list options' => 'Traffic shaping services', 'shared' => 'shared', -'shared memory' => 'Shared Memory', +'shared memory' => 'Shared Memory ', 'sharename' => 'Sharename', 'shares' => 'Shares', 'show ajax speedmeter in footer' => 'Show Ajax Speedmeter', @@ -1408,7 +1410,7 @@ 'swap usage per' => 'Swap Usage per', 'system' => 'System', 'system cpu' => 'System CPU', -'system cpu usage' => 'System CPU Usage', +'system cpu usage' => 'System CPU Usage ', 'system graphs' => 'System Graphs', 'system log viewer' => 'System Log Viewer', 'system logs' => 'System Logs', @@ -1762,11 +1764,11 @@ 'use ipfire red ip' => 'The classical RED IP used by IPFire during connection', 'use only proposed settings' => 'Use only proposed settings.', 'used' => 'Used', -'used memory' => 'Used Memory', +'used memory' => 'Used Memory ', 'used swap' => 'Used Swap', 'user' => 'User', 'user cpu' => 'User CPU', -'user cpu usage' => 'User CPU Usage', +'user cpu usage' => 'User CPU Usage ', 'user log' => 'user log', 'user proxy logs' => 'user proxy log', 'username' => 'User Name:', diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index da252d6b16..ed3bbeac25 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -408,7 +408,7 @@ sub updatehdddata $temp = 0; my $hdd_output = ''; my $smart_output = ''; - + if ( -e "$path_smartctl" ) { system("$path_smartctl -iHA /dev/$disk > /var/log/smartctl_out_hddtemp-$disk"); @@ -417,7 +417,7 @@ sub updatehdddata if ( -e "$path_hddtemp" ) { $hdd_output = `$path_hddtemp -qn /dev/$disk`; - + # I know 4 response possible responses: # # /dev/harddisk: harddisk type: S.M.A.R.T. not available @@ -454,12 +454,11 @@ sub updatehdddata { $temp = 0; } + -# print "hdd $hdd_output \n"; -# print "temp $temp \n"; + print "Temperature for ".$disk."->".$temp."<-\n"; RRDs::update ("$rrdlog/hddtemp-$disk.rrd", "-t", "temperature", "N:$temp"); - $ERROR = RRDs::error; print "Error in RRD::update for hdd-$disk: $ERROR\n" if $ERROR; } @@ -550,6 +549,10 @@ updatecpudata(); updateloaddata(); updatememdata(); +### +### HDD graphs +### + my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; print "\nFound following amount of disks:".@disks."\n"; foreach (@disks){ @@ -557,6 +560,7 @@ my $disk = $_; chomp $disk; print "Working on disk ".$disk.".\n"; updatediskdata($disk); +updatehdddata($disk); } ### @@ -570,16 +574,9 @@ updatefwhitsdata(); updatelq(); ### -### HDDTEMP-Graphs for /dev/harddisk +### Mbmon Data ### - -my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; -print "\nFound following amount of disks for hddtemp:".@disks."\n"; -foreach (@disks){ -my $disk = $_; -chomp $disk; -updatehdddata ($disk); -} +updatembmondata(); ### ### Network Graphs -- 2.39.2