# Generate Graphs exported from Makegraphs to minimize system load an only generate the Graphs when displayed
-# Initialisation
+# This is part of the IPFire Firewall
package Graphs;
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
-$General::version = '2.0b';
-$General::swroot = '/var/ipfire';
-
my $ERROR;
my $rrdlog = "/var/log/rrd";
my $graphs = "/srv/web/ipfire/html/graphs";
&General::readhash("${General::swroot}/mbmon/settings", \%mbmon_settings);
my %mbmon_values = ();
+&General::readhash("/var/log/mbmon-values", \%mbmon_values);
+
my $key;
my $value;
my @args = ();
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
- "-t $tr{'cpu usage per'} $tr{$period}",
+ "-t $Lang::tr{'cpu usage per'} $Lang::tr{$period}",
"DEF:iowait=$rrdlog/cpu.rrd:iowait:AVERAGE",
"DEF:user=$rrdlog/cpu.rrd:user:AVERAGE",
"DEF:system=$rrdlog/cpu.rrd:system:AVERAGE",
"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{'maximal'}",
- "COMMENT:$tr{'average'}",
- "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");
+ "COMMENT:$Lang::tr{'caption'}\\t\\t\\t ",
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::tr{'current'}\\j",
+ "AREA:iowaitpct".$color{"color14"}.":$Lang::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"}.":$Lang::tr{'cpu irq 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"}.":$Lang::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"}.":$Lang::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"}.":$Lang::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;
}
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
- "-t $tr{'memory usage per'} $tr{$period}",
+ "-t $Lang::tr{'memory usage per'} $Lang::tr{$period}",
"DEF:used=$rrdlog/mem.rrd:memused:AVERAGE",
"DEF:free=$rrdlog/mem.rrd:memfree:AVERAGE",
"DEF:shared=$rrdlog/mem.rrd:memshared:AVERAGE",
"CDEF:bufferpct=100,buffer,total,/,*",
"CDEF:cachepct=100,cache,total,/,*",
"CDEF:freepct=100,free,total,/,*",
- "AREA:usedpct".$color{"color11"}.":$tr{'used memory'}",
- "STACK:sharedpct".$color{"color13"}.":$tr{'shared memory'}",
- "STACK:bufferpct".$color{"color23"}.":$tr{'buffered memory'}",
- "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");
+ "COMMENT:$Lang::tr{'caption'}\\t\\t\\t",
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::tr{'current'}\\j",
+ "AREA:usedpct".$color{"color11"}.":$Lang::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"}.":$Lang::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"}.":$Lang::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"}.":$Lang::tr{'cached memory'}",
+ "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"}.":$Lang::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;
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
- "-t $tr{'swap usage per'} $tr{$period}",
+ "-t $Lang::tr{'swap usage per'} $Lang::tr{$period}",
"DEF:used=$rrdlog/mem.rrd:swapused:AVERAGE",
"DEF:free=$rrdlog/mem.rrd:swapfree:AVERAGE",
"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{'maximal'}",
- "COMMENT:$tr{'average'}",
- "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");
+ "COMMENT:$Lang::tr{'caption'}\\t\\t",
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::tr{'current'}\\j",
+ "AREA:usedpct".$color{"color11"}.":$Lang::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"}.":$Lang::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;
}
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
- "-t $tr{'disk access per'} $tr{$period} $disk",
+ "-t $Lang::tr{'disk access per'} $Lang::tr{$period} $disk",
"DEF:read=$rrdlog/disk-$disk.rrd:readsect:AVERAGE",
"DEF:write=$rrdlog/disk-$disk.rrd:writesect:AVERAGE",
- "AREA:read".$color{"color11"}.":$tr{'sectors read from disk per second'}",
- "STACK:write".$color{"color12"}.":$tr{'sectors written to disk per second'}\\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",
- "COMMENT:$tr{'maximal'}",
- "COMMENT:$tr{'average'}",
- "COMMENT:$tr{'current'}\\j",
- "GPRINT:read:MAX:$tr{'read sectors'}\\:%8.0lf",
- "GPRINT:read:AVERAGE:$tr{'read sectors'}\\:%8.0lf",
- "GPRINT:read:LAST:$tr{'read sectors'}\\:%8.0lf\\j",
- "GPRINT:write:MAX:$tr{'written sectors'}\\:%8.0lf",
- "GPRINT:write:AVERAGE:$tr{'written sectors'}\\:%8.0lf",
- "GPRINT:write:LAST:$tr{'written sectors'}\\:%8.0lf\\j");
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'current'}\\j",
+ "GPRINT:read:MAX:$Lang::tr{'read sectors'}\\:%8.0lf",
+ "GPRINT:read:AVERAGE:$Lang::tr{'read sectors'}\\:%8.0lf",
+ "GPRINT:read:LAST:$Lang::tr{'read sectors'}\\:%8.0lf\\j",
+ "GPRINT:write:MAX:$Lang::tr{'written sectors'}\\:%8.0lf",
+ "GPRINT:write:AVERAGE:$Lang::tr{'written sectors'}\\:%8.0lf",
+ "GPRINT:write:LAST:$Lang::tr{'written sectors'}\\:%8.0lf\\j");
$ERROR = RRDs::error;
print "Error in RRD::graph for disk: $ERROR\n" if $ERROR;
}
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
- "-t $tr{'traffic on'} $interface ($tr{'graph per'} $tr{$period})",
- "-v$tr{'bytes per second'}",
+ "-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",
- "AREA:incoming".$color{"color11"}.":$tr{'incoming traffic in bytes per second'}",
- "LINE1:outgoing".$color{"color12"}.":$tr{'outgoing traffic in bytes per second'}\\j",
+ "AREA:incoming".$color{"color11"}.":$Lang::tr{'incoming traffic in bytes per second'}",
+ "AREA:outgoing".$color{"color12"}.":$Lang::tr{'outgoing traffic in bytes per second'}\\j",
"COMMENT: \\j",
- "COMMENT:$tr{'maximal'}",
- "COMMENT:$tr{'average'}",
- "COMMENT:$tr{'current'}\\j",
- "GPRINT:incoming:MAX:$tr{'in'}\\:%8.3lf %sBps",
- "GPRINT:incoming:AVERAGE:$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:LAST:$tr{'out'}\\:%8.3lf %sBps\\j");
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::tr{'current'}\\j",
+ "GPRINT:incoming:MAX:$Lang::tr{'in'}\\:%8.3lf %sBps",
+ "GPRINT:incoming:AVERAGE:$Lang::tr{'in'}\\:%8.3lf %sBps",
+ "GPRINT:incoming:MIN:$Lang::tr{'in'}\\:%8.3lf %sBps",
+ "GPRINT:incoming:LAST:$Lang::tr{'in'}\\:%8.3lf %sBps\\j",
+ "GPRINT:outgoing:MAX:$Lang::tr{'out'}\\:%8.3lf %sBps",
+ "GPRINT:outgoing:AVERAGE:$Lang::tr{'out'}\\:%8.3lf %sBps",
+ "GPRINT:outgoing:MIN:$Lang::tr{'out'}\\:%8.3lf %sBps",
+ "GPRINT:outgoing:LAST:$Lang::tr{'out'}\\:%8.3lf %sBps\\j");
$ERROR = RRDs::error;
print "Error in RRD::graph for $interface: $ERROR\n" if $ERROR;
}
sub updatefwhitsgraph {
- my $interval = $_[0];
+ my $period = $_[0];
- RRDs::graph ("$graphs/firewallhits-$interval-area.png",
- "--start", "-1$interval", "-aPNG", "-i", "-z",
- "--alt-y-grid", "-w 600", "-h 200",
+ RRDs::graph ("$graphs/firewallhits-$period-area.png",
+ "--start", "-1$period", "-aPNG", "-i", "-z",
+ "--alt-y-grid", "-w 600", "-h 100",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
- "-t firewall hits over the last $interval",
+ "-t $Lang::tr{'firewall hits per'} $Lang::tr{$period}",
"DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
- "AREA:amount".$color{"color24"}.":$tr{'firewallhits'}",
- "GPRINT:amount:MAX: $tr{'maximal'}\\: %2.2lf %S",
- "GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
- "GPRINT:amount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min\\n",
"DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE",
- "AREA:portamount".$color{"color25"}.":$tr{'portscans'}",
- "GPRINT:portamount:MAX: $tr{'maximal'}\\: %2.2lf %S",
- "GPRINT:portamount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
- "GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min");
+ "COMMENT:$Lang::tr{'caption'}\\t\\t\\t",
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::tr{'current'}\\j",
+ "AREA:amount".$color{"color24"}.":$Lang::tr{'firewallhits'}/5 min",
+ "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"}.":$Lang::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;
}
RRDs::graph ("$graphs/lq-$period.png",
"--start", "-1$period", "-aPNG", "-i", "-z",
"--alt-y-grid", "-w 600", "-h 100", "-l 0", "-r",
- "-t $tr{'linkq'} ($tr{'graph per'} $tr{$period})",
+ "-t $Lang::tr{'linkq'} ($Lang::tr{'graph per'} $Lang::tr{$period})",
"--lazy",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"AREA:r0".$color{"color12"}.":<30 ms",
"AREA:loss10".$color{"color13"}.":Packet loss (x10)\\j",
"COMMENT: \\j",
- "COMMENT:$tr{'maximal'}",
- "COMMENT:$tr{'average'}",
- "COMMENT:$tr{'current'}\\j",
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::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;
}
sub updatehddgraph {
+
my $disk = $_[0];
my $period = $_[1];
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
- "-t $tr{'harddisk temperature'} ($tr{'graph per'} $tr{$period})",
+ "-t $Lang::tr{'harddisk temperature'} ($Lang::tr{'graph per'} $Lang::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",
+ "LINE2:temperature".$color{"color11"}.":$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",
);
- $ERROR = RRDs::error;
+ $ERROR = RRDs::error;
print "Error in RRD::graph for hdd-$disk: $ERROR\n" if $ERROR;
}
{
my $type = "temp";
my $period = $_[0];
-
- @args = ("$graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
+ my $count = "11";
+
+ @args = ("$graphs/mbmon-$type-$period.png",
+ "--start", "-1$period", "-aPNG", "-i", "-z",
"--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
- "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})" );
-
- $count = 10;
+ "-t $Lang::tr{'mbmon temp'} ($Lang::tr{'graph per'} $Lang::tr{$period})",
+ "COMMENT:$Lang::tr{'caption'}\\t\\t",
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::tr{'current'}\\j",);
+
foreach $key ( sort(keys %mbmon_values) )
{
if ( (index($key, $type) != -1) && ($mbmon_settings{'LINE-'.$key} eq 'on') )
{
$mbmon_settings{'LABEL-'.$key} = $key;
}
-
- push(@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE");
- push(@args, "LINE2:$key$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");
-
- $count++;
- }
+ push (@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE");
+ 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++;
+ }
}
-
- if ( $count > 1 )
- {
- RRDs::graph ( @args );
+
+ RRDs::graph ( @args );
$ERROR = RRDs::error;
print("Error in RRD::graph for temp: $ERROR\n")if $ERROR;
- }
}
sub updatefangraph
{
my $type = "fan";
my $period = $_[0];
+ my $count = "11";
@args = ("$graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
"--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
- "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})" );
+ "-t $Lang::tr{'mbmon fan'} ($Lang::tr{'graph per'} $Lang::tr{$period})",
+ "COMMENT:$Lang::tr{'caption'}\\t\\t",
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::tr{'current'}\\j",);
- $count = 10;
foreach $key ( sort(keys %mbmon_values) )
{
if ( (index($key, $type) != -1) && ($mbmon_settings{'LINE-'.$key} eq 'on') )
}
push(@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE");
- push(@args, "LINE2:$key$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++;
}
}
-
- if ( $count > 1 )
- {
RRDs::graph ( @args );
$ERROR = RRDs::error;
print("Error in RRD::graph for temp: $ERROR\n")if $ERROR;
- }
}
sub updatevoltgraph
{
my $type = "volt";
my $period = $_[0];
+ my $count = "11";
@args = ("$graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
"--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
- "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})" );
+ "-t $Lang::tr{'mbmon volt'} ($Lang::tr{'graph per'} $Lang::tr{$period})",
+ "COMMENT:$Lang::tr{'caption'}\\t",
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::tr{'current'}\\j",);
- $count = 10;
foreach $key ( sort(keys %mbmon_values) )
{
my $v = substr($key,0,1);
}
push(@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE");
- push(@args, "LINE2:$key$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++;
}
}
- if ( $count > 1 )
- {
RRDs::graph ( @args );
$ERROR = RRDs::error;
print("Error in RRD::graph for temp: $ERROR\n")if $ERROR;
- }
}
projects / people / pmueller / ipfire-2.x.git / blobdiff