diff options
Diffstat (limited to 'plugins')
57 files changed, 236 insertions, 213 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 031dd25..d2ac4be 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am | |||
@@ -48,7 +48,7 @@ noinst_LIBRARIES = libnpcommon.a | |||
48 | libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c \ | 48 | libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c \ |
49 | popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h | 49 | popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h |
50 | 50 | ||
51 | BASEOBJS = libnpcommon.a ../lib/libnagiosplug.a ../gl/libgnu.a | 51 | BASEOBJS = libnpcommon.a ../lib/libmonitoringplug.a ../gl/libgnu.a |
52 | NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS) | 52 | NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS) |
53 | NETLIBS = $(NETOBJS) $(SOCKETLIBS) | 53 | NETLIBS = $(NETOBJS) $(SOCKETLIBS) |
54 | SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS) | 54 | SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS) |
diff --git a/plugins/check_apt.c b/plugins/check_apt.c index bf7bbde..9994213 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_apt plugin | 3 | * Monitoring check_apt plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2006-2008 Nagios Plugins Development Team | 6 | * Copyright (c) 2006-2008 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Original author: Sean Finney | 8 | * Original author: Sean Finney |
9 | * | 9 | * |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | const char *progname = "check_apt"; | 32 | const char *progname = "check_apt"; |
33 | const char *copyright = "2006-2008"; | 33 | const char *copyright = "2006-2008"; |
34 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "runcmd.h" | 37 | #include "runcmd.h" |
@@ -430,7 +430,7 @@ print_help (void) | |||
430 | printf(UT_HELP_VRSN); | 430 | printf(UT_HELP_VRSN); |
431 | printf(UT_EXTRA_OPTS); | 431 | printf(UT_EXTRA_OPTS); |
432 | 432 | ||
433 | printf(UT_TIMEOUT, timeout_interval); | 433 | printf(UT_PLUG_TIMEOUT, timeout_interval); |
434 | 434 | ||
435 | printf (" %s\n", "-U, --upgrade=OPTS"); | 435 | printf (" %s\n", "-U, --upgrade=OPTS"); |
436 | printf (" %s\n", _("[Default] Perform an upgrade. If an optional OPTS argument is provided,")); | 436 | printf (" %s\n", _("[Default] Perform an upgrade. If an optional OPTS argument is provided,")); |
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index 2a23487..58f333d 100644 --- a/plugins/check_by_ssh.c +++ b/plugins/check_by_ssh.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_by_ssh plugin | 3 | * Monitoring check_by_ssh plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2008 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2008 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | const char *progname = "check_by_ssh"; | 29 | const char *progname = "check_by_ssh"; |
30 | const char *copyright = "2000-2008"; | 30 | const char *copyright = "2000-2008"; |
31 | const char *email = "devel@nagios-plugins.org"; | 31 | const char *email = "devel@monitoring-plugins.org"; |
32 | 32 | ||
33 | #include "common.h" | 33 | #include "common.h" |
34 | #include "utils.h" | 34 | #include "utils.h" |
@@ -246,7 +246,7 @@ process_arguments (int argc, char **argv) | |||
246 | } | 246 | } |
247 | service[services - 1] = p1; | 247 | service[services - 1] = p1; |
248 | break; | 248 | break; |
249 | case 'n': /* short name of host in nagios configuration */ | 249 | case 'n': /* short name of host in the monitoring configuration */ |
250 | host_shortname = optarg; | 250 | host_shortname = optarg; |
251 | break; | 251 | break; |
252 | 252 | ||
@@ -371,7 +371,7 @@ validate_arguments (void) | |||
371 | die (STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname); | 371 | die (STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname); |
372 | 372 | ||
373 | if (passive && host_shortname == NULL) | 373 | if (passive && host_shortname == NULL) |
374 | die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the nagios configs.\n"), progname); | 374 | die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the monitoring configs.\n"), progname); |
375 | 375 | ||
376 | return OK; | 376 | return OK; |
377 | } | 377 | } |
@@ -416,11 +416,11 @@ print_help (void) | |||
416 | printf (" %s\n","-i, --identity=KEYFILE"); | 416 | printf (" %s\n","-i, --identity=KEYFILE"); |
417 | printf (" %s\n", _("identity of an authorized key [optional]")); | 417 | printf (" %s\n", _("identity of an authorized key [optional]")); |
418 | printf (" %s\n","-O, --output=FILE"); | 418 | printf (" %s\n","-O, --output=FILE"); |
419 | printf (" %s\n", _("external command file for nagios [optional]")); | 419 | printf (" %s\n", _("external command file for monitoring [optional]")); |
420 | printf (" %s\n","-s, --services=LIST"); | 420 | printf (" %s\n","-s, --services=LIST"); |
421 | printf (" %s\n", _("list of nagios service names, separated by ':' [optional]")); | 421 | printf (" %s\n", _("list of monitoring service names, separated by ':' [optional]")); |
422 | printf (" %s\n","-n, --name=NAME"); | 422 | printf (" %s\n","-n, --name=NAME"); |
423 | printf (" %s\n", _("short name of host in nagios configuration [optional]")); | 423 | printf (" %s\n", _("short name of host in the monitoring configuration [optional]")); |
424 | printf (" %s\n","-o, --ssh-option=OPTION"); | 424 | printf (" %s\n","-o, --ssh-option=OPTION"); |
425 | printf (" %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]")); | 425 | printf (" %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]")); |
426 | printf (" %s\n","-F, --configfile"); | 426 | printf (" %s\n","-F, --configfile"); |
@@ -428,7 +428,7 @@ print_help (void) | |||
428 | printf (" %s\n","-q, --quiet"); | 428 | printf (" %s\n","-q, --quiet"); |
429 | printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]")); | 429 | printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]")); |
430 | printf (UT_WARN_CRIT); | 430 | printf (UT_WARN_CRIT); |
431 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 431 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
432 | printf (UT_VERBOSE); | 432 | printf (UT_VERBOSE); |
433 | printf("\n"); | 433 | printf("\n"); |
434 | printf (" %s\n", _("The most common mode of use is to refer to a local identity file with")); | 434 | printf (" %s\n", _("The most common mode of use is to refer to a local identity file with")); |
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c index b046c14..cf699e1 100644 --- a/plugins/check_cluster.c +++ b/plugins/check_cluster.c | |||
@@ -1,10 +1,10 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * check_cluster.c - Host and Service Cluster Plugin for Nagios 2.x | 3 | * check_cluster.c - Host and Service Cluster Plugin for Monitoring |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org) | 6 | * Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org) |
7 | * Copyright (c) 2007 Nagios Plugins Development Team | 7 | * Copyright (c) 2007 Monitoring Plugins Development Team |
8 | * | 8 | * |
9 | * This program is free software: you can redistribute it and/or modify | 9 | * This program is free software: you can redistribute it and/or modify |
10 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | const char *progname = "check_cluster"; | 25 | const char *progname = "check_cluster"; |
26 | const char *copyright = "2000-2007"; | 26 | const char *copyright = "2000-2007"; |
27 | const char *email = "devel@nagios-plugins.org"; | 27 | const char *email = "devel@monitoring-plugins.org"; |
28 | 28 | ||
29 | #include "common.h" | 29 | #include "common.h" |
30 | #include "utils.h" | 30 | #include "utils.h" |
@@ -227,7 +227,7 @@ print_help(void) | |||
227 | printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n"); | 227 | printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n"); |
228 | printf(COPYRIGHT, copyright, email); | 228 | printf(COPYRIGHT, copyright, email); |
229 | 229 | ||
230 | printf(_("Host/Service Cluster Plugin for Nagios 2")); | 230 | printf(_("Host/Service Cluster Plugin for Monitoring")); |
231 | printf("\n\n"); | 231 | printf("\n\n"); |
232 | 232 | ||
233 | print_usage(); | 233 | print_usage(); |
diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c index bd50565..c6244fd 100644 --- a/plugins/check_dbi.c +++ b/plugins/check_dbi.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_dbi plugin | 3 | * Monitoring check_dbi plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2011 Nagios Plugins Development Team | 6 | * Copyright (c) 2011 Monitoring Plugins Development Team |
7 | * Author: Sebastian 'tokkee' Harl <sh@teamix.net> | 7 | * Author: Sebastian 'tokkee' Harl <sh@teamix.net> |
8 | * | 8 | * |
9 | * Description: | 9 | * Description: |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | const char *progname = "check_dbi"; | 32 | const char *progname = "check_dbi"; |
33 | const char *copyright = "2011"; | 33 | const char *copyright = "2011"; |
34 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "utils.h" | 37 | #include "utils.h" |
@@ -562,7 +562,7 @@ print_help (void) | |||
562 | printf (" %s\n", _("(ignore the query result)")); | 562 | printf (" %s\n", _("(ignore the query result)")); |
563 | printf ("\n"); | 563 | printf ("\n"); |
564 | 564 | ||
565 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 565 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
566 | 566 | ||
567 | printf (UT_VERBOSE); | 567 | printf (UT_VERBOSE); |
568 | 568 | ||
diff --git a/plugins/check_dig.c b/plugins/check_dig.c index 445b04f..903019d 100644 --- a/plugins/check_dig.c +++ b/plugins/check_dig.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_dig plugin | 3 | * Monitoring check_dig plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2002-2008 Nagios Plugins Development Team | 6 | * Copyright (c) 2002-2008 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | const char *progname = "check_dig"; | 35 | const char *progname = "check_dig"; |
36 | const char *copyright = "2002-2008"; | 36 | const char *copyright = "2002-2008"; |
37 | const char *email = "devel@nagios-plugins.org"; | 37 | const char *email = "devel@monitoring-plugins.org"; |
38 | 38 | ||
39 | #include "common.h" | 39 | #include "common.h" |
40 | #include "netutils.h" | 40 | #include "netutils.h" |
@@ -348,7 +348,7 @@ print_help (void) | |||
348 | printf (" %s\n","-A, --dig-arguments=STRING"); | 348 | printf (" %s\n","-A, --dig-arguments=STRING"); |
349 | printf (" %s\n",_("Pass STRING as argument(s) to dig")); | 349 | printf (" %s\n",_("Pass STRING as argument(s) to dig")); |
350 | printf (UT_WARN_CRIT); | 350 | printf (UT_WARN_CRIT); |
351 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 351 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
352 | printf (UT_VERBOSE); | 352 | printf (UT_VERBOSE); |
353 | 353 | ||
354 | printf ("\n"); | 354 | printf ("\n"); |
diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 906f3de..8b85b4f 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_disk plugin | 3 | * Monitoring check_disk plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2008 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2008 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -29,7 +29,7 @@ | |||
29 | const char *progname = "check_disk"; | 29 | const char *progname = "check_disk"; |
30 | const char *program_name = "check_disk"; /* Required for coreutils libs */ | 30 | const char *program_name = "check_disk"; /* Required for coreutils libs */ |
31 | const char *copyright = "1999-2008"; | 31 | const char *copyright = "1999-2008"; |
32 | const char *email = "devel@nagios-plugins.org"; | 32 | const char *email = "devel@monitoring-plugins.org"; |
33 | 33 | ||
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
@@ -911,7 +911,7 @@ print_help (void) | |||
911 | printf (" %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)")); | 911 | printf (" %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)")); |
912 | printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION"); | 912 | printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION"); |
913 | printf (" %s\n", _("Regular expression to ignore selected path or partition (may be repeated)")); | 913 | printf (" %s\n", _("Regular expression to ignore selected path or partition (may be repeated)")); |
914 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 914 | printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
915 | printf (" %s\n", "-u, --units=STRING"); | 915 | printf (" %s\n", "-u, --units=STRING"); |
916 | printf (" %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)")); | 916 | printf (" %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)")); |
917 | printf (UT_VERBOSE); | 917 | printf (UT_VERBOSE); |
diff --git a/plugins/check_dns.c b/plugins/check_dns.c index 082df2b..eebe72c 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_dns plugin | 3 | * Monitoring check_dns plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2008 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2008 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | const char *progname = "check_dns"; | 32 | const char *progname = "check_dns"; |
33 | const char *copyright = "2000-2008"; | 33 | const char *copyright = "2000-2008"; |
34 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "utils.h" | 37 | #include "utils.h" |
@@ -474,7 +474,7 @@ print_help (void) | |||
474 | printf (" -c, --critical=seconds\n"); | 474 | printf (" -c, --critical=seconds\n"); |
475 | printf (" %s\n", _("Return critical if elapsed time exceeds value. Default off")); | 475 | printf (" %s\n", _("Return critical if elapsed time exceeds value. Default off")); |
476 | 476 | ||
477 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 477 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
478 | 478 | ||
479 | printf (UT_SUPPORT); | 479 | printf (UT_SUPPORT); |
480 | } | 480 | } |
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c index ca8e457..3ed6871 100644 --- a/plugins/check_dummy.c +++ b/plugins/check_dummy.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_dummy plugin | 3 | * Monitoring check_dummy plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | const char *progname = "check_dummy"; | 31 | const char *progname = "check_dummy"; |
32 | const char *copyright = "1999-2007"; | 32 | const char *copyright = "1999-2007"; |
33 | const char *email = "devel@nagios-plugins.org"; | 33 | const char *email = "devel@monitoring-plugins.org"; |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include "utils.h" | 36 | #include "utils.h" |
diff --git a/plugins/check_fping.c b/plugins/check_fping.c index 507c3a0..46046b4 100644 --- a/plugins/check_fping.c +++ b/plugins/check_fping.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_fping plugin | 3 | * Monitoring check_fping plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | const char *progname = "check_fping"; | 32 | const char *progname = "check_fping"; |
33 | const char *copyright = "2000-2007"; | 33 | const char *copyright = "2000-2007"; |
34 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "popen.h" | 37 | #include "popen.h" |
diff --git a/plugins/check_game.c b/plugins/check_game.c index 9b5f523..29e59e2 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_game plugin | 3 | * Monitoring check_game plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2002-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2002-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | const char *progname = "check_game"; | 32 | const char *progname = "check_game"; |
33 | const char *copyright = "2002-2007"; | 33 | const char *copyright = "2002-2007"; |
34 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "utils.h" | 37 | #include "utils.h" |
@@ -312,7 +312,7 @@ print_help (void) | |||
312 | printf (" %s\n", "-pf"); | 312 | printf (" %s\n", "-pf"); |
313 | printf (" %s\n", _("Field number in raw qstat output that contains ping time")); | 313 | printf (" %s\n", _("Field number in raw qstat output that contains ping time")); |
314 | 314 | ||
315 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 315 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
316 | 316 | ||
317 | printf ("\n"); | 317 | printf ("\n"); |
318 | printf ("%s\n", _("Notes:")); | 318 | printf ("%s\n", _("Notes:")); |
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c index 49ee86e..1e7605b 100644 --- a/plugins/check_hpjd.c +++ b/plugins/check_hpjd.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_hpjd plugin | 3 | * Monitoring check_hpjd plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | const char *progname = "check_hpjd"; | 32 | const char *progname = "check_hpjd"; |
33 | const char *copyright = "2000-2007"; | 33 | const char *copyright = "2000-2007"; |
34 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "popen.h" | 37 | #include "popen.h" |
diff --git a/plugins/check_http.c b/plugins/check_http.c index 4eba4b6..92861d9 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_http plugin | 3 | * Monitoring check_http plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2013 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2013 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | const char *progname = "check_http"; | 36 | const char *progname = "check_http"; |
37 | const char *copyright = "1999-2013"; | 37 | const char *copyright = "1999-2013"; |
38 | const char *email = "devel@nagios-plugins.org"; | 38 | const char *email = "devel@monitoring-plugins.org"; |
39 | 39 | ||
40 | #include "common.h" | 40 | #include "common.h" |
41 | #include "netutils.h" | 41 | #include "netutils.h" |
@@ -157,7 +157,7 @@ main (int argc, char **argv) | |||
157 | /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */ | 157 | /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */ |
158 | server_url = strdup(HTTP_URL); | 158 | server_url = strdup(HTTP_URL); |
159 | server_url_length = strlen(server_url); | 159 | server_url_length = strlen(server_url); |
160 | xasprintf (&user_agent, "User-Agent: check_http/v%s (nagios-plugins %s)", | 160 | xasprintf (&user_agent, "User-Agent: check_http/v%s (monitoring-plugins %s)", |
161 | NP_VERSION, VERSION); | 161 | NP_VERSION, VERSION); |
162 | 162 | ||
163 | /* Parse extra opts if any */ | 163 | /* Parse extra opts if any */ |
@@ -1534,7 +1534,7 @@ print_help (void) | |||
1534 | 1534 | ||
1535 | printf (UT_WARN_CRIT); | 1535 | printf (UT_WARN_CRIT); |
1536 | 1536 | ||
1537 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 1537 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
1538 | 1538 | ||
1539 | printf (UT_VERBOSE); | 1539 | printf (UT_VERBOSE); |
1540 | 1540 | ||
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c index 1f0549c..bce1f31 100644 --- a/plugins/check_ide_smart.c +++ b/plugins/check_ide_smart.c | |||
@@ -1,13 +1,13 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_ide_smart plugin | 3 | * Monitoring check_ide_smart plugin |
4 | * ide-smart 1.3 - IDE S.M.A.R.T. checking tool | 4 | * ide-smart 1.3 - IDE S.M.A.R.T. checking tool |
5 | * | 5 | * |
6 | * License: GPL | 6 | * License: GPL |
7 | * Copyright (C) 1998-1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org> | 7 | * Copyright (C) 1998-1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org> |
8 | * 1998 Gadi Oxman <gadio@netvision.net.il> | 8 | * 1998 Gadi Oxman <gadio@netvision.net.il> |
9 | * Copyright (c) 2000 Robert Dale <rdale@digital-mission.com> | 9 | * Copyright (c) 2000 Robert Dale <rdale@digital-mission.com> |
10 | * Copyright (c) 2000-2007 Nagios Plugins Development Team | 10 | * Copyright (c) 2000-2007 Monitoring Plugins Development Team |
11 | * | 11 | * |
12 | * Description: | 12 | * Description: |
13 | * | 13 | * |
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | const char *progname = "check_ide_smart"; | 36 | const char *progname = "check_ide_smart"; |
37 | const char *copyright = "1998-2007"; | 37 | const char *copyright = "1998-2007"; |
38 | const char *email = "devel@nagios-plugins.org"; | 38 | const char *email = "devel@monitoring-plugins.org"; |
39 | 39 | ||
40 | #include "common.h" | 40 | #include "common.h" |
41 | #include "utils.h" | 41 | #include "utils.h" |
@@ -592,7 +592,7 @@ print_help (void) | |||
592 | { | 592 | { |
593 | print_revision (progname, NP_VERSION); | 593 | print_revision (progname, NP_VERSION); |
594 | 594 | ||
595 | printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n"); | 595 | printf ("monitoring feature - 1999 Robert Dale <rdale@digital-mission.com>\n"); |
596 | printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n"); | 596 | printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n"); |
597 | printf (COPYRIGHT, copyright, email); | 597 | printf (COPYRIGHT, copyright, email); |
598 | 598 | ||
@@ -616,8 +616,8 @@ print_help (void) | |||
616 | printf (" %s\n", _("Turn on automatic offline tests")); | 616 | printf (" %s\n", _("Turn on automatic offline tests")); |
617 | printf (" %s\n", "-0, --auto-off"); | 617 | printf (" %s\n", "-0, --auto-off"); |
618 | printf (" %s\n", _("Turn off automatic offline tests")); | 618 | printf (" %s\n", _("Turn off automatic offline tests")); |
619 | printf (" %s\n", "-n, --nagios"); | 619 | printf (" %s\n", "-n, --monitoring"); |
620 | printf (" %s\n", _("Output suitable for Nagios")); | 620 | printf (" %s\n", _("Output suitable for the monitoring system")); |
621 | 621 | ||
622 | printf (UT_SUPPORT); | 622 | printf (UT_SUPPORT); |
623 | } | 623 | } |
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index 4717885..c371be9 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_ldap plugin | 3 | * Monitoring check_ldap plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2008 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2008 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -29,7 +29,7 @@ | |||
29 | /* progname may be check_ldaps */ | 29 | /* progname may be check_ldaps */ |
30 | char *progname = "check_ldap"; | 30 | char *progname = "check_ldap"; |
31 | const char *copyright = "2000-2008"; | 31 | const char *copyright = "2000-2008"; |
32 | const char *email = "devel@nagios-plugins.org"; | 32 | const char *email = "devel@monitoring-plugins.org"; |
33 | 33 | ||
34 | #include "common.h" | 34 | #include "common.h" |
35 | #include "netutils.h" | 35 | #include "netutils.h" |
@@ -430,7 +430,7 @@ print_help (void) | |||
430 | 430 | ||
431 | printf (UT_WARN_CRIT); | 431 | printf (UT_WARN_CRIT); |
432 | 432 | ||
433 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 433 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
434 | 434 | ||
435 | printf (UT_VERBOSE); | 435 | printf (UT_VERBOSE); |
436 | 436 | ||
diff --git a/plugins/check_load.c b/plugins/check_load.c index 479dc49..cde63e5 100644 --- a/plugins/check_load.c +++ b/plugins/check_load.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_load plugin | 3 | * Monitoring check_load plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | const char *progname = "check_load"; | 31 | const char *progname = "check_load"; |
32 | const char *copyright = "1999-2007"; | 32 | const char *copyright = "1999-2007"; |
33 | const char *email = "devel@nagios-plugins.org"; | 33 | const char *email = "devel@monitoring-plugins.org"; |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include "utils.h" | 36 | #include "utils.h" |
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c index b2467b2..ed75f4c 100644 --- a/plugins/check_mrtg.c +++ b/plugins/check_mrtg.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_mrtg plugin | 3 | * Monitoring check_mrtg plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | const char *progname = "check_mrtg"; | 32 | const char *progname = "check_mrtg"; |
33 | const char *copyright = "1999-2007"; | 33 | const char *copyright = "1999-2007"; |
34 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "utils.h" | 37 | #include "utils.h" |
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c index 4e6168d..32ba050 100644 --- a/plugins/check_mrtgtraf.c +++ b/plugins/check_mrtgtraf.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_mrtgtraf plugin | 3 | * Monitoring check_mrtgtraf plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | const char *progname = "check_mrtgtraf"; | 35 | const char *progname = "check_mrtgtraf"; |
36 | const char *copyright = "1999-2007"; | 36 | const char *copyright = "1999-2007"; |
37 | const char *email = "devel@nagios-plugins.org"; | 37 | const char *email = "devel@monitoring-plugins.org"; |
38 | 38 | ||
39 | int process_arguments (int, char **); | 39 | int process_arguments (int, char **); |
40 | int validate_arguments (void); | 40 | int validate_arguments (void); |
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index 3414320..135aa18 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c | |||
@@ -1,11 +1,11 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_mysql plugin | 3 | * Monitoring check_mysql plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at) | 6 | * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at) |
7 | * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) | 7 | * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) |
8 | * Copyright (c) 1999-2011 Nagios Plugins Development Team | 8 | * Copyright (c) 1999-2011 Monitoring Plugins Development Team |
9 | * | 9 | * |
10 | * Description: | 10 | * Description: |
11 | * | 11 | * |
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | const char *progname = "check_mysql"; | 33 | const char *progname = "check_mysql"; |
34 | const char *copyright = "1999-2011"; | 34 | const char *copyright = "1999-2011"; |
35 | const char *email = "devel@nagios-plugins.org"; | 35 | const char *email = "devel@monitoring-plugins.org"; |
36 | 36 | ||
37 | #define SLAVERESULTSIZE 70 | 37 | #define SLAVERESULTSIZE 70 |
38 | 38 | ||
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c index edc2ec8..9d2f493 100644 --- a/plugins/check_mysql_query.c +++ b/plugins/check_mysql_query.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_mysql_query plugin | 3 | * Monitoring check_mysql_query plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2006-2009 Nagios Plugins Development Team | 6 | * Copyright (c) 2006-2009 Monitoring Plugins Development Team |
7 | * Original code from check_mysql, copyright 1999 Didi Rieder | 7 | * Original code from check_mysql, copyright 1999 Didi Rieder |
8 | * | 8 | * |
9 | * Description: | 9 | * Description: |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | const char *progname = "check_mysql_query"; | 32 | const char *progname = "check_mysql_query"; |
33 | const char *copyright = "1999-2007"; | 33 | const char *copyright = "1999-2007"; |
34 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "utils.h" | 37 | #include "utils.h" |
@@ -152,7 +152,13 @@ main (int argc, char **argv) | |||
152 | } else if (status == STATE_CRITICAL) { | 152 | } else if (status == STATE_CRITICAL) { |
153 | printf("QUERY %s: ", _("CRITICAL")); | 153 | printf("QUERY %s: ", _("CRITICAL")); |
154 | } | 154 | } |
155 | printf(_("'%s' returned %f"), sql_query, value); | 155 | printf(_("'%s' returned %f | %s"), sql_query, value, |
156 | fperfdata("result", value, "", | ||
157 | my_thresholds->warning?TRUE:FALSE, my_thresholds->warning?my_thresholds->warning->end:0, | ||
158 | my_thresholds->critical?TRUE:FALSE, my_thresholds->critical?my_thresholds->critical->end:0, | ||
159 | FALSE, 0, | ||
160 | FALSE, 0) | ||
161 | ); | ||
156 | printf("\n"); | 162 | printf("\n"); |
157 | 163 | ||
158 | return status; | 164 | return status; |
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c index d3891c1..791b6db 100644 --- a/plugins/check_nagios.c +++ b/plugins/check_nagios.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_nagios plugin | 3 | * Monitoring check_nagios plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | const char *progname = "check_nagios"; | 35 | const char *progname = "check_nagios"; |
36 | const char *copyright = "1999-2007"; | 36 | const char *copyright = "1999-2007"; |
37 | const char *email = "devel@nagios-plugins.org"; | 37 | const char *email = "devel@monitoring-plugins.org"; |
38 | 38 | ||
39 | #include "common.h" | 39 | #include "common.h" |
40 | #include "runcmd.h" | 40 | #include "runcmd.h" |
diff --git a/plugins/check_nt.c b/plugins/check_nt.c index 20f0bb5..1aa7ab5 100644 --- a/plugins/check_nt.c +++ b/plugins/check_nt.c | |||
@@ -1,10 +1,10 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_nt plugin | 3 | * Monitoring check_nt plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com) | 6 | * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com) |
7 | * Copyright (c) 2003-2007 Nagios Plugins Development Team | 7 | * Copyright (c) 2003-2007 Monitoring Plugins Development Team |
8 | * | 8 | * |
9 | * Description: | 9 | * Description: |
10 | * | 10 | * |
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | const char *progname = "check_nt"; | 35 | const char *progname = "check_nt"; |
36 | const char *copyright = "2000-2007"; | 36 | const char *copyright = "2000-2007"; |
37 | const char *email = "devel@nagios-plugins.org"; | 37 | const char *email = "devel@monitoring-plugins.org"; |
38 | 38 | ||
39 | #include "common.h" | 39 | #include "common.h" |
40 | #include "netutils.h" | 40 | #include "netutils.h" |
@@ -750,7 +750,7 @@ void print_help(void) | |||
750 | printf (" %s\n", _("The purpose of this is to be run from command line to determine what instances")); | 750 | printf (" %s\n", _("The purpose of this is to be run from command line to determine what instances")); |
751 | printf (" %s\n", _(" are available for monitoring without having to log onto the Windows server")); | 751 | printf (" %s\n", _(" are available for monitoring without having to log onto the Windows server")); |
752 | printf (" %s\n", _(" to run Perfmon directly.")); | 752 | printf (" %s\n", _(" to run Perfmon directly.")); |
753 | printf (" %s\n", _("It can also be used in scripts that automatically create Nagios service")); | 753 | printf (" %s\n", _("It can also be used in scripts that automatically create the monitoring service")); |
754 | printf (" %s\n", _(" configuration files.")); | 754 | printf (" %s\n", _(" configuration files.")); |
755 | printf (" %s\n", _("Some examples:")); | 755 | printf (" %s\n", _("Some examples:")); |
756 | printf (" %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process")); | 756 | printf (" %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process")); |
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index 8527126..93b2869 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c | |||
@@ -1,10 +1,10 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_ntp plugin | 3 | * Monitoring check_ntp plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2006 Sean Finney <seanius@seanius.net> | 6 | * Copyright (c) 2006 Sean Finney <seanius@seanius.net> |
7 | * Copyright (c) 2006-2008 Nagios Plugins Development Team | 7 | * Copyright (c) 2006-2008 Monitoring Plugins Development Team |
8 | * | 8 | * |
9 | * Description: | 9 | * Description: |
10 | * | 10 | * |
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | const char *progname = "check_ntp"; | 33 | const char *progname = "check_ntp"; |
34 | const char *copyright = "2006-2008"; | 34 | const char *copyright = "2006-2008"; |
35 | const char *email = "devel@nagios-plugins.org"; | 35 | const char *email = "devel@monitoring-plugins.org"; |
36 | 36 | ||
37 | #include "common.h" | 37 | #include "common.h" |
38 | #include "netutils.h" | 38 | #include "netutils.h" |
@@ -858,7 +858,7 @@ void print_help(void){ | |||
858 | printf (" %s\n", _("Warning threshold for jitter")); | 858 | printf (" %s\n", _("Warning threshold for jitter")); |
859 | printf (" %s\n", "-k, --jcrit=THRESHOLD"); | 859 | printf (" %s\n", "-k, --jcrit=THRESHOLD"); |
860 | printf (" %s\n", _("Critical threshold for jitter")); | 860 | printf (" %s\n", _("Critical threshold for jitter")); |
861 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 861 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
862 | printf (UT_VERBOSE); | 862 | printf (UT_VERBOSE); |
863 | 863 | ||
864 | printf("\n"); | 864 | printf("\n"); |
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index 16cce45..8dc1978 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c | |||
@@ -1,10 +1,10 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_ntp_peer plugin | 3 | * Monitoring check_ntp_peer plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2006 Sean Finney <seanius@seanius.net> | 6 | * Copyright (c) 2006 Sean Finney <seanius@seanius.net> |
7 | * Copyright (c) 2006-2008 Nagios Plugins Development Team | 7 | * Copyright (c) 2006-2008 Monitoring Plugins Development Team |
8 | * | 8 | * |
9 | * Description: | 9 | * Description: |
10 | * | 10 | * |
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | const char *progname = "check_ntp_peer"; | 38 | const char *progname = "check_ntp_peer"; |
39 | const char *copyright = "2006-2008"; | 39 | const char *copyright = "2006-2008"; |
40 | const char *email = "devel@nagios-plugins.org"; | 40 | const char *email = "devel@monitoring-plugins.org"; |
41 | 41 | ||
42 | #include "common.h" | 42 | #include "common.h" |
43 | #include "netutils.h" | 43 | #include "netutils.h" |
@@ -686,7 +686,7 @@ void print_help(void){ | |||
686 | printf (" %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")")); | 686 | printf (" %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")")); |
687 | printf (" %s\n", "-n, --tcrit=THRESHOLD"); | 687 | printf (" %s\n", "-n, --tcrit=THRESHOLD"); |
688 | printf (" %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")")); | 688 | printf (" %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")")); |
689 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 689 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
690 | printf (UT_VERBOSE); | 690 | printf (UT_VERBOSE); |
691 | 691 | ||
692 | printf("\n"); | 692 | printf("\n"); |
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c index 9db73f7..746b683 100644 --- a/plugins/check_ntp_time.c +++ b/plugins/check_ntp_time.c | |||
@@ -1,10 +1,10 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_ntp_time plugin | 3 | * Monitoring check_ntp_time plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2006 Sean Finney <seanius@seanius.net> | 6 | * Copyright (c) 2006 Sean Finney <seanius@seanius.net> |
7 | * Copyright (c) 2006-2008 Nagios Plugins Development Team | 7 | * Copyright (c) 2006-2008 Monitoring Plugins Development Team |
8 | * | 8 | * |
9 | * Description: | 9 | * Description: |
10 | * | 10 | * |
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | const char *progname = "check_ntp_time"; | 37 | const char *progname = "check_ntp_time"; |
38 | const char *copyright = "2006-2008"; | 38 | const char *copyright = "2006-2008"; |
39 | const char *email = "devel@nagios-plugins.org"; | 39 | const char *email = "devel@monitoring-plugins.org"; |
40 | 40 | ||
41 | #include "common.h" | 41 | #include "common.h" |
42 | #include "netutils.h" | 42 | #include "netutils.h" |
@@ -614,7 +614,7 @@ void print_help(void){ | |||
614 | printf (" %s\n", _("Offset to result in warning status (seconds)")); | 614 | printf (" %s\n", _("Offset to result in warning status (seconds)")); |
615 | printf (" %s\n", "-c, --critical=THRESHOLD"); | 615 | printf (" %s\n", "-c, --critical=THRESHOLD"); |
616 | printf (" %s\n", _("Offset to result in critical status (seconds)")); | 616 | printf (" %s\n", _("Offset to result in critical status (seconds)")); |
617 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 617 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
618 | printf (UT_VERBOSE); | 618 | printf (UT_VERBOSE); |
619 | 619 | ||
620 | printf("\n"); | 620 | printf("\n"); |
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c index ade3789..1a7bfa1 100644 --- a/plugins/check_nwstat.c +++ b/plugins/check_nwstat.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_nwstat plugin | 3 | * Monitoring check_nwstat plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | const char *progname = "check_nwstat"; | 32 | const char *progname = "check_nwstat"; |
33 | const char *copyright = "2000-2007"; | 33 | const char *copyright = "2000-2007"; |
34 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "netutils.h" | 37 | #include "netutils.h" |
@@ -1664,7 +1664,7 @@ void print_help(void) | |||
1664 | printf (" %s\n", "-o, --osversion"); | 1664 | printf (" %s\n", "-o, --osversion"); |
1665 | printf (" %s\n", _("Include server version string in results")); | 1665 | printf (" %s\n", _("Include server version string in results")); |
1666 | 1666 | ||
1667 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 1667 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
1668 | 1668 | ||
1669 | printf ("\n"); | 1669 | printf ("\n"); |
1670 | printf ("%s\n", _("Notes:")); | 1670 | printf ("%s\n", _("Notes:")); |
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c index 8bd0eb6..af5eb9b 100644 --- a/plugins/check_overcr.c +++ b/plugins/check_overcr.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_overcr plugin | 3 | * Monitoring check_overcr plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | const char *progname = "check_overcr"; | 32 | const char *progname = "check_overcr"; |
33 | const char *copyright = "2000-2007"; | 33 | const char *copyright = "2000-2007"; |
34 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "netutils.h" | 37 | #include "netutils.h" |
@@ -442,7 +442,7 @@ print_help (void) | |||
442 | printf (" %s\n", _("NET<port> = number of active connections on TCP port <port>")); | 442 | printf (" %s\n", _("NET<port> = number of active connections on TCP port <port>")); |
443 | printf (" %s\n", _("UPTIME = system uptime in seconds")); | 443 | printf (" %s\n", _("UPTIME = system uptime in seconds")); |
444 | 444 | ||
445 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 445 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
446 | 446 | ||
447 | printf (UT_VERBOSE); | 447 | printf (UT_VERBOSE); |
448 | 448 | ||
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c index a9ebf81..4f2cf1d 100644 --- a/plugins/check_pgsql.c +++ b/plugins/check_pgsql.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_pgsql plugin | 3 | * Monitoring check_pgsql plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2011 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2011 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | const char *progname = "check_pgsql"; | 31 | const char *progname = "check_pgsql"; |
32 | const char *copyright = "1999-2011"; | 32 | const char *copyright = "1999-2011"; |
33 | const char *email = "devel@nagios-plugins.org"; | 33 | const char *email = "devel@monitoring-plugins.org"; |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include "utils.h" | 36 | #include "utils.h" |
@@ -524,7 +524,7 @@ print_help (void) | |||
524 | 524 | ||
525 | printf (UT_WARN_CRIT); | 525 | printf (UT_WARN_CRIT); |
526 | 526 | ||
527 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 527 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
528 | 528 | ||
529 | printf (" %s\n", "-q, --query=STRING"); | 529 | printf (" %s\n", "-q, --query=STRING"); |
530 | printf (" %s\n", _("SQL query to run. Only first column in first row will be read")); | 530 | printf (" %s\n", _("SQL query to run. Only first column in first row will be read")); |
@@ -563,7 +563,7 @@ print_help (void) | |||
563 | printf (" %s\n", _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP")); | 563 | printf (" %s\n", _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP")); |
564 | printf (" %s\n\n", _("connections (start the postmaster with the -i option).")); | 564 | printf (" %s\n\n", _("connections (start the postmaster with the -i option).")); |
565 | 565 | ||
566 | printf (" %s\n", _("Typically, the nagios user (unless the --logname option is used) should be")); | 566 | printf (" %s\n", _("Typically, the monitoring user (unless the --logname option is used) should be")); |
567 | printf (" %s\n", _("able to connect to the database without a password. The plugin can also send")); | 567 | printf (" %s\n", _("able to connect to the database without a password. The plugin can also send")); |
568 | printf (" %s\n", _("a password, but no effort is made to obsure or encrypt the password.")); | 568 | printf (" %s\n", _("a password, but no effort is made to obsure or encrypt the password.")); |
569 | 569 | ||
diff --git a/plugins/check_ping.c b/plugins/check_ping.c index 83b907e..c0bb32f 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_ping plugin | 3 | * Monitoring check_ping plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | const char *progname = "check_ping"; | 31 | const char *progname = "check_ping"; |
32 | const char *copyright = "2000-2007"; | 32 | const char *copyright = "2000-2007"; |
33 | const char *email = "devel@nagios-plugins.org"; | 33 | const char *email = "devel@monitoring-plugins.org"; |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include "netutils.h" | 36 | #include "netutils.h" |
@@ -581,7 +581,7 @@ print_help (void) | |||
581 | printf (" %s\n", "-L, --link"); | 581 | printf (" %s\n", "-L, --link"); |
582 | printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)")); | 582 | printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)")); |
583 | 583 | ||
584 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 584 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
585 | 585 | ||
586 | printf ("\n"); | 586 | printf ("\n"); |
587 | printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel")); | 587 | printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel")); |
diff --git a/plugins/check_procs.c b/plugins/check_procs.c index 7ba02e2..402aac5 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_procs plugin | 3 | * Monitoring check_procs plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2008 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2008 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -34,7 +34,7 @@ | |||
34 | const char *progname = "check_procs"; | 34 | const char *progname = "check_procs"; |
35 | const char *program_name = "check_procs"; /* Required for coreutils libs */ | 35 | const char *program_name = "check_procs"; /* Required for coreutils libs */ |
36 | const char *copyright = "2000-2008"; | 36 | const char *copyright = "2000-2008"; |
37 | const char *email = "devel@nagios-plugins.org"; | 37 | const char *email = "devel@monitoring-plugins.org"; |
38 | 38 | ||
39 | #include "common.h" | 39 | #include "common.h" |
40 | #include "utils.h" | 40 | #include "utils.h" |
@@ -123,6 +123,7 @@ main (int argc, char **argv) | |||
123 | char *procprog; | 123 | char *procprog; |
124 | 124 | ||
125 | pid_t mypid = 0; | 125 | pid_t mypid = 0; |
126 | pid_t myppid = 0; | ||
126 | struct stat statbuf; | 127 | struct stat statbuf; |
127 | dev_t mydev = 0; | 128 | dev_t mydev = 0; |
128 | ino_t myino = 0; | 129 | ino_t myino = 0; |
@@ -172,6 +173,7 @@ main (int argc, char **argv) | |||
172 | 173 | ||
173 | /* find ourself */ | 174 | /* find ourself */ |
174 | mypid = getpid(); | 175 | mypid = getpid(); |
176 | myppid = getppid(); | ||
175 | if (usepid || stat_exe(mypid, &statbuf) == -1) { | 177 | if (usepid || stat_exe(mypid, &statbuf) == -1) { |
176 | /* usepid might have been set by -T */ | 178 | /* usepid might have been set by -T */ |
177 | usepid = 1; | 179 | usepid = 1; |
@@ -241,6 +243,12 @@ main (int argc, char **argv) | |||
241 | printf("not considering - is myself or gone\n"); | 243 | printf("not considering - is myself or gone\n"); |
242 | continue; | 244 | continue; |
243 | } | 245 | } |
246 | /* Ignore parent*/ | ||
247 | else if (myppid == procpid) { | ||
248 | if (verbose >= 3) | ||
249 | printf("not considering - is parent\n"); | ||
250 | continue; | ||
251 | } | ||
244 | 252 | ||
245 | /* filter kernel threads (childs of KTHREAD_PARENT)*/ | 253 | /* filter kernel threads (childs of KTHREAD_PARENT)*/ |
246 | /* TODO adapt for other OSes than GNU/Linux | 254 | /* TODO adapt for other OSes than GNU/Linux |
@@ -707,7 +715,7 @@ print_help (void) | |||
707 | #if defined( __linux__ ) | 715 | #if defined( __linux__ ) |
708 | printf (" %s\n", _("ELAPSED - time elapsed in seconds")); | 716 | printf (" %s\n", _("ELAPSED - time elapsed in seconds")); |
709 | #endif /* defined(__linux__) */ | 717 | #endif /* defined(__linux__) */ |
710 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 718 | printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
711 | 719 | ||
712 | printf (" %s\n", "-v, --verbose"); | 720 | printf (" %s\n", "-v, --verbose"); |
713 | printf (" %s\n", _("Extra information. Up to 3 verbosity levels")); | 721 | printf (" %s\n", _("Extra information. Up to 3 verbosity levels")); |
diff --git a/plugins/check_radius.c b/plugins/check_radius.c index d42df09..3481f0c 100644 --- a/plugins/check_radius.c +++ b/plugins/check_radius.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_radius plugin | 3 | * Monitoring check_radius plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2008 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2008 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | const char *progname = "check_radius"; | 31 | const char *progname = "check_radius"; |
32 | const char *copyright = "2000-2008"; | 32 | const char *copyright = "2000-2008"; |
33 | const char *email = "devel@nagios-plugins.org"; | 33 | const char *email = "devel@monitoring-plugins.org"; |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include "utils.h" | 36 | #include "utils.h" |
@@ -361,7 +361,7 @@ print_help (void) | |||
361 | printf (" %s\n", "-r, --retries=INTEGER"); | 361 | printf (" %s\n", "-r, --retries=INTEGER"); |
362 | printf (" %s\n", _("Number of times to retry a failed connection")); | 362 | printf (" %s\n", _("Number of times to retry a failed connection")); |
363 | 363 | ||
364 | printf (UT_TIMEOUT, timeout_interval); | 364 | printf (UT_CONN_TIMEOUT, timeout_interval); |
365 | 365 | ||
366 | printf ("\n"); | 366 | printf ("\n"); |
367 | printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections.")); | 367 | printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections.")); |
@@ -370,8 +370,8 @@ print_help (void) | |||
370 | printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); | 370 | printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); |
371 | printf ("%s\n", _("The password option presents a substantial security issue because the")); | 371 | printf ("%s\n", _("The password option presents a substantial security issue because the")); |
372 | printf ("%s\n", _("password can possibly be determined by careful watching of the command line")); | 372 | printf ("%s\n", _("password can possibly be determined by careful watching of the command line")); |
373 | printf ("%s\n", _("in a process listing. This risk is exacerbated because nagios will")); | 373 | printf ("%s\n", _("in a process listing. This risk is exacerbated because the plugin will")); |
374 | printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that")); | 374 | printf ("%s\n", _("typically be executed at regular predictable intervals. Please be sure that")); |
375 | printf ("%s\n", _("the password used does not allow access to sensitive system resources.")); | 375 | printf ("%s\n", _("the password used does not allow access to sensitive system resources.")); |
376 | 376 | ||
377 | printf (UT_SUPPORT); | 377 | printf (UT_SUPPORT); |
diff --git a/plugins/check_real.c b/plugins/check_real.c index 2fe4c5c..47776c5 100644 --- a/plugins/check_real.c +++ b/plugins/check_real.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_real plugin | 3 | * Monitoring check_real plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | const char *progname = "check_real"; | 31 | const char *progname = "check_real"; |
32 | const char *copyright = "2000-2007"; | 32 | const char *copyright = "2000-2007"; |
33 | const char *email = "devel@nagios-plugins.org"; | 33 | const char *email = "devel@monitoring-plugins.org"; |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include "netutils.h" | 36 | #include "netutils.h" |
@@ -429,7 +429,7 @@ print_help (void) | |||
429 | 429 | ||
430 | printf (UT_WARN_CRIT); | 430 | printf (UT_WARN_CRIT); |
431 | 431 | ||
432 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 432 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
433 | 433 | ||
434 | printf (UT_VERBOSE); | 434 | printf (UT_VERBOSE); |
435 | 435 | ||
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 27313c4..2430453 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_smtp plugin | 3 | * Monitoring check_smtp plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | const char *progname = "check_smtp"; | 31 | const char *progname = "check_smtp"; |
32 | const char *copyright = "2000-2007"; | 32 | const char *copyright = "2000-2007"; |
33 | const char *email = "devel@nagios-plugins.org"; | 33 | const char *email = "devel@monitoring-plugins.org"; |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include "netutils.h" | 36 | #include "netutils.h" |
@@ -822,7 +822,7 @@ print_help (void) | |||
822 | 822 | ||
823 | printf (UT_WARN_CRIT); | 823 | printf (UT_WARN_CRIT); |
824 | 824 | ||
825 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 825 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
826 | 826 | ||
827 | printf (UT_VERBOSE); | 827 | printf (UT_VERBOSE); |
828 | 828 | ||
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 34504bf..ca17970 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_snmp plugin | 3 | * Monitoring check_snmp plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | const char *progname = "check_snmp"; | 31 | const char *progname = "check_snmp"; |
32 | const char *copyright = "1999-2007"; | 32 | const char *copyright = "1999-2007"; |
33 | const char *email = "devel@nagios-plugins.org"; | 33 | const char *email = "devel@monitoring-plugins.org"; |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include "runcmd.h" | 36 | #include "runcmd.h" |
@@ -1160,7 +1160,7 @@ print_help (void) | |||
1160 | printf (" %s\n", "-D, --output-delimiter=STRING"); | 1160 | printf (" %s\n", "-D, --output-delimiter=STRING"); |
1161 | printf (" %s\n", _("Separates output on multiple OID requests")); | 1161 | printf (" %s\n", _("Separates output on multiple OID requests")); |
1162 | 1162 | ||
1163 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 1163 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
1164 | printf (" %s\n", "-e, --retries=INTEGER"); | 1164 | printf (" %s\n", "-e, --retries=INTEGER"); |
1165 | printf (" %s\n", _("Number of retries to be used in the requests")); | 1165 | printf (" %s\n", _("Number of retries to be used in the requests")); |
1166 | 1166 | ||
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c index 2d63528..5c75d27 100644 --- a/plugins/check_ssh.c +++ b/plugins/check_ssh.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_ssh plugin | 3 | * Monitoring check_ssh plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | const char *progname = "check_ssh"; | 31 | const char *progname = "check_ssh"; |
32 | const char *copyright = "2000-2007"; | 32 | const char *copyright = "2000-2007"; |
33 | const char *email = "devel@nagios-plugins.org"; | 33 | const char *email = "devel@monitoring-plugins.org"; |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include "netutils.h" | 36 | #include "netutils.h" |
@@ -293,7 +293,7 @@ print_help (void) | |||
293 | 293 | ||
294 | printf (UT_IPv46); | 294 | printf (UT_IPv46); |
295 | 295 | ||
296 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 296 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
297 | 297 | ||
298 | printf (" %s\n", "-r, --remote-version=STRING"); | 298 | printf (" %s\n", "-r, --remote-version=STRING"); |
299 | printf (" %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)")); | 299 | printf (" %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)")); |
diff --git a/plugins/check_swap.c b/plugins/check_swap.c index 7cbd46b..ce510e1 100644 --- a/plugins/check_swap.c +++ b/plugins/check_swap.c | |||
@@ -1,10 +1,10 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_disk plugin | 3 | * Monitoring check_disk plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) | 6 | * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) |
7 | * Copyright (c) 2000-2007 Nagios Plugins Development Team | 7 | * Copyright (c) 2000-2007 Monitoring Plugins Development Team |
8 | * | 8 | * |
9 | * Description: | 9 | * Description: |
10 | * | 10 | * |
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | const char *progname = "check_swap"; | 30 | const char *progname = "check_swap"; |
31 | const char *copyright = "2000-2007"; | 31 | const char *copyright = "2000-2007"; |
32 | const char *email = "devel@nagios-plugins.org"; | 32 | const char *email = "devel@monitoring-plugins.org"; |
33 | 33 | ||
34 | #include "common.h" | 34 | #include "common.h" |
35 | #include "popen.h" | 35 | #include "popen.h" |
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index 89f52cc..2714961 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_tcp plugin | 3 | * Monitoring check_tcp plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2013 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2013 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -30,7 +30,7 @@ | |||
30 | /* progname "check_tcp" changes depending on symlink called */ | 30 | /* progname "check_tcp" changes depending on symlink called */ |
31 | char *progname; | 31 | char *progname; |
32 | const char *copyright = "1999-2008"; | 32 | const char *copyright = "1999-2008"; |
33 | const char *email = "devel@nagios-plugins.org"; | 33 | const char *email = "devel@monitoring-plugins.org"; |
34 | 34 | ||
35 | #include <ctype.h> | 35 | #include <ctype.h> |
36 | 36 | ||
@@ -670,7 +670,7 @@ print_help (void) | |||
670 | 670 | ||
671 | printf (UT_WARN_CRIT); | 671 | printf (UT_WARN_CRIT); |
672 | 672 | ||
673 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 673 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
674 | 674 | ||
675 | printf (UT_VERBOSE); | 675 | printf (UT_VERBOSE); |
676 | 676 | ||
diff --git a/plugins/check_time.c b/plugins/check_time.c index 719645f..3943742 100644 --- a/plugins/check_time.c +++ b/plugins/check_time.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_time plugin | 3 | * Monitoring check_time plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 1999-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | const char *progname = "check_time"; | 31 | const char *progname = "check_time"; |
32 | const char *copyright = "1999-2007"; | 32 | const char *copyright = "1999-2007"; |
33 | const char *email = "devel@nagios-plugins.org"; | 33 | const char *email = "devel@monitoring-plugins.org"; |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include "netutils.h" | 36 | #include "netutils.h" |
@@ -358,7 +358,7 @@ print_help (void) | |||
358 | printf (" %s\n", "-C, --critical-connect=INTEGER"); | 358 | printf (" %s\n", "-C, --critical-connect=INTEGER"); |
359 | printf (" %s\n", _("Response time (sec.) necessary to result in critical status")); | 359 | printf (" %s\n", _("Response time (sec.) necessary to result in critical status")); |
360 | 360 | ||
361 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 361 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
362 | 362 | ||
363 | printf (UT_SUPPORT); | 363 | printf (UT_SUPPORT); |
364 | } | 364 | } |
diff --git a/plugins/check_ups.c b/plugins/check_ups.c index aaf62f0..7cced49 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c | |||
@@ -1,16 +1,16 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_ups plugin | 3 | * Monitoring check_ups plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000 Tom Shields | 6 | * Copyright (c) 2000 Tom Shields |
7 | * 2004 Alain Richard <alain.richard@equation.fr> | 7 | * 2004 Alain Richard <alain.richard@equation.fr> |
8 | * 2004 Arnaud Quette <arnaud.quette@mgeups.com> | 8 | * 2004 Arnaud Quette <arnaud.quette@mgeups.com> |
9 | * Copyright (c) 2002-2007 Nagios Plugins Development Team | 9 | * Copyright (c) 2002-2007 Monitoring Plugins Development Team |
10 | * | 10 | * |
11 | * Description: | 11 | * Description: |
12 | * | 12 | * |
13 | * This file contains Network UPS Tools plugin for Nagios | 13 | * This file contains Network UPS Tools plugin for Monitoring |
14 | * | 14 | * |
15 | * This plugin tests the UPS service on the specified host. Network UPS Tools | 15 | * This plugin tests the UPS service on the specified host. Network UPS Tools |
16 | * from www.networkupstools.org must be running for this plugin to work. | 16 | * from www.networkupstools.org must be running for this plugin to work. |
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | const char *progname = "check_ups"; | 35 | const char *progname = "check_ups"; |
36 | const char *copyright = "2000-2007"; | 36 | const char *copyright = "2000-2007"; |
37 | const char *email = "devel@nagios-plugins.org"; | 37 | const char *email = "devel@monitoring-plugins.org"; |
38 | 38 | ||
39 | #include "common.h" | 39 | #include "common.h" |
40 | #include "netutils.h" | 40 | #include "netutils.h" |
@@ -625,7 +625,7 @@ print_help (void) | |||
625 | 625 | ||
626 | printf (UT_WARN_CRIT); | 626 | printf (UT_WARN_CRIT); |
627 | 627 | ||
628 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 628 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
629 | 629 | ||
630 | /* TODO: -v clashing with -v/-variable. Commenting out help text since verbose | 630 | /* TODO: -v clashing with -v/-variable. Commenting out help text since verbose |
631 | is unused up to now */ | 631 | is unused up to now */ |
diff --git a/plugins/check_users.c b/plugins/check_users.c index 04ff5c0..458a7ca 100644 --- a/plugins/check_users.c +++ b/plugins/check_users.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios check_users plugin | 3 | * Monitoring check_users plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2012 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2012 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | const char *progname = "check_users"; | 33 | const char *progname = "check_users"; |
34 | const char *copyright = "2000-2007"; | 34 | const char *copyright = "2000-2007"; |
35 | const char *email = "devel@nagios-plugins.org"; | 35 | const char *email = "devel@monitoring-plugins.org"; |
36 | 36 | ||
37 | #include "common.h" | 37 | #include "common.h" |
38 | #include "utils.h" | 38 | #include "utils.h" |
diff --git a/plugins/common.h b/plugins/common.h index f135838..01003b3 100644 --- a/plugins/common.h +++ b/plugins/common.h | |||
@@ -1,10 +1,10 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios plugins common include file | 3 | * Monitoring Plugins common include file |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) | 6 | * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) |
7 | * Copyright (c) 2003-2007 Nagios Plugins Development Team | 7 | * Copyright (c) 2003-2007 Monitoring Plugins Development Team |
8 | * | 8 | * |
9 | * Description: | 9 | * Description: |
10 | * | 10 | * |
diff --git a/plugins/negate.c b/plugins/negate.c index 81a0821..84ad7eb 100644 --- a/plugins/negate.c +++ b/plugins/negate.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios negate plugin | 3 | * Monitoring negate plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2002-2008 Nagios Plugins Development Team | 6 | * Copyright (c) 2002-2008 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | const char *progname = "negate"; | 32 | const char *progname = "negate"; |
33 | const char *copyright = "2002-2008"; | 33 | const char *copyright = "2002-2008"; |
34 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
35 | 35 | ||
36 | #define DEFAULT_TIMEOUT 11 | 36 | #define DEFAULT_TIMEOUT 11 |
37 | 37 | ||
@@ -252,7 +252,7 @@ print_help (void) | |||
252 | 252 | ||
253 | printf (UT_HELP_VRSN); | 253 | printf (UT_HELP_VRSN); |
254 | 254 | ||
255 | printf (UT_TIMEOUT, timeout_interval); | 255 | printf (UT_PLUG_TIMEOUT, timeout_interval); |
256 | printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status.")); | 256 | printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status.")); |
257 | printf (" -T, --timeout-result=STATUS\n"); | 257 | printf (" -T, --timeout-result=STATUS\n"); |
258 | printf (" %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n")); | 258 | printf (" %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n")); |
diff --git a/plugins/netutils.c b/plugins/netutils.c index 9f18723..0044046 100644 --- a/plugins/netutils.c +++ b/plugins/netutils.c | |||
@@ -1,10 +1,10 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios plugins network utilities | 3 | * Monitoring Plugins network utilities |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) | 6 | * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) |
7 | * Copyright (c) 2003-2008 Nagios Plugins Development Team | 7 | * Copyright (c) 2003-2008 Monitoring Plugins Development Team |
8 | * | 8 | * |
9 | * Description: | 9 | * Description: |
10 | * | 10 | * |
diff --git a/plugins/netutils.h b/plugins/netutils.h index 347509e..c5aa18f 100644 --- a/plugins/netutils.h +++ b/plugins/netutils.h | |||
@@ -1,10 +1,10 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios plugins net utilities include file | 3 | * Monitoring Plugins net utilities include file |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) | 6 | * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) |
7 | * Copyright (c) 2003-2007 Nagios Plugins Development Team | 7 | * Copyright (c) 2003-2007 Monitoring Plugins Development Team |
8 | * | 8 | * |
9 | * Description: | 9 | * Description: |
10 | * | 10 | * |
diff --git a/plugins/popen.c b/plugins/popen.c index 716bd52..592263f 100644 --- a/plugins/popen.c +++ b/plugins/popen.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios plugins popen | 3 | * Monitoring Plugins popen |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2005-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2005-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
diff --git a/plugins/runcmd.c b/plugins/runcmd.c index 8aba1e3..4352e60 100644 --- a/plugins/runcmd.c +++ b/plugins/runcmd.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios run command utilities | 3 | * Monitoring run command utilities |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2005-2006 Nagios Plugins Development Team | 6 | * Copyright (c) 2005-2006 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description : | 8 | * Description : |
9 | * | 9 | * |
diff --git a/plugins/runcmd.h b/plugins/runcmd.h index fe66067..2dcdadf 100644 --- a/plugins/runcmd.h +++ b/plugins/runcmd.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | * | 2 | * |
3 | * License: GPL | 3 | * License: GPL |
4 | * Copyright (c) 2005 Nagios Plugins Development Team | 4 | * Copyright (c) 2005 Monitoring Plugins Development Team |
5 | * Author: Andreas Ericsson <ae@op5.se> | 5 | * Author: Andreas Ericsson <ae@op5.se> |
6 | * | 6 | * |
7 | * | 7 | * |
diff --git a/plugins/sslutils.c b/plugins/sslutils.c index 2ec9190..2732125 100644 --- a/plugins/sslutils.c +++ b/plugins/sslutils.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios plugins SSL utilities | 3 | * Monitoring Plugins SSL utilities |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2005-2010 Nagios Plugins Development Team | 6 | * Copyright (c) 2005-2010 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t index 39b4ca9..7e0f74b 100644 --- a/plugins/t/check_disk.t +++ b/plugins/t/check_disk.t | |||
@@ -4,7 +4,7 @@ | |||
4 | # | 4 | # |
5 | # | 5 | # |
6 | 6 | ||
7 | # TODO: Add in tests for perf data. Need to beef up Nagios::Plugin::Performance to cater for max, min, etc | 7 | # TODO: Add in tests for perf data. Need to beef up Monitoring::Plugin::Performance to cater for max, min, etc |
8 | 8 | ||
9 | use strict; | 9 | use strict; |
10 | use Test::More; | 10 | use Test::More; |
@@ -37,7 +37,7 @@ cmp_ok( $c, '==', 2, "Got two mountpoints in output"); | |||
37 | 37 | ||
38 | 38 | ||
39 | # Get perf data | 39 | # Get perf data |
40 | # Should use Nagios::Plugin | 40 | # Should use Monitoring::Plugin |
41 | my @perf_data = sort(split(/ /, $result->perf_output)); | 41 | my @perf_data = sort(split(/ /, $result->perf_output)); |
42 | 42 | ||
43 | 43 | ||
diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t index 64aaf0c..2c903db 100644 --- a/plugins/t/check_dns.t +++ b/plugins/t/check_dns.t | |||
@@ -17,7 +17,7 @@ my $successOutput = '/DNS OK: [\.0-9]+ seconds? response time/'; | |||
17 | my $hostname_valid = getTestParameter( | 17 | my $hostname_valid = getTestParameter( |
18 | "NP_HOSTNAME_VALID", | 18 | "NP_HOSTNAME_VALID", |
19 | "A valid (known to DNS) hostname", | 19 | "A valid (known to DNS) hostname", |
20 | "nagios.com" | 20 | "monitoring-plugins.org" |
21 | ); | 21 | ); |
22 | 22 | ||
23 | my $hostname_valid_ip = getTestParameter( | 23 | my $hostname_valid_ip = getTestParameter( |
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t index 29cac69..2539a28 100644 --- a/plugins/t/check_http.t +++ b/plugins/t/check_http.t | |||
@@ -31,8 +31,8 @@ my $internet_access = getTestParameter( "NP_INTERNET_ACCESS", | |||
31 | "yes"); | 31 | "yes"); |
32 | 32 | ||
33 | my $host_tcp_http2 = getTestParameter( "NP_HOST_TCP_HTTP2", | 33 | my $host_tcp_http2 = getTestParameter( "NP_HOST_TCP_HTTP2", |
34 | "A host providing an index page containing the string 'nagios'", | 34 | "A host providing an index page containing the string 'monitoring'", |
35 | "nagios.org" ); | 35 | "test.monitoring-plugins.org" ); |
36 | 36 | ||
37 | 37 | ||
38 | $res = NPTest->testCmd( | 38 | $res = NPTest->testCmd( |
@@ -62,23 +62,23 @@ cmp_ok( $res->return_code, '==', 2, "Webserver $hostname_invalid not valid" ); | |||
62 | like( $res->output, "/Unable to open TCP socket|Socket timeout after/", "Output OK"); | 62 | like( $res->output, "/Unable to open TCP socket|Socket timeout after/", "Output OK"); |
63 | 63 | ||
64 | SKIP: { | 64 | SKIP: { |
65 | skip "No host serving nagios in index file", 7 unless $host_tcp_http2; | 65 | skip "No host serving monitoring in index file", 7 unless $host_tcp_http2; |
66 | 66 | ||
67 | $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios'" ); | 67 | $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'monitoring'" ); |
68 | cmp_ok( $res->return_code, "==", 0, "Got a reference to 'nagios'"); | 68 | cmp_ok( $res->return_code, "==", 0, "Got a reference to 'monitoring'"); |
69 | 69 | ||
70 | $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs'" ); | 70 | $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'mONiTORing'" ); |
71 | cmp_ok( $res->return_code, "==", 2, "Not got 'nAGiOs'"); | 71 | cmp_ok( $res->return_code, "==", 2, "Not got 'mONiTORing'"); |
72 | like ( $res->output, "/pattern not found/", "Error message says 'pattern not found'"); | 72 | like ( $res->output, "/pattern not found/", "Error message says 'pattern not found'"); |
73 | 73 | ||
74 | $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -R 'nAGiOs'" ); | 74 | $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -R 'mONiTORing'" ); |
75 | cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'nAGiOs'"); | 75 | cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'mONiTORing'"); |
76 | 76 | ||
77 | $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios' --invert-regex" ); | 77 | $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'monitoring' --invert-regex" ); |
78 | cmp_ok( $res->return_code, "==", 2, "Invert results work when found"); | 78 | cmp_ok( $res->return_code, "==", 2, "Invert results work when found"); |
79 | like ( $res->output, "/pattern found/", "Error message says 'pattern found'"); | 79 | like ( $res->output, "/pattern found/", "Error message says 'pattern found'"); |
80 | 80 | ||
81 | $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs' --invert-regex" ); | 81 | $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'mONiTORing' --invert-regex" ); |
82 | cmp_ok( $res->return_code, "==", 0, "And also when not found"); | 82 | cmp_ok( $res->return_code, "==", 0, "And also when not found"); |
83 | } | 83 | } |
84 | SKIP: { | 84 | SKIP: { |
diff --git a/plugins/t/check_procs.t b/plugins/t/check_procs.t index 1dea564..ca4acdd 100644 --- a/plugins/t/check_procs.t +++ b/plugins/t/check_procs.t | |||
@@ -13,7 +13,7 @@ my $t; | |||
13 | if (`uname -s` eq "SunOS\n" && ! -x "/usr/local/nagios/libexec/pst3") { | 13 | if (`uname -s` eq "SunOS\n" && ! -x "/usr/local/nagios/libexec/pst3") { |
14 | plan skip_all => "Ignoring tests on solaris because of pst3"; | 14 | plan skip_all => "Ignoring tests on solaris because of pst3"; |
15 | } else { | 15 | } else { |
16 | plan tests => 12; | 16 | plan tests => 14; |
17 | } | 17 | } |
18 | 18 | ||
19 | my $result; | 19 | my $result; |
@@ -26,6 +26,11 @@ $result = NPTest->testCmd( "./check_procs -w 100000 -c 100000 -s Z" ); | |||
26 | is( $result->return_code, 0, "Checking less than 100000 zombie processes" ); | 26 | is( $result->return_code, 0, "Checking less than 100000 zombie processes" ); |
27 | like( $result->output, '/^PROCS OK: [0-9]+ process(es)? with /', "Output correct" ); | 27 | like( $result->output, '/^PROCS OK: [0-9]+ process(es)? with /', "Output correct" ); |
28 | 28 | ||
29 | if(fork() == 0) { exec("sleep 7"); } # fork a test process | ||
30 | $result = NPTest->testCmd( "./check_procs -a 'sleep 7'" ); | ||
31 | is( $result->return_code, 0, "Parent process is ignored" ); | ||
32 | like( $result->output, '/^PROCS OK: 1 process?/', "Output correct" ); | ||
33 | |||
29 | $result = NPTest->testCmd( "./check_procs -w 0 -c 100000" ); | 34 | $result = NPTest->testCmd( "./check_procs -w 0 -c 100000" ); |
30 | is( $result->return_code, 1, "Checking warning if processes > 0" ); | 35 | is( $result->return_code, 1, "Checking warning if processes > 0" ); |
31 | like( $result->output, '/^PROCS WARNING: [0-9]+ process(es)? | procs=[0-9]+;0;100000;0;$/', "Output correct" ); | 36 | like( $result->output, '/^PROCS WARNING: [0-9]+ process(es)? | procs=[0-9]+;0;100000;0;$/', "Output correct" ); |
diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t index c3085e1..2c89beb 100755 --- a/plugins/tests/check_http.t +++ b/plugins/tests/check_http.t | |||
@@ -7,7 +7,7 @@ | |||
7 | # Country Name (2 letter code) [AU]:UK | 7 | # Country Name (2 letter code) [AU]:UK |
8 | # State or Province Name (full name) [Some-State]:Derbyshire | 8 | # State or Province Name (full name) [Some-State]:Derbyshire |
9 | # Locality Name (eg, city) []:Belper | 9 | # Locality Name (eg, city) []:Belper |
10 | # Organization Name (eg, company) [Internet Widgits Pty Ltd]:Nagios Plugins | 10 | # Organization Name (eg, company) [Internet Widgits Pty Ltd]:Monitoring Plugins |
11 | # Organizational Unit Name (eg, section) []: | 11 | # Organizational Unit Name (eg, section) []: |
12 | # Common Name (eg, YOUR name) []:Ton Voon | 12 | # Common Name (eg, YOUR name) []:Ton Voon |
13 | # Email Address []:tonvoon@mac.com | 13 | # Email Address []:tonvoon@mac.com |
diff --git a/plugins/tests/var/ps_axwo.debian b/plugins/tests/var/ps_axwo.debian index 0d7d7bc..37a2d35 100644 --- a/plugins/tests/var/ps_axwo.debian +++ b/plugins/tests/var/ps_axwo.debian | |||
@@ -31,7 +31,7 @@ S 0 6907 1 2308 892 0.0 mysqld_safe /bin/sh /usr/bin/mysqld_ | |||
31 | S 103 6944 6907 123220 27724 0.0 mysqld /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --user=mysql --pid-file=/var/run/mysqld/mysqld.pid --skip-locking --port=3306 --socket=/var/run/mysqld/mysqld.sock | 31 | S 103 6944 6907 123220 27724 0.0 mysqld /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --user=mysql --pid-file=/var/run/mysqld/mysqld.pid --skip-locking --port=3306 --socket=/var/run/mysqld/mysqld.sock |
32 | S 0 6945 6907 1488 420 0.0 logger logger -p daemon.err -t mysqld_safe -i -t mysqld | 32 | S 0 6945 6907 1488 420 0.0 logger logger -p daemon.err -t mysqld_safe -i -t mysqld |
33 | S 1001 17778 1 6436 1588 0.0 snmpd /usr/sbin/snmpd -u nagios -Lsd -Lf /dev/null -p/var/run/snmpd.pid | 33 | S 1001 17778 1 6436 1588 0.0 snmpd /usr/sbin/snmpd -u nagios -Lsd -Lf /dev/null -p/var/run/snmpd.pid |
34 | Ss 0 17789 1 9496 5556 0.0 snmptrapd /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/nagios/snmp/load -p /var/run/snmptrapd.pid | 34 | Ss 0 17789 1 9496 5556 0.0 snmptrapd /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/monitoring/snmp/load -p /var/run/snmptrapd.pid |
35 | Ss 0 847 2319 14452 1752 0.0 sshd sshd: tonvoon [priv] | 35 | Ss 0 847 2319 14452 1752 0.0 sshd sshd: tonvoon [priv] |
36 | S 1000 857 847 14616 1832 0.0 sshd sshd: tonvoon@pts/3 | 36 | S 1000 857 847 14616 1832 0.0 sshd sshd: tonvoon@pts/3 |
37 | Ss 1000 860 857 2984 1620 0.0 bash -bash | 37 | Ss 1000 860 857 2984 1620 0.0 bash -bash |
@@ -79,6 +79,6 @@ Ss 1001 23783 1 3220 764 0.0 ndo2db /usr/local/nagios/bin/nd | |||
79 | Ss 1001 23784 1 6428 4948 0.0 import_ndologsd import_ndologsd | 79 | Ss 1001 23784 1 6428 4948 0.0 import_ndologsd import_ndologsd |
80 | S+ 1001 9803 18955 4132 1936 0.0 ssh ssh altinity@cube02.lei.altinity | 80 | S+ 1001 9803 18955 4132 1936 0.0 ssh ssh altinity@cube02.lei.altinity |
81 | S 1001 22505 22324 20256 1616 0.0 nagios ../../bin/nagios -d /usr/local/nagios/etc/nagios.cfg | 81 | S 1001 22505 22324 20256 1616 0.0 nagios ../../bin/nagios -d /usr/local/nagios/etc/nagios.cfg |
82 | S 1001 22506 22505 1676 608 0.0 check_ping /usr/local/nagios/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1 | 82 | S 1001 22506 22505 1676 608 0.0 check_ping /usr/local/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1 |
83 | S 1001 22507 22506 1660 492 0.0 ping /bin/ping -n -U -w 10 -c 1 192.168.10.23 | 83 | S 1001 22507 22506 1660 492 0.0 ping /bin/ping -n -U -w 10 -c 1 192.168.10.23 |
84 | R+ 1001 22508 23370 2308 680 0.0 ps ps axwo stat uid pid ppid vsz rss pcpu comm args | 84 | R+ 1001 22508 23370 2308 680 0.0 ps ps axwo stat uid pid ppid vsz rss pcpu comm args |
diff --git a/plugins/urlize.c b/plugins/urlize.c index ef2de82..6fda72d 100644 --- a/plugins/urlize.c +++ b/plugins/urlize.c | |||
@@ -1,17 +1,16 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | * | 2 | * |
3 | * Nagios urlize plugin | 3 | * Monitoring urlize plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2000-2007 Monitoring Plugins Development Team |
7 | * | 7 | * |
8 | * Description: | 8 | * Description: |
9 | * | 9 | * |
10 | * This file contains the urlize plugin | 10 | * This file contains the urlize plugin |
11 | * | 11 | * |
12 | * This plugin wraps the text output of another command (plugin) in HTML <A> | 12 | * This plugin wraps the text output of another command (plugin) in HTML <A> |
13 | * tags, thus displaying the child plugin's output as a clickable link in the | 13 | * tags. This plugin returns the status of the invoked plugin. |
14 | * Nagios status screen. This plugin returns the status of the invoked plugin. | ||
15 | * | 14 | * |
16 | * | 15 | * |
17 | * This program is free software: you can redistribute it and/or modify | 16 | * This program is free software: you can redistribute it and/or modify |
@@ -32,7 +31,7 @@ | |||
32 | 31 | ||
33 | const char *progname = "urlize"; | 32 | const char *progname = "urlize"; |
34 | const char *copyright = "2000-2006"; | 33 | const char *copyright = "2000-2006"; |
35 | const char *email = "devel@nagios-plugins.org"; | 34 | const char *email = "devel@monitoring-plugins.org"; |
36 | 35 | ||
37 | #include "common.h" | 36 | #include "common.h" |
38 | #include "utils.h" | 37 | #include "utils.h" |
@@ -166,9 +165,9 @@ print_help (void) | |||
166 | printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"); | 165 | printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"); |
167 | printf (COPYRIGHT, copyright, email); | 166 | printf (COPYRIGHT, copyright, email); |
168 | 167 | ||
169 | printf ("%s\n", _("This plugin wraps the text output of another command (plugin)")); | 168 | printf ("%s\n", _("This plugin wraps the text output of another command (plugin) in HTML <A>")); |
170 | printf ("%s\n", _("in HTML <A> tags, thus displaying the child plugin's output as a clickable link in")); | 169 | printf ("%s\n", _("tags, thus displaying the child plugin's output as a clickable link in compatible")); |
171 | printf ("%s\n", _("the Nagios status screen. This plugin returns the status of the invoked plugin.")); | 170 | printf ("%s\n", _("monitoring status screen. This plugin returns the status of the invoked plugin.")); |
172 | 171 | ||
173 | printf ("\n\n"); | 172 | printf ("\n\n"); |
174 | 173 | ||
diff --git a/plugins/utils.c b/plugins/utils.c index b57d5e1..58b153d 100644 --- a/plugins/utils.c +++ b/plugins/utils.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net) | 6 | * Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net) |
7 | * Copyright (c) 2002-2007 Nagios Plugin Development Team | 7 | * Copyright (c) 2002-2007 Monitoring Plugins Development Team |
8 | * | 8 | * |
9 | * This program is free software: you can redistribute it and/or modify | 9 | * This program is free software: you can redistribute it and/or modify |
10 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
diff --git a/plugins/utils.h b/plugins/utils.h index 325d6f0..1f37654 100644 --- a/plugins/utils.h +++ b/plugins/utils.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifndef NP_UTILS_H | 1 | #ifndef NP_UTILS_H |
2 | #define NP_UTILS_H | 2 | #define NP_UTILS_H |
3 | /* Header file for nagios plugins utils.c */ | 3 | /* Header file for monitoring plugins utils.c */ |
4 | 4 | ||
5 | /* This file should be included in all plugins */ | 5 | /* This file should be included in all plugins */ |
6 | 6 | ||
@@ -131,7 +131,7 @@ char *fperfdata (const char *, | |||
131 | {"warning",required_argument,0,'w'},\ | 131 | {"warning",required_argument,0,'w'},\ |
132 | {"hostname",required_argument,0,'H'} | 132 | {"hostname",required_argument,0,'H'} |
133 | 133 | ||
134 | #define COPYRIGHT "Copyright (c) %s Nagios Plugin Development Team\n\ | 134 | #define COPYRIGHT "Copyright (c) %s Monitoring Plugins Development Team\n\ |
135 | \t<%s>\n\n" | 135 | \t<%s>\n\n" |
136 | 136 | ||
137 | #define UT_HLP_VRS _("\ | 137 | #define UT_HLP_VRS _("\ |
@@ -159,7 +159,8 @@ char *fperfdata (const char *, | |||
159 | 159 | ||
160 | #define UT_VERBOSE _("\ | 160 | #define UT_VERBOSE _("\ |
161 | -v, --verbose\n\ | 161 | -v, --verbose\n\ |
162 | Show details for command-line debugging (Nagios may truncate output)\n") | 162 | Show details for command-line debugging (output may be truncated by\n\ |
163 | the monitoring system)\n") | ||
163 | 164 | ||
164 | #define UT_WARN_CRIT _("\ | 165 | #define UT_WARN_CRIT _("\ |
165 | -w, --warning=DOUBLE\n\ | 166 | -w, --warning=DOUBLE\n\ |
@@ -173,15 +174,19 @@ char *fperfdata (const char *, | |||
173 | -c, --critical=RANGE\n\ | 174 | -c, --critical=RANGE\n\ |
174 | Critical range\n") | 175 | Critical range\n") |
175 | 176 | ||
176 | #define UT_TIMEOUT _("\ | 177 | #define UT_CONN_TIMEOUT _("\ |
177 | -t, --timeout=INTEGER\n\ | 178 | -t, --timeout=INTEGER\n\ |
178 | Seconds before connection times out (default: %d)\n") | 179 | Seconds before connection times out (default: %d)\n") |
179 | 180 | ||
181 | #define UT_PLUG_TIMEOUT _("\ | ||
182 | -t, --timeout=INTEGER\n\ | ||
183 | Seconds before plugin times out (default: %d)\n") | ||
184 | |||
180 | #ifdef NP_EXTRA_OPTS | 185 | #ifdef NP_EXTRA_OPTS |
181 | #define UT_EXTRA_OPTS _("\ | 186 | #define UT_EXTRA_OPTS _("\ |
182 | --extra-opts=[section][@file]\n\ | 187 | --extra-opts=[section][@file]\n\ |
183 | Read options from an ini file. See\n\ | 188 | Read options from an ini file. See\n\ |
184 | https://www.nagios-plugins.org/doc/extra-opts.html\n\ | 189 | https://www.monitoring-plugins.org/doc/extra-opts.html\n\ |
185 | for usage and examples.\n") | 190 | for usage and examples.\n") |
186 | #else | 191 | #else |
187 | #define UT_EXTRA_OPTS "" | 192 | #define UT_EXTRA_OPTS "" |
@@ -189,16 +194,16 @@ char *fperfdata (const char *, | |||
189 | 194 | ||
190 | #define UT_THRESHOLDS_NOTES _("\ | 195 | #define UT_THRESHOLDS_NOTES _("\ |
191 | See:\n\ | 196 | See:\n\ |
192 | https://www.nagios-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\ | 197 | https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\ |
193 | for THRESHOLD format and examples.\n") | 198 | for THRESHOLD format and examples.\n") |
194 | 199 | ||
195 | #define UT_SUPPORT _("\n\ | 200 | #define UT_SUPPORT _("\n\ |
196 | Send email to help@nagios-plugins.org if you have questions regarding use\n\ | 201 | Send email to help@monitoring-plugins.org if you have questions regarding\n\ |
197 | of this software. To submit patches or suggest improvements, send email to\n\ | 202 | use of this software. To submit patches or suggest improvements, send email\n\ |
198 | devel@nagios-plugins.org\n\n") | 203 | to devel@monitoring-plugins.org\n\n") |
199 | 204 | ||
200 | #define UT_NOWARRANTY _("\n\ | 205 | #define UT_NOWARRANTY _("\n\ |
201 | The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\ | 206 | The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\ |
202 | copies of the plugins under the terms of the GNU General Public License.\n\ | 207 | copies of the plugins under the terms of the GNU General Public License.\n\ |
203 | For more information about these matters, see the file named COPYING.\n") | 208 | For more information about these matters, see the file named COPYING.\n") |
204 | 209 | ||