make lazy really work...

[upsgraph] / upsgraph.pl

diff --git a/upsgraph.pl b/upsgraph.pl
index 91ae5adb99c055bf04f5e0b8e0ca4a876240e8a4..04a4f8c751bc15f8747374ed48f40a86bf337b02 100755 (executable)
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -8,6 +8,7 @@ if ((@ARGV != 1) && (@ARGV != 2)) {
 use Net::SNMP;
 use IO::Socket::INET;
 use RRDs;
+use File::Copy;
 use Data::Dumper;
 
 $UPSGRAPH::outdir = "";
@@ -107,6 +108,11 @@ if ($> == 0) {
 foreach my $host (@$hosts) {
        my $rrdfile = $host->{'rrdfile'};
 
+       foreach my $var (keys(%{$host->{'vars'}})) {
+               $host->{'vars'}->{$var}->{'min'} = 'U' if (!defined($host->{'vars'}->{$var}->{'min'}));
+               $host->{'vars'}->{$var}->{'max'} = 'U' if (!defined($host->{'vars'}->{$var}->{'max'}));
+       }
+
        if (-e "${rrdfile}") {
                print "Reading old ${rrdfile} to preserve data...\n";
 
@@ -190,7 +196,6 @@ foreach my $host (@$hosts) {
 
                if (defined($rrdinfo->{"ds[${field}].max"})) {
                        if ($rrdinfo->{"ds[${field}].max"} ne $host->{'vars'}->{$field}->{'max'}) {
-                               print "Max differs\n";
                                RRDs::tune("${rrdfile}.${field}","-a",$field.":".$host->{'vars'}->{$field}->{'max'});
                        }
                } else {
@@ -319,7 +324,7 @@ while(1) {
                }
 
                foreach my $var (@{$host->{'fields'}}) {
-                       my @graphdef = ("-t", $hostname." - ".$vars->{$var}->{'name'}, "DEF:${var}=${rrdfile}.${var}:${var}:AVERAGE", "LINE1:${var}#FF0000");
+                       my @graphdef = ("--lazy", "-t", $hostname." - ".$vars->{$var}->{'name'}, "DEF:${var}=${rrdfile}.${var}:${var}:AVERAGE", "LINE1:${var}#FF0000");
                        (my $averages, my $width, my $height) =
                                RRDs::graph("${outdir}/${hostname}.${var}.png.new",
                                                "-w", "720", @graphdef);
@@ -327,7 +332,7 @@ while(1) {
                        if (RRDs::error) {
                                print "Error while graphing: " . RRDs::error . "\n";
                        } else {
-                               rename("${outdir}/${hostname}.${var}.png.new", "${outdir}/${hostname}.${var}.png");
+                               copy("${outdir}/${hostname}.${var}.png.new", "${outdir}/${hostname}.${var}.png");
                        }
 
                        print HTML "<a href=\"${hostname}.${var}.html\"><img src=\"${hostname}.${var}.png\" width=\"${width}\" height=\"${height}\" border=\"0\"></a><br>\n";
@@ -356,7 +361,7 @@ while(1) {
                        if (RRDs::error) {
                                print "Error while graphing: " . RRDs::error . "\n";
                        } else {
-                               rename("${outdir}/${hostname}.${var}.long.png.new", "${outdir}/${hostname}.${var}.long.png");
+                               copy("${outdir}/${hostname}.${var}.long.png.new", "${outdir}/${hostname}.${var}.long.png");
                        }
 
                        print HTML2 "<img src=\"${hostname}.${var}.long.png\" width=\"${width}\" height=\"${height}\"><br>";
@@ -368,7 +373,7 @@ while(1) {
                        if (RRDs::error) {
                                print "Error while graphing: " . RRDs::error . "\n";
                        } else {
-                               rename("${outdir}/${hostname}.${var}.week.png.new", "${outdir}/${hostname}.${var}.week.png");
+                               copy("${outdir}/${hostname}.${var}.week.png.new", "${outdir}/${hostname}.${var}.week.png");
                        }
 
                        print HTML2 "<img src=\"${hostname}.${var}.week.png\" width=\"${width}\" height=\"${height}\"><br>";
@@ -380,7 +385,7 @@ while(1) {
                        if (RRDs::error) {
                                print "Error while graphing: " . RRDs::error . "\n";
                        } else {
-                               rename("${outdir}/${hostname}.${var}.year.png.new", "${outdir}/${hostname}.${var}.year.png");
+                               copy("${outdir}/${hostname}.${var}.year.png.new", "${outdir}/${hostname}.${var}.year.png");
                        }
 
                        print HTML2 "<img src=\"${hostname}.${var}.year.png\" width=\"${width}\" height=\"${height}\"><br>";