[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop:[1927] ipcop/trunk
From: owes () users ! sourceforge ! net
Date: 2008-09-22 6:23:33
Message-ID: E1KhepZ-0005pZ-BG () 3kljzd1 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 1927
http://ipcop.svn.sourceforge.net/ipcop/?rev=1927&view=rev
Author: owes
Date: 2008-09-22 06:23:32 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
Drop swap usage graph and add swapused to diskuse graph.
Add last updated information into RRD graph (need to add last update to lang DB).
Restyle makegraphs to avoid some duplication of code.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/graphs.cgi
ipcop/trunk/src/scripts/makegraphs
Modified: ipcop/trunk/html/cgi-bin/graphs.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/graphs.cgi 2008-09-22 06:18:06 UTC (rev 1926)
+++ ipcop/trunk/html/cgi-bin/graphs.cgi 2008-09-22 06:23:32 UTC (rev 1927)
@@ -43,7 +43,7 @@
}
&Header::openbigbox('100%', 'left');
-if ($cgigraphs[1] =~ /(GREEN|BLUE|ORANGE|RED|cpu|memory|swap|diskuse|disk)/) {
+if ($cgigraphs[1] =~ /(GREEN|BLUE|ORANGE|RED|cpu|memory|diskuse|disk)/) {
my $graph = $cgigraphs[1];
my $graphname = ucfirst(lc($cgigraphs[1]));
my ($title, $count) = split('_', $graphname);
@@ -59,12 +59,10 @@
&Header::openbox('100%', 'center', "$title $Lang::tr{'graph'}");
if (-e "$graphdir/${graph}-day.png") {
- my $ftime = localtime((stat("$graphdir/${graph}-day.png"))[9]);
print <<END
<table width='100%'><tr>
<td width='10%'>$back<img src='/images/back.png' alt='$Lang::tr{'back'}' \
title='$Lang::tr{'back'}' /></a></td>
- <td align='center'>$Lang::tr{'the statistics were last updated at'}: $ftime</td>
- <td width='10%'> </td>
+ <td> </td>
</tr></table>
<hr />
<img src='/graphs/${graph}-day.png' border='0' alt='${graph}-$Lang::tr{'day'}' /><hr \
/> @@ -99,8 +97,6 @@
&Header::openbox('100%', 'center', "$title $Lang::tr{'graph'}");
if (-e "$graphdir/${graphname}-day.png") {
- my $ftime = localtime((stat("$graphdir/${graphname}-day.png"))[9]);
- print "<center>$Lang::tr{'the statistics were last updated at'}: \
$ftime</center><br />\n"; print "<a href='/cgi-bin/graphs.cgi?graph=$graphname'>";
print "<img src='/graphs/${graphname}-day.png' \
alt='${graphname}-$Lang::tr{'day'}' border='0' />"; print "</a><br />";
@@ -127,7 +123,6 @@
else {
&disp_graph("CPU $Lang::tr{'graph'}", "cpu", "cpu-$Lang::tr{'day'}");
&disp_graph("Memory $Lang::tr{'graph'}", "memory", \
"$Lang::tr{'memory'}:-$Lang::tr{'day'}");
- &disp_graph("Swap $Lang::tr{'graph'}", "swap", \
"$Lang::tr{'swap'}-$Lang::tr{'day'}") unless ( -e "/etc/FLASH" );
&disp_graph("Diskuse $Lang::tr{'graph'}", "diskuse", "$Lang::tr{'disk \
usage'}:-$Lang::tr{'day'}");
&disp_graph("Disk $Lang::tr{'graph'}", "disk", "disk-$Lang::tr{'day'}");
}
@@ -144,8 +139,6 @@
&Header::openbox('100%', 'center', $title);
if (-e "$graphdir/$file-day.png") {
- my $ftime = localtime((stat("$graphdir/$file-day.png"))[9]);
- print "<center>$Lang::tr{'the statistics were last updated at'}: \
$ftime</center><br />\n"; print "<a href='/cgi-bin/graphs.cgi?graph=$file'>";
print "<img src='/graphs/$file-day.png' alt='$alt' border='0' />";
print "</a><br />";
Modified: ipcop/trunk/src/scripts/makegraphs
===================================================================
--- ipcop/trunk/src/scripts/makegraphs 2008-09-22 06:18:06 UTC (rev 1926)
+++ ipcop/trunk/src/scripts/makegraphs 2008-09-22 06:23:32 UTC (rev 1927)
@@ -51,6 +51,56 @@
my $graphs = "/home/httpd/html/graphs";
$ENV{PATH} = "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin";
+sub RRDescape
+{
+ my $text = shift;
+ return undef if not defined $text;
+ $text =~ s/\\/\\\\/g;
+ $text =~ s/:/\\:/g;
+ return $text;
+}
+
+sub rrd_header {
+ my $name = shift;
+ my $period = shift;
+ my $title = shift;
+ my $lower = shift;
+ my $upper = shift;
+ my $result = [];
+
+ push @$result, "$graphs/$name-$period.png";
+ push @$result, ("--title", "$title");
+ push @$result, ("--start", "-1$period");
+ push @$result, ("--width", 600);
+ push @$result, ("--height", 100);
+ if ($lower != -1) {
+ push @$result, ("--lower-limit", $lower);
+ push @$result, ("--upper-limit", $upper);
+ push @$result, "--rigid";
+ }
+ push @$result, "--alt-y-grid";
+ push @$result, "--lazy";
+ push @$result, ("--imgformat", "PNG");
+ # gets ignored in 1.3 for now
+ push @$result, "--interlaced";
+ push @$result, "--pango-markup";
+ push @$result, ("--font", "TITLE:0:sans mono bold oblique");
+ push @$result, ("--color", "SHADEA$Header::boxcolour");
+ push @$result, ("--color", "SHADEB$Header::boxcolour");
+ push @$result, ("--color", "BACK$Header::boxcolour");
+
+ return $result;
+}
+
+sub rrd_lastupdate {
+ my $result = [];
+
+ push @$result, "COMMENT:<span size='smaller'> </span>\\r";
+ push @$result, "COMMENT:<span size='smaller'>Last update\\: ". RRDescape(scalar \
localtime()) ."</span>\\r"; +
+ return $result;
+}
+
sub gettraffic {
my $interface = $_[0];
@@ -65,54 +115,40 @@
sub updatecpugraph {
my $period = $_[0];
+ my @rrd = ();
my $col_width = length($Lang::tr{'user cpu usage'});
$col_width = length($Lang::tr{'system cpu usage'}) if (length($Lang::tr{'system \
cpu usage'}) > $col_width);
$col_width = length($Lang::tr{'idle cpu usage'}) if (length($Lang::tr{'idle \
cpu usage'}) > $col_width); $col_width += 2;
- RRDs::graph(
- "$graphs/cpu-$period.png",
- "--start",
- "-1$period",
- "-aPNG",
- "-i",
- "-z",
- "--alt-y-grid",
- "-w 600",
- "-h 100",
- "-l 0",
- "-u 100",
- "-r",
- "--color",
- "SHADEA$Header::boxcolour",
- "--color",
- "SHADEB$Header::boxcolour",
- "--color",
- "BACK$Header::boxcolour",
- "-t $Lang::tr{'cpu usage per'} $Lang::tr{$period}",
- "DEF:user=$rrdlog/cpu.rrd:user:AVERAGE",
- "DEF:system=$rrdlog/cpu.rrd:system:AVERAGE",
- "DEF:idle=$rrdlog/cpu.rrd:idle:AVERAGE",
- "CDEF:total=user,system,idle,+,+",
- "CDEF:userpct=100,user,total,/,*",
- "CDEF:systempct=100,system,total,/,*",
- "CDEF:idlepct=100,idle,total,/,*",
- "AREA:userpct#0000FF:$Lang::tr{'user cpu usage'}" . (" " x ($col_width - \
length($Lang::tr{'user cpu usage'}))),
- "GPRINT:userpct:MAX:$Lang::tr{'maximal'}\\:%6.2lf%%",
- "GPRINT:userpct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf%%",
- "GPRINT:userpct:LAST:$Lang::tr{'current'}\\:%6.2lf%%\\j",
- "AREA:systempct#FF0000:$Lang::tr{'system cpu usage'}"
- . (" " x ($col_width - length($Lang::tr{'system cpu usage'})) . \
":STACK"),
- "GPRINT:systempct:MAX:$Lang::tr{'maximal'}\\:%6.2lf%%",
- "GPRINT:systempct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf%%",
- "GPRINT:systempct:LAST:$Lang::tr{'current'}\\:%6.2lf%%\\j",
- "AREA:idlepct#00FF00:$Lang::tr{'idle cpu usage'}"
- . (" " x ($col_width - length($Lang::tr{'idle cpu usage'})) . ":STACK"),
- "GPRINT:idlepct:MAX:$Lang::tr{'maximal'}\\:%6.2lf%%",
- "GPRINT:idlepct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf%%",
- "GPRINT:idlepct:LAST:$Lang::tr{'current'}\\:%6.2lf%%\\j"
- );
+ push @rrd, @{&rrd_header("cpu", $period, "$Lang::tr{'cpu usage per'} $period", \
0, 100)}; +
+ push @rrd, "DEF:user=$rrdlog/cpu.rrd:user:AVERAGE";
+ push @rrd, "DEF:system=$rrdlog/cpu.rrd:system:AVERAGE";
+ push @rrd, "DEF:idle=$rrdlog/cpu.rrd:idle:AVERAGE";
+ push @rrd, "CDEF:total=user,system,idle,+,+";
+ push @rrd, "CDEF:userpct=100,user,total,/,*";
+ push @rrd, "CDEF:systempct=100,system,total,/,*";
+ push @rrd, "CDEF:idlepct=100,idle,total,/,*";
+ push @rrd, "AREA:userpct#0000FF:$Lang::tr{'user cpu usage'}" . (" " x \
($col_width - length($Lang::tr{'user cpu usage'}))); + push @rrd, \
"GPRINT:userpct:MAX:$Lang::tr{'maximal'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:userpct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:userpct:LAST:$Lang::tr{'current'}\\:%6.2lf %%\\j"; + push @rrd, \
"AREA:systempct#FF0000:$Lang::tr{'system cpu usage'}" + . (" " x \
($col_width - length($Lang::tr{'system cpu usage'})) . ":STACK"); + push @rrd, \
"GPRINT:systempct:MAX:$Lang::tr{'maximal'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:systempct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:systempct:LAST:$Lang::tr{'current'}\\:%6.2lf %%\\j"; + push @rrd, \
"AREA:idlepct#00FF00:$Lang::tr{'idle cpu usage'}" + . (" " x ($col_width - \
length($Lang::tr{'idle cpu usage'})) . ":STACK"); + push @rrd, \
"GPRINT:idlepct:MAX:$Lang::tr{'maximal'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:idlepct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:idlepct:LAST:$Lang::tr{'current'}\\:%6.2lf %%\\j"; +
+ push @rrd, @{&rrd_lastupdate()};
+ RRDs::graph (@rrd);
+
$ERROR = RRDs::error;
print "Error in RRD::graph for cpu: $ERROR\n" if $ERROR;
}
@@ -145,11 +181,11 @@
RRDs::update("$rrdlog/cpu.rrd", "-t", "user:system:idle", \
"N:$user:$system:$idle"); $ERROR = RRDs::error;
print "Error in RRD::update for cpu: $ERROR\n" if $ERROR;
-
}
sub updatememgraph {
my $period = $_[0];
+ my @rrd = ();
my $col_width = length($Lang::tr{'used memory'});
$col_width = length($Lang::tr{'buffered memory'}) if \
(length($Lang::tr{'buffered memory'}) > $col_width); @@ -158,106 +194,48 @@
$col_width = length($Lang::tr{'free memory'}) if (length($Lang::tr{'free \
memory'}) > $col_width); $col_width += 2;
- RRDs::graph(
- "$graphs/memory-$period.png",
- "--start",
- "-1$period",
- "-aPNG",
- "-i",
- "-z",
- "--alt-y-grid",
- "-w 600",
- "-h 100",
- "-l 0",
- "-u 100",
- "-r",
- "--color",
- "SHADEA$Header::boxcolour",
- "--color",
- "SHADEB$Header::boxcolour",
- "--color",
- "BACK$Header::boxcolour",
- "-t $Lang::tr{'memory usage per'} $Lang::tr{$period}",
- "DEF:used=$rrdlog/mem.rrd:memused:AVERAGE",
- "DEF:free=$rrdlog/mem.rrd:memfree:AVERAGE",
- "DEF:buffer=$rrdlog/mem.rrd:membuffers:AVERAGE",
- "DEF:cache=$rrdlog/mem.rrd:memcache:AVERAGE",
- "DEF:swapcached=$rrdlog/mem.rrd:memswapcached:AVERAGE",
- "CDEF:total=used,free,+",
- "CDEF:used2=used,buffer,cache,swapcached,+,+,-",
- "CDEF:usedpct=100,used2,total,/,*",
- "CDEF:bufferpct=100,buffer,total,/,*",
- "CDEF:cachepct=100,cache,total,/,*",
- "CDEF:swapcachedpct=100,swapcached,total,/,*",
- "CDEF:freepct=100,free,total,/,*",
- "AREA:usedpct#0000FF:$Lang::tr{'used memory'}" . (" " x ($col_width - \
length($Lang::tr{'used memory'}))),
- "GPRINT:usedpct:MAX:$Lang::tr{'maximal'}\\:%6.2lf%%",
- "GPRINT:usedpct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf%%",
- "GPRINT:usedpct:LAST:$Lang::tr{'current'}\\:%6.2lf%%\\j",
- "STACK:bufferpct#FF00FF:$Lang::tr{'buffered memory'}"
- . (" " x ($col_width - length($Lang::tr{'buffered memory'}))),
- "GPRINT:bufferpct:MAX:$Lang::tr{'maximal'}\\:%6.2lf%%",
- "GPRINT:bufferpct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf%%",
- "GPRINT:bufferpct:LAST:$Lang::tr{'current'}\\:%6.2lf%%\\j",
- "STACK:cachepct#FFFF00:$Lang::tr{'cached memory'}" . (" " x ($col_width - \
length($Lang::tr{'cached memory'}))),
- "GPRINT:cachepct:MAX:$Lang::tr{'maximal'}\\:%6.2lf%%",
- "GPRINT:cachepct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf%%",
- "GPRINT:cachepct:LAST:$Lang::tr{'current'}\\:%6.2lf%%\\j",
- "STACK:swapcachedpct#FF0000:$Lang::tr{'swapcached memory'}"
- . (" " x ($col_width - length($Lang::tr{'swapcached memory'}))),
- "GPRINT:swapcachedpct:MAX:$Lang::tr{'maximal'}\\:%6.2lf%%",
- "GPRINT:swapcachedpct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf%%",
- "GPRINT:swapcachedpct:LAST:$Lang::tr{'current'}\\:%6.2lf%%\\j",
- "STACK:freepct#00FF00:$Lang::tr{'free memory'}" . (" " x ($col_width - \
length($Lang::tr{'free memory'}))),
- "GPRINT:freepct:MAX:$Lang::tr{'maximal'}\\:%6.2lf%%",
- "GPRINT:freepct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf%%",
- "GPRINT:freepct:LAST:$Lang::tr{'current'}\\:%6.2lf%%\\j"
- );
- $ERROR = RRDs::error;
- print "Error in RRD::graph for mem: $ERROR\n" if $ERROR;
+ push @rrd, @{&rrd_header("memory", $period, "$Lang::tr{'memory usage per'} \
$period", 0, 100)};
- unless (-e "/etc/FLASH") {
- $col_width = length($Lang::tr{'used swap'});
- $col_width = length($Lang::tr{'free swap'}) if (length($Lang::tr{'free \
swap'}) > $col_width);
- $col_width += 2;
+ push @rrd, "DEF:used=$rrdlog/mem.rrd:memused:AVERAGE";
+ push @rrd, "DEF:free=$rrdlog/mem.rrd:memfree:AVERAGE";
+ push @rrd, "DEF:buffer=$rrdlog/mem.rrd:membuffers:AVERAGE";
+ push @rrd, "DEF:cache=$rrdlog/mem.rrd:memcache:AVERAGE";
+ push @rrd, "DEF:swapcached=$rrdlog/mem.rrd:memswapcached:AVERAGE";
+ push @rrd, "CDEF:total=used,free,+";
+ push @rrd, "CDEF:used2=used,buffer,cache,swapcached,+,+,-";
+ push @rrd, "CDEF:usedpct=100,used2,total,/,*";
+ push @rrd, "CDEF:bufferpct=100,buffer,total,/,*";
+ push @rrd, "CDEF:cachepct=100,cache,total,/,*";
+ push @rrd, "CDEF:swapcachedpct=100,swapcached,total,/,*";
+ push @rrd, "CDEF:freepct=100,free,total,/,*";
+ push @rrd, "AREA:usedpct#0000FF:$Lang::tr{'used memory'}" . (" " x ($col_width - \
length($Lang::tr{'used memory'}))); + push @rrd, \
"GPRINT:usedpct:MAX:$Lang::tr{'maximal'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:usedpct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:usedpct:LAST:$Lang::tr{'current'}\\:%6.2lf %%\\j"; + push @rrd, \
"STACK:bufferpct#FF00FF:$Lang::tr{'buffered memory'}" + . (" " x \
($col_width - length($Lang::tr{'buffered memory'}))); + push @rrd, \
"GPRINT:bufferpct:MAX:$Lang::tr{'maximal'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:bufferpct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:bufferpct:LAST:$Lang::tr{'current'}\\:%6.2lf %%\\j"; + push @rrd, \
"STACK:cachepct#FFFF00:$Lang::tr{'cached memory'}" . (" " x ($col_width - \
length($Lang::tr{'cached memory'}))); + push @rrd, \
"GPRINT:cachepct:MAX:$Lang::tr{'maximal'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:cachepct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:cachepct:LAST:$Lang::tr{'current'}\\:%6.2lf %%\\j"; + push @rrd, \
"STACK:swapcachedpct#FF0000:$Lang::tr{'swapcached memory'}" + . (" " x \
($col_width - length($Lang::tr{'swapcached memory'}))); + push @rrd, \
"GPRINT:swapcachedpct:MAX:$Lang::tr{'maximal'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:swapcachedpct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:swapcachedpct:LAST:$Lang::tr{'current'}\\:%6.2lf %%\\j"; + push @rrd, \
"STACK:freepct#00FF00:$Lang::tr{'free memory'}" . (" " x ($col_width - \
length($Lang::tr{'free memory'}))); + push @rrd, \
"GPRINT:freepct:MAX:$Lang::tr{'maximal'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:freepct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf %%"; + push @rrd, \
"GPRINT:freepct:LAST:$Lang::tr{'current'}\\:%6.2lf %%\\j";
- RRDs::graph(
- "$graphs/swap-$period.png",
- "--start",
- "-1$period",
- "-aPNG",
- "-i",
- "-z",
- "--alt-y-grid",
- "-w 600",
- "-h 100",
- "-l 0",
- "-u 100",
- "-r",
- "--color",
- "SHADEA$Header::boxcolour",
- "--color",
- "SHADEB$Header::boxcolour",
- "--color",
- "BACK$Header::boxcolour",
- "-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#0000FF:$Lang::tr{'used swap'}" . (" " x ($col_width - \
length($Lang::tr{'used swap'}))),
- "GPRINT:usedpct:MAX:$Lang::tr{'maximal'}\\:%6.2lf%%",
- "GPRINT:usedpct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf%%",
- "GPRINT:usedpct:LAST:$Lang::tr{'current'}\\:%6.2lf%%\\j",
- "STACK:freepct#00FF00:$Lang::tr{'free swap'}" . (" " x ($col_width - \
length($Lang::tr{'free swap'}))),
- "GPRINT:freepct:MAX:$Lang::tr{'maximal'}\\:%6.2lf%%",
- "GPRINT:freepct:AVERAGE:$Lang::tr{'average'}\\:%6.2lf%%",
- "GPRINT:freepct:LAST:$Lang::tr{'current'}\\:%6.2lf%%\\j"
- );
- $ERROR = RRDs::error;
- print "Error in RRD::graph for swap: $ERROR\n" if $ERROR;
- }
+ push @rrd, @{&rrd_lastupdate()};
+ RRDs::graph (@rrd);
+
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for mem: $ERROR\n" if $ERROR;
}
sub updatememdata {
@@ -332,43 +310,43 @@
sub updatediskusegraph {
my $period = $_[0];
+ my @rrd = ();
- RRDs::graph(
- "$graphs/diskuse-$period.png",
- "--start",
- "-1$period",
- "-aPNG",
- "-i",
- "-z",
- "--alt-y-grid",
- "-w 600",
- "-h 100",
- "-l 0",
- "-u 100",
- "-r",
- "--color",
- "SHADEA$Header::boxcolour",
- "--color",
- "SHADEB$Header::boxcolour",
- "--color",
- "BACK$Header::boxcolour",
- "-t $Lang::tr{'disk usage per'} $Lang::tr{$period}",
- "DEF:root=$rrdlog/diskuse.rrd:root:AVERAGE",
- "DEF:varlog=$rrdlog/diskuse.rrd:varlog:AVERAGE",
- "DEF:boot=$rrdlog/diskuse.rrd:boot:AVERAGE",
- "LINE2:root#0000FF:/ ",
- "GPRINT:root:MAX:$Lang::tr{'maximal'}\\:%3.0lf%%",
- "GPRINT:root:AVERAGE:$Lang::tr{'average'}\\:%3.0lf%%",
- "GPRINT:root:LAST:$Lang::tr{'current'}\\:%3.0lf%%\\j",
- "LINE2:varlog#00FF00:/var/log",
- "GPRINT:varlog:MAX:$Lang::tr{'maximal'}\\:%3.0lf%%",
- "GPRINT:varlog:AVERAGE:$Lang::tr{'average'}\\:%3.0lf%%",
- "GPRINT:varlog:LAST:$Lang::tr{'current'}\\:%3.0lf%%\\j",
- "LINE2:boot#FF00FF:/boot ",
- "GPRINT:boot:MAX:$Lang::tr{'maximal'}\\:%3.0lf%%",
- "GPRINT:boot:AVERAGE:$Lang::tr{'average'}\\:%3.0lf%%",
- "GPRINT:boot:LAST:$Lang::tr{'current'}\\:%3.0lf%%\\j"
- );
+ my $col_width = length($Lang::tr{'used swap'});
+ $col_width = length('/var/log') if (length('/var/log') > $col_width);
+ $col_width += 2;
+
+ push @rrd, @{&rrd_header("diskuse", $period, "$Lang::tr{'disk usage per'} \
$period", 0, 100)}; +
+ push @rrd, "DEF:root=$rrdlog/diskuse.rrd:root:AVERAGE";
+ push @rrd, "DEF:varlog=$rrdlog/diskuse.rrd:varlog:AVERAGE";
+ push @rrd, "DEF:boot=$rrdlog/diskuse.rrd:boot:AVERAGE";
+ push @rrd, "LINE2:root#0000FF:/" . (" " x ($col_width - length('/')));
+ push @rrd, "GPRINT:root:MAX:$Lang::tr{'maximal'}\\:%3.0lf %%";
+ push @rrd, "GPRINT:root:AVERAGE:$Lang::tr{'average'}\\:%3.0lf %%";
+ push @rrd, "GPRINT:root:LAST:$Lang::tr{'current'}\\:%3.0lf %%\\j";
+ push @rrd, "LINE2:varlog#00FF00:/var/log" . (" " x ($col_width - \
length('/var/log'))); + push @rrd, \
"GPRINT:varlog:MAX:$Lang::tr{'maximal'}\\:%3.0lf %%"; + push @rrd, \
"GPRINT:varlog:AVERAGE:$Lang::tr{'average'}\\:%3.0lf %%"; + push @rrd, \
"GPRINT:varlog:LAST:$Lang::tr{'current'}\\:%3.0lf %%\\j"; + push @rrd, \
"LINE2:boot#FF00FF:/boot" . (" " x ($col_width - length('/boot'))); + push @rrd, \
"GPRINT:boot:MAX:$Lang::tr{'maximal'}\\:%3.0lf %%"; + push @rrd, \
"GPRINT:boot:AVERAGE:$Lang::tr{'average'}\\:%3.0lf %%"; + push @rrd, \
"GPRINT:boot:LAST:$Lang::tr{'current'}\\:%3.0lf %%\\j"; + unless (-e "/etc/FLASH") \
{ + push @rrd, "DEF:used=$rrdlog/mem.rrd:swapused:AVERAGE";
+ push @rrd, "DEF:free=$rrdlog/mem.rrd:swapfree:AVERAGE";
+ push @rrd, "CDEF:total=used,free,+";
+ push @rrd, "CDEF:usedpct=100,used,total,/,*";
+ push @rrd, "LINE2:usedpct#FF0000:$Lang::tr{'used swap'}" . (" " x \
($col_width - length($Lang::tr{'used swap'}))); + push @rrd, \
"GPRINT:usedpct:MAX:$Lang::tr{'maximal'}\\:%3.0lf %%"; + push @rrd, \
"GPRINT:usedpct:AVERAGE:$Lang::tr{'average'}\\:%3.0lf %%"; + push @rrd, \
"GPRINT:usedpct:LAST:$Lang::tr{'current'}\\:%3.0lf %%\\j"; + }
+
+ push @rrd, @{&rrd_lastupdate()};
+ RRDs::graph (@rrd);
+
$ERROR = RRDs::error;
print "Error in RRD::graph for diskuse: $ERROR\n" if $ERROR;
}
@@ -417,37 +395,26 @@
sub updatediskgraph {
my $period = $_[0];
+ my @rrd = ();
- RRDs::graph(
- "$graphs/disk-$period.png",
- "--start",
- "-1$period",
- "-aPNG",
- "-i",
- "-z",
- "--alt-y-grid",
- "-w 600",
- "-h 100",
- "--color",
- "SHADEA$Header::boxcolour",
- "--color",
- "SHADEB$Header::boxcolour",
- "--color",
- "BACK$Header::boxcolour",
- "-t $Lang::tr{'disk access per'} $Lang::tr{$period}",
- "DEF:read=$rrdlog/disk.rrd:readsect:AVERAGE",
- "DEF:write=$rrdlog/disk.rrd:writesect:AVERAGE",
- "CDEF:readneg=read,-1,*",
- "HRULE:0#000000",
- "AREA:readneg#0000FF:$Lang::tr{'sectors read from disk per second'}\\j",
- "GPRINT:read:MAX:$Lang::tr{'maximal'}\\:%8.0lf",
- "GPRINT:read:AVERAGE:$Lang::tr{'average'}\\:%8.0lf",
- "GPRINT:read:LAST:$Lang::tr{'current'}\\:%8.0lf\\j",
- "AREA:write#00FF00:$Lang::tr{'sectors written to disk per second'}\\j",
- "GPRINT:write:MAX:$Lang::tr{'maximal'}\\:%8.0lf",
- "GPRINT:write:AVERAGE:$Lang::tr{'average'}\\:%8.0lf",
- "GPRINT:write:LAST:$Lang::tr{'current'}\\:%8.0lf\\j"
- );
+ push @rrd, @{&rrd_header("disk", $period, "$Lang::tr{'disk access per'} \
$period", -1, -1)}; +
+ push @rrd, "DEF:read=$rrdlog/disk.rrd:readsect:AVERAGE";
+ push @rrd, "DEF:write=$rrdlog/disk.rrd:writesect:AVERAGE";
+ push @rrd, "CDEF:readneg=read,-1,*";
+ push @rrd, "HRULE:0#000000";
+ push @rrd, "AREA:readneg#0000FF:$Lang::tr{'sectors read from disk per \
second'}\\j"; + push @rrd, "GPRINT:read:MAX:$Lang::tr{'maximal'}\\:%8.0lf";
+ push @rrd, "GPRINT:read:AVERAGE:$Lang::tr{'average'}\\:%8.0lf";
+ push @rrd, "GPRINT:read:LAST:$Lang::tr{'current'}\\:%8.0lf\\j";
+ push @rrd, "AREA:write#00FF00:$Lang::tr{'sectors written to disk per \
second'}\\j"; + push @rrd, "GPRINT:write:MAX:$Lang::tr{'maximal'}\\:%8.0lf";
+ push @rrd, "GPRINT:write:AVERAGE:$Lang::tr{'average'}\\:%8.0lf";
+ push @rrd, "GPRINT:write:LAST:$Lang::tr{'current'}\\:%8.0lf\\j";
+
+ push @rrd, @{&rrd_lastupdate()};
+ RRDs::graph (@rrd);
+
$ERROR = RRDs::error;
print "Error in RRD::graph for disk: $ERROR\n" if $ERROR;
}
@@ -488,44 +455,33 @@
sub updateifgraph {
my $interface = $_[0];
my $period = $_[1];
+ my @rrd = ();
my ($title, $count) = split('_', $interface);
$title = $title . " " . $count if ($count >= 2);
- RRDs::graph(
- "$graphs/$interface-$period.png",
- "--start",
- "-1$period",
- "-aPNG",
- "-i",
- "-z",
- "--alt-y-grid",
- "-w 600",
- "-h 100",
- "--color",
- "SHADEA$Header::boxcolour",
- "--color",
- "SHADEB$Header::boxcolour",
- "--color",
- "BACK$Header::boxcolour",
- "-t $Lang::tr{'traffic on'} $title ($Lang::tr{'graph per'} \
$Lang::tr{$period})",
- "-v$Lang::tr{'bits per second'}",
- "DEF:incoming=$rrdlog/$interface.rrd:incoming:AVERAGE",
- "DEF:outgoing=$rrdlog/$interface.rrd:outgoing:AVERAGE",
- "CDEF:incomingbits=incoming,8,*",
- "CDEF:outgoingbits=outgoing,8,*",
- "CDEF:outgoingnegbits=outgoing,-8,*",
- "HRULE:0#000000",
- "AREA:incomingbits#00FF00:$Lang::tr{'incoming traffic in bits per \
second'}\\j",
- "GPRINT:incomingbits:MAX:$Lang::tr{'maximal'}\\:%8.3lf %sbps",
- "GPRINT:incomingbits:AVERAGE:$Lang::tr{'average'}\\:%8.3lf %sbps",
- "GPRINT:incomingbits:LAST:$Lang::tr{'current'}\\:%8.3lf %sbps\\j",
- "AREA:outgoingnegbits#0000FF:$Lang::tr{'outgoing traffic in bits per \
second'}\\j",
- "GPRINT:outgoingbits:MAX:$Lang::tr{'maximal'}\\:%8.3lf %sbps",
- "GPRINT:outgoingbits:AVERAGE:$Lang::tr{'average'}\\:%8.3lf %sbps",
- "GPRINT:outgoingbits:LAST:$Lang::tr{'current'}\\:%8.3lf %sbps\\j"
- );
+ push @rrd, @{&rrd_header($interface, $period, "$Lang::tr{'traffic on'} $title \
($period)", -1, -1)}; +
+ push @rrd, "-v$Lang::tr{'bits per second'}";
+ push @rrd, "DEF:incoming=$rrdlog/$interface.rrd:incoming:AVERAGE";
+ push @rrd, "DEF:outgoing=$rrdlog/$interface.rrd:outgoing:AVERAGE";
+ push @rrd, "CDEF:incomingbits=incoming,8,*";
+ push @rrd, "CDEF:outgoingbits=outgoing,8,*";
+ push @rrd, "CDEF:outgoingnegbits=outgoing,-8,*";
+ push @rrd, "HRULE:0#000000";
+ push @rrd, "AREA:incomingbits#00FF00:$Lang::tr{'incoming traffic in bits per \
second'}\\j"; + push @rrd, "GPRINT:incomingbits:MAX:$Lang::tr{'maximal'}\\:%8.3lf \
%sbps"; + push @rrd, "GPRINT:incomingbits:AVERAGE:$Lang::tr{'average'}\\:%8.3lf \
%sbps"; + push @rrd, "GPRINT:incomingbits:LAST:$Lang::tr{'current'}\\:%8.3lf \
%sbps\\j"; + push @rrd, "AREA:outgoingnegbits#0000FF:$Lang::tr{'outgoing traffic \
in bits per second'}\\j"; + push @rrd, \
"GPRINT:outgoingbits:MAX:$Lang::tr{'maximal'}\\:%8.3lf %sbps"; + push @rrd, \
"GPRINT:outgoingbits:AVERAGE:$Lang::tr{'average'}\\:%8.3lf %sbps"; + push @rrd, \
"GPRINT:outgoingbits:LAST:$Lang::tr{'current'}\\:%8.3lf %sbps\\j"; +
+ push @rrd, @{&rrd_lastupdate()};
+ RRDs::graph(@rrd);
+
$ERROR = RRDs::error;
print "Error in RRD::graph for $interface: $ERROR\n" if $ERROR;
}
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic