X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/upsgraph/blobdiff_plain/0d627df92167c3a34339140fe3570a90dd51bebe..bcd0e31b0502cde60a8a8ab890ed7de361eaab43:/upsgraph.pl
diff --git a/upsgraph.pl b/upsgraph.pl
index 82e0259..06e66e3 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 = "";
@@ -57,6 +58,7 @@ sub fetch_snmp(@) {
if (!$session) {
print STDERR "session error: $error";
+ return undef;
}
$session->translate(0);
@@ -107,6 +109,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";
@@ -318,24 +325,37 @@ 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");
+
+ push @graphdef, "VDEF:cur=${var},LAST";
+ push @graphdef, 'GPRINT:cur:Current\\: %.2lf\\r';
+
+ 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);
+ pop @graphdef;
+ pop @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 "![](\"${hostname}.${var}.png\")
\n";
open (HTML2, ">${outdir}/${hostname}.${var}.html.new");
- print HTML2 "" . $vars->{$var}->{'name'} . "";
+ print HTML2 '' . $vars->{$var}->{'name'} . '';
print HTML2 '';
-
push @graphdef, "VDEF:min=${var},MINIMUM";
push @graphdef, "GPRINT:min:Minimum\\: %.2lf";
@@ -348,38 +368,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 "![](\"${hostname}.${var}.long.png\")
";
+ $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 "![](\"${hostname}.${var}.week.png\")
";
+ $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 "![](\"${hostname}.${var}.year.png\")
";