rename ambient to ups temperature

[upsgraph] / upsgraph.pl

diff --git a/upsgraph.pl b/upsgraph.pl
index 2783fcf75e86ba259cd0ddad1a3469f1a4eeb0f5..010d11445a9af2766dc1a5c2d9e67387798c13b5 100755 (executable)
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -11,6 +11,7 @@ if ((@ARGV != 1) && (@ARGV != 2)) {
 
 use Net::SNMP;
 use IO::Socket::INET;
+use IO::Select;
 use RRDs;
 use File::Copy;
 use Data::Dumper;
@@ -124,7 +125,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 +144,39 @@ 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;
+}
+
 if ($> == 0) {
        if (@ARGV != 2) {
                print STDERR "Running as root, please provide UID as 2th argument!\n";
@@ -333,6 +373,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 +386,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);