X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/upsgraph/blobdiff_plain/235b08abaa2e746a485090fd0760cdd1e85c09af..d036d16a336b8b31db2c7b09ea40012164d96a83:/upsgraph.pl

diff --git a/upsgraph.pl b/upsgraph.pl
index 4f66090..cade9b2 100755
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -23,6 +23,7 @@ $UPSGRAPH::stepsPerHour = (60 * 60) / $UPSGRAPH::step;
 $UPSGRAPH::keep = ($UPSGRAPH::daysCovered*24*60*60)/$UPSGRAPH::step;
 $UPSGRAPH::keepHours = ($UPSGRAPH::daysCovered*24*60*60)/$UPSGRAPH::stepsPerHour/$UPSGRAPH::step;
 $UPSGRAPH::hosts = ();
+$UPSGRAPH::regenerateOnStart = 1; #when set, regenerate graphs on script startup
 
 do $ARGV[0] or die "can't read config: $!";
 
@@ -324,12 +325,15 @@ foreach my $host (@$hosts) {
 			exit 1;
 		}
 
+		my $limitsChanged = 0;
 		if (defined($rrdinfo->{"ds[${field}].min"})) {
 			if ($rrdinfo->{"ds[${field}].min"} ne $host->{'vars'}->{$field}->{'min'}) {
+				$limitsChanged = 1;
 				RRDs::tune("${rrdfile}.${field}","-i",$field.":".$host->{'vars'}->{$field}->{'min'});
 			}
 		} else {
 			if ($host->{'vars'}->{$field}->{'min'} ne 'U') {
+				$limitsChanged = 1;
 				RRDs::tune("${rrdfile}.${field}","-i",$field.":".$host->{'vars'}->{$field}->{'min'});
 			}
 		}
@@ -341,10 +345,12 @@ foreach my $host (@$hosts) {
 
 		if (defined($rrdinfo->{"ds[${field}].max"})) {
 			if ($rrdinfo->{"ds[${field}].max"} ne $host->{'vars'}->{$field}->{'max'}) {
+				$limitsChanged = 1;
 				RRDs::tune("${rrdfile}.${field}","-a",$field.":".$host->{'vars'}->{$field}->{'max'});
 			}
 		} else {
 			if ($host->{'vars'}->{$field}->{'max'} ne 'U') {
+				$limitsChanged = 1;
 				RRDs::tune("${rrdfile}.${field}","-a",$field.":".$host->{'vars'}->{$field}->{'max'});
 			}
 		}
@@ -355,7 +361,8 @@ foreach my $host (@$hosts) {
 		}
 		    
 		if ($rrdinfo->{'rra[0].rows'} != $keep ||
-			!defined($rrdinfo->{'rra[1].rows'}) || $rrdinfo->{'rra[1].rows'} != $keepHours) {
+			!defined($rrdinfo->{'rra[1].rows'}) || $rrdinfo->{'rra[1].rows'} != $keepHours ||
+			$limitsChanged == 1) {
 
 			print "Resizing ${rrdfile}.${field} from " . $rrdinfo->{'rra[0].rows'} .
 				" to ${keep} samples.\n";
@@ -421,6 +428,7 @@ die "fork failed!" if (!defined($child));
 
 exit 0 if ($child != 0);
 
+my $first = $UPSGRAPH::regenerateOnStart;
 while(1) {
 	open(HTML, ">${outdir}/index.html.new");
 
@@ -497,7 +505,8 @@ while(1) {
 				};
 			}
 
-			my @graphdef = ('-P', "--lazy", "-t", $hostname." - ".$vars->{$var}->{'name'});
+			my @graphdef = ('-P', "-t", $hostname." - ".$vars->{$var}->{'name'});
+			push @graphdef, "--lazy" if !$first;
 
 			push @graphdef, "DEF:${var}-avg=${rrdfile}.${var}:${var}:AVERAGE";
 			push @graphdef, "DEF:${var}-min=${rrdfile}.${var}:${var}:MIN";
@@ -622,4 +631,5 @@ while(1) {
 	rename("${outdir}/index.html.new", "${outdir}/index.html");
 
 	sleep(${step}/2);
+	$first = 0;
 }