X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/upsgraph/blobdiff_plain/f49c04f7a2365b6bedf0828ca03dc4403bf12c8c..b57167a10dcdf5c36f21f058e2aecf277aff54bc:/upsgraph.pl

diff --git a/upsgraph.pl b/upsgraph.pl
index 2783fcf..10f622b 100755
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -137,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";
@@ -333,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'};
@@ -345,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);