X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/upsgraph/blobdiff_plain/f49c04f7a2365b6bedf0828ca03dc4403bf12c8c..235b08abaa2e746a485090fd0760cdd1e85c09af:/upsgraph.pl
diff --git a/upsgraph.pl b/upsgraph.pl
index 2783fcf..4f66090 100755
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -11,20 +11,26 @@ if ((@ARGV != 1) && (@ARGV != 2)) {
use Net::SNMP;
use IO::Socket::INET;
+use IO::Select;
use RRDs;
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 = ();
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(@) {
@@ -78,9 +84,11 @@ 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}";
RRDs::create(@cmd);
if (RRDs::error) {
@@ -124,7 +132,13 @@ sub fetch_tcp(@) {
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);
@@ -137,6 +151,95 @@ sub fetch_tcp(@) {
$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 = '';
+ for (my $i = 1; $i < $dataPoints; ++$i) {
+ $dayCons .= "prev${mode}${i},";
+ $consFunc .= ",${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)};
+ }
+ }
+ return \@graphDef;
+}
+
if ($> == 0) {
if (@ARGV != 2) {
print STDERR "Running as root, please provide UID as 2th argument!\n";
@@ -251,7 +354,9 @@ foreach my $host (@$hosts) {
exit 1;
}
- if ($rrdinfo->{'rra[0].rows'} != $keep) {
+ if ($rrdinfo->{'rra[0].rows'} != $keep ||
+ !defined($rrdinfo->{'rra[1].rows'}) || $rrdinfo->{'rra[1].rows'} != $keepHours) {
+
print "Resizing ${rrdfile}.${field} from " . $rrdinfo->{'rra[0].rows'} .
" to ${keep} samples.\n";
@@ -270,7 +375,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) {
@@ -333,6 +438,7 @@ while(1) {
my $vars = $host->{'vars'};
my $rrdfile = $host->{'rrdfile'};
my $hostname = $host->{'name'};
+ my %multi_values = ();
foreach my $var (@{$host->{'fields'}}) {
delete $vars->{$var}->{'value'};
@@ -345,6 +451,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'});
+ } 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);
@@ -366,9 +480,30 @@ 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', "--lazy", "-t", $hostname." - ".$vars->{$var}->{'name'});
- 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, "LINE1:${var}-avg#FF0000";
+ push @graphdef, "VDEF:cur=${var}-avg,LAST";
push @graphdef, 'GPRINT:cur:Current\\: %.2lf\\r';
my $mtime;
@@ -380,6 +515,7 @@ while(1) {
pop @graphdef;
pop @graphdef;
+ pop @graphdef;
if ($rrd_result) {
print "Error while graphing: " . $rrd_result . "\n";
@@ -394,25 +530,28 @@ while(1) {
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, "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";
@@ -424,12 +563,16 @@ while(1) {
}
}
- print HTML2 "![](\"${hostname}.${var}.long.png\")
";
+ 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";
@@ -441,12 +584,16 @@ while(1) {
}
}
- print HTML2 "![](\"${hostname}.${var}.week.png\")
";
+ 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";
@@ -458,7 +605,7 @@ while(1) {
}
}
- print HTML2 "![](\"${hostname}.${var}.year.png\")
";
+ print HTML2 "
\n";
print HTML2 "\n";
close(HTML2);