X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/upsgraph/blobdiff_plain/f004592ac75253abcb2e32548ddb995f10ff9cf2..2ce46592475b7148e6aeb6e298b11eac5a26d8d6:/upsgraph.pl

diff --git a/upsgraph.pl b/upsgraph.pl
index 1fbb452..10f622b 100755
--- 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;
@@ -58,6 +99,7 @@ sub fetch_snmp(@) {
 
 	if (!$session) {
 		print STDERR "session error: $error";
+		return undef;
 	}
 
 	$session->translate(0);
@@ -95,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";
@@ -291,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'};
@@ -303,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);
@@ -317,24 +393,30 @@ 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'}}) {
-			my @graphdef = ("--lazy", "-t", $hostname." - ".$vars->{$var}->{'name'}, "DEF:${var}=${rrdfile}.${var}:${var}:AVERAGE", "LINE1:${var}#FF0000");
+			my @graphdef = ('-P', "--lazy", "-t", $hostname." - ".$vars->{$var}->{'name'}, "DEF:${var}=${rrdfile}.${var}:${var}:AVERAGE", "LINE1:${var}#FF0000");
+
+			push @graphdef, "VDEF:cur=${var},LAST";
+			push @graphdef, 'GPRINT:cur:Current\\: <span foreground="#FF0000">%.2lf</span>\\r';
 
 			my $mtime;
 			$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);
 
-			if (RRDs::error) {
-				print "Error while graphing: " . RRDs::error . "\n";
+			pop @graphdef;
+			pop @graphdef;
+
+			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)) {
@@ -346,10 +428,9 @@ while(1) {
 			print HTML "<a href=\"${hostname}.${var}.html\"><img src=\"${hostname}.${var}.png\" width=\"${width}\" height=\"${height}\" border=\"0\"></a><br>\n";
 
 			open (HTML2, ">${outdir}/${hostname}.${var}.html.new");
-			print HTML2 "<html><head><title>" . $vars->{$var}->{'name'} . "</title></head>";
+			print HTML2 '<html><head><meta http-equiv="refresh" content="60"/><meta http-equiv="cache-control" content="no-cache"/><meta http-equiv="pragma" content="no-cache"/><meta http_equiv="expires" content="Sat, 26 Jul 1997 05:00:00 GMT"/><title>' . $vars->{$var}->{'name'} . '</title></head>';
 			print HTML2 '<body bgcolor="#ffffff">';
 
-
 			push @graphdef, "VDEF:min=${var},MINIMUM";
 			push @graphdef, "GPRINT:min:Minimum\\: %.2lf";
 
@@ -364,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)) {
@@ -381,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)) {
@@ -398,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)) {