Added performance data to check_ping (Christian Schneemann)

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1990 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/NEWS b/NEWS
index a6c1a4d2ba908aeb4ac3f157a504d0470a1ecbaf..674a274f05a870931a2f10828224f8d6037ca6a9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ This file documents the major additions and syntax changes between releases.
        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

diff --git a/THANKS.in b/THANKS.in
index 2def3b11c631d565169f2f5bdc26a612cc6489bd..5153198bff9e8165b370c8796bf26a90d3b8b5b3 100644 (file)
--- a/THANKS.in
+++ b/THANKS.in
@@ -233,3 +233,4 @@ Alessandro Ren
 Harald Jenny
 Matthias Urlichs
 Jan Wagner
+Christian Schneemann

diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index ac43a0c459d25afa78622c64f1f38760c0faf401..e22856dab48d88ac06fbbf74657304a743b64172 100644 (file)
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -162,7 +162,16 @@ main (int argc, char **argv)
                                                        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);