add performance data for snapmirror, and linefeed option for output

Author: ngarratt

check_netapp_ontap.pl

@@ -32,6 +32,7 @@
 if ($verbose || $debug || $trace) {
 	use Data::Dumper;
 }
+my $lineFeed = undef;
 
 ##############################################
 ## DISK HEALTH
@@ -1144,6 +1145,7 @@ sub calc_snapmirror_health {
 	my $intState = 0;
 	my $intObjectCount = 0;
 	my $strOutput;
+	my %perfOutput = ();
 
 	foreach my $strSM (keys %$hrefSMInfo) {
 		$intObjectCount = $intObjectCount + 1;
@@ -1172,13 +1174,18 @@ sub calc_snapmirror_health {
 				$intState = get_nagios_state($intState, 1);
 			}
 		}
+		$perfOutput{"snapmirror-$strSM"} = "'" . $strSM . "_snapmirror'=" . $hrefSMInfo->{$strSM}->{'lag'} . "s;" . $hrefWarnThresholds->{'lag-time'} . ";" . $hrefCritThresholds->{'lag-time'} . ";;";
 	}
 
 	# If everything looks ok and no output has been defined then set the message to display OK.
 	if (!(defined($strOutput))) {
 		$strOutput = "OK - No problem found ($intObjectCount checked)";
 	}
 
+        if (keys(%perfOutput) > 0) {
+                $strOutput .= ("\n| " . join(' ', values(%perfOutput)));
+        }
+
 	return $intState, $strOutput;
 }
 
@@ -1943,6 +1950,8 @@ sub help {
 	This modifier is used to set an inclusive or exclusive filter on what you want to monitor.
 --report, -r
 	The output format. Can be "short", "long" (default), or "html"
+--linefeed, -l
+	Use linefeed for object separation instead of comma (requires nagios 3.x or later)
 --verbose, --debug, --trace
 	Debug output options
 --help, -h
@@ -2077,7 +2086,7 @@ sub get_nagios_description {
 	if (!(defined($strOutput))) {
 		$strOutput = $strNewMessage;
 	} else {
-		$strOutput .= ", " . $strNewMessage;
+		$strOutput .= (defined $lineFeed ? "\n" : ", ") . $strNewMessage;
 	}
 
 	return $strOutput;
@@ -2187,6 +2196,7 @@ sub filter_object {
 	"c=s" => \$strCritical,		"critical=s" => \$strCritical,
 	"m=s" => \$strModifier,		"modifier=s" => \$strModifier,
 	"r=s" => \$strReport,		"report=s" => \$strReport,
+	"l"   => \$lineFeed,		"linefeed" => \$lineFeed,
 	"verbose" => \$verbose,
 	"debug" => \$debug,
 	"trace" => \$trace,