]> git.zerfleddert.de Git - upsgraph/blobdiff - upsgraph.pl
select
[upsgraph] / upsgraph.pl
index 9ed59ba5f5b81b9a0e646356d612477ddb075eca..010d11445a9af2766dc1a5c2d9e67387798c13b5 100755 (executable)
@@ -1,37 +1,74 @@
 #!/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);
 }
 
 use Net::SNMP;
+use IO::Socket::INET;
+use IO::Select;
 use RRDs;
+use File::Copy;
 use Data::Dumper;
 
-$UPSGRAPH::host = "";
-$UPSGRAPH::rrdfile = "";
 $UPSGRAPH::outdir = "";
-$UPSGRAPH::community = "public";
 $UPSGRAPH::step = 60;
 $UPSGRAPH::keep = (370*24*60*60)/$UPSGRAPH::step;
-@UPSGRAPH::fields = ();
-$UPSGRAPH::vars = {};
+$UPSGRAPH::hosts = ();
 
 do $ARGV[0] or die "can't read config: $!";
 
-my $host = $UPSGRAPH::host;
-my $rrdfile = $UPSGRAPH::rrdfile;
 my $outdir = $UPSGRAPH::outdir;
-my $community = $UPSGRAPH::community;
 my $step = $UPSGRAPH::step;
 my $keep = $UPSGRAPH::keep;
-my @fields = @UPSGRAPH::fields;
-my $vars = $UPSGRAPH::vars;
+my $hosts = $UPSGRAPH::hosts;
+
+sub rrd_update(@) {
+       my @args = @_;
+
+       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 = ();
+
+       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;
+       my $vars = shift;
        my $start = shift;
 
        my @cmd = ("${newrrd}", "--step=${step}");
@@ -53,83 +90,122 @@ sub rrdcreate(@) {
        }
 }
 
