modified i4 temperature config

[upsgraph] / upsgraph.pl

diff --git a/upsgraph.pl b/upsgraph.pl
index 9887d0c4ab2215e9b20eaecd4abf0cc23de55292..10f622b7f643dd04ec4c6f458ace8d6069457c5d 100755 (executable)
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -1,5 +1,9 @@
 #!/usr/bin/perl -w
 
+#Due to memory leak in Debian squeeze (Bug #545519)
+my $use_rrds = 0;
+my $rrd_result = 0;
+
 if ((@ARGV != 1) && (@ARGV != 2)) {
        print STDERR "Syntax: ${0} configfile [uid]\n";
        exit(1);
@@ -23,6 +27,43 @@ my $step = $UPSGRAPH::step;
 my $keep = $UPSGRAPH::keep;
 my $hosts = $UPSGRAPH::hosts;
 
+sub rrd_update(@) {
+       my @args = @_;
+
+       if ($use_rrds == 1) {
+               RRDs::update(@args);
+               $rrd_result = RRDs::error;
+       } else {
+               $rrd_result = system("rrdtool", "update", @args);
+       }
+}
+
+sub rrd_graph(@) {
+       my @args = @_;
+       my @rrd_out = ();
+
+       if ($use_rrds == 1) {
+               @rrd_out = RRDs::graph(@args);
+               $rrd_result = RRDs::error;
+       } else {
+               my $rrd_stdout;
+
+               open(RRDFD, '-|', 'rrdtool', 'graph', @args);
+               while(<RRDFD>) {
+                       chomp;
+                       $rrd_stdout = $_;
+               }
+               close(RRDFD);
+               $rrd_result = $?;
+               if ($rrd_result == 0) {
+                       push @rrd_out, 0;
+                       push @rrd_out, split(/x/, $rrd_stdout);
+               }
+       }
+
+       return @rrd_out;
+}
+
 sub rrdcreate(@) {
        my $newrrd = shift;
        my $field = shift;
@@ -96,6 +137,31 @@ 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);
+
+       while(<$sock>) {
+               chomp;
+               (my $key, my $value) = split(/${delimiter}/, $_);
+               $value=~ s/\s//g;
+               $values{$key} = $value;
+       }
+
+       close($sock);
+
+       %values;
+}
+
 if ($> == 0) {
        if (@ARGV != 2) {
                print STDERR "Running as root, please provide UID as 2th argument!\n";
@@ -292,6 +358,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'};
@@ -304,6 +371,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);
@@ -318,10 +393,10 @@ while(1) {
                        if (!(defined($vars->{$var}->{'value'}))) {
                                $vars->{$var}->{'value'} = 'U';
                        }
-                       RRDs::update("${rrdfile}.${var}", "N:" . $vars->{$var}->{'value'});
+                       rrd_update("${rrdfile}.${var}", "N:" . $vars->{$var}->{'value'});
                }
-               if (RRDs::error) {
-                       print "Error while updating: " . RRDs::error . "\n";
+               if ($rrd_result) {
+                       print "Error while updating: " . $rrd_result . "\n";
                }
 
                foreach my $var (@{$host->{'fields'}}) {
@@ -334,14 +409,14 @@ while(1) {
                        $mtime=(stat("${outdir}/${hostname}.${var}.png.work"))[9];
 
                        (my $averages, my $width, my $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.png.work",
+                               rrd_graph("${outdir}/${hostname}.${var}.png.work",
                                                "-w", "720", @graphdef);
 
                        pop @graphdef;
                        pop @graphdef;
 
-                       if (RRDs::error) {
-                               print "Error while graphing: " . RRDs::error . "\n";
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
                        } else {
                                my $newmtime=(stat("${outdir}/${hostname}.${var}.png.work"))[9];
                                if ((!defined($mtime)) || ($newmtime != $mtime)) {
@@ -370,11 +445,11 @@ while(1) {
 
                        $mtime=(stat("${outdir}/${hostname}.${var}.long.png.work"))[9];
                        ($averages, $width, $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.long.png.work",
+                               rrd_graph("${outdir}/${hostname}.${var}.long.png.work",
                                                "-w", "1008", @graphdef);
 
-                       if (RRDs::error) {
-                               print "Error while graphing: " . RRDs::error . "\n";
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
                        } else {
                                my $newmtime=(stat("${outdir}/${hostname}.${var}.long.png.work"))[9];
                                if ((!defined($mtime)) || ($newmtime != $mtime)) {
@@ -387,11 +462,11 @@ while(1) {
 
                        $mtime=(stat("${outdir}/${hostname}.${var}.week.png.work"))[9];
                        ($averages, $width, $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.week.png.work",
+                               rrd_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";
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
                        } else {
                                my $newmtime=(stat("${outdir}/${hostname}.${var}.week.png.work"))[9];
                                if ((!defined($mtime)) || ($newmtime != $mtime)) {
@@ -404,11 +479,11 @@ while(1) {
 
                        $mtime=(stat("${outdir}/${hostname}.${var}.year.png.work"))[9];
                        ($averages, $width, $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.year.png.work",
+                               rrd_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";
+                       if ($rrd_result) {
+                               print "Error while graphing: " . $rrd_result . "\n";
                        } else {
                                my $newmtime=(stat("${outdir}/${hostname}.${var}.year.png.work"))[9];
                                if ((!defined($mtime)) || ($newmtime != $mtime)) {