packages: nagios-plugin-check_asterisk_skype/check_asterisk_skype - semicol...

[glen]

Author: glen                         Date: Wed Mar  3 09:52:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- semicolon is tr/;/:/ by nagios, as it is used for perfdata separator
- update balance warning/critical levels

---- Files affected:
packages/nagios-plugin-check_asterisk_skype:
   check_asterisk_skype (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype
diff -u packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype:1.9 packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype:1.10
--- packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype:1.9	Wed Mar  3 07:58:55 2010
+++ packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype	Wed Mar  3 10:52:53 2010
@@ -57,7 +57,7 @@
 			Host-ID:\s+([\da-f:]+)\s+--\s+
 			Channels:\s+(\d+)\s+\((\S+)\)
 			/x) {
-			$message .= "License $state: $channels channels, expires $expires";
+			$message .= "License $state: $channels channels (expires $expires)";
 			if ($state ne 'OK') {
 				$status = $ERRORS{CRITICAL};
 			}
@@ -122,10 +122,10 @@
 	close $fh || die "asterisk exited with: $?\n";
 
 	if (@status) {
-		$message .= "; User: ".join(', ', @status);
+		$message .= ", User: ".join(', ', @status);
 	} else {
 		$status = $ERRORS{CRITICAL};
-		$message .= "; No skype user setup";
+		$message .= ", No skype user setup";
 	}
 }
 
@@ -136,8 +136,8 @@
 sub check_skype_calls {
 	# TODO: add command line opts support
 	my $logfile = '/var/log/asterisk/calls.log';
-	my $warning = 2.5;
-	my $critical = 0.5;
+	my $warning = 4.00;
+	my $critical = 2.00;
 
 	open(my $fh, '<', $logfile) or die "Can't open $logfile: $!\n";
 	my @lines = reverse <$fh>;
@@ -157,13 +157,13 @@
 			} else {
 				$state = 'OK';
 			}
-			$message .= sprintf "; Balance %s: %.2f %s", $state, $balance, $currency;
+			$message .= sprintf ", Balance %s: %.2f %s", $state, $balance, $currency;
 			last;
 		}
 	}
 
 	if (!$seen) {
-		$message .= "; Balance UNKNOWN: No info found";
+		$message .= ", Balance UNKNOWN: No info found";
 		$status = $ERRORS{UNKNOWN} unless $status;
 	}
 }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype?r1=1.9&r2=1.10&f=u