[Nagiosplug-checkins] SF.net SVN: nagiosplug: [1990] nagiosplug/trunk

[dermoth at users.sourceforge.net]

Revision: 1990
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=1990&view=rev
Author:   dermoth
Date:     2008-05-07 03:01:48 -0700 (Wed, 07 May 2008)

Log Message:
-----------
Added performance data to check_ping (Christian Schneemann)

Modified Paths:
--------------
    nagiosplug/trunk/NEWS
    nagiosplug/trunk/THANKS.in
    nagiosplug/trunk/plugins/check_ping.c

Modified: nagiosplug/trunk/NEWS
===================================================================
--- nagiosplug/trunk/NEWS	2008-05-02 09:28:15 UTC (rev 1989)
+++ nagiosplug/trunk/NEWS	2008-05-07 10:01:48 UTC (rev 1990)
@@ -21,6 +21,8 @@
 	check_mysql now try clearing password in processlist just like check_mysql_query
 	check_mysql and check_mysql_query now support sockets explicitely (-s, --socket)
 	negate now has the ability to replace the status text as well (-s, --substitute)
+	Added performance data to check_ping (Christian Schneemann)
+	Added support for --extra-opts in all C plugins (disabled by default, see configure --help)
 
 1.4.11 13th December 2007
 	Fixed check_http regression in 1.4.10 where following redirects to

Modified: nagiosplug/trunk/THANKS.in
===================================================================
--- nagiosplug/trunk/THANKS.in	2008-05-02 09:28:15 UTC (rev 1989)
+++ nagiosplug/trunk/THANKS.in	2008-05-07 10:01:48 UTC (rev 1990)
@@ -233,3 +233,4 @@
 Harald Jenny
 Matthias Urlichs
 Jan Wagner
+Christian Schneemann

Modified: nagiosplug/trunk/plugins/check_ping.c
===================================================================
--- nagiosplug/trunk/plugins/check_ping.c	2008-05-02 09:28:15 UTC (rev 1989)
+++ nagiosplug/trunk/plugins/check_ping.c	2008-05-07 10:01:48 UTC (rev 1990)
@@ -162,8 +162,17 @@
 							state_text (this_result), warn_text, pl, rta);
 		if (display_html == TRUE)
 			printf ("</A>");
-		printf ("\n");
 
+		/* Print performance data */
+		printf("|%s", fperfdata ("rta", (double) rta, "ms",
+		                          wrta>0?TRUE:FALSE, wrta,
+		                          crta>0?TRUE:FALSE, crta,
+		                          TRUE, 0, FALSE, 0));
+		printf(" %s\n", perfdata ("pl", (long) pl, "%",
+		                          wpl>0?TRUE:FALSE, wpl,
+		                          cpl>0?TRUE:FALSE, cpl,
+		                          TRUE, 0, FALSE, 0));
+
 		if (verbose >= 2)
 			printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.