X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/upsgraph/blobdiff_plain/5225937733d50608843fbf146b6ddda2b48ca237..bcd0e31b0502cde60a8a8ab890ed7de361eaab43:/upsgraph.pl
diff --git a/upsgraph.pl b/upsgraph.pl
index 05553fd..06e66e3 100755
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -58,6 +58,7 @@ sub fetch_snmp(@) {
if (!$session) {
print STDERR "session error: $error";
+ return undef;
}
$session->translate(0);
@@ -326,6 +327,9 @@ while(1) {
foreach my $var (@{$host->{'fields'}}) {
my @graphdef = ("--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];
@@ -333,11 +337,14 @@ while(1) {
RRDs::graph("${outdir}/${hostname}.${var}.png.work",
"-w", "720", @graphdef);
+ pop @graphdef;
+ pop @graphdef;
+
if (RRDs::error) {
print "Error while graphing: " . RRDs::error . "\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 +353,9 @@ while(1) {
print HTML "
\n";
open (HTML2, ">${outdir}/${hostname}.${var}.html.new");
- print HTML2 "