" . $vars->{$var}->{'name'} . "

X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/upsgraph/blobdiff_plain/5225937733d50608843fbf146b6ddda2b48ca237..f49c04f7a2365b6bedf0828ca03dc4403bf12c8c:/upsgraph.pl diff --git a/upsgraph.pl b/upsgraph.pl index 05553fd..2783fcf 100755 --- a/upsgraph.pl +++ b/upsgraph.pl @@ -1,5 +1,9 @@ #!/usr/bin/perl -w +#Due to memory leak in Debian squeeze (Bug #545519) +my $use_rrds = 0; +my $rrd_result = 0; + if ((@ARGV != 1) && (@ARGV != 2)) { print STDERR "Syntax: ${0} configfile [uid]\n"; exit(1); @@ -23,6 +27,43 @@ my $step = $UPSGRAPH::step; my $keep = $UPSGRAPH::keep; my $hosts = $UPSGRAPH::hosts; +sub rrd_update(@) { + my @args = @_; + + if ($use_rrds == 1) { + RRDs::update(@args); + $rrd_result = RRDs::error; + } else { + $rrd_result = system("rrdtool", "update", @args); + } +} + +sub rrd_graph(@) { + my @args = @_; + my @rrd_out = (); + + if ($use_rrds == 1) { + @rrd_out = RRDs::graph(@args); + $rrd_result = RRDs::error; + } else { + my $rrd_stdout; + + open(RRDFD, '-|', 'rrdtool', 'graph', @args); + while() { + chomp; + $rrd_stdout = $_; + } + close(RRDFD); + $rrd_result = $?; + if ($rrd_result == 0) { + push @rrd_out, 0; + push @rrd_out, split(/x/, $rrd_stdout); + } + } + + return @rrd_out; +} + sub rrdcreate(@) { my $newrrd = shift; my $field = shift; @@ -58,6 +99,7 @@ sub fetch_snmp(@) { if (!$session) { print STDERR "session error: $error"; + return undef; } $session->translate(0); @@ -317,27 +359,33 @@ while(1) { if (!(defined($vars->{$var}->{'value'}))) { $vars->{$var}->{'value'} = 'U'; } - RRDs::update("${rrdfile}.${var}", "N:" . $vars->{$var}->{'value'}); + rrd_update("${rrdfile}.${var}", "N:" . $vars->{$var}->{'value'}); } - if (RRDs::error) { - print "Error while updating: " . RRDs::error . "\n"; + if ($rrd_result) { + print "Error while updating: " . $rrd_result . "\n"; } foreach my $var (@{$host->{'fields'}}) { - my @graphdef = ("--lazy", "-t", $hostname." - ".$vars->{$var}->{'name'}, "DEF:${var}=${rrdfile}.${var}:${var}:AVERAGE", "LINE1:${var}#FF0000"); + my @graphdef = ('-P', "--lazy", "-t", $hostname." - ".$vars->{$var}->{'name'}, "DEF:${var}=${rrdfile}.${var}:${var}:AVERAGE", "LINE1:${var}#FF0000"); + + push @graphdef, "VDEF:cur=${var},LAST"; + push @graphdef, 'GPRINT:cur:Current\\: %.2lf\\r'; my $mtime; $mtime=(stat("${outdir}/${hostname}.${var}.png.work"))[9]; (my $averages, my $width, my $height) = - RRDs::graph("${outdir}/${hostname}.${var}.png.work", + rrd_graph("${outdir}/${hostname}.${var}.png.work", "-w", "720", @graphdef); - if (RRDs::error) { - print "Error while graphing: " . RRDs::error . "\n"; + pop @graphdef; + pop @graphdef; + + if ($rrd_result) { + print "Error while graphing: " . $rrd_result . "\n"; } else { my $newmtime=(stat("${outdir}/${hostname}.${var}.png.work"))[9]; - if ($newmtime != $mtime) { + if ((!defined($mtime)) || ($newmtime != $mtime)) { copy("${outdir}/${hostname}.${var}.png.work", "${outdir}/${hostname}.${var}.png.new"); rename("${outdir}/${hostname}.${var}.png.new", "${outdir}/${hostname}.${var}.png"); } @@ -346,10 +394,9 @@ while(1) { print HTML "

\n"; open (HTML2, ">${outdir}/${hostname}.${var}.html.new"); - print HTML2 "" . $vars->{$var}->{'name'} . ""; + print HTML2 '' . $vars->{$var}->{'name'} . ''; print HTML2 ''; - push @graphdef, "VDEF:min=${var},MINIMUM"; push @graphdef, "GPRINT:min:Minimum\\: %.2lf"; @@ -364,14 +411,14 @@ while(1) { $mtime=(stat("${outdir}/${hostname}.${var}.long.png.work"))[9]; ($averages, $width, $height) = - RRDs::graph("${outdir}/${hostname}.${var}.long.png.work", + rrd_graph("${outdir}/${hostname}.${var}.long.png.work", "-w", "1008", @graphdef); - if (RRDs::error) { - print "Error while graphing: " . RRDs::error . "\n"; + if ($rrd_result) { + print "Error while graphing: " . $rrd_result . "\n"; } else { my $newmtime=(stat("${outdir}/${hostname}.${var}.long.png.work"))[9]; - if ($newmtime != $mtime) { + if ((!defined($mtime)) || ($newmtime != $mtime)) { copy("${outdir}/${hostname}.${var}.long.png.work", "${outdir}/${hostname}.${var}.long.png.new"); rename("${outdir}/${hostname}.${var}.long.png.new", "${outdir}/${hostname}.${var}.long.png"); } @@ -381,14 +428,14 @@ while(1) { $mtime=(stat("${outdir}/${hostname}.${var}.week.png.work"))[9]; ($averages, $width, $height) = - RRDs::graph("${outdir}/${hostname}.${var}.week.png.work", + rrd_graph("${outdir}/${hostname}.${var}.week.png.work", "-w", "1008", "-e", "now", "-s", "end-1w", @graphdef); - if (RRDs::error) { - print "Error while graphing: " . RRDs::error . "\n"; + if ($rrd_result) { + print "Error while graphing: " . $rrd_result . "\n"; } else { my $newmtime=(stat("${outdir}/${hostname}.${var}.week.png.work"))[9]; - if ($newmtime != $mtime) { + if ((!defined($mtime)) || ($newmtime != $mtime)) { copy("${outdir}/${hostname}.${var}.week.png.work", "${outdir}/${hostname}.${var}.week.png.new"); rename("${outdir}/${hostname}.${var}.week.png.new", "${outdir}/${hostname}.${var}.week.png"); } @@ -398,14 +445,14 @@ while(1) { $mtime=(stat("${outdir}/${hostname}.${var}.year.png.work"))[9]; ($averages, $width, $height) = - RRDs::graph("${outdir}/${hostname}.${var}.year.png.work", + rrd_graph("${outdir}/${hostname}.${var}.year.png.work", "-w", "1008", "-e", "now", "-s", "end-1y", @graphdef); - if (RRDs::error) { - print "Error while graphing: " . RRDs::error . "\n"; + if ($rrd_result) { + print "Error while graphing: " . $rrd_result . "\n"; } else { my $newmtime=(stat("${outdir}/${hostname}.${var}.year.png.work"))[9]; - if ($newmtime != $mtime) { + if ((!defined($mtime)) || ($newmtime != $mtime)) { copy("${outdir}/${hostname}.${var}.year.png.work", "${outdir}/${hostname}.${var}.year.png.new"); rename("${outdir}/${hostname}.${var}.year.png.new", "${outdir}/${hostname}.${var}.year.png"); }