summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMonitoring Plugins Development Team <devel@monitoring-plugins.org>2014-01-18 03:40:24 -0500
committerThomas Guyot-Sionnest <dermoth@aei.ca>2014-01-19 14:18:47 -0500
commit63734f52ab1b4b2c17545b26fc41016d6bbd80bd (patch)
treedcd7aa3fd9a2a6a69a47d3a7e6a18d034426087a /plugins
parent9db763963f3993f923619a2147e4313b09f12134 (diff)
downloadmonitoring-plugins-63734f52ab1b4b2c17545b26fc41016d6bbd80bd.tar.gz
Project rename initial commit.
This is an initial take at renaming the project to Monitoring Plugins. It's not expected to be fully complete, and it is expected to break things (The perl module for instance). More testing will be required before this goes mainline.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Makefile.am2
-rw-r--r--plugins/check_apt.c6
-rw-r--r--plugins/check_by_ssh.c16
-rw-r--r--plugins/check_cluster.c8
-rw-r--r--plugins/check_dbi.c6
-rw-r--r--plugins/check_dig.c6
-rw-r--r--plugins/check_disk.c6
-rw-r--r--plugins/check_dns.c6
-rw-r--r--plugins/check_dummy.c6
-rw-r--r--plugins/check_fping.c6
-rw-r--r--plugins/check_game.c6
-rw-r--r--plugins/check_hpjd.c6
-rw-r--r--plugins/check_http.c8
-rw-r--r--plugins/check_ide_smart.c12
-rw-r--r--plugins/check_ldap.c6
-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.c6
-rw-r--r--plugins/check_nagios.c6
-rw-r--r--plugins/check_nt.c8
-rw-r--r--plugins/check_ntp.c6
-rw-r--r--plugins/check_ntp_peer.c6
-rw-r--r--plugins/check_ntp_time.c6
-rw-r--r--plugins/check_nwstat.c6
-rw-r--r--plugins/check_overcr.c6
-rw-r--r--plugins/check_pgsql.c8
-rw-r--r--plugins/check_ping.c6
-rw-r--r--plugins/check_procs.c6
-rw-r--r--plugins/check_radius.c8
-rw-r--r--plugins/check_real.c6
-rw-r--r--plugins/check_smtp.c6
-rw-r--r--plugins/check_snmp.c6
-rw-r--r--plugins/check_ssh.c6
-rw-r--r--plugins/check_swap.c6
-rw-r--r--plugins/check_tcp.c6
-rw-r--r--plugins/check_time.c6
-rw-r--r--plugins/check_ups.c8
-rw-r--r--plugins/check_users.c6
-rw-r--r--plugins/common.h4
-rw-r--r--plugins/negate.c6
-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
-rwxr-xr-xplugins/tests/check_http.t2
-rw-r--r--plugins/tests/var/ps_axwo.debian4
-rw-r--r--plugins/urlize.c16
-rw-r--r--plugins/utils.c2
-rw-r--r--plugins/utils.h17
56 files changed, 183 insertions, 182 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 031dd251..d2ac4bec 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 daeb7578..12038d07 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index c5f0d529..e3ec1caf 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 = "nagiosplug-devel@lists.sourceforge.net"; 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");
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index d4e39e0f..cf699e1f 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 8c4a511d..692a600e 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 = "nagiosplug-devel@lists.sourceforge.net"; 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_dig.c b/plugins/check_dig.c
index c113d87b..246624ae 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 04d588fb..7d6ab7f4 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 = "nagiosplug-devel@lists.sourceforge.net"; 32const char *email = "devel@monitoring-plugins.org";
33 33
34 34
35#include "common.h" 35#include "common.h"
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index ac6cfc38..4b3a0fb4 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 = "nagiosplug-devel@lists.sourceforge.net"; 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_dummy.c b/plugins/check_dummy.c
index 3cfc9ede..ab907731 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 dad000e6..786276ea 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 89bb4b12..205f4678 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 = "nagiosplug-devel@lists.sourceforge.net"; 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_hpjd.c b/plugins/check_hpjd.c
index 60e922ed..0d86eb16 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 c36d916a..03465540 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 */
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 0a8009ab..72fc707a 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
@@ -592,7 +592,7 @@ print_help (void)
592{ 592{
593 print_revision (progname, NP_VERSION); 593 print_revision (progname, NP_VERSION);
594 594
595 printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n"); 595 printf ("monitoring feature - 1999 Robert Dale <rdale@digital-mission.com>\n");
596 printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n"); 596 printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
597 printf (COPYRIGHT, copyright, email); 597 printf (COPYRIGHT, copyright, email);
598 598
@@ -616,8 +616,8 @@ print_help (void)
616 printf (" %s\n", _("Turn on automatic offline tests")); 616 printf (" %s\n", _("Turn on automatic offline tests"));
617 printf (" %s\n", "-0, --auto-off"); 617 printf (" %s\n", "-0, --auto-off");
618 printf (" %s\n", _("Turn off automatic offline tests")); 618 printf (" %s\n", _("Turn off automatic offline tests"));
619 printf (" %s\n", "-n, --nagios"); 619 printf (" %s\n", "-n, --monitoring");
620 printf (" %s\n", _("Output suitable for Nagios")); 620 printf (" %s\n", _("Output suitable for the monitoring system"));
621 621
622 printf (UT_SUPPORT); 622 printf (UT_SUPPORT);
623} 623}
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index b05aca9a..9c9b9c98 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 296a8233..2a3436db 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 d6162f35..192aa928 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 a8226514..4ce0f865 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 db670e2d..8dc2000a 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 0bb83c3e..10d47a32 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 = "nagiosplug-devel@lists.sourceforge.net"; 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_nagios.c b/plugins/check_nagios.c
index 4fd6342d..791b6dbe 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 52bbd1c5..de99d3f5 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 16be7c51..d293d8b7 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 76152e17..56d7400d 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index bbcaa0ba..a117ab2a 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 6ebe8f83..96635288 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 95977e91..de41b372 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 324bd5f4..a4e79e87 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
@@ -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 eef2195b..c0747204 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index c2239dba..065f7226 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index e54105b0..61ced532 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
@@ -370,7 +370,7 @@ 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 monitor will"));
374 printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that")); 374 printf ("%s\n", _("run the plugin 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
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 18240f30..92dd3d9e 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index d477a51e..e04e84d4 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 52ad31ea..2ca36b0e 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 6e8a5fc5..f0a40320 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 1b2a8dd5..20257eb3 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 6ab82616..a9928011 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 = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "devel@monitoring-plugins.org";
34 34
35#include <ctype.h> 35#include <ctype.h>
36 36
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 7ee014e9..e082723d 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 59dcc264..bba36ad9 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 = "nagiosplug-devel@lists.sourceforge.net"; 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"
diff --git a/plugins/check_users.c b/plugins/check_users.c
index ff2aedd2..246130b0 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 = "nagiosplug-devel@lists.sourceforge.net"; 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 f1358380..01003b3b 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 ef7d4e03..a6a43046 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 = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "devel@monitoring-plugins.org";
35 35
36#define DEFAULT_TIMEOUT 11 36#define DEFAULT_TIMEOUT 11
37 37
diff --git a/plugins/netutils.c b/plugins/netutils.c
index 9f18723a..00440465 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 347509e2..c5aa18fc 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 716bd524..592263fd 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 8aba1e33..4352e603 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 fe660673..2dcdadf0 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 2ec91904..2732125d 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 39b4ca9f..7e0f74b7 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 64aaf0ce..2c903db9 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 29086737..5bd27d2b 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 "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/tests/check_http.t b/plugins/tests/check_http.t
index c3085e13..2c89beb0 100755
--- a/plugins/tests/check_http.t
+++ b/plugins/tests/check_http.t
@@ -7,7 +7,7 @@
7# Country Name (2 letter code) [AU]:UK 7# Country Name (2 letter code) [AU]:UK
8# State or Province Name (full name) [Some-State]:Derbyshire 8# State or Province Name (full name) [Some-State]:Derbyshire
9# Locality Name (eg, city) []:Belper 9# Locality Name (eg, city) []:Belper
10# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Nagios Plugins 10# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Monitoring Plugins
11# Organizational Unit Name (eg, section) []: 11# Organizational Unit Name (eg, section) []:
12# Common Name (eg, YOUR name) []:Ton Voon 12# Common Name (eg, YOUR name) []:Ton Voon
13# Email Address []:tonvoon@mac.com 13# Email Address []:tonvoon@mac.com
diff --git a/plugins/tests/var/ps_axwo.debian b/plugins/tests/var/ps_axwo.debian
index 0d7d7bce..38e284af 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/monitoring/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 30b2a353..781569dd 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -1,17 +1,17 @@
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, thus displaying the child plugin's output as a clickable link in compatible
14* Nagios status screen. This plugin returns the status of the invoked plugin. 14* monitoring status screen. This plugin returns the status of the invoked plugin.
15* 15*
16* 16*
17* This program is free software: you can redistribute it and/or modify 17* This program is free software: you can redistribute it and/or modify
@@ -32,7 +32,7 @@
32 32
33const char *progname = "urlize"; 33const char *progname = "urlize";
34const char *copyright = "2000-2006"; 34const char *copyright = "2000-2006";
35const char *email = "nagiosplug-devel@lists.sourceforge.net"; 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"
@@ -166,9 +166,9 @@ print_help (void)
166 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"); 166 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
167 printf (COPYRIGHT, copyright, email); 167 printf (COPYRIGHT, copyright, email);
168 168
169 printf ("%s\n", _("This plugin wraps the text output of another command (plugin)")); 169 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")); 170 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.")); 171 printf ("%s\n", _("monitoring status screen. This plugin returns the status of the invoked plugin."));
172 172
173 printf ("\n\n"); 173 printf ("\n\n");
174 174
diff --git a/plugins/utils.c b/plugins/utils.c
index b57d5e17..58b153d8 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 657d4bfa..6a89a9b7 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\
@@ -180,7 +181,7 @@ char *fperfdata (const char *,
180#ifdef NP_EXTRA_OPTS 181#ifdef NP_EXTRA_OPTS
181#define UT_EXTRA_OPTS _("\ 182#define UT_EXTRA_OPTS _("\
182 --extra-opts=[section][@file]\n\ 183 --extra-opts=[section][@file]\n\
183 Read options from an ini file. See http://nagiosplugins.org/extra-opts\n\ 184 Read options from an ini file. See http://monitoring-plugins.org/doc/extra-opts.html\n\
184 for usage and examples.\n") 185 for usage and examples.\n")
185#else 186#else
186#define UT_EXTRA_OPTS "" 187#define UT_EXTRA_OPTS ""
@@ -188,16 +189,16 @@ char *fperfdata (const char *,
188 189
189#define UT_THRESHOLDS_NOTES _("\ 190#define UT_THRESHOLDS_NOTES _("\
190 See:\n\ 191 See:\n\
191 http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT\n\ 192 http://monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\
192 for THRESHOLD format and examples.\n") 193 for THRESHOLD format and examples.\n")
193 194
194#define UT_SUPPORT _("\n\ 195#define UT_SUPPORT _("\n\
195Send email to nagios-users@lists.sourceforge.net if you have questions\n\ 196Send email to help@monitoring-plugins.org if you have questions\n\
196regarding use of this software. To submit patches or suggest improvements,\n\ 197regarding use of this software. To submit patches or suggest improvements,\n\
197send email to nagiosplug-devel@lists.sourceforge.net\n\n") 198send email to devel@monitoring-plugins.org\n\n")
198 199
199#define UT_NOWARRANTY _("\n\ 200#define UT_NOWARRANTY _("\n\
200The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\ 201The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
201copies of the plugins under the terms of the GNU General Public License.\n\ 202copies of the plugins under the terms of the GNU General Public License.\n\
202For more information about these matters, see the file named COPYING.\n") 203For more information about these matters, see the file named COPYING.\n")
203 204