summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Makefile.am2
-rw-r--r--plugins/check_apt.c8
-rw-r--r--plugins/check_by_ssh.c18
-rw-r--r--plugins/check_cluster.c8
-rw-r--r--plugins/check_dbi.c8
-rw-r--r--plugins/check_dig.c18
-rw-r--r--plugins/check_disk.c10
-rw-r--r--plugins/check_dns.c8
-rw-r--r--plugins/check_dummy.c6
-rw-r--r--plugins/check_fping.c6
-rw-r--r--plugins/check_game.c8
-rw-r--r--plugins/check_hpjd.c6
-rw-r--r--plugins/check_http.c10
-rw-r--r--plugins/check_ide_smart.c119
-rw-r--r--plugins/check_ldap.c8
-rw-r--r--plugins/check_load.c6
-rw-r--r--plugins/check_mrtg.c6
-rw-r--r--plugins/check_mrtgtraf.c6
-rw-r--r--plugins/check_mysql.c6
-rw-r--r--plugins/check_mysql_query.c40
-rw-r--r--plugins/check_nagios.c6
-rw-r--r--plugins/check_nt.c8
-rw-r--r--plugins/check_ntp.c12
-rw-r--r--plugins/check_ntp_peer.c8
-rw-r--r--plugins/check_ntp_time.c12
-rw-r--r--plugins/check_nwstat.c8
-rw-r--r--plugins/check_overcr.c8
-rw-r--r--plugins/check_pgsql.c10
-rw-r--r--plugins/check_ping.c14
-rw-r--r--plugins/check_procs.c16
-rw-r--r--plugins/check_radius.c12
-rw-r--r--plugins/check_real.c8
-rw-r--r--plugins/check_smtp.c8
-rw-r--r--plugins/check_snmp.c10
-rw-r--r--plugins/check_ssh.c8
-rw-r--r--plugins/check_swap.c30
-rw-r--r--plugins/check_tcp.c8
-rw-r--r--plugins/check_time.c8
-rw-r--r--plugins/check_ups.c10
-rw-r--r--plugins/check_users.c6
-rw-r--r--plugins/common.h4
-rw-r--r--plugins/negate.c37
-rw-r--r--plugins/netutils.c4
-rw-r--r--plugins/netutils.h4
-rw-r--r--plugins/popen.c4
-rw-r--r--plugins/runcmd.c4
-rw-r--r--plugins/runcmd.h2
-rw-r--r--plugins/sslutils.c4
-rw-r--r--plugins/t/check_disk.t4
-rw-r--r--plugins/t/check_dns.t2
-rw-r--r--plugins/t/check_http.t22
-rw-r--r--plugins/t/check_mysql.t32
-rw-r--r--plugins/t/check_procs.t7
-rw-r--r--plugins/t/negate.t2
-rwxr-xr-xplugins/tests/check_http.t2
-rwxr-xr-x[-rw-r--r--]plugins/tests/check_procs.t30
-rwxr-xr-xplugins/tests/check_snmp.t36
-rw-r--r--plugins/tests/check_snmp_agent.pl14
-rw-r--r--plugins/tests/var/ps_axwo.debian4
-rw-r--r--plugins/urlize.c15
-rw-r--r--plugins/utils.c2
-rw-r--r--plugins/utils.h27
62 files changed, 425 insertions, 354 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 9d34a7c..368876e 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -48,7 +48,7 @@ noinst_LIBRARIES = libnpcommon.a
48libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c \ 48libnpcommon_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
51BASEOBJS = libnpcommon.a ../lib/libnagiosplug.a ../gl/libgnu.a 51BASEOBJS = libnpcommon.a ../lib/libmonitoringplug.a ../gl/libgnu.a
52NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS) 52NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS)
53NETLIBS = $(NETOBJS) $(SOCKETLIBS) 53NETLIBS = $(NETOBJS) $(SOCKETLIBS)
54SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS) 54SSLOBJS = $(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
32const char *progname = "check_apt"; 32const char *progname = "check_apt";
33const char *copyright = "2006-2008"; 33const char *copyright = "2006-2008";
34const char *email = "devel@nagios-plugins.org"; 34const 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
29const char *progname = "check_by_ssh"; 29const char *progname = "check_by_ssh";
30const char *copyright = "2000-2008"; 30const char *copyright = "2000-2008";
31const char *email = "devel@nagios-plugins.org"; 31const 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
25const char *progname = "check_cluster"; 25const char *progname = "check_cluster";
26const char *copyright = "2000-2007"; 26const char *copyright = "2000-2007";
27const char *email = "devel@nagios-plugins.org"; 27const 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
32const char *progname = "check_dbi"; 32const char *progname = "check_dbi";
33const char *copyright = "2011"; 33const char *copyright = "2011";
34const char *email = "devel@nagios-plugins.org"; 34const 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..d9481f2 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
35const char *progname = "check_dig"; 35const char *progname = "check_dig";
36const char *copyright = "2002-2008"; 36const char *copyright = "2002-2008";
37const char *email = "devel@nagios-plugins.org"; 37const char *email = "devel@monitoring-plugins.org";
38 38
39#include "common.h" 39#include "common.h"
40#include "netutils.h" 40#include "netutils.h"
@@ -48,6 +48,7 @@ void print_usage (void);
48 48
49#define UNDEFINED 0 49#define UNDEFINED 0
50#define DEFAULT_PORT 53 50#define DEFAULT_PORT 53
51#define DEFAULT_TRIES 3
51 52
52char *query_address = NULL; 53char *query_address = NULL;
53char *record_type = "A"; 54char *record_type = "A";
@@ -57,6 +58,7 @@ char *dig_args = "";
57char *query_transport = ""; 58char *query_transport = "";
58int verbose = FALSE; 59int verbose = FALSE;
59int server_port = DEFAULT_PORT; 60int server_port = DEFAULT_PORT;
61int number_tries = DEFAULT_TRIES;
60double warning_interval = UNDEFINED; 62double warning_interval = UNDEFINED;
61double critical_interval = UNDEFINED; 63double critical_interval = UNDEFINED;
62struct timeval tv; 64struct timeval tv;
@@ -72,6 +74,7 @@ main (int argc, char **argv)
72 long microsec; 74 long microsec;
73 double elapsed_time; 75 double elapsed_time;
74 int result = STATE_UNKNOWN; 76 int result = STATE_UNKNOWN;
77 int timeout_interval_dig;
75 78
76 setlocale (LC_ALL, ""); 79 setlocale (LC_ALL, "");
77 bindtextdomain (PACKAGE, LOCALEDIR); 80 bindtextdomain (PACKAGE, LOCALEDIR);
@@ -87,9 +90,12 @@ main (int argc, char **argv)
87 if (process_arguments (argc, argv) == ERROR) 90 if (process_arguments (argc, argv) == ERROR)
88 usage_va(_("Could not parse arguments")); 91 usage_va(_("Could not parse arguments"));
89 92
93 /* dig applies the timeout to each try, so we need to work around this */
94 timeout_interval_dig = timeout_interval / number_tries + number_tries;
95
90 /* get the command to run */ 96 /* get the command to run */
91 xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s", 97 xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s +tries=%d +time=%d",
92 PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport); 98 PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport, number_tries, timeout_interval_dig);
93 99
94 alarm (timeout_interval); 100 alarm (timeout_interval);
95 gettimeofday (&tv, NULL); 101 gettimeofday (&tv, NULL);
@@ -348,7 +354,7 @@ print_help (void)
348 printf (" %s\n","-A, --dig-arguments=STRING"); 354 printf (" %s\n","-A, --dig-arguments=STRING");
349 printf (" %s\n",_("Pass STRING as argument(s) to dig")); 355 printf (" %s\n",_("Pass STRING as argument(s) to dig"));
350 printf (UT_WARN_CRIT); 356 printf (UT_WARN_CRIT);
351 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 357 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
352 printf (UT_VERBOSE); 358 printf (UT_VERBOSE);
353 359
354 printf ("\n"); 360 printf ("\n");
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 906f3de..c12b5d9 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 @@
29const char *progname = "check_disk"; 29const char *progname = "check_disk";
30const char *program_name = "check_disk"; /* Required for coreutils libs */ 30const char *program_name = "check_disk"; /* Required for coreutils libs */
31const char *copyright = "1999-2008"; 31const char *copyright = "1999-2008";
32const char *email = "devel@nagios-plugins.org"; 32const char *email = "devel@monitoring-plugins.org";
33 33
34 34
35#include "common.h" 35#include "common.h"
@@ -877,7 +877,7 @@ print_help (void)
877 printf (" %s\n", "-K, --icritical=PERCENT%"); 877 printf (" %s\n", "-K, --icritical=PERCENT%");
878 printf (" %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free")); 878 printf (" %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free"));
879 printf (" %s\n", "-p, --path=PATH, --partition=PARTITION"); 879 printf (" %s\n", "-p, --path=PATH, --partition=PARTITION");
880 printf (" %s\n", _("Path or partition (may be repeated)")); 880 printf (" %s\n", _("Mount point or block device as emitted by the mount(8) command (may be repeated)"));
881 printf (" %s\n", "-x, --exclude_device=PATH <STRING>"); 881 printf (" %s\n", "-x, --exclude_device=PATH <STRING>");
882 printf (" %s\n", _("Ignore device (only works if -p unspecified)")); 882 printf (" %s\n", _("Ignore device (only works if -p unspecified)"));
883 printf (" %s\n", "-C, --clear"); 883 printf (" %s\n", "-C, --clear");
@@ -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
32const char *progname = "check_dns"; 32const char *progname = "check_dns";
33const char *copyright = "2000-2008"; 33const char *copyright = "2000-2008";
34const char *email = "devel@nagios-plugins.org"; 34const 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
31const char *progname = "check_dummy"; 31const char *progname = "check_dummy";
32const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
33const char *email = "devel@nagios-plugins.org"; 33const 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
32const char *progname = "check_fping"; 32const char *progname = "check_fping";
33const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
34const char *email = "devel@nagios-plugins.org"; 34const 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
32const char *progname = "check_game"; 32const char *progname = "check_game";
33const char *copyright = "2002-2007"; 33const char *copyright = "2002-2007";
34const char *email = "devel@nagios-plugins.org"; 34const 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
32const char *progname = "check_hpjd"; 32const char *progname = "check_hpjd";
33const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
34const char *email = "devel@nagios-plugins.org"; 34const 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
36const char *progname = "check_http"; 36const char *progname = "check_http";
37const char *copyright = "1999-2013"; 37const char *copyright = "1999-2013";
38const char *email = "devel@nagios-plugins.org"; 38const 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..55faacc 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
36const char *progname = "check_ide_smart"; 36const char *progname = "check_ide_smart";
37const char *copyright = "1998-2007"; 37const char *copyright = "1998-2007";
38const char *email = "devel@nagios-plugins.org"; 38const char *email = "devel@monitoring-plugins.org";
39 39
40#include "common.h" 40#include "common.h"
41#include "utils.h" 41#include "utils.h"
@@ -172,12 +172,12 @@ void print_value (value_t *, threshold_t *);
172void print_values (values_t *, thresholds_t *); 172void print_values (values_t *, thresholds_t *);
173int smart_cmd_simple (int, enum SmartCommand, __u8, char); 173int smart_cmd_simple (int, enum SmartCommand, __u8, char);
174int smart_read_thresholds (int, thresholds_t *); 174int smart_read_thresholds (int, thresholds_t *);
175int verbose = FALSE;
175 176
176int 177int
177main (int argc, char *argv[]) 178main (int argc, char *argv[])
178{ 179{
179 char *device = NULL; 180 char *device = NULL;
180 int command = -1;
181 int o, longindex; 181 int o, longindex;
182 int retval = 0; 182 int retval = 0;
183 183
@@ -191,7 +191,7 @@ main (int argc, char *argv[])
191 {"quiet-check", no_argument, 0, 'q'}, 191 {"quiet-check", no_argument, 0, 'q'},
192 {"auto-on", no_argument, 0, '1'}, 192 {"auto-on", no_argument, 0, '1'},
193 {"auto-off", no_argument, 0, '0'}, 193 {"auto-off", no_argument, 0, '0'},
194 {"nagios", no_argument, 0, 'n'}, 194 {"nagios", no_argument, 0, 'n'}, /* DEPRECATED, but we still accept it */
195 {"help", no_argument, 0, 'h'}, 195 {"help", no_argument, 0, 'h'},
196 {"version", no_argument, 0, 'V'}, 196 {"version", no_argument, 0, 'V'},
197 {0, 0, 0, 0} 197 {0, 0, 0, 0}
@@ -206,7 +206,7 @@ main (int argc, char *argv[])
206 206
207 while (1) { 207 while (1) {
208 208
209 o = getopt_long (argc, argv, "+d:iq10nhV", longopts, &longindex); 209 o = getopt_long (argc, argv, "+d:iq10nhVv", longopts, &longindex);
210 210
211 if (o == -1 || o == EOF || o == 1) 211 if (o == -1 || o == EOF || o == 1)
212 break; 212 break;
@@ -216,19 +216,21 @@ main (int argc, char *argv[])
216 device = optarg; 216 device = optarg;
217 break; 217 break;
218 case 'q': 218 case 'q':
219 command = 3; 219 fprintf (stderr, "%s\n", _("DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"."));
220 fprintf (stderr, "%s\n", _("Nagios-compatible output is now always returned."));
220 break; 221 break;
221 case 'i': 222 case 'i':
222 command = 2;
223 break;
224 case '1': 223 case '1':
225 command = 1;
226 break;
227 case '0': 224 case '0':
228 command = 0; 225 printf ("%s\n", _("SMART commands are broken and have been disabled (See Notes in --help)."));
226 return STATE_CRITICAL;
229 break; 227 break;
230 case 'n': 228 case 'n':
231 command = 4; 229 fprintf (stderr, "%s\n", _("DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the"));
230 fprintf (stderr, "%s\n", _("default and will be removed from future releases."));
231 break;
232 case 'v': /* verbose */
233 verbose = TRUE;
232 break; 234 break;
233 case 'h': 235 case 'h':
234 print_help (); 236 print_help ();
@@ -257,37 +259,16 @@ main (int argc, char *argv[])
257 return STATE_CRITICAL; 259 return STATE_CRITICAL;
258 } 260 }
259 261
260 if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, TRUE)) { 262 if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, FALSE)) {
261 printf (_("CRITICAL - SMART_CMD_ENABLE\n")); 263 printf (_("CRITICAL - SMART_CMD_ENABLE\n"));
262 return STATE_CRITICAL; 264 return STATE_CRITICAL;
263 } 265 }
264 266
265 switch (command) { 267 smart_read_values (fd, &values);
266 case 0: 268 smart_read_thresholds (fd, &thresholds);
267 retval = smart_cmd_simple (fd, SMART_CMD_AUTO_OFFLINE, 0, TRUE); 269 retval = nagios (&values, &thresholds);
268 break; 270 if (verbose) print_values (&values, &thresholds);
269 case 1: 271
270 retval = smart_cmd_simple (fd, SMART_CMD_AUTO_OFFLINE, 0xF8, TRUE);
271 break;
272 case 2:
273 retval = smart_cmd_simple (fd, SMART_CMD_IMMEDIATE_OFFLINE, 0, TRUE);
274 break;
275 case 3:
276 smart_read_values (fd, &values);
277 smart_read_thresholds (fd, &thresholds);
278 retval = values_not_passed (&values, &thresholds);
279 break;
280 case 4:
281 smart_read_values (fd, &values);
282 smart_read_thresholds (fd, &thresholds);
283 retval = nagios (&values, &thresholds);
284 break;
285 default:
286 smart_read_values (fd, &values);
287 smart_read_thresholds (fd, &thresholds);
288 print_values (&values, &thresholds);
289 break;
290 }
291 close (fd); 272 close (fd);
292 return retval; 273 return retval;
293} 274}
@@ -368,7 +349,7 @@ values_not_passed (values_t * p, thresholds_t * t)
368 int i; 349 int i;
369 for (i = 0; i < NR_ATTRIBUTES; i++) { 350 for (i = 0; i < NR_ATTRIBUTES; i++) {
370 if (value->id && threshold->id && value->id == threshold->id) { 351 if (value->id && threshold->id && value->id == threshold->id) {
371 if (value->value <= threshold->threshold) { 352 if (value->value < threshold->threshold) {
372 ++failed; 353 ++failed;
373 } 354 }
374 else { 355 else {
@@ -397,7 +378,7 @@ nagios (values_t * p, thresholds_t * t)
397 int i; 378 int i;
398 for (i = 0; i < NR_ATTRIBUTES; i++) { 379 for (i = 0; i < NR_ATTRIBUTES; i++) {
399 if (value->id && threshold->id && value->id == threshold->id) { 380 if (value->id && threshold->id && value->id == threshold->id) {
400 if (value->value <= threshold->threshold) { 381 if (value->value < threshold->threshold) {
401 ++failed; 382 ++failed;
402 if (value->status & 1) { 383 if (value->status & 1) {
403 status = PREFAILURE; 384 status = PREFAILURE;
@@ -454,7 +435,7 @@ print_value (value_t * p, threshold_t * t)
454 printf ("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n", 435 printf ("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n",
455 p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory ", 436 p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory ",
456 p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold, 437 p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold,
457 p->value > t->threshold ? "Passed" : "Failed"); 438 p->value >= t->threshold ? "Passed" : "Failed");
458} 439}
459 440
460 441
@@ -495,7 +476,7 @@ print_values (values_t * p, thresholds_t * t)
495int 476int
496smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error) 477smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error)
497{ 478{
498 int e = 0; 479 int e = STATE_UNKNOWN;
499#ifdef __linux__ 480#ifdef __linux__
500 __u8 args[4]; 481 __u8 args[4];
501 args[0] = WIN_SMART; 482 args[0] = WIN_SMART;
@@ -503,11 +484,15 @@ smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error)
503 args[2] = smart_command[command].value; 484 args[2] = smart_command[command].value;
504 args[3] = 0; 485 args[3] = 0;
505 if (ioctl (fd, HDIO_DRIVE_CMD, &args)) { 486 if (ioctl (fd, HDIO_DRIVE_CMD, &args)) {
506 e = errno; 487 e = STATE_CRITICAL;
507 if (show_error) { 488 if (show_error)
508 printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno)); 489 printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno));
509 } 490 } else {
491 e = STATE_OK;
492 if (show_error)
493 printf (_("OK - Command sent (%s)\n"), smart_command[command].text);
510 } 494 }
495
511#endif /* __linux__ */ 496#endif /* __linux__ */
512#ifdef __NetBSD__ 497#ifdef __NetBSD__
513 struct atareq req; 498 struct atareq req;
@@ -528,10 +513,15 @@ smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error)
528 } 513 }
529 514
530 if (errno != 0) { 515 if (errno != 0) {
531 e = errno; 516 e = STATE_CRITICAL;
532 printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno)); 517 if (show_error)
533 return e; 518 printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno));
519 } else {
520 e = STATE_OK;
521 if (show_error)
522 printf (_("OK - Command sent (%s)\n"), smart_command[command].text);
534 } 523 }
524
535#endif /* __NetBSD__ */ 525#endif /* __NetBSD__ */
536 return e; 526 return e;
537} 527}
@@ -592,8 +582,8 @@ print_help (void)
592{ 582{
593 print_revision (progname, NP_VERSION); 583 print_revision (progname, NP_VERSION);
594 584
595 printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n");
596 printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n"); 585 printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
586 printf ("Plugin implementation - 1999 Robert Dale <rdale@digital-mission.com>\n");
597 printf (COPYRIGHT, copyright, email); 587 printf (COPYRIGHT, copyright, email);
598 588
599 printf (_("This plugin checks a local hard drive with the (Linux specific) SMART interface [http://smartlinux.sourceforge.net/smart/index.php].")); 589 printf (_("This plugin checks a local hard drive with the (Linux specific) SMART interface [http://smartlinux.sourceforge.net/smart/index.php]."));
@@ -607,17 +597,19 @@ print_help (void)
607 597
608 printf (" %s\n", "-d, --device=DEVICE"); 598 printf (" %s\n", "-d, --device=DEVICE");
609 printf (" %s\n", _("Select device DEVICE")); 599 printf (" %s\n", _("Select device DEVICE"));
610 printf (" %s\n", _("Note: if the device is selected with this option, _no_ other options are accepted")); 600 printf (" %s\n", _("Note: if the device is specified without this option, any further option will"));
611 printf (" %s\n", "-i, --immediate"); 601 printf (" %s\n", _("be ignored."));
612 printf (" %s\n", _("Perform immediately offline tests")); 602
613 printf (" %s\n", "-q, --quiet-check"); 603 printf (UT_VERBOSE);
614 printf (" %s\n", _("Returns the number of failed tests")); 604
615 printf (" %s\n", "-1, --auto-on"); 605 printf ("\n");
616 printf (" %s\n", _("Turn on automatic offline tests")); 606 printf ("%s\n", _("Notes:"));
617 printf (" %s\n", "-0, --auto-off"); 607 printf (" %s\n", _("The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were"));
618 printf (" %s\n", _("Turn off automatic offline tests")); 608 printf (" %s\n", _("broken in an underhand manner and have been disabled. You can use smartctl"));
619 printf (" %s\n", "-n, --nagios"); 609 printf (" %s\n", _("instead:"));
620 printf (" %s\n", _("Output suitable for Nagios")); 610 printf (" %s\n", _("-0/--auto-off: use \"smartctl --offlineauto=off\""));
611 printf (" %s\n", _("-1/--auto-on: use \"smartctl --offlineauto=on\""));
612 printf (" %s\n", _("-i/--immediate: use \"smartctl --test=offline\""));
621 613
622 printf (UT_SUPPORT); 614 printf (UT_SUPPORT);
623} 615}
@@ -638,6 +630,5 @@ void
638print_usage (void) 630print_usage (void)
639{ 631{
640 printf ("%s\n", _("Usage:")); 632 printf ("%s\n", _("Usage:"));
641 printf ("%s [-d <device>] [-i <immediate>] [-q quiet] [-1 <auto-on>]",progname); 633 printf ("%s [-d <device>] [-v]", progname);
642 printf (" [-O <auto-off>] [-n <nagios>]\n");
643} 634}
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 */
30char *progname = "check_ldap"; 30char *progname = "check_ldap";
31const char *copyright = "2000-2008"; 31const char *copyright = "2000-2008";
32const char *email = "devel@nagios-plugins.org"; 32const 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
31const char *progname = "check_load"; 31const char *progname = "check_load";
32const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
33const char *email = "devel@nagios-plugins.org"; 33const 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
32const char *progname = "check_mrtg"; 32const char *progname = "check_mrtg";
33const char *copyright = "1999-2007"; 33const char *copyright = "1999-2007";
34const char *email = "devel@nagios-plugins.org"; 34const 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
35const char *progname = "check_mrtgtraf"; 35const char *progname = "check_mrtgtraf";
36const char *copyright = "1999-2007"; 36const char *copyright = "1999-2007";
37const char *email = "devel@nagios-plugins.org"; 37const char *email = "devel@monitoring-plugins.org";
38 38
39int process_arguments (int, char **); 39int process_arguments (int, char **);
40int validate_arguments (void); 40int 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
33const char *progname = "check_mysql"; 33const char *progname = "check_mysql";
34const char *copyright = "1999-2011"; 34const char *copyright = "1999-2011";
35const char *email = "devel@nagios-plugins.org"; 35const 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..71ab776 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
32const char *progname = "check_mysql_query"; 32const char *progname = "check_mysql_query";
33const char *copyright = "1999-2007"; 33const char *copyright = "1999-2007";
34const char *email = "devel@nagios-plugins.org"; 34const char *email = "devel@monitoring-plugins.org";
35 35
36#include "common.h" 36#include "common.h"
37#include "utils.h" 37#include "utils.h"
@@ -46,6 +46,8 @@ char *db_host = NULL;
46char *db_socket = NULL; 46char *db_socket = NULL;
47char *db_pass = NULL; 47char *db_pass = NULL;
48char *db = NULL; 48char *db = NULL;
49char *opt_file = NULL;
50char *opt_group = NULL;
49unsigned int db_port = MYSQL_PORT; 51unsigned int db_port = MYSQL_PORT;
50 52
51int process_arguments (int, char **); 53int process_arguments (int, char **);
@@ -83,7 +85,13 @@ main (int argc, char **argv)
83 /* initialize mysql */ 85 /* initialize mysql */
84 mysql_init (&mysql); 86 mysql_init (&mysql);
85 87
86 mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client"); 88 if (opt_file != NULL)
89 mysql_options(&mysql,MYSQL_READ_DEFAULT_FILE,opt_file);
90
91 if (opt_group != NULL)
92 mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,opt_group);
93 else
94 mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client");
87 95
88 /* establish a connection to the server and error checking */ 96 /* establish a connection to the server and error checking */
89 if (!mysql_real_connect(&mysql,db_host,db_user,db_pass,db,db_port,db_socket,0)) { 97 if (!mysql_real_connect(&mysql,db_host,db_user,db_pass,db,db_port,db_socket,0)) {
@@ -152,7 +160,13 @@ main (int argc, char **argv)
152 } else if (status == STATE_CRITICAL) { 160 } else if (status == STATE_CRITICAL) {
153 printf("QUERY %s: ", _("CRITICAL")); 161 printf("QUERY %s: ", _("CRITICAL"));
154 } 162 }
155 printf(_("'%s' returned %f"), sql_query, value); 163 printf(_("'%s' returned %f | %s"), sql_query, value,
164 fperfdata("result", value, "",
165 my_thresholds->warning?TRUE:FALSE, my_thresholds->warning?my_thresholds->warning->end:0,
166 my_thresholds->critical?TRUE:FALSE, my_thresholds->critical?my_thresholds->critical->end:0,
167 FALSE, 0,
168 FALSE, 0)
169 );
156 printf("\n"); 170 printf("\n");
157 171
158 return status; 172 return status;
@@ -174,6 +188,8 @@ process_arguments (int argc, char **argv)
174 {"database", required_argument, 0, 'd'}, 188 {"database", required_argument, 0, 'd'},
175 {"username", required_argument, 0, 'u'}, 189 {"username", required_argument, 0, 'u'},
176 {"password", required_argument, 0, 'p'}, 190 {"password", required_argument, 0, 'p'},
191 {"file", required_argument, 0, 'f'},
192 {"group", required_argument, 0, 'g'},
177 {"port", required_argument, 0, 'P'}, 193 {"port", required_argument, 0, 'P'},
178 {"verbose", no_argument, 0, 'v'}, 194 {"verbose", no_argument, 0, 'v'},
179 {"version", no_argument, 0, 'V'}, 195 {"version", no_argument, 0, 'V'},
@@ -188,7 +204,7 @@ process_arguments (int argc, char **argv)
188 return ERROR; 204 return ERROR;
189 205
190 while (1) { 206 while (1) {
191 c = getopt_long (argc, argv, "hvVP:p:u:d:H:s:q:w:c:", longopts, &option); 207 c = getopt_long (argc, argv, "hvVP:p:u:d:H:s:q:w:c:f:g:", longopts, &option);
192 208
193 if (c == -1 || c == EOF) 209 if (c == -1 || c == EOF)
194 break; 210 break;
@@ -220,6 +236,12 @@ process_arguments (int argc, char **argv)
220 optarg++; 236 optarg++;
221 } 237 }
222 break; 238 break;
239 case 'f': /* client options file */
240 opt_file = optarg;
241 break;
242 case 'g': /* client options group */
243 opt_group = optarg;
244 break;
223 case 'P': /* critical time threshold */ 245 case 'P': /* critical time threshold */
224 db_port = atoi (optarg); 246 db_port = atoi (optarg);
225 break; 247 break;
@@ -299,6 +321,10 @@ print_help (void)
299 printf (" %s\n", _("Use the specified socket (has no effect if -H is used)")); 321 printf (" %s\n", _("Use the specified socket (has no effect if -H is used)"));
300 printf (" -d, --database=STRING\n"); 322 printf (" -d, --database=STRING\n");
301 printf (" %s\n", _("Database to check")); 323 printf (" %s\n", _("Database to check"));
324 printf (" %s\n", "-f, --file=STRING");
325 printf (" %s\n", _("Read from the specified client options file"));
326 printf (" %s\n", "-g, --group=STRING");
327 printf (" %s\n", _("Use a client options group"));
302 printf (" -u, --username=STRING\n"); 328 printf (" -u, --username=STRING\n");
303 printf (" %s\n", _("Username to login with")); 329 printf (" %s\n", _("Username to login with"));
304 printf (" -p, --password=STRING\n"); 330 printf (" -p, --password=STRING\n");
@@ -324,5 +350,5 @@ print_usage (void)
324{ 350{
325 printf ("%s\n", _("Usage:")); 351 printf ("%s\n", _("Usage:"));
326 printf (" %s -q SQL_query [-w warn] [-c crit] [-H host] [-P port] [-s socket]\n",progname); 352 printf (" %s -q SQL_query [-w warn] [-c crit] [-H host] [-P port] [-s socket]\n",progname);
327 printf (" [-d database] [-u user] [-p password]\n"); 353 printf (" [-d database] [-u user] [-p password] [-f optfile] [-g group]\n");
328} 354}
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
35const char *progname = "check_nagios"; 35const char *progname = "check_nagios";
36const char *copyright = "1999-2007"; 36const char *copyright = "1999-2007";
37const char *email = "devel@nagios-plugins.org"; 37const 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
35const char *progname = "check_nt"; 35const char *progname = "check_nt";
36const char *copyright = "2000-2007"; 36const char *copyright = "2000-2007";
37const char *email = "devel@nagios-plugins.org"; 37const 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..0a7640a 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
33const char *progname = "check_ntp"; 33const char *progname = "check_ntp";
34const char *copyright = "2006-2008"; 34const char *copyright = "2006-2008";
35const char *email = "devel@nagios-plugins.org"; 35const char *email = "devel@monitoring-plugins.org";
36 36
37#include "common.h" 37#include "common.h"
38#include "netutils.h" 38#include "netutils.h"
@@ -54,7 +54,9 @@ void print_help (void);
54void print_usage (void); 54void print_usage (void);
55 55
56/* number of times to perform each request to get a good average. */ 56/* number of times to perform each request to get a good average. */
57#ifndef AVG_NUM
57#define AVG_NUM 4 58#define AVG_NUM 4
59#endif
58 60
59/* max size of control message data */ 61/* max size of control message data */
60#define MAX_CM_SIZE 468 62#define MAX_CM_SIZE 468
@@ -480,7 +482,7 @@ double offset_request(const char *host, int *status){
480 } else { 482 } else {
481 /* finally, calculate the average offset */ 483 /* finally, calculate the average offset */
482 for(i=0; i<servers[best_index].num_responses;i++){ 484 for(i=0; i<servers[best_index].num_responses;i++){
483 avg_offset+=servers[best_index].offset[j]; 485 avg_offset+=servers[best_index].offset[i];
484 } 486 }
485 avg_offset/=servers[best_index].num_responses; 487 avg_offset/=servers[best_index].num_responses;
486 } 488 }
@@ -858,7 +860,7 @@ void print_help(void){
858 printf (" %s\n", _("Warning threshold for jitter")); 860 printf (" %s\n", _("Warning threshold for jitter"));
859 printf (" %s\n", "-k, --jcrit=THRESHOLD"); 861 printf (" %s\n", "-k, --jcrit=THRESHOLD");
860 printf (" %s\n", _("Critical threshold for jitter")); 862 printf (" %s\n", _("Critical threshold for jitter"));
861 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 863 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
862 printf (UT_VERBOSE); 864 printf (UT_VERBOSE);
863 865
864 printf("\n"); 866 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
38const char *progname = "check_ntp_peer"; 38const char *progname = "check_ntp_peer";
39const char *copyright = "2006-2008"; 39const char *copyright = "2006-2008";
40const char *email = "devel@nagios-plugins.org"; 40const 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..72dffbd 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
37const char *progname = "check_ntp_time"; 37const char *progname = "check_ntp_time";
38const char *copyright = "2006-2008"; 38const char *copyright = "2006-2008";
39const char *email = "devel@nagios-plugins.org"; 39const char *email = "devel@monitoring-plugins.org";
40 40
41#include "common.h" 41#include "common.h"
42#include "netutils.h" 42#include "netutils.h"
@@ -55,7 +55,9 @@ void print_help (void);
55void print_usage (void); 55void print_usage (void);
56 56
57/* number of times to perform each request to get a good average. */ 57/* number of times to perform each request to get a good average. */
58#ifndef AVG_NUM
58#define AVG_NUM 4 59#define AVG_NUM 4
60#endif
59 61
60/* max size of control message data */ 62/* max size of control message data */
61#define MAX_CM_SIZE 468 63#define MAX_CM_SIZE 468
@@ -426,7 +428,7 @@ double offset_request(const char *host, int *status){
426 } else { 428 } else {
427 /* finally, calculate the average offset */ 429 /* finally, calculate the average offset */
428 for(i=0; i<servers[best_index].num_responses;i++){ 430 for(i=0; i<servers[best_index].num_responses;i++){
429 avg_offset+=servers[best_index].offset[j]; 431 avg_offset+=servers[best_index].offset[i];
430 } 432 }
431 avg_offset/=servers[best_index].num_responses; 433 avg_offset/=servers[best_index].num_responses;
432 } 434 }
@@ -614,7 +616,7 @@ void print_help(void){
614 printf (" %s\n", _("Offset to result in warning status (seconds)")); 616 printf (" %s\n", _("Offset to result in warning status (seconds)"));
615 printf (" %s\n", "-c, --critical=THRESHOLD"); 617 printf (" %s\n", "-c, --critical=THRESHOLD");
616 printf (" %s\n", _("Offset to result in critical status (seconds)")); 618 printf (" %s\n", _("Offset to result in critical status (seconds)"));
617 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 619 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
618 printf (UT_VERBOSE); 620 printf (UT_VERBOSE);
619 621
620 printf("\n"); 622 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
32const char *progname = "check_nwstat"; 32const char *progname = "check_nwstat";
33const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
34const char *email = "devel@nagios-plugins.org"; 34const 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
32const char *progname = "check_overcr"; 32const char *progname = "check_overcr";
33const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
34const char *email = "devel@nagios-plugins.org"; 34const 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
31const char *progname = "check_pgsql"; 31const char *progname = "check_pgsql";
32const char *copyright = "1999-2011"; 32const char *copyright = "1999-2011";
33const char *email = "devel@nagios-plugins.org"; 33const 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..95ac7b4 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
31const char *progname = "check_ping"; 31const char *progname = "check_ping";
32const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
33const char *email = "devel@nagios-plugins.org"; 33const char *email = "devel@monitoring-plugins.org";
34 34
35#include "common.h" 35#include "common.h"
36#include "netutils.h" 36#include "netutils.h"
@@ -482,7 +482,11 @@ run_ping (const char *cmd, const char *addr)
482 /* check stderr, setting at least WARNING if there is output here */ 482 /* check stderr, setting at least WARNING if there is output here */
483 /* Add warning into warn_text */ 483 /* Add warning into warn_text */
484 while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) { 484 while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
485 if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")) { 485 if (
486 ! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")
487 && ! strstr(buf,"Warning: time of day goes back")
488
489 ) {
486 if (verbose >= 3) { 490 if (verbose >= 3) {
487 printf("Got stderr: %s", buf); 491 printf("Got stderr: %s", buf);
488 } 492 }
@@ -581,7 +585,7 @@ print_help (void)
581 printf (" %s\n", "-L, --link"); 585 printf (" %s\n", "-L, --link");
582 printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)")); 586 printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
583 587
584 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 588 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
585 589
586 printf ("\n"); 590 printf ("\n");
587 printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel")); 591 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 @@
34const char *progname = "check_procs"; 34const char *progname = "check_procs";
35const char *program_name = "check_procs"; /* Required for coreutils libs */ 35const char *program_name = "check_procs"; /* Required for coreutils libs */
36const char *copyright = "2000-2008"; 36const char *copyright = "2000-2008";
37const char *email = "devel@nagios-plugins.org"; 37const 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
31const char *progname = "check_radius"; 31const char *progname = "check_radius";
32const char *copyright = "2000-2008"; 32const char *copyright = "2000-2008";
33const char *email = "devel@nagios-plugins.org"; 33const 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
31const char *progname = "check_real"; 31const char *progname = "check_real";
32const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
33const char *email = "devel@nagios-plugins.org"; 33const 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
31const char *progname = "check_smtp"; 31const char *progname = "check_smtp";
32const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
33const char *email = "devel@nagios-plugins.org"; 33const 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..d516fbc 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
31const char *progname = "check_snmp"; 31const char *progname = "check_snmp";
32const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
33const char *email = "devel@nagios-plugins.org"; 33const char *email = "devel@monitoring-plugins.org";
34 34
35#include "common.h" 35#include "common.h"
36#include "runcmd.h" 36#include "runcmd.h"
@@ -459,7 +459,7 @@ main (int argc, char **argv)
459 /* Process this block for numeric comparisons */ 459 /* Process this block for numeric comparisons */
460 /* Make some special values,like Timeticks numeric only if a threshold is defined */ 460 /* Make some special values,like Timeticks numeric only if a threshold is defined */
461 if (thlds[i]->warning || thlds[i]->critical || calculate_rate) { 461 if (thlds[i]->warning || thlds[i]->critical || calculate_rate) {
462 ptr = strpbrk (show, "0123456789"); 462 ptr = strpbrk (show, "-0123456789");
463 if (ptr == NULL) 463 if (ptr == NULL)
464 die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show); 464 die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show);
465 while (i >= response_size) { 465 while (i >= response_size) {
@@ -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
31const char *progname = "check_ssh"; 31const char *progname = "check_ssh";
32const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
33const char *email = "devel@nagios-plugins.org"; 33const 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..26dba0b 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
30const char *progname = "check_swap"; 30const char *progname = "check_swap";
31const char *copyright = "2000-2007"; 31const char *copyright = "2000-2007";
32const char *email = "devel@nagios-plugins.org"; 32const char *email = "devel@monitoring-plugins.org";
33 33
34#include "common.h" 34#include "common.h"
35#include "popen.h" 35#include "popen.h"
@@ -60,9 +60,10 @@ void print_help (void);
60int warn_percent = 0; 60int warn_percent = 0;
61int crit_percent = 0; 61int crit_percent = 0;
62float warn_size_bytes = 0; 62float warn_size_bytes = 0;
63float crit_size_bytes= 0; 63float crit_size_bytes = 0;
64int verbose; 64int verbose;
65int allswaps; 65int allswaps;
66int no_swap_state = STATE_CRITICAL;
66 67
67int 68int
68main (int argc, char **argv) 69main (int argc, char **argv)
@@ -350,7 +351,7 @@ main (int argc, char **argv)
350 if(total_swap_mb) { 351 if(total_swap_mb) {
351 percent_used = 100 * ((double) used_swap_mb) / ((double) total_swap_mb); 352 percent_used = 100 * ((double) used_swap_mb) / ((double) total_swap_mb);
352 } else { 353 } else {
353 percent_used = 0; 354 percent_used = 100;
354 } 355 }
355 356
356 result = max_state (result, check_swap (percent_used, free_swap_mb)); 357 result = max_state (result, check_swap (percent_used, free_swap_mb));
@@ -372,6 +373,9 @@ main (int argc, char **argv)
372int 373int
373check_swap (int usp, float free_swap_mb) 374check_swap (int usp, float free_swap_mb)
374{ 375{
376
377 if (!free_swap_mb) return no_swap_state;
378
375 int result = STATE_UNKNOWN; 379 int result = STATE_UNKNOWN;
376 float free_swap = free_swap_mb * (1024 * 1024); /* Convert back to bytes as warn and crit specified in bytes */ 380 float free_swap = free_swap_mb * (1024 * 1024); /* Convert back to bytes as warn and crit specified in bytes */
377 if (usp >= 0 && crit_percent != 0 && usp >= (100.0 - crit_percent)) 381 if (usp >= 0 && crit_percent != 0 && usp >= (100.0 - crit_percent))
@@ -400,6 +404,7 @@ process_arguments (int argc, char **argv)
400 {"warning", required_argument, 0, 'w'}, 404 {"warning", required_argument, 0, 'w'},
401 {"critical", required_argument, 0, 'c'}, 405 {"critical", required_argument, 0, 'c'},
402 {"allswaps", no_argument, 0, 'a'}, 406 {"allswaps", no_argument, 0, 'a'},
407 {"no-swap", required_argument, 0, 'n'},
403 {"verbose", no_argument, 0, 'v'}, 408 {"verbose", no_argument, 0, 'v'},
404 {"version", no_argument, 0, 'V'}, 409 {"version", no_argument, 0, 'V'},
405 {"help", no_argument, 0, 'h'}, 410 {"help", no_argument, 0, 'h'},
@@ -410,7 +415,7 @@ process_arguments (int argc, char **argv)
410 return ERROR; 415 return ERROR;
411 416
412 while (1) { 417 while (1) {
413 c = getopt_long (argc, argv, "+?Vvhac:w:", longopts, &option); 418 c = getopt_long (argc, argv, "+?Vvhac:w:n:", longopts, &option);
414 419
415 if (c == -1 || c == EOF) 420 if (c == -1 || c == EOF)
416 break; 421 break;
@@ -455,6 +460,10 @@ process_arguments (int argc, char **argv)
455 case 'a': /* all swap */ 460 case 'a': /* all swap */
456 allswaps = TRUE; 461 allswaps = TRUE;
457 break; 462 break;
463 case 'n':
464 if ((no_swap_state = mp_translate_state(optarg)) == ERROR) {
465 usage4 (_("no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
466 }
458 case 'v': /* verbose */ 467 case 'v': /* verbose */
459 verbose++; 468 verbose++;
460 break; 469 break;
@@ -538,13 +547,16 @@ print_help (void)
538 printf (" %s\n", "-c, --critical=INTEGER"); 547 printf (" %s\n", "-c, --critical=INTEGER");
539 printf (" %s\n", _("Exit with CRITICAL status if less than INTEGER bytes of swap space are free")); 548 printf (" %s\n", _("Exit with CRITICAL status if less than INTEGER bytes of swap space are free"));
540 printf (" %s\n", "-c, --critical=PERCENT%%"); 549 printf (" %s\n", "-c, --critical=PERCENT%%");
541 printf (" %s\n", _("Exit with CRITCAL status if less than PERCENT of swap space is free")); 550 printf (" %s\n", _("Exit with CRITICAL status if less than PERCENT of swap space is free"));
542 printf (" %s\n", "-a, --allswaps"); 551 printf (" %s\n", "-a, --allswaps");
543 printf (" %s\n", _("Conduct comparisons for all swap partitions, one by one")); 552 printf (" %s\n", _("Conduct comparisons for all swap partitions, one by one"));
553 printf (" %s\n", "-n, --no-swap=<ok|warning|critical|unknown>");
554 printf (" %s %s\n", _("Resulting state when there is no swap regardless of thresholds. Default:"), state_text(no_swap_state));
544 printf (UT_VERBOSE); 555 printf (UT_VERBOSE);
545 556
546 printf ("\n"); 557 printf ("\n");
547 printf ("%s\n", _("Notes:")); 558 printf ("%s\n", _("Notes:"));
559 printf (" %s\n", _("Both INTEGER and PERCENT thresholds can be specified, they are all checked."));
548 printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.")); 560 printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."));
549 561
550 printf (UT_SUPPORT); 562 printf (UT_SUPPORT);
@@ -556,6 +568,6 @@ void
556print_usage (void) 568print_usage (void)
557{ 569{
558 printf ("%s\n", _("Usage:")); 570 printf ("%s\n", _("Usage:"));
559 printf ("%s [-av] -w <percent_free>%% -c <percent_free>%%\n",progname); 571 printf (" %s [-av] -w <percent_free>%% -c <percent_free>%%\n",progname);
560 printf ("%s [-av] -w <bytes_free> -c <bytes_free>\n", progname); 572 printf (" -w <bytes_free> -c <bytes_free> [-n <state>]\n");
561} 573}
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 */
31char *progname; 31char *progname;
32const char *copyright = "1999-2008"; 32const char *copyright = "1999-2008";
33const char *email = "devel@nagios-plugins.org"; 33const 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
31const char *progname = "check_time"; 31const char *progname = "check_time";
32const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
33const char *email = "devel@nagios-plugins.org"; 33const 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
35const char *progname = "check_ups"; 35const char *progname = "check_ups";
36const char *copyright = "2000-2007"; 36const char *copyright = "2000-2007";
37const char *email = "devel@nagios-plugins.org"; 37const 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
33const char *progname = "check_users"; 33const char *progname = "check_users";
34const char *copyright = "2000-2007"; 34const char *copyright = "2000-2007";
35const char *email = "devel@nagios-plugins.org"; 35const 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..4bd09de 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
32const char *progname = "negate"; 32const char *progname = "negate";
33const char *copyright = "2002-2008"; 33const char *copyright = "2002-2008";
34const char *email = "devel@nagios-plugins.org"; 34const char *email = "devel@monitoring-plugins.org";
35 35
36#define DEFAULT_TIMEOUT 11 36#define DEFAULT_TIMEOUT 11
37 37
@@ -45,7 +45,6 @@ const char *email = "devel@nagios-plugins.org";
45 45
46static const char **process_arguments (int, char **); 46static const char **process_arguments (int, char **);
47int validate_arguments (char **); 47int validate_arguments (char **);
48int translate_state (char *);
49void print_help (void); 48void print_help (void);
50void print_usage (void); 49void print_usage (void);
51int subst_text = FALSE; 50int subst_text = FALSE;
@@ -166,27 +165,27 @@ process_arguments (int argc, char **argv)
166 timeout_interval = atoi (optarg); 165 timeout_interval = atoi (optarg);
167 break; 166 break;
168 case 'T': /* Result to return on timeouts */ 167 case 'T': /* Result to return on timeouts */
169 if ((timeout_state = translate_state(optarg)) == ERROR) 168 if ((timeout_state = mp_translate_state(optarg)) == ERROR)
170 usage4 (_("Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); 169 usage4 (_("Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
171 break; 170 break;
172 case 'o': /* replacement for OK */ 171 case 'o': /* replacement for OK */
173 if ((state[STATE_OK] = translate_state(optarg)) == ERROR) 172 if ((state[STATE_OK] = mp_translate_state(optarg)) == ERROR)
174 usage4 (_("Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); 173 usage4 (_("Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
175 permute = FALSE; 174 permute = FALSE;
176 break; 175 break;
177 176
178 case 'w': /* replacement for WARNING */ 177 case 'w': /* replacement for WARNING */
179 if ((state[STATE_WARNING] = translate_state(optarg)) == ERROR) 178 if ((state[STATE_WARNING] = mp_translate_state(optarg)) == ERROR)
180 usage4 (_("Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); 179 usage4 (_("Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
181 permute = FALSE; 180 permute = FALSE;
182 break; 181 break;
183 case 'c': /* replacement for CRITICAL */ 182 case 'c': /* replacement for CRITICAL */
184 if ((state[STATE_CRITICAL] = translate_state(optarg)) == ERROR) 183 if ((state[STATE_CRITICAL] = mp_translate_state(optarg)) == ERROR)
185 usage4 (_("Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); 184 usage4 (_("Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
186 permute = FALSE; 185 permute = FALSE;
187 break; 186 break;
188 case 'u': /* replacement for UNKNOWN */ 187 case 'u': /* replacement for UNKNOWN */
189 if ((state[STATE_UNKNOWN] = translate_state(optarg)) == ERROR) 188 if ((state[STATE_UNKNOWN] = mp_translate_state(optarg)) == ERROR)
190 usage4 (_("Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); 189 usage4 (_("Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
191 permute = FALSE; 190 permute = FALSE;
192 break; 191 break;
@@ -218,24 +217,6 @@ validate_arguments (char **command_line)
218} 217}
219 218
220 219
221int
222translate_state (char *state_text)
223{
224 char *temp_ptr;
225 for (temp_ptr = state_text; *temp_ptr; temp_ptr++) {
226 *temp_ptr = toupper(*temp_ptr);
227 }
228 if (!strcmp(state_text,"OK") || !strcmp(state_text,"0"))
229 return STATE_OK;
230 if (!strcmp(state_text,"WARNING") || !strcmp(state_text,"1"))
231 return STATE_WARNING;
232 if (!strcmp(state_text,"CRITICAL") || !strcmp(state_text,"2"))
233 return STATE_CRITICAL;
234 if (!strcmp(state_text,"UNKNOWN") || !strcmp(state_text,"3"))
235 return STATE_UNKNOWN;
236 return ERROR;
237}
238
239void 220void
240print_help (void) 221print_help (void)
241{ 222{
@@ -252,7 +233,7 @@ print_help (void)
252 233
253 printf (UT_HELP_VRSN); 234 printf (UT_HELP_VRSN);
254 235
255 printf (UT_TIMEOUT, timeout_interval); 236 printf (UT_PLUG_TIMEOUT, timeout_interval);
256 printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status.")); 237 printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status."));
257 printf (" -T, --timeout-result=STATUS\n"); 238 printf (" -T, --timeout-result=STATUS\n");
258 printf (" %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n")); 239 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
9use strict; 9use strict;
10use Test::More; 10use 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
41my @perf_data = sort(split(/ /, $result->perf_output)); 41my @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/';
17my $hostname_valid = getTestParameter( 17my $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
23my $hostname_valid_ip = getTestParameter( 23my $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
33my $host_tcp_http2 = getTestParameter( "NP_HOST_TCP_HTTP2", 33my $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" );
62like( $res->output, "/Unable to open TCP socket|Socket timeout after/", "Output OK"); 62like( $res->output, "/Unable to open TCP socket|Socket timeout after/", "Output OK");
63 63
64SKIP: { 64SKIP: {
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}
84SKIP: { 84SKIP: {
diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t
index d971645..28cd4cd 100644
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
@@ -21,27 +21,29 @@ plan skip_all => "check_mysql not compiled" unless (-x "check_mysql");
21plan tests => 15; 21plan tests => 15;
22 22
23my $bad_login_output = '/Access denied for user /'; 23my $bad_login_output = '/Access denied for user /';
24my $mysqlserver = getTestParameter( 24my $mysqlserver = getTestParameter(
25 "NP_MYSQL_SERVER", 25 "NP_MYSQL_SERVER",
26 "A MySQL Server hostname or IP with no slaves setup" 26 "A MySQL Server hostname or IP with no slaves setup"
27 ); 27 );
28my $mysqlsocket = getTestParameter( 28my $mysqlsocket = getTestParameter(
29 "NP_MYSQL_SOCKET", 29 "NP_MYSQL_SOCKET",
30 "A MySQL Server socket with no slaves setup" 30 "Full path to a MySQL Server socket with no slaves setup"
31 ); 31 );
32my $mysql_login_details = getTestParameter( 32my $mysql_login_details = getTestParameter(
33 "MYSQL_LOGIN_DETAILS", 33 "MYSQL_LOGIN_DETAILS",
34 "Command line parameters to specify login access", 34 "Command line parameters to specify login access (requires " .
35 "-u user -ppw -d db", 35 "REPLICATION CLIENT privleges)",
36 "-u test -ptest",
36 ); 37 );
37my $with_slave = getTestParameter( 38my $with_slave = getTestParameter(
38 "NP_MYSQL_WITH_SLAVE", 39 "NP_MYSQL_WITH_SLAVE",
39 "MySQL server with slaves setup" 40 "MySQL server with slaves setup"
40 ); 41 );
41my $with_slave_login = getTestParameter( 42my $with_slave_login = getTestParameter(
42 "NP_MYSQL_WITH_SLAVE_LOGIN", 43 "NP_MYSQL_WITH_SLAVE_LOGIN",
43 "Login details for server with slave", 44 "Login details for server with slave (requires REPLICATION CLIENT " .
44 "-uroot -ppw" 45 "privleges)",
46 $mysql_login_details || "-u test -ptest"
45 ); 47 );
46 48
47my $result; 49my $result;
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;
13if (`uname -s` eq "SunOS\n" && ! -x "/usr/local/nagios/libexec/pst3") { 13if (`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
19my $result; 19my $result;
@@ -26,6 +26,11 @@ $result = NPTest->testCmd( "./check_procs -w 100000 -c 100000 -s Z" );
26is( $result->return_code, 0, "Checking less than 100000 zombie processes" ); 26is( $result->return_code, 0, "Checking less than 100000 zombie processes" );
27like( $result->output, '/^PROCS OK: [0-9]+ process(es)? with /', "Output correct" ); 27like( $result->output, '/^PROCS OK: [0-9]+ process(es)? with /', "Output correct" );
28 28
29if(fork() == 0) { exec("sleep 7"); } # fork a test process
30$result = NPTest->testCmd( "./check_procs -a 'sleep 7'" );
31is( $result->return_code, 0, "Parent process is ignored" );
32like( $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" );
30is( $result->return_code, 1, "Checking warning if processes > 0" ); 35is( $result->return_code, 1, "Checking warning if processes > 0" );
31like( $result->output, '/^PROCS WARNING: [0-9]+ process(es)? | procs=[0-9]+;0;100000;0;$/', "Output correct" ); 36like( $result->output, '/^PROCS WARNING: [0-9]+ process(es)? | procs=[0-9]+;0;100000;0;$/', "Output correct" );
diff --git a/plugins/t/negate.t b/plugins/t/negate.t
index 0afe3ae..f18acc3 100644
--- a/plugins/t/negate.t
+++ b/plugins/t/negate.t
@@ -78,7 +78,7 @@ foreach my $current_state (keys(%state)) {
78 } 78 }
79} 79}
80 80
81# Same as aboce with substitute 81# Same as above with substitute
82foreach my $current_state (keys(%state)) { 82foreach my $current_state (keys(%state)) {
83 foreach my $new_state (keys(%state)) { 83 foreach my $new_state (keys(%state)) {
84 $res = NPTest->testCmd( "./negate -s --$current_state=$new_state ./check_dummy ".$state{$current_state}." 'Fake $new_state'" ); 84 $res = NPTest->testCmd( "./negate -s --$current_state=$new_state ./check_dummy ".$state{$current_state}." 'Fake $new_state'" );
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/check_procs.t b/plugins/tests/check_procs.t
index d71c83a..06ad9df 100644..100755
--- a/plugins/tests/check_procs.t
+++ b/plugins/tests/check_procs.t
@@ -18,23 +18,23 @@ my $command = "./check_procs --input-file=tests/var/ps-axwo.darwin";
18 18
19$result = NPTest->testCmd( "$command" ); 19$result = NPTest->testCmd( "$command" );
20is( $result->return_code, 0, "Run with no options" ); 20is( $result->return_code, 0, "Run with no options" );
21like( $result->output, '/^PROCS OK: 95 processes$/', "Output correct" ); 21is( $result->output, "PROCS OK: 95 processes | procs=95;;;0;", "Output correct" );
22 22
23$result = NPTest->testCmd( "$command -w 5" ); 23$result = NPTest->testCmd( "$command -w 5" );
24is( $result->return_code, 1, "Checking > 5 processes" ); 24is( $result->return_code, 1, "Checking > 5 processes" );
25like( $result->output, '/^PROCS WARNING: 95 processes$/', "Output correct" ); 25is( $result->output, "PROCS WARNING: 95 processes | procs=95;5;;0;", "Output correct" );
26 26
27$result = NPTest->testCmd( "$command -w 4 -c 44" ); 27$result = NPTest->testCmd( "$command -w 4 -c 44" );
28is( $result->return_code, 2, "Checking critical" ); 28is( $result->return_code, 2, "Checking critical" );
29like( $result->output, '/^PROCS CRITICAL: 95 processes$/', "Output correct" ); 29is( $result->output, "PROCS CRITICAL: 95 processes | procs=95;4;44;0;", "Output correct" );
30 30
31$result = NPTest->testCmd( "$command -w 100 -c 200" ); 31$result = NPTest->testCmd( "$command -w 100 -c 200" );
32is( $result->return_code, 0, "Checking no threshold breeched" ); 32is( $result->return_code, 0, "Checking no threshold breeched" );
33like( $result->output, '/^PROCS OK: 95 processes$/', "Output correct" ); 33is( $result->output, "PROCS OK: 95 processes | procs=95;100;200;0;", "Output correct" );
34 34
35$result = NPTest->testCmd( "$command -C launchd -c 5" ); 35$result = NPTest->testCmd( "$command -C launchd -c 5" );
36is( $result->return_code, 2, "Checking processes filtered by command name" ); 36is( $result->return_code, 2, "Checking processes filtered by command name" );
37like( $result->output, '/^PROCS CRITICAL: 6 processes with command name \'launchd\'$/', "Output correct" ); 37is( $result->output, "PROCS CRITICAL: 6 processes with command name 'launchd' | procs=6;;5;0;", "Output correct" );
38 38
39$result = NPTest->testCmd( "$command -u 501 -w 39 -c 41" ); 39$result = NPTest->testCmd( "$command -u 501 -w 39 -c 41" );
40is( $result->return_code, 1, "Checking processes filtered by userid" ); 40is( $result->return_code, 1, "Checking processes filtered by userid" );
@@ -62,15 +62,15 @@ like( $result->output, '/^PROCS OK: 0 processes with UID = -2 \(nobody\), args \
62 62
63$result = NPTest->testCmd( "$command --ereg-argument-array='mdworker.*501'" ); 63$result = NPTest->testCmd( "$command --ereg-argument-array='mdworker.*501'" );
64is( $result->return_code, 0, "Checking regexp search of arguments" ); 64is( $result->return_code, 0, "Checking regexp search of arguments" );
65is( $result->output, "PROCS OK: 1 process with regex args 'mdworker.*501'", "Output correct" ); 65is( $result->output, "PROCS OK: 1 process with regex args 'mdworker.*501' | procs=1;;;0;", "Output correct" );
66 66
67$result = NPTest->testCmd( "$command --vsz 1000000" ); 67$result = NPTest->testCmd( "$command --vsz 1000000" );
68is( $result->return_code, 0, "Checking filter by VSZ" ); 68is( $result->return_code, 0, "Checking filter by VSZ" );
69like( $result->output, '/^PROCS OK: 24 processes with VSZ >= 1000000$/', "Output correct" ); 69is( $result->output, 'PROCS OK: 24 processes with VSZ >= 1000000 | procs=24;;;0;', "Output correct" );
70 70
71$result = NPTest->testCmd( "$command --rss 100000" ); 71$result = NPTest->testCmd( "$command --rss 100000" );
72is( $result->return_code, 0, "Checking filter by RSS" ); 72is( $result->return_code, 0, "Checking filter by RSS" );
73like( $result->output, '/^PROCS OK: 3 processes with RSS >= 100000$/', "Output correct" ); 73is( $result->output, 'PROCS OK: 3 processes with RSS >= 100000 | procs=3;;;0;', "Output correct" );
74 74
75$result = NPTest->testCmd( "$command -s S" ); 75$result = NPTest->testCmd( "$command -s S" );
76is( $result->return_code, 0, "Checking filter for sleeping processes" ); 76is( $result->return_code, 0, "Checking filter for sleeping processes" );
@@ -86,15 +86,15 @@ like( $result->output, '/^PROCS CRITICAL: 39 processes with PPID = 1/', "Output
86 86
87$result = NPTest->testCmd( "$command -P 0.71" ); 87$result = NPTest->testCmd( "$command -P 0.71" );
88is( $result->return_code, 0, "Checking filter for percentage cpu > 0.71" ); 88is( $result->return_code, 0, "Checking filter for percentage cpu > 0.71" );
89is( $result->output, 'PROCS OK: 7 processes with PCPU >= 0.71', "Output correct" ); 89is( $result->output, 'PROCS OK: 7 processes with PCPU >= 0.71 | procs=7;;;0;', "Output correct" );
90 90
91$result = NPTest->testCmd( "$command -P 0.70" ); 91$result = NPTest->testCmd( "$command -P 0.70" );
92is( $result->return_code, 0, "Checking filter for percentage cpu > 0.70" ); 92is( $result->return_code, 0, "Checking filter for percentage cpu > 0.70" );
93is( $result->output, 'PROCS OK: 8 processes with PCPU >= 0.70', "Output correct" ); 93is( $result->output, 'PROCS OK: 8 processes with PCPU >= 0.70 | procs=8;;;0;', "Output correct" );
94 94
95$result = NPTest->testCmd( "$command --metric=CPU -w 8" ); 95$result = NPTest->testCmd( "$command --metric=CPU -w 8" );
96is( $result->return_code, 1, "Checking against metric of CPU > 8" ); 96is( $result->return_code, 1, "Checking against metric of CPU > 8" );
97is( $result->output, 'CPU WARNING: 1 warn out of 95 processes', "Output correct" ); 97is( $result->output, 'CPU WARNING: 1 warn out of 95 processes | procs=95;;;0; procs_warn=1;;;0; procs_crit=0;;;0;', "Output correct" );
98 98
99# TODO: Because of a conversion to int, if CPU is 1.45%, will not alert, but 2.01% will. 99# TODO: Because of a conversion to int, if CPU is 1.45%, will not alert, but 2.01% will.
100$result = NPTest->testCmd( "$command --metric=CPU -w 1 -u 501 -v" ); 100$result = NPTest->testCmd( "$command --metric=CPU -w 1 -u 501 -v" );
@@ -103,17 +103,17 @@ is( $result->output, 'CPU WARNING: 2 warn out of 40 processes with UID = 501 (to
103 103
104$result = NPTest->testCmd( "$command --metric=VSZ -w 1200000 -v" ); 104$result = NPTest->testCmd( "$command --metric=VSZ -w 1200000 -v" );
105is( $result->return_code, 1, "Checking against VSZ > 1.2GB" ); 105is( $result->return_code, 1, "Checking against VSZ > 1.2GB" );
106is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype]', "Output correct" ); 106is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype] | procs=95;;;0; procs_warn=4;;;0; procs_crit=0;;;0;', "Output correct" );
107 107
108$result = NPTest->testCmd( "$command --metric=VSZ -w 1200000 -v" ); 108$result = NPTest->testCmd( "$command --metric=VSZ -w 1200000 -v" );
109is( $result->return_code, 1, "Checking against VSZ > 1.2GB" ); 109is( $result->return_code, 1, "Checking against VSZ > 1.2GB" );
110is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype]', "Output correct" ); 110is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype] | procs=95;;;0; procs_warn=4;;;0; procs_crit=0;;;0;', "Output correct" );
111 111
112$result = NPTest->testCmd( "$command --metric=RSS -c 70000 -v" ); 112$result = NPTest->testCmd( "$command --metric=RSS -c 70000 -v" );
113is( $result->return_code, 2, "Checking against RSS > 70MB" ); 113is( $result->return_code, 2, "Checking against RSS > 70MB" );
114is( $result->output, 'RSS CRITICAL: 5 crit, 0 warn out of 95 processes [WindowServer, SystemUIServer, Safari, Mail, Safari]', "Output correct" ); 114is( $result->output, 'RSS CRITICAL: 5 crit, 0 warn out of 95 processes [WindowServer, SystemUIServer, Safari, Mail, Safari] | procs=95;;;0; procs_warn=0;;;0; procs_crit=5;;;0;', "Output correct" );
115 115
116$result = NPTest->testCmd( "$command --ereg-argument-array='(nosuchname|nosuch2name)'" ); 116$result = NPTest->testCmd( "$command --ereg-argument-array='(nosuchname|nosuch2name)'" );
117is( $result->return_code, 0, "Checking no pipe symbol in output" ); 117is( $result->return_code, 0, "Checking no pipe symbol in output" );
118is( $result->output, "PROCS OK: 0 processes with regex args '(nosuchname,nosuch2name)'", "Output correct" ); 118is( $result->output, "PROCS OK: 0 processes with regex args '(nosuchname,nosuch2name)' | procs=0;;;0;", "Output correct" );
119 119
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t
index 1ef0b20..d865e19 100755
--- a/plugins/tests/check_snmp.t
+++ b/plugins/tests/check_snmp.t
@@ -8,7 +8,7 @@ use Test::More;
8use NPTest; 8use NPTest;
9use FindBin qw($Bin); 9use FindBin qw($Bin);
10 10
11my $tests = 53; 11my $tests = 67;
12# Check that all dependent modules are available 12# Check that all dependent modules are available
13eval { 13eval {
14 require NetSNMP::OID; 14 require NetSNMP::OID;
@@ -59,7 +59,7 @@ if ($ARGV[0] && $ARGV[0] eq "-d") {
59} 59}
60 60
61# We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data 61# We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data
62$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'} ||= "/var/tmp"; 62$ENV{'MP_STATE_PATH'} ||= "/var/tmp";
63 63
64my $res; 64my $res;
65 65
@@ -79,7 +79,7 @@ Copyright (c) 1986-2004 by cisco Systems, Inc.
79$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.0 -o sysContact.0 -o .1.3.6.1.4.1.8072.3.2.67.1"); 79$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.0 -o sysContact.0 -o .1.3.6.1.4.1.8072.3.2.67.1");
80cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" ); 80cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" );
81like($res->output, '/^SNMP OK - /', "String contains SNMP OK"); 81like($res->output, '/^SNMP OK - /', "String contains SNMP OK");
82like($res->output, '/'.quotemeta('SNMP OK - Cisco Internetwork Operating System Software Alice Kisco Outernetwork Oserating Gystem Totware | 82like($res->output, '/'.quotemeta('SNMP OK - Cisco Internetwork Operating System Software "Alice" Kisco Outernetwork Oserating Gystem Totware |
83.1.3.6.1.4.1.8072.3.2.67.0: 83.1.3.6.1.4.1.8072.3.2.67.0:
84"Cisco Internetwork Operating System Software 84"Cisco Internetwork Operating System Software
85IOS (tm) Catalyst 4000 \"L3\" Switch Software (cat4000-I9K91S-M), Version 85IOS (tm) Catalyst 4000 \"L3\" Switch Software (cat4000-I9K91S-M), Version
@@ -109,7 +109,7 @@ like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C
109"And now have fun with with this: \"C:\\\\\" 109"And now have fun with with this: \"C:\\\\\"
110because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3"); 110because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3");
111 111
112system("rm -f ".$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'}."/check_snmp/*"); 112system("rm -f ".$ENV{'MP_STATE_PATH'}."/check_snmp/*");
113$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" ); 113$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" );
114is($res->return_code, 0, "Returns OK"); 114is($res->return_code, 0, "Returns OK");
115is($res->output, "No previous data to calculate rate - assume okay"); 115is($res->output, "No previous data to calculate rate - assume okay");
@@ -214,3 +214,31 @@ $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1
214is($res->return_code, 0, "String check should check whole string, not a parsed number" ); 214is($res->return_code, 0, "String check should check whole string, not a parsed number" );
215is($res->output, 'SNMP OK - "CUSTOM CHECK OK: foo is 12345" | ', "String check witn numbers returns whole string"); 215is($res->output, 'SNMP OK - "CUSTOM CHECK OK: foo is 12345" | ', "String check witn numbers returns whole string");
216 216
217$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
218is($res->return_code, 0, "Negative integer check OK" );
219is($res->output, 'SNMP OK - -2 | iso.3.6.1.4.1.8072.3.2.67.16=-2 ', "Negative integer check OK output" );
220
221$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
222is($res->return_code, 1, "Negative integer check WARNING" );
223is($res->output, 'SNMP WARNING - *-3* | iso.3.6.1.4.1.8072.3.2.67.16=-3 ', "Negative integer check WARNING output" );
224
225$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
226is($res->return_code, 2, "Negative integer check CRITICAL" );
227is($res->output, 'SNMP CRITICAL - *-4* | iso.3.6.1.4.1.8072.3.2.67.16=-4 ', "Negative integer check CRITICAL output" );
228
229$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.17 -w -3: -c -6:" );
230is($res->return_code, 1, "Negative integer as string, WARNING" );
231is($res->output, 'SNMP WARNING - *-4* | iso.3.6.1.4.1.8072.3.2.67.17=-4 ', "Negative integer as string, WARNING output" );
232
233$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.17 -w -2: -c -3:" );
234is($res->return_code, 2, "Negative integer as string, CRITICAL" );
235is($res->output, 'SNMP CRITICAL - *-4* | iso.3.6.1.4.1.8072.3.2.67.17=-4 ', "Negative integer as string, CRITICAL output" );
236
237$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -c ~:-6.5" );
238is($res->return_code, 0, "Negative float OK" );
239is($res->output, 'SNMP OK - -6.6 | iso.3.6.1.4.1.8072.3.2.67.18=-6.6 ', "Negative float OK output" );
240
241$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -w ~:-6.65 -c ~:-6.55" );
242is($res->return_code, 1, "Negative float WARNING" );
243is($res->output, 'SNMP WARNING - *-6.6* | iso.3.6.1.4.1.8072.3.2.67.18=-6.6 ', "Negative float WARNING output" );
244
diff --git a/plugins/tests/check_snmp_agent.pl b/plugins/tests/check_snmp_agent.pl
index 8cacd52..0e41d57 100644
--- a/plugins/tests/check_snmp_agent.pl
+++ b/plugins/tests/check_snmp_agent.pl
@@ -7,7 +7,7 @@
7use NetSNMP::OID qw(:all); 7use NetSNMP::OID qw(:all);
8use NetSNMP::agent; 8use NetSNMP::agent;
9use NetSNMP::ASN qw(ASN_OCTET_STR ASN_COUNTER ASN_COUNTER64 ASN_INTEGER ASN_INTEGER64 ASN_UNSIGNED ASN_UNSIGNED64); 9use NetSNMP::ASN qw(ASN_OCTET_STR ASN_COUNTER ASN_COUNTER64 ASN_INTEGER ASN_INTEGER64 ASN_UNSIGNED ASN_UNSIGNED64);
10#use Math::Int64 qw(uint64); # Skip that module whie we don't need it 10#use Math::Int64 qw(uint64); # Skip that module while we don't need it
11sub uint64 { return $_ } 11sub uint64 { return $_ }
12 12
13if (!$agent) { 13if (!$agent) {
@@ -16,8 +16,6 @@ if (!$agent) {
16} 16}
17 17
18my $baseoid = '.1.3.6.1.4.1.8072.3.2.67'; 18my $baseoid = '.1.3.6.1.4.1.8072.3.2.67';
19# Next are arrays of indexes (Type, initial value and increments)
20# Undef miltipliers are randomized
21my $multiline = 'Cisco Internetwork Operating System Software 19my $multiline = 'Cisco Internetwork Operating System Software
22IOS (tm) Catalyst 4000 "L3" Switch Software (cat4000-I9K91S-M), Version 20IOS (tm) Catalyst 4000 "L3" Switch Software (cat4000-I9K91S-M), Version
2312.2(20)EWA, RELEASE SOFTWARE (fc1) 2112.2(20)EWA, RELEASE SOFTWARE (fc1)
@@ -33,10 +31,12 @@ ends with with this: C:\\';
33my $multilin5 = 'And now have fun with with this: "C:\\" 31my $multilin5 = 'And now have fun with with this: "C:\\"
34because we\'re not done yet!'; 32because we\'re not done yet!';
35 33
36# 0..15 <---- please update comment when adding/removing fields 34# Next are arrays of indexes (Type, initial value and increments)
37my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR ); 35# 0..16 <---- please update comment when adding/removing fields
38my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"', 'CUSTOM CHECK OK: foo is 12345' ); 36my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_INTEGER, ASN_OCTET_STR, ASN_OCTET_STR );
39my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef, undef ); 37my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"', 'CUSTOM CHECK OK: foo is 12345', -2, '-4', '-6.6' );
38# undef increments are randomized
39my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef, undef, -1, undef, undef );
40 40
41# Number of elements in our OID 41# Number of elements in our OID
42my $oidelts; 42my $oidelts;
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_
31S 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 31S 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
32S 0 6945 6907 1488 420 0.0 logger logger -p daemon.err -t mysqld_safe -i -t mysqld 32S 0 6945 6907 1488 420 0.0 logger logger -p daemon.err -t mysqld_safe -i -t mysqld
33S 1001 17778 1 6436 1588 0.0 snmpd /usr/sbin/snmpd -u nagios -Lsd -Lf /dev/null -p/var/run/snmpd.pid 33S 1001 17778 1 6436 1588 0.0 snmpd /usr/sbin/snmpd -u nagios -Lsd -Lf /dev/null -p/var/run/snmpd.pid
34Ss 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 34Ss 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
35Ss 0 847 2319 14452 1752 0.0 sshd sshd: tonvoon [priv] 35Ss 0 847 2319 14452 1752 0.0 sshd sshd: tonvoon [priv]
36S 1000 857 847 14616 1832 0.0 sshd sshd: tonvoon@pts/3 36S 1000 857 847 14616 1832 0.0 sshd sshd: tonvoon@pts/3
37Ss 1000 860 857 2984 1620 0.0 bash -bash 37Ss 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
79Ss 1001 23784 1 6428 4948 0.0 import_ndologsd import_ndologsd 79Ss 1001 23784 1 6428 4948 0.0 import_ndologsd import_ndologsd
80S+ 1001 9803 18955 4132 1936 0.0 ssh ssh altinity@cube02.lei.altinity 80S+ 1001 9803 18955 4132 1936 0.0 ssh ssh altinity@cube02.lei.altinity
81S 1001 22505 22324 20256 1616 0.0 nagios ../../bin/nagios -d /usr/local/nagios/etc/nagios.cfg 81S 1001 22505 22324 20256 1616 0.0 nagios ../../bin/nagios -d /usr/local/nagios/etc/nagios.cfg
82S 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 82S 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
83S 1001 22507 22506 1660 492 0.0 ping /bin/ping -n -U -w 10 -c 1 192.168.10.23 83S 1001 22507 22506 1660 492 0.0 ping /bin/ping -n -U -w 10 -c 1 192.168.10.23
84R+ 1001 22508 23370 2308 680 0.0 ps ps axwo stat uid pid ppid vsz rss pcpu comm args 84R+ 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
33const char *progname = "urlize"; 32const char *progname = "urlize";
34const char *copyright = "2000-2006"; 33const char *copyright = "2000-2006";
35const char *email = "devel@nagios-plugins.org"; 34const 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..4c4aacc 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,32 +174,36 @@ 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 " \b"
188#endif 193#endif
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\
196Send email to help@nagios-plugins.org if you have questions regarding use\n\ 201Send email to help@monitoring-plugins.org if you have questions regarding\n\
197of this software. To submit patches or suggest improvements, send email to\n\ 202use of this software. To submit patches or suggest improvements, send email\n\
198devel@nagios-plugins.org\n\n") 203to devel@monitoring-plugins.org\n\n")
199 204
200#define UT_NOWARRANTY _("\n\ 205#define UT_NOWARRANTY _("\n\
201The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\ 206The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
202copies of the plugins under the terms of the GNU General Public License.\n\ 207copies of the plugins under the terms of the GNU General Public License.\n\
203For more information about these matters, see the file named COPYING.\n") 208For more information about these matters, see the file named COPYING.\n")
204 209