add example for tr7432

[upsgraph] / upsgraph.pl

diff --git a/upsgraph.pl b/upsgraph.pl
index ce195002ca2e54f71bc502212e84195170524f51..f9d0fe3ea558a315bdc100ea5809b94b034eb767 100755 (executable)
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -15,6 +15,8 @@ use IO::Select;
 use RRDs;
 use File::Copy;
 use Data::Dumper;
+use LWP::UserAgent;
+use JSON;
 
 $UPSGRAPH::outdir = "";
 $UPSGRAPH::daysCovered = 370;
@@ -23,6 +25,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: $!";
 
@@ -89,6 +92,7 @@ sub rrdcreate(@) {
        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) {
@@ -184,6 +188,39 @@ sub fetch_tcp_multi(@) {
        %values;
 }
 
+sub fetch_iotcore(@) {
+       my $host = shift;
+       my $adr = shift;
+       my $mask = shift;
+
+       my $ua = LWP::UserAgent->new;
+       $ua->timeout(1);
+
+       my $iotcore_req = {
+               cid => 1,
+               code => 10,
+               adr => $adr,
+       };
+
+       my $req = HTTP::Request->new(POST => "http://${host}");
+       $req->content_type('application/json');
+       $req->content(encode_json($iotcore_req));
+
+       my $resp = $ua->request($req);
+       return undef if (!$resp->is_success);
+
+       my $pdin = decode_json($resp->decoded_content);
+       return undef if (!defined($pdin));
+
+       my $value = hex($pdin->{'data'}->{'value'});
+
+       if (defined($mask)) {
+               $value = $value & $mask;
+       }
+
+       $value;
+}
+
 sub dayGraphFunc {
        my $dataSrc = shift;
        my $mode = shift;
@@ -199,9 +236,16 @@ sub dayGraphFunc {
        }
        my $dayCons = '';
        my $consFunc = '';
-       for (my $i = 1; $i < $dataPoints; ++$i) {
-               $dayCons .= "prev${mode}${i},";
-               $consFunc .= ",${mode}";
+       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";
@@ -235,6 +279,8 @@ sub cfgToGraphDef {
                        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;
@@ -360,7 +406,7 @@ foreach my $host (@$hosts) {
                }
                    
                if ($rrdinfo->{'rra[0].rows'} != $keep ||
-                       !defined($rrdinfo->{'rra[1].rows'}) || $rrdinfo->{'rra[1].rows'} != $keepHours ||
+                       !defined($rrdinfo->{'rra[3].rows'}) || $rrdinfo->{'rra[3].rows'} != $keepHours ||
                        $limitsChanged == 1) {
 
                        print "Resizing ${rrdfile}.${field} from " . $rrdinfo->{'rra[0].rows'} .
@@ -427,6 +473,7 @@ die "fork failed!" if (!defined($child));
 
 exit 0 if ($child != 0);
 
+my $first = $UPSGRAPH::regenerateOnStart;
 while(1) {
        open(HTML, ">${outdir}/index.html.new");
 
@@ -465,6 +512,8 @@ while(1) {
                                        @multi_values{keys %values} = values %values;
                                        $result = $multi_values{$vars->{$var}->{'multi_id'}};
                                }
+                       } elsif ($vars->{$var}->{'proto'} eq 'iotcore') {
+                               $result = fetch_iotcore($host->{'address'}, $vars->{$var}->{'adr'}, $vars->{$var}->{'mask'});
                        }
 
                        next unless (defined $result);
@@ -503,11 +552,13 @@ while(1) {
                                };
                        }
 
-                       my @graphdef = ('-P', "--lazy", "-t", $hostname." - ".$vars->{$var}->{'name'});
+                       my @graphdef = ('-P', "-A", "-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, "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\\: <span foreground="#FF0000">%.2lf</span>\\r';
@@ -628,4 +679,5 @@ while(1) {
        rename("${outdir}/index.html.new", "${outdir}/index.html");
 
        sleep(${step}/2);
+       $first = 0;
 }