X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/upsgraph/blobdiff_plain/fd198fcdfda36da547af84d57ab456faf16a0dd0..d036d16a336b8b31db2c7b09ea40012164d96a83:/upsgraph.pl
diff --git a/upsgraph.pl b/upsgraph.pl
index c8bc4c6..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: $!";
@@ -223,6 +224,23 @@ sub dayGraphFunc {
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)};
+ }
+ }
+ return \@graphDef;
+}
+
if ($> == 0) {
if (@ARGV != 2) {
print STDERR "Running as root, please provide UID as 2th argument!\n";
@@ -307,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'});
}
}
@@ -324,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'});
}
}
@@ -338,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";
@@ -404,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");
@@ -463,11 +488,31 @@ while(1) {
}
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, "DEF:${var}-min=${rrdfile}.${var}:${var}:MIN", "LINE1:${var}-min#0000FF";
- push @graphdef, "DEF:${var}-max=${rrdfile}.${var}:${var}:MAX", "LINE1:${var}-max#00FF00";
- push @graphdef, "VDEF:cur=${var},LAST";
+ 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, "LINE1:${var}-avg#FF0000";
+ push @graphdef, "VDEF:cur=${var}-avg,LAST";
push @graphdef, 'GPRINT:cur:Current\\: %.2lf\\r';
my $mtime;
@@ -479,6 +524,7 @@ while(1) {
pop @graphdef;
pop @graphdef;
+ pop @graphdef;
if ($rrd_result) {
print "Error while graphing: " . $rrd_result . "\n";
@@ -499,19 +545,22 @@ while(1) {
push @graphdef, "VDEF:min=${var}-min,MINIMUM";
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, "VDEF:max=${var}-max,MAXIMUM";
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";
+ my @dayGraphDef = @graphdef;
+ push @dayGraphDef, @{cfgToGraphDef($graphConfig->{'day'}, ${var}, 24)};
+
$mtime=(stat("${outdir}/${hostname}.${var}.long.png.work"))[9];
($averages, $width, $height) =
rrd_graph("${outdir}/${hostname}.${var}.long.png.work",
- "-w", "1008", @graphdef);
+ "-w", $graphWidth, @dayGraphDef);
if ($rrd_result) {
print "Error while graphing: " . $rrd_result . "\n";
@@ -526,9 +575,13 @@ while(1) {
print HTML2 "
\n";
$mtime=(stat("${outdir}/${hostname}.${var}.week.png.work"))[9];
+
+ my @weekGraphDef = @graphdef;
+ push @weekGraphDef, @{cfgToGraphDef($graphConfig->{'week'}, ${var}, 24)};
+
($averages, $width, $height) =
rrd_graph("${outdir}/${hostname}.${var}.week.png.work",
- "-w", "1008", "-e", "now", "-s", "end-1w", @graphdef);
+ "-w", "$graphWidth", "-e", "now", "-s", "00:00-8d", @weekGraphDef);
if ($rrd_result) {
print "Error while graphing: " . $rrd_result . "\n";
@@ -543,9 +596,13 @@ while(1) {
print HTML2 "
\n";
$mtime=(stat("${outdir}/${hostname}.${var}.year.png.work"))[9];
+
+ my @yearGraphDef = @graphdef;
+ push @yearGraphDef, @{cfgToGraphDef($graphConfig->{'year'}, ${var}, 3)};
+
($averages, $width, $height) =
rrd_graph("${outdir}/${hostname}.${var}.year.png.work",
- "-w", "1008", "-e", "now", "-s", "end-1y", @graphdef);
+ "-w", "$graphWidth", "-e", "00:00", "-s", "end-365d", @yearGraphDef);
if ($rrd_result) {
print "Error while graphing: " . $rrd_result . "\n";
@@ -574,4 +631,5 @@ while(1) {
rename("${outdir}/index.html.new", "${outdir}/index.html");
sleep(${step}/2);
+ $first = 0;
}