X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/upsgraph/blobdiff_plain/1c46ea617272124eae806cd59532ae86822eaf4f..4a7fc650d9185b9c2ac670e866b4113e8a7b5321:/upsgraph.pl?ds=sidebyside diff --git a/upsgraph.pl b/upsgraph.pl index 0d19fb6..e55622b 100755 --- a/upsgraph.pl +++ b/upsgraph.pl @@ -17,15 +17,21 @@ use File::Copy; use Data::Dumper; $UPSGRAPH::outdir = ""; +$UPSGRAPH::daysCovered = 370; $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::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; +my $stepsPerHour = $UPSGRAPH::stepsPerHour; my $keep = $UPSGRAPH::keep; +my $keepHours = $UPSGRAPH::keepHours; my $hosts = $UPSGRAPH::hosts; sub rrd_update(@) { @@ -79,9 +85,12 @@ sub rrdcreate(@) { 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: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) { @@ -177,6 +186,71 @@ sub fetch_tcp_multi(@) { %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"; @@ -261,12 +335,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'}); } } @@ -278,10 +355,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'}); } } @@ -291,7 +370,10 @@ foreach my $host (@$hosts) { 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"; @@ -310,7 +392,7 @@ foreach my $host (@$hosts) { $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) { @@ -356,6 +438,7 @@ die "fork failed!" if (!defined($child)); exit 0 if ($child != 0); +my $first = $UPSGRAPH::regenerateOnStart; while(1) { open(HTML, ">${outdir}/index.html.new"); @@ -415,9 +498,32 @@ 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"); + 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, "VDEF:cur=${var},LAST"; + 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\\: %.2lf\\r'; my $mtime; @@ -429,6 +535,7 @@ while(1) { pop @graphdef; pop @graphdef; + pop @graphdef; if ($rrd_result) { print "Error while graphing: " . $rrd_result . "\n"; @@ -446,22 +553,25 @@ while(1) { print HTML2 '' . $vars->{$var}->{'name'} . ''; print HTML2 ''; - push @graphdef, "VDEF:min=${var},MINIMUM"; + 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},MAXIMUM"; + 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"; @@ -476,9 +586,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"; @@ -493,9 +607,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"; @@ -524,4 +642,5 @@ while(1) { rename("${outdir}/index.html.new", "${outdir}/index.html"); sleep(${step}/2); + $first = 0; }