-if ($> == 0) {
-       if (@ARGV != 2) {
-               print STDERR "Running as root, please provide UID as 2th argument!\n";
-               exit(1);
+sub fetch_snmp(@) {
+       my $address = shift;
+       my $community = shift;
+       my $oid = shift;
+
+       (my $session, my $error) = Net::SNMP->session(Hostname => $address,
+                       Community => $community);
+
+       if (!$session) {
+               print STDERR "session error: $error";
+               return undef;
        }
 
-       print "Running as root, switching to ".$ARGV[1]."\n";
-       $< = $> = $ARGV[1];
+       $session->translate(0);
+
+       my $result = $session->get_request($oid);
+
+       $session->close;
+
+       return undef if (!defined($result));
+
+       $result->{$oid};
 }
 
-if (-e "${rrdfile}") {
-       print "Reading old ${rrdfile} to preserve data...\n";
+sub fetch_tcp(@) {
+       my $address = shift;
+       my $port = shift;
 
-       my $rrdinfo = RRDs::info("${rrdfile}");
-       if (RRDs::error) {
-               print "Error while getting info: " . RRDs::error . "\n";
-               exit 1;
-       }
+       my $sock = IO::Socket::INET->new(PeerAddr => $address,
+                       PeerPort => $port,
+                       Proto => 'tcp',
+                       Timeout => 1);
 
-       (my $start, my $ostep, my $names, my $data) =
-               RRDs::fetch("${rrdfile}",
-                               "-s " . (time() - ($rrdinfo->{'rra[0].rows'} * $rrdinfo->{'step'})),
-                               "AVERAGE");
+       return undef if (!$sock);
 
-       if (RRDs::error) {
-               print "Error while fetching data: " . RRDs::error . "\n";
-               exit 1;
+       my $select = IO::Select->new($sock);
+
+       my $value = undef;
+
+       if ($select->can_read(1)) {
+               chomp($value) if (sysread($sock, $value, 4096) > 0);
        }
 
-       foreach my $field (@$names) {
-               if (! -e "${rrdfile}.${field}") {
-                       rrdcreate("${rrdfile}.${field}","${field}",(${start}-${ostep}));
-               }
+       close($sock);
+
+       if (!$value) {
+               return undef;
        }
 
-       my $pos = $start;
-       foreach my $line (@$data) {
-               foreach my $field (@$names) {
-                       my $val = shift (@$line);
-                       next if (!defined($val));
+       $value=~ s/\s//g;
 
-                       RRDs::update("${rrdfile}.${field}", "${pos}:${val}");
-                       if (RRDs::error) {
-                               print "Can't insert data: " . RRDs::error . "\n";
-                               exit 1;
-                       }
+       $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);
 
-               $pos += $ostep;
+       my $select = IO::Select->new($sock);
 
-               if ((($pos-$start)/$ostep) == $#$data) {
+       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;
                }
        }
 
-       rename("${rrdfile}", "${rrdfile}.old") or die "Can't rename old file: $!\n";
+       close($sock);
+
+       %values;
 }
 
-foreach my $field (@fields) {
-       if (! -e "${rrdfile}.${field}") {
-               print "Creating ${rrdfile}.${field}...\n";
-               rrdcreate("${rrdfile}.${field}","${field}");
+if ($> == 0) {
+       if (@ARGV != 2) {
+               print STDERR "Running as root, please provide UID as 2th argument!\n";
+               exit(1);
        }
 
-       my $rrdinfo = RRDs::info("${rrdfile}.${field}");
-       if (RRDs::error) {
-               print "Error while getting info: " . RRDs::error . "\n";
-               exit 1;
+       print "Running as root, switching to ".$ARGV[1]."\n";
+       $< = $> = $ARGV[1];
+}
+
+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 ($rrdinfo->{'rra[0].rows'} != $keep) {
-               print "Resizing ${rrdfile}.${field} from " . $rrdinfo->{'rra[0].rows'} .
-                       " to ${keep} samples.\n";
+       if (-e "${rrdfile}") {
+               print "Reading old ${rrdfile} to preserve data...\n";
+
+               my $rrdinfo = RRDs::info("${rrdfile}");
+               if (RRDs::error) {
+                       print "Error while getting info: " . RRDs::error . "\n";
+                       exit 1;
+               }
 
                (my $start, my $ostep, my $names, my $data) =
-                       RRDs::fetch("${rrdfile}.${field}",
+                       RRDs::fetch("${rrdfile}",
                                        "-s " . (time() - ($rrdinfo->{'rra[0].rows'} * $rrdinfo->{'step'})),
                                        "AVERAGE");
 
@@ -138,24 +214,29 @@ foreach my $field (@fields) {
                        exit 1;
                }
 
-               rrdcreate("${rrdfile}.${field}.new", "${field}", (${start}-${ostep}));
-
-               print "Preserving data since " . localtime($start) . "\n";
+               foreach my $field (@$names) {
+                       if (! -e "${rrdfile}.${field}") {
+                               rrdcreate("${rrdfile}.${field}",
+                                       "${field}",
+                                       $host->{'vars'},
+                                       (${start}-${ostep}));
+                       }
+               }
 
                my $pos = $start;
                foreach my $line (@$data) {
-                       my $vline = "${pos}";
-
-                       foreach my $val (@$line) {
+                       foreach my $field (@$names) {
+                               my $val = shift (@$line);
                                $val = 'U' if (!defined($val));
-                               $vline .= ":${val}";
-                       }
-                       RRDs::update("${rrdfile}.${field}.new", $vline) or die "Can't insert data\n";
 
-                       if (RRDs::error) {
-                               print "Error while updating: " . RRDs::error . "\n";
-                               exit 1;
+                               RRDs::update("${rrdfile}.${field}", "${pos}:${val}");
+                               if (RRDs::error) {
+                                       print "Can't insert data: " . RRDs::error . "\n";
+                                       exit 1;
+                               }
+
                        }
+
                        $pos += $ostep;
 
                        if ((($pos-$start)/$ostep) == $#$data) {
@@ -163,135 +244,275 @@ foreach my $field (@fields) {
                        }
                }
 
-               rename("${rrdfile}.${field}", "${rrdfile}.${field}.old") or die "Can't rename old file: $!\n";
-               rename("${rrdfile}.${field}.new", "${rrdfile}.${field}") or die "Can't rename new file: $!\n";
+               rename("${rrdfile}", "${rrdfile}.old") or die "Can't rename old file: $!\n";
+       }
 
-               $rrdinfo = RRDs::info("${rrdfile}.${field}");
+       foreach my $field (@{$host->{'fields'}}) {
+               if (! -e "${rrdfile}.${field}") {
+                       print "Creating ${rrdfile}.${field}...\n";
+                       rrdcreate("${rrdfile}.${field}",
+                               "${field}",
+                               $host->{'vars'});
+               }
+
+               my $rrdinfo = RRDs::info("${rrdfile}.${field}");
                if (RRDs::error) {
                        print "Error while getting info: " . RRDs::error . "\n";
                        exit 1;
                }
 
-               if ($rrdinfo->{'rra[0].rows'} != $keep) {
-                       print "Failed!\n";
+               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;
                }
-       }
-}
 
-my $child = fork();
+               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'});
+                       }
+               }
 
-die "fork failed!" if (!defined($child));
+               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";
 
-exit 0 if ($child != 0);
+                       (my $start, my $ostep, my $names, my $data) =
+                               RRDs::fetch("${rrdfile}.${field}",
+                                               "-s " . (time() - ($rrdinfo->{'rra[0].rows'} * $rrdinfo->{'step'})),
+                                               "AVERAGE");
 
-while(1) {
-       ($session,$error) = Net::SNMP->session(Hostname => $host,
-                       Community => $community);
+                       if (RRDs::error) {
+                               print "Error while fetching data: " . RRDs::error . "\n";
+                               exit 1;
+                       }
 
-       die "session error: $error" unless ($session);
+                       rrdcreate("${rrdfile}.${field}.new",
+                               "${field}",
+                               $host->{'vars'},
+                               (${start}-${ostep}));
 
-       $session->translate(0);
+                       print "Preserving data since " . localtime($start) . "\n";
 
-       foreach my $var (@fields) {
-               delete $vars->{$var}->{'value'};
+                       my $pos = $start;
+                       foreach my $line (@$data) {
+                               my $vline = "${pos}";
 
-               my $result = $session->get_request($vars->{$var}->{'oid'});
-               next unless (defined $result);
+                               foreach my $val (@$line) {
+                                       $val = 'U' if (!defined($val));
+                                       $vline .= ":${val}";
+                               }
+                               RRDs::update("${rrdfile}.${field}.new", $vline) or die "Can't insert data\n";
 
-               $vars->{$var}->{'value'} = $result->{$vars->{$var}->{'oid'}};
-               if (defined($vars->{$var}->{'factor'})) {
-                       $vars->{$var}->{'value'} *= $vars->{$var}->{'factor'};
-               }
-       }
+                               if (RRDs::error) {
+                                       print "Error while updating: " . RRDs::error . "\n";
+                                       exit 1;
+                               }
+                               $pos += $ostep;
 
-       $session->close;
+                               if ((($pos-$start)/$ostep) == $#$data) {
+                                       last;
+                               }
+                       }
+
+                       rename("${rrdfile}.${field}", "${rrdfile}.${field}.old") or die "Can't rename old file: $!\n";
+                       rename("${rrdfile}.${field}.new", "${rrdfile}.${field}") or die "Can't rename new file: $!\n";
+
+                       $rrdinfo = RRDs::info("${rrdfile}.${field}");
+                       if (RRDs::error) {
+                               print "Error while getting info: " . RRDs::error . "\n";
+                               exit 1;
+                       }
 
-       foreach my $var (@fields) {
-               if (!(defined($vars->{$var}->{'value'}))) {
-                       $vars->{$var}->{'value'} = 'U';
+                       if ($rrdinfo->{'rra[0].rows'} != $keep) {
+                               print "Failed!\n";
+                               exit 1;
+                       }
                }
-               RRDs::update("${rrdfile}.${var}", "N:" . $vars->{$var}->{'value'});
-       }
-       if (RRDs::error) {
-               print "Error while updating: " . RRDs::error . "\n";
        }
+}
 
+my $child = fork();
+
+die "fork failed!" if (!defined($child));
+
+exit 0 if ($child != 0);
+
+while(1) {
        open(HTML, ">${outdir}/index.html.new");
 
-       print HTML '<html><head><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>USV status</title></head>';
+       print HTML '<html><head><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>Status</title></head>';
        print HTML '<body bgcolor="#ffffff">';
 
-       foreach my $var (@fields) {
-               my @graphdef = ("-t", $vars->{$var}->{'name'}, "DEF:${var}=${rrdfile}.${var}:${var}:AVERAGE", "LINE1:${var}#FF0000");
-               (my $averages, my $width, my $height) =
-                       RRDs::graph("${outdir}/${var}.png.new",
-                       "-w", "720", @graphdef);
+       foreach my $host (@$hosts) {
+               print HTML "[<a href=\"#".${host}->{'name'}."\">".${host}->{'name'}."</a>]&nbsp;";
+       }
+       print HTML "<br>\n";
+
+       foreach my $host (@$hosts) {
+               print HTML "<br>\n";
+               print HTML "<a name=\"".${host}->{'name'}."\"></a>\n";
+               my $vars = $host->{'vars'};
+               my $rrdfile = $host->{'rrdfile'};
+               my $hostname = $host->{'name'};
+               my %multi_values = ();
+
+               foreach my $var (@{$host->{'fields'}}) {
+                       delete $vars->{$var}->{'value'};
+
+                       my $result;
+
+                       if ((!defined($vars->{$var}->{'proto'})) ||
+                           ($vars->{$var}->{'proto'} eq '') ||
+                           ($vars->{$var}->{'proto'} eq 'snmp')) {
+                               $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'}};
+                               }
+                       }
 
-               if (RRDs::error) {
-                       print "Error while graphing: " . RRDs::error . "\n";
-               } else {
-                       rename("${outdir}/${var}.png.new", "${outdir}/${var}.png");
+                       next unless (defined $result);
+
+                       $vars->{$var}->{'value'} = $result;
+                       if (defined($vars->{$var}->{'factor'})) {
+                               $vars->{$var}->{'value'} *= $vars->{$var}->{'factor'};
+                       }
                }
 
-               print HTML "<a href=\"${var}.html\"><img src=\"${var}.png\" width=\"${width}\" height=\"${height}\" border=\"0\"></a>";
+               foreach my $var (@{$host->{'fields'}}) {
+                       if (!(defined($vars->{$var}->{'value'}))) {
+                               $vars->{$var}->{'value'} = 'U';
+                       }
+                       rrd_update("${rrdfile}.${var}", "N:" . $vars->{$var}->{'value'});
+               }
+               if ($rrd_result) {
+                       print "Error while updating: " . $rrd_result . "\n";
+               }
 
-               open (HTML2, ">${outdir}/${var}.html.new");
-               print HTML2 "<html><head><title>" . $vars->{$var}->{'name'} . "</title></head>";
-               print HTML2 '<body bgcolor="#ffffff">';
+               foreach my $var (@{$host->{'fields'}}) {
+                       my @graphdef = ('-P', "--lazy", "-t", $hostname." - ".$vars->{$var}->{'name'}, "DEF:${var}=${rrdfile}.${var}:${var}:AVERAGE", "LINE1:${var}#FF0000");
 
+                       push @graphdef, "VDEF:cur=${var},LAST";
+                       push @graphdef, 'GPRINT:cur:Current\\: <span foreground="#FF0000">%.2lf</span>\\r';
 
-               push @graphdef, "VDEF:min=${var},MINIMUM";
-               push @graphdef, "GPRINT:min:Minimum\\: %.2lf";
+                       my $mtime;
+                       $mtime=(stat("${outdir}/${hostname}.${var}.png.work"))[9];
 
-               push @graphdef, "VDEF:avg=${var},AVERAGE";
-               push @graphdef, "GPRINT:avg:Average\\: %.2lf";
+                       (my $averages, my $width, my $height) =
+                               rrd_graph("${outdir}/${hostname}.${var}.png.work",
+                                               "-w", "720", @graphdef);
 
-               push @graphdef, "VDEF:max=${var},MAXIMUM";
-               push @graphdef, "GPRINT:max:Maximum\\: %.2lf";
+                       pop @graphdef;
+                       pop @graphdef;
 
-               push @graphdef, "VDEF:cur=${var},LAST";
-               push @graphdef, "GPRINT:cur:Current\\: %.2lf";
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
+                       } else {
+                               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");
+                               }
+                       }
 
-               ($averages, $width, $height) =
-                       RRDs::graph("${outdir}/${var}.long.png.new",
-                       "-w", "1008", @graphdef);
+                       print HTML "<a href=\"${hostname}.${var}.html\"><img src=\"${hostname}.${var}.png\" width=\"${width}\" height=\"${height}\" border=\"0\"></a><br>\n";
 
-               if (RRDs::error) {
-                       print "Error while graphing: " . RRDs::error . "\n";
-               } else {
-                       rename("${outdir}/${var}.long.png.new", "${outdir}/${var}.long.png");
-               }
+                       open (HTML2, ">${outdir}/${hostname}.${var}.html.new");
+                       print HTML2 '<html><head><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 "<img src=\"${var}.long.png\" width=\"${width}\" height=\"${height}\"><br>";
+                       push @graphdef, "VDEF:min=${var},MINIMUM";
+                       push @graphdef, "GPRINT:min:Minimum\\: %.2lf";
 
-               ($averages, $width, $height) =
-                       RRDs::graph("${outdir}/${var}.week.png.new",
-                       "-w", "1008", "-e", "now", "-s", "end-1w", @graphdef);
+                       push @graphdef, "VDEF:avg=${var},AVERAGE";
+                       push @graphdef, "GPRINT:avg:Average\\: %.2lf";
 
-               if (RRDs::error) {
-                       print "Error while graphing: " . RRDs::error . "\n";
-               } else {
-                       rename("${outdir}/${var}.week.png.new", "${outdir}/${var}.week.png");
-               }
+                       push @graphdef, "VDEF:max=${var},MAXIMUM";
+                       push @graphdef, "GPRINT:max:Maximum\\: %.2lf";
 
-               print HTML2 "<img src=\"${var}.week.png\" width=\"${width}\" height=\"${height}\"><br>";
+                       push @graphdef, "VDEF:cur=${var},LAST";
+                       push @graphdef, "GPRINT:cur:Current\\: %.2lf";
 
-               ($averages, $width, $height) =
-                       RRDs::graph("${outdir}/${var}.year.png.new",
-                       "-w", "1008", "-e", "now", "-s", "end-1y", @graphdef);
+                       $mtime=(stat("${outdir}/${hostname}.${var}.long.png.work"))[9];
+                       ($averages, $width, $height) =
+                               rrd_graph("${outdir}/${hostname}.${var}.long.png.work",
+                                               "-w", "1008", @graphdef);
 
-               if (RRDs::error) {
-                       print "Error while graphing: " . RRDs::error . "\n";
-               } else {
-                       rename("${outdir}/${var}.year.png.new", "${outdir}/${var}.year.png");
-               }
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
+                       } else {
+                               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=\"${var}.year.png\" width=\"${width}\" height=\"${height}\"><br>";
+                       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) =
+                               rrd_graph("${outdir}/${hostname}.${var}.week.png.work",
+                                               "-w", "1008", "-e", "now", "-s", "end-1w", @graphdef);
+
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
+                       } else {
+                               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 "</body></html>\n";
-               close(HTML2);
-               rename("${outdir}/${var}.html.new", "${outdir}/${var}.html");
+                       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) =
+                               rrd_graph("${outdir}/${hostname}.${var}.year.png.work",
+                                               "-w", "1008", "-e", "now", "-s", "end-1y", @graphdef);
+
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
+                       } else {
+                               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 "</body></html>\n";
+                       close(HTML2);
+                       rename("${outdir}/${hostname}.${var}.html.new", "${outdir}/${hostname}.${var}.html");
+               }
        }
 
        print HTML "</body></html>\n";
Impressum, Datenschutz