summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-05-07 10:01:48 +0000
committerThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-05-07 10:01:48 +0000
commit4d157889e3018119e07bdcc7f48afde1422f7396 (patch)
tree6a2ecdbe45263f04549839b09290c161d00e4284
parent82f8c52fbdca00bd8118bab3cee977da14757818 (diff)
downloadmonitoring-plugins-4d157889e3018119e07bdcc7f48afde1422f7396.tar.gz
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
-rw-r--r--NEWS2
-rw-r--r--THANKS.in1
-rw-r--r--plugins/check_ping.c11
3 files changed, 13 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a6c1a4d2..674a274f 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ This file documents the major additions and syntax changes between releases.
21 check_mysql now try clearing password in processlist just like check_mysql_query 21 check_mysql now try clearing password in processlist just like check_mysql_query
22 check_mysql and check_mysql_query now support sockets explicitely (-s, --socket) 22 check_mysql and check_mysql_query now support sockets explicitely (-s, --socket)
23 negate now has the ability to replace the status text as well (-s, --substitute) 23 negate now has the ability to replace the status text as well (-s, --substitute)
24 Added performance data to check_ping (Christian Schneemann)
25 Added support for --extra-opts in all C plugins (disabled by default, see configure --help)
24 26
251.4.11 13th December 2007 271.4.11 13th December 2007
26 Fixed check_http regression in 1.4.10 where following redirects to 28 Fixed check_http regression in 1.4.10 where following redirects to
diff --git a/THANKS.in b/THANKS.in
index 2def3b11..5153198b 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -233,3 +233,4 @@ Alessandro Ren
233Harald Jenny 233Harald Jenny
234Matthias Urlichs 234Matthias Urlichs
235Jan Wagner 235Jan Wagner
236Christian Schneemann
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index ac43a0c4..e22856da 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -162,7 +162,16 @@ main (int argc, char **argv)
162 state_text (this_result), warn_text, pl, rta); 162 state_text (this_result), warn_text, pl, rta);
163 if (display_html == TRUE) 163 if (display_html == TRUE)
164 printf ("</A>"); 164 printf ("</A>");
165 printf ("\n"); 165
166 /* Print performance data */
167 printf("|%s", fperfdata ("rta", (double) rta, "ms",
168 wrta>0?TRUE:FALSE, wrta,
169 crta>0?TRUE:FALSE, crta,
170 TRUE, 0, FALSE, 0));
171 printf(" %s\n", perfdata ("pl", (long) pl, "%",
172 wpl>0?TRUE:FALSE, wpl,
173 cpl>0?TRUE:FALSE, cpl,
174 TRUE, 0, FALSE, 0));
166 175
167 if (verbose >= 2) 176 if (verbose >= 2)
168 printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl); 177 printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);