X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/upsgraph/blobdiff_plain/178e4778b096a75cb2c9b00f7908959c3d633d1c..f004592ac75253abcb2e32548ddb995f10ff9cf2:/upsgraph.pl

diff --git a/upsgraph.pl b/upsgraph.pl
index 91ae5ad..1fbb452 100755
--- 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,15 +324,23 @@ 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 $mtime;
+			$mtime=(stat("${outdir}/${hostname}.${var}.png.work"))[9];
+
 			(my $averages, my $width, my $height) =
-				RRDs::graph("${outdir}/${hostname}.${var}.png.new",
+				RRDs::graph("${outdir}/${hostname}.${var}.png.work",
 						"-w", "720", @graphdef);
 
 			if (RRDs::error) {
 				print "Error while graphing: " . RRDs::error . "\n";
 			} else {
-				rename("${outdir}/${hostname}.${var}.png.new", "${outdir}/${hostname}.${var}.png");
+				my $newmtime=(stat("${outdir}/${hostname}.${var}.png.work"))[9];
+				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");
+				}
 			}
 
 			print HTML "<a href=\"${hostname}.${var}.html\"><img src=\"${hostname}.${var}.png\" width=\"${width}\" height=\"${height}\" border=\"0\"></a><br>\n";
@@ -349,38 +362,53 @@ while(1) {
 			push @graphdef, "VDEF:cur=${var},LAST";
 			push @graphdef, "GPRINT:cur:Current\\: %.2lf";
 
+			$mtime=(stat("${outdir}/${hostname}.${var}.long.png.work"))[9];
 			($averages, $width, $height) =
-				RRDs::graph("${outdir}/${hostname}.${var}.long.png.new",
+				RRDs::graph("${outdir}/${hostname}.${var}.long.png.work",
 						"-w", "1008", @graphdef);
 
 			if (RRDs::error) {
 				print "Error while graphing: " . RRDs::error . "\n";
 			} else {
-				rename("${outdir}/${hostname}.${var}.long.png.new", "${outdir}/${hostname}.${var}.long.png");
+				my $newmtime=(stat("${outdir}/${hostname}.${var}.long.png.work"))[9];
+				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");
+				}
 			}
 
 			print HTML2 "<img src=\"${hostname}.${var}.long.png\" width=\"${width}\" height=\"${height}\"><br>";
 
+			$mtime=(stat("${outdir}/${hostname}.${var}.week.png.work"))[9];
 			($averages, $width, $height) =
-				RRDs::graph("${outdir}/${hostname}.${var}.week.png.new",
+				RRDs::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";
 			} else {
-				rename("${outdir}/${hostname}.${var}.week.png.new", "${outdir}/${hostname}.${var}.week.png");
+				my $newmtime=(stat("${outdir}/${hostname}.${var}.week.png.work"))[9];
+				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");
+				}
 			}
 
 			print HTML2 "<img src=\"${hostname}.${var}.week.png\" width=\"${width}\" height=\"${height}\"><br>";
 
+			$mtime=(stat("${outdir}/${hostname}.${var}.year.png.work"))[9];
 			($averages, $width, $height) =
-				RRDs::graph("${outdir}/${hostname}.${var}.year.png.new",
+				RRDs::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";
 			} else {
-				rename("${outdir}/${hostname}.${var}.year.png.new", "${outdir}/${hostname}.${var}.year.png");
+				my $newmtime=(stat("${outdir}/${hostname}.${var}.year.png.work"))[9];
+				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");
+				}
 			}
 
 			print HTML2 "<img src=\"${hostname}.${var}.year.png\" width=\"${width}\" height=\"${height}\"><br>";