]> git.zerfleddert.de Git - upsgraph/blobdiff - upsgraph.pl
projects / upsgraph / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Revert "disable pango text rendering, it leaks memory"
[upsgraph] / upsgraph.pl
diff --git a/upsgraph.pl b/upsgraph.pl
index 05553fdb45129e51ac599ee863f18fbbfd028486..9887d0c4ab2215e9b20eaecd4abf0cc23de55292 100755 (executable)
--- 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);
@@ -324,7 +325,10 @@ while(1) {
                }
 
                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\\: <span foreground="#FF0000">%.2lf</span>\\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 "<a href=\"${hostname}.${var}.html\"><img src=\"${hostname}.${var}.png\" width=\"${width}\" height=\"${height}\" border=\"0\"></a><br>\n";
 
                        open (HTML2, ">${outdir}/${hostname}.${var}.html.new");
-                       print HTML2 "<html><head><title>" . $vars->{$var}->{'name'} . "</title></head>";
+                       print HTML2 '<html><head><meta http-equiv="refresh" content="60"/><meta http-equiv="cache-control" content="no-cache"/><meta http-equiv="pragma" content="no-cache"/><meta http_equiv="expires" content="Sat, 26 Jul 1997 05:00:00 GMT"/><title>' . $vars->{$var}->{'name'} . '</title></head>';
                        print HTML2 '<body bgcolor="#ffffff">';
 
-
                        push @graphdef, "VDEF:min=${var},MINIMUM";
                        push @graphdef, "GPRINT:min:Minimum\\: %.2lf";
 
@@ -371,7 +377,7 @@ while(1) {
                                print "Error while graphing: " . RRDs::error . "\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");
                                }
@@ -388,7 +394,7 @@ while(1) {
                                print "Error while graphing: " . RRDs::error . "\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");
                                }
@@ -405,7 +411,7 @@ while(1) {
                                print "Error while graphing: " . RRDs::error . "\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");
                                }
APC UPS grapher
Impressum, Datenschutz