lazy graph update

[upsgraph] / upsgraph.pl

diff --git a/upsgraph.pl b/upsgraph.pl
index 24d196afde99a9886e4b7434c86840a0e2015642..cc98e64969e01ee37284ba0d07d816299222f38a 100755 (executable)
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -107,6 +107,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";
 
@@ -173,6 +178,36 @@ foreach my $host (@$hosts) {
                        exit 1;
                }
 
+               if (defined($rrdinfo->{"ds[${field}].min"})) {
+                       if ($rrdinfo->{"ds[${field}].min"} ne $host->{'vars'}->{$field}->{'min'}) {
+                               RRDs::tune("${rrdfile}.${field}","-i",$field.":".$host->{'vars'}->{$field}->{'min'});
+                       }
+               } else {
+                       if ($host->{'vars'}->{$field}->{'min'} ne 'U') {
+                               RRDs::tune("${rrdfile}.${field}","-i",$field.":".$host->{'vars'}->{$field}->{'min'});
+                       }
+               }
+
+               if (RRDs::error) {
+                       print "Error while setting min: " . RRDs::error . "\n";
+                       exit 1;
+               }
+
+               if (defined($rrdinfo->{"ds[${field}].max"})) {
+                       if ($rrdinfo->{"ds[${field}].max"} ne $host->{'vars'}->{$field}->{'max'}) {
+                               RRDs::tune("${rrdfile}.${field}","-a",$field.":".$host->{'vars'}->{$field}->{'max'});
+                       }
+               } else {
+                       if ($host->{'vars'}->{$field}->{'max'} ne 'U') {
+                               RRDs::tune("${rrdfile}.${field}","-a",$field.":".$host->{'vars'}->{$field}->{'max'});
+                       }
+               }
+
+               if (RRDs::error) {
+                       print "Error while setting max: " . RRDs::error . "\n";
+                       exit 1;
+               }
+                   
                if ($rrdinfo->{'rra[0].rows'} != $keep) {
                        print "Resizing ${rrdfile}.${field} from " . $rrdinfo->{'rra[0].rows'} .
                                " to ${keep} samples.\n";
@@ -288,7 +323,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);