]> git.zerfleddert.de Git - upsgraph/blobdiff - upsgraph.pl
Add daily average graph mode
[upsgraph] / upsgraph.pl
index 91ae5adb99c055bf04f5e0b8e0ca4a876240e8a4..bd3b37f3f579954fa93221496453a01a6c64a470 100755 (executable)
@@ -1,5 +1,9 @@
 #!/usr/bin/perl -w
 
 #!/usr/bin/perl -w
 
+#Due to memory leak in Debian squeeze (Bug #545519)
+my $use_rrds = 0;
+my $rrd_result = 0;
+
 if ((@ARGV != 1) && (@ARGV != 2)) {
        print STDERR "Syntax: ${0} configfile [uid]\n";
        exit(1);
 if ((@ARGV != 1) && (@ARGV != 2)) {
        print STDERR "Syntax: ${0} configfile [uid]\n";
        exit(1);
@@ -7,21 +11,66 @@ if ((@ARGV != 1) && (@ARGV != 2)) {
 
 use Net::SNMP;
 use IO::Socket::INET;
 
 use Net::SNMP;
 use IO::Socket::INET;
+use IO::Select;
 use RRDs;
 use RRDs;
+use File::Copy;
 use Data::Dumper;
 
 $UPSGRAPH::outdir = "";
 use Data::Dumper;
 
 $UPSGRAPH::outdir = "";
+$UPSGRAPH::daysCovered = 370;
 $UPSGRAPH::step = 60;
 $UPSGRAPH::step = 60;
-$UPSGRAPH::keep = (370*24*60*60)/$UPSGRAPH::step;
+$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::hosts = ();
+$UPSGRAPH::regenerateOnStart = 1; #when set, regenerate graphs on script startup
 
 do $ARGV[0] or die "can't read config: $!";
 
 my $outdir = $UPSGRAPH::outdir;
 my $step = $UPSGRAPH::step;
 
 do $ARGV[0] or die "can't read config: $!";
 
 my $outdir = $UPSGRAPH::outdir;
 my $step = $UPSGRAPH::step;
+my $stepsPerHour = $UPSGRAPH::stepsPerHour;
 my $keep = $UPSGRAPH::keep;
 my $keep = $UPSGRAPH::keep;
+my $keepHours = $UPSGRAPH::keepHours;
 my $hosts = $UPSGRAPH::hosts;
 
 my $hosts = $UPSGRAPH::hosts;
 
+sub rrd_update(@) {
+       my @args = @_;
+       print "Updating: ". Dumper(\@_);
+       if ($use_rrds == 1) {
+               RRDs::update(@args);
+               $rrd_result = RRDs::error;
+       } else {
+               $rrd_result = system("rrdtool", "update", @args);
+       }
+}
+
+sub rrd_graph(@) {
+       my @args = @_;
+       my @rrd_out = ();
+       print "Graphing: " . Dumper(\@_);
+       if ($use_rrds == 1) {
+               @rrd_out = RRDs::graph(@args);
+               $rrd_result = RRDs::error;
+       } else {
+               my $rrd_stdout;
+
+               open(RRDFD, '-|', 'rrdtool', 'graph', @args);
+               while(<RRDFD>) {
+                       chomp;
+                       $rrd_stdout = $_;
+               }
+               close(RRDFD);
+               $rrd_result = $?;
+               if ($rrd_result == 0) {
+                       push @rrd_out, 0;
+                       push @rrd_out, split(/x/, $rrd_stdout);
+               }
+       }
+
+       return @rrd_out;
+}
+
 sub rrdcreate(@) {
        my $newrrd = shift;
        my $field = shift;
 sub rrdcreate(@) {
        my $newrrd = shift;
        my $field = shift;
@@ -36,13 +85,17 @@ sub rrdcreate(@) {
 
        push @cmd, "DS:${field}:GAUGE:600:" .
                $vars->{$field}->{'min'} . ":" .
 
        push @cmd, "DS:${field}:GAUGE:600:" .
                $vars->{$field}->{'min'} . ":" .
-               $vars->{$field}->{'max'} . " ";
+               $vars->{$field}->{'max'};
 
        push @cmd, "RRA:AVERAGE:0.5:1:${keep}";
 
        push @cmd, "RRA:AVERAGE:0.5:1:${keep}";
+       push @cmd, "RRA:MIN:0.4:${stepsPerHour}:${keepHours}";
+       push @cmd, "RRA:MAX:0.4:${stepsPerHour}:${keepHours}";
+       push @cmd, "RRA:AVERAGE:0.5:${stepsPerHour}:${keepHours}";
 
        RRDs::create(@cmd);
        if (RRDs::error) {
                print "Error while creating: " . RRDs::error . "\n";
 
        RRDs::create(@cmd);
        if (RRDs::error) {
                print "Error while creating: " . RRDs::error . "\n";
+               print Dumper(\@cmd);
                exit 1;
        }
 }
                exit 1;
        }
 }
@@ -57,6 +110,7 @@ sub fetch_snmp(@) {
 
        if (!$session) {
                print STDERR "session error: $error";
 
        if (!$session) {
                print STDERR "session error: $error";
+               return undef;
        }
 
        $session->translate(0);
        }
 
        $session->translate(0);
@@ -81,7 +135,13 @@ sub fetch_tcp(@) {
 
        return undef if (!$sock);
 
 
        return undef if (!$sock);
 
-       chomp(my $value = <$sock>);
+       my $select = IO::Select->new($sock);
+
+       my $value = undef;
+
+       if ($select->can_read(1)) {
+               chomp($value) if (sysread($sock, $value, 4096) > 0);
+       }
 
        close($sock);
 
 
        close($sock);
 
@@ -94,6 +154,104 @@ sub fetch_tcp(@) {
        $value;
 }
 
        $value;
 }
 
+sub fetch_tcp_multi(@) {
+       my $address = shift;
+       my $port = shift;
+       my $delimiter = shift;
+       my %values;
+
+       my $sock = IO::Socket::INET->new(PeerAddr => $address,
+                       PeerPort => $port,
+                       Proto => 'tcp',
+                       Timeout => 1);
+
+       return undef if (!$sock);
+
+       my $select = IO::Select->new($sock);
+
+       while($select->can_read(1)) {
+               if (sysread($sock, my $buf, 16384) > 0) {
+                       $buf=~s/\r//g;
+                       foreach my $line (split(/\n/, $buf)) {
+                               (my $key, my $value) = split(/${delimiter}/, $line);
+                               $value=~ s/\s//g;
+                               $values{$key} = $value;
+                       }
+               } else {
+                       last;
+               }
+       }
+
+       close($sock);
+
+       %values;
+}
+
+sub dayGraphFunc {
+       my $dataSrc = shift;
+       my $mode = shift;
+       my $color = shift;
+       my $label = shift;
+       my $dataPoints = shift;
+       my @args = ();
+       push @args, "CDEF:prev${mode}1=PREV(${dataSrc})";
+       for (my $i = 1; $i < $dataPoints - 1; ++$i) {
+               my $prev = $i;
+               my $next = $i+1;
+               push @args, "CDEF:prev${mode}${next}=PREV(prev${mode}${prev})";
+       }
+       my $dayCons = '';
+       my $consFunc = '';
+       if ($mode ne 'AVG') {
+               for (my $i = 1; $i < $dataPoints; ++$i) {
+                       $dayCons .= "prev${mode}${i},";
+                       $consFunc .= ",${mode}";
+               }
+       } else {
+               for (my $i = 1; $i < $dataPoints; ++$i) {
+                       $dayCons .= "prev${mode}${i},";
+               }
+               $consFunc = ",${dataPoints},${mode}";
+       }
+       push @args, "CDEF:day${mode}=${dayCons}${dataSrc}${consFunc}";
+       push @args, "CDEF:fillCalDay${mode}0=COUNT,${dataPoints},%,0,EQ,day${mode},UNKN,IF";
+       for (my $i = 1; $i < $dataPoints; ++$i) {
+               my $prev = $i-1;
+               my $next = $i;
+               push @args, "CDEF:fillCalDay${mode}${next}=PREV(fillCalDay${mode}${prev})";
+       }
+       my $fillPoint = '';
+       my $if = '';
+       for (my $i = 0; $i < $dataPoints; ++$i) {
+               $fillPoint .= "COUNT,${dataPoints},%,${i},EQ,fillCalDay${mode}${i},";
+               $if .= ",IF";
+       }
+       push @args, "CDEF:${mode}Curve=${fillPoint}UNKN${if}";
+       my $forwardShift = (24*60*60) * ($dataPoints - 1) / $dataPoints;
+       push @args, "SHIFT:${mode}Curve:-${forwardShift}";
+       push @args, "LINE1:${mode}Curve#${color}:${label}";
+       return \@args;
+}
+
+sub cfgToGraphDef {
+       my $cfg = shift;
+       my $varname = shift;
+       my $dpPerDay= shift;
+       my @graphDef = ();
+       foreach my $subGraph (@$cfg) {
+               if ($subGraph eq 'avg') {
+                       push @graphDef, "LINE1:${varname}-avg#FF0000";
+               } elsif ($subGraph eq 'day-min') {
+                       push @graphDef, @{dayGraphFunc("${varname}-min", 'MIN', '0000ff', 'Day Minimum Temperature', $dpPerDay)};
+               } elsif ($subGraph eq 'day-max') {
+                       push @graphDef, @{dayGraphFunc("${varname}-max", 'MAX', '00ff00', 'Day Maximum Temperature', $dpPerDay)};
+               } elsif ($subGraph eq 'day-avg') {
+                       push @graphDef, @{dayGraphFunc("${varname}-houravg", 'AVG', 'ff0000', 'Day Average Temperature', $dpPerDay)};
+               }
+       }
+       return \@graphDef;
+}
+
 if ($> == 0) {
        if (@ARGV != 2) {
                print STDERR "Running as root, please provide UID as 2th argument!\n";
 if ($> == 0) {
        if (@ARGV != 2) {
                print STDERR "Running as root, please provide UID as 2th argument!\n";
@@ -107,6 +265,11 @@ if ($> == 0) {
 foreach my $host (@$hosts) {
        my $rrdfile = $host->{'rrdfile'};
 
 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";
 
        if (-e "${rrdfile}") {
                print "Reading old ${rrdfile} to preserve data...\n";
 
@@ -173,12 +336,15 @@ foreach my $host (@$hosts) {
                        exit 1;
                }
 
                        exit 1;
                }
 
+               my $limitsChanged = 0;
                if (defined($rrdinfo->{"ds[${field}].min"})) {
                        if ($rrdinfo->{"ds[${field}].min"} ne $host->{'vars'}->{$field}->{'min'}) {
                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') {
                                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'});
                        }
                }
                                RRDs::tune("${rrdfile}.${field}","-i",$field.":".$host->{'vars'}->{$field}->{'min'});
                        }
                }
@@ -190,11 +356,12 @@ foreach my $host (@$hosts) {
 
                if (defined($rrdinfo->{"ds[${field}].max"})) {
                        if ($rrdinfo->{"ds[${field}].max"} ne $host->{'vars'}->{$field}->{'max'}) {
 
                if (defined($rrdinfo->{"ds[${field}].max"})) {
                        if ($rrdinfo->{"ds[${field}].max"} ne $host->{'vars'}->{$field}->{'max'}) {
-                               print "Max differs\n";
+                               $limitsChanged = 1;
                                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'});
                        }
                } else {
                        if ($host->{'vars'}->{$field}->{'max'} ne 'U') {
+                               $limitsChanged = 1;
                                RRDs::tune("${rrdfile}.${field}","-a",$field.":".$host->{'vars'}->{$field}->{'max'});
                        }
                }
                                RRDs::tune("${rrdfile}.${field}","-a",$field.":".$host->{'vars'}->{$field}->{'max'});
                        }
                }
@@ -204,7 +371,10 @@ foreach my $host (@$hosts) {
                        exit 1;
                }
                    
                        exit 1;
                }
                    
-               if ($rrdinfo->{'rra[0].rows'} != $keep) {
+               if ($rrdinfo->{'rra[0].rows'} != $keep ||
+                       !defined($rrdinfo->{'rra[3].rows'}) || $rrdinfo->{'rra[3].rows'} != $keepHours ||
+                       $limitsChanged == 1) {
+
                        print "Resizing ${rrdfile}.${field} from " . $rrdinfo->{'rra[0].rows'} .
                                " to ${keep} samples.\n";
 
                        print "Resizing ${rrdfile}.${field} from " . $rrdinfo->{'rra[0].rows'} .
                                " to ${keep} samples.\n";
 
@@ -223,7 +393,7 @@ foreach my $host (@$hosts) {
                                $host->{'vars'},
                                (${start}-${ostep}));
 
                                $host->{'vars'},
                                (${start}-${ostep}));
 
-                       print "Preserving data since " . localtime($start) . "\n";
+                       print "Preserving data in file ${rrdfile}.${field} since " . localtime($start) . "\n";
 
                        my $pos = $start;
                        foreach my $line (@$data) {
 
                        my $pos = $start;
                        foreach my $line (@$data) {
@@ -263,12 +433,13 @@ foreach my $host (@$hosts) {
        }
 }
 
        }
 }
 
-my $child = fork();
-
-die "fork failed!" if (!defined($child));
-
-exit 0 if ($child != 0);
+#my $child = fork();
+#
+#die "fork failed!" if (!defined($child));
+#
+#exit 0 if ($child != 0);
 
 
+my $first = $UPSGRAPH::regenerateOnStart;
 while(1) {
        open(HTML, ">${outdir}/index.html.new");
 
 while(1) {
        open(HTML, ">${outdir}/index.html.new");
 
@@ -286,6 +457,7 @@ while(1) {
                my $vars = $host->{'vars'};
                my $rrdfile = $host->{'rrdfile'};
                my $hostname = $host->{'name'};
                my $vars = $host->{'vars'};
                my $rrdfile = $host->{'rrdfile'};
                my $hostname = $host->{'name'};
+               my %multi_values = ();
 
                foreach my $var (@{$host->{'fields'}}) {
                        delete $vars->{$var}->{'value'};
 
                foreach my $var (@{$host->{'fields'}}) {
                        delete $vars->{$var}->{'value'};
@@ -298,6 +470,14 @@ while(1) {
                                $result = fetch_snmp($host->{'address'}, $host->{'community'}, $vars->{$var}->{'oid'});
                        } elsif ($vars->{$var}->{'proto'} eq 'tcp') {
                                $result = fetch_tcp($host->{'address'}, $vars->{$var}->{'port'});
                                $result = fetch_snmp($host->{'address'}, $host->{'community'}, $vars->{$var}->{'oid'});
                        } elsif ($vars->{$var}->{'proto'} eq 'tcp') {
                                $result = fetch_tcp($host->{'address'}, $vars->{$var}->{'port'});
+                       } elsif ($vars->{$var}->{'proto'} eq 'tcp_multi') {
+                               if (defined($multi_values{$vars->{$var}->{'multi_id'}})) {
+                                       $result = $multi_values{$vars->{$var}->{'multi_id'}}
+                               } else {
+                                       my %values = fetch_tcp_multi($host->{'address'}, $vars->{$var}->{'port'}, $vars->{$var}->{'multi_delimiter'});
+                                       @multi_values{keys %values} = values %values;
+                                       $result = $multi_values{$vars->{$var}->{'multi_id'}};
+                               }
                        }
 
                        next unless (defined $result);
                        }
 
                        next unless (defined $result);
@@ -312,78 +492,141 @@ while(1) {
                        if (!(defined($vars->{$var}->{'value'}))) {
                                $vars->{$var}->{'value'} = 'U';
                        }
                        if (!(defined($vars->{$var}->{'value'}))) {
                                $vars->{$var}->{'value'} = 'U';
                        }
-                       RRDs::update("${rrdfile}.${var}", "N:" . $vars->{$var}->{'value'});
+                       rrd_update("${rrdfile}.${var}", "N:" . $vars->{$var}->{'value'});
                }
                }
-               if (RRDs::error) {
-                       print "Error while updating: " . RRDs::error . "\n";
+               if ($rrd_result) {
+                       print "Error while updating: " . $rrd_result . "\n";
                }
 
                foreach my $var (@{$host->{'fields'}}) {
                }
 
                foreach my $var (@{$host->{'fields'}}) {
-                       my @graphdef = ("-t", $hostname." - ".$vars->{$var}->{'name'}, "DEF:${var}=${rrdfile}.${var}:${var}:AVERAGE", "LINE1:${var}#FF0000");
+                       my $graphWidth = 365 * 3;
+                       my $graphConfig;
+                       if (defined $vars->{$var}->{'graph'}) {
+                               $graphConfig = $vars->{$var}->{'graph'};
+                               foreach my $subGraph (qw(day week year)) {
+                                       if (!defined($graphConfig->{$subGraph})) {
+                                               $graphConfig->{$subGraph} = [ 'avg'];
+                                       }
+                               }
+                       } else {
+                               $graphConfig = {
+                                       'day' =>  [ 'avg' ],
+                                       'week' => [ 'avg' ],
+                                       'year' => [ 'avg' ],
+                               };
+                       }
+
+                       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";
+                       push @graphdef, "DEF:${var}-max=${rrdfile}.${var}:${var}:MAX";
+                       push @graphdef, "DEF:${var}-houravg=${rrdfile}.${var}:${var}:AVERAGE:step=3600";
+                       push @graphdef, "LINE1:${var}-avg#FF0000";
+                       push @graphdef, "VDEF:cur=${var}-avg,LAST";
+                       push @graphdef, 'GPRINT:cur:Current\\: <span foreground="#FF0000">%.2lf</span>\\r';
+
+                       my $mtime;
+                       $mtime=(stat("${outdir}/${hostname}.${var}.png.work"))[9];
+
                        (my $averages, my $width, my $height) =
                        (my $averages, my $width, my $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.png.new",
+                               rrd_graph("${outdir}/${hostname}.${var}.png.work",
                                                "-w", "720", @graphdef);
 
                                                "-w", "720", @graphdef);
 
-                       if (RRDs::error) {
-                               print "Error while graphing: " . RRDs::error . "\n";
+                       pop @graphdef;
+                       pop @graphdef;
+                       pop @graphdef;
+
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
                        } else {
                        } 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";
 
                        open (HTML2, ">${outdir}/${hostname}.${var}.html.new");
                        }
 
                        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="Content-Type" content="text/html; charset=utf-8"><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">';
 
                        print HTML2 '<body bgcolor="#ffffff">';
 
-
-                       push @graphdef, "VDEF:min=${var},MINIMUM";
+                       push @graphdef, "VDEF:min=${var}-min,MINIMUM";
                        push @graphdef, "GPRINT:min:Minimum\\: %.2lf";
 
                        push @graphdef, "GPRINT:min:Minimum\\: %.2lf";
 
-                       push @graphdef, "VDEF:avg=${var},AVERAGE";
+                       push @graphdef, "VDEF:avg=${var}-avg,AVERAGE";
                        push @graphdef, "GPRINT:avg:Average\\: %.2lf";
 
                        push @graphdef, "GPRINT:avg:Average\\: %.2lf";
 
-                       push @graphdef, "VDEF:max=${var},MAXIMUM";
+                       push @graphdef, "VDEF:max=${var}-max,MAXIMUM";
                        push @graphdef, "GPRINT:max:Maximum\\: %.2lf";
 
                        push @graphdef, "GPRINT:max:Maximum\\: %.2lf";
 
-                       push @graphdef, "VDEF:cur=${var},LAST";
+                       push @graphdef, "VDEF:cur=${var}-avg,LAST";
                        push @graphdef, "GPRINT:cur:Current\\: %.2lf";
 
                        push @graphdef, "GPRINT:cur:Current\\: %.2lf";
 
+                       my @dayGraphDef = @graphdef;
+                       push @dayGraphDef, @{cfgToGraphDef($graphConfig->{'day'}, ${var}, 24)};
+
+                       $mtime=(stat("${outdir}/${hostname}.${var}.long.png.work"))[9];
                        ($averages, $width, $height) =
                        ($averages, $width, $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.long.png.new",
-                                               "-w", "1008", @graphdef);
+                               rrd_graph("${outdir}/${hostname}.${var}.long.png.work",
+                                               "-w", $graphWidth, @dayGraphDef);
 
 
-                       if (RRDs::error) {
-                               print "Error while graphing: " . RRDs::error . "\n";
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
                        } else {
                        } 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>";
+                       print HTML2 "<img src=\"${hostname}.${var}.long.png\" width=\"${width}\" height=\"${height}\"><br>\n";
+
+                       $mtime=(stat("${outdir}/${hostname}.${var}.week.png.work"))[9];
+
+                       my @weekGraphDef = @graphdef;
+                       push @weekGraphDef, @{cfgToGraphDef($graphConfig->{'week'}, ${var}, 24)};
 
                        ($averages, $width, $height) =
 
                        ($averages, $width, $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.week.png.new",
-                                               "-w", "1008", "-e", "now", "-s", "end-1w", @graphdef);
+                               rrd_graph("${outdir}/${hostname}.${var}.week.png.work",
+                                               "-w", "$graphWidth", "-e", "now", "-s", "00:00-8d", @weekGraphDef);
 
 
-                       if (RRDs::error) {
-                               print "Error while graphing: " . RRDs::error . "\n";
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
                        } else {
                        } 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>";
+                       print HTML2 "<img src=\"${hostname}.${var}.week.png\" width=\"${width}\" height=\"${height}\"><br>\n";
+
+                       $mtime=(stat("${outdir}/${hostname}.${var}.year.png.work"))[9];
+
+                       my @yearGraphDef = @graphdef;
+                       push @yearGraphDef, @{cfgToGraphDef($graphConfig->{'year'}, ${var}, 3)};
 
                        ($averages, $width, $height) =
 
                        ($averages, $width, $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.year.png.new",
-                                               "-w", "1008", "-e", "now", "-s", "end-1y", @graphdef);
+                               rrd_graph("${outdir}/${hostname}.${var}.year.png.work",
+                                               "-w", "$graphWidth", "-e", "00:00", "-s", "end-365d", @yearGraphDef);
 
 
-                       if (RRDs::error) {
-                               print "Error while graphing: " . RRDs::error . "\n";
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
                        } else {
                        } 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>";
+                       print HTML2 "<img src=\"${hostname}.${var}.year.png\" width=\"${width}\" height=\"${height}\"><br>\n";
 
                        print HTML2 "</body></html>\n";
                        close(HTML2);
 
                        print HTML2 "</body></html>\n";
                        close(HTML2);
@@ -400,4 +643,5 @@ while(1) {
        rename("${outdir}/index.html.new", "${outdir}/index.html");
 
        sleep(${step}/2);
        rename("${outdir}/index.html.new", "${outdir}/index.html");
 
        sleep(${step}/2);
+       $first = 0;
 }
 }
Impressum, Datenschutz