return undef if initiating snmp session fails

[upsgraph] / upsgraph.pl
diff --git a/upsgraph.pl b/upsgraph.pl

index 1fbb452d331588a06e640de00d7a998affee6733..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,6 +337,9 @@ 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 {
@@ -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";