From 63734f52ab1b4b2c17545b26fc41016d6bbd80bd Mon Sep 17 00:00:00 2001 From: Monitoring Plugins Development Team Date: Sat, 18 Jan 2014 03:40:24 -0500 Subject: 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. --- plugins/Makefile.am | 2 +- plugins/check_apt.c | 6 +++--- plugins/check_by_ssh.c | 16 ++++++++-------- plugins/check_cluster.c | 8 ++++---- plugins/check_dbi.c | 6 +++--- plugins/check_dig.c | 6 +++--- plugins/check_disk.c | 6 +++--- plugins/check_dns.c | 6 +++--- plugins/check_dummy.c | 6 +++--- plugins/check_fping.c | 6 +++--- plugins/check_game.c | 6 +++--- plugins/check_hpjd.c | 6 +++--- plugins/check_http.c | 8 ++++---- plugins/check_ide_smart.c | 12 ++++++------ plugins/check_ldap.c | 6 +++--- plugins/check_load.c | 6 +++--- plugins/check_mrtg.c | 6 +++--- plugins/check_mrtgtraf.c | 6 +++--- plugins/check_mysql.c | 6 +++--- plugins/check_mysql_query.c | 6 +++--- plugins/check_nagios.c | 6 +++--- plugins/check_nt.c | 8 ++++---- plugins/check_ntp.c | 6 +++--- plugins/check_ntp_peer.c | 6 +++--- plugins/check_ntp_time.c | 6 +++--- plugins/check_nwstat.c | 6 +++--- plugins/check_overcr.c | 6 +++--- plugins/check_pgsql.c | 8 ++++---- plugins/check_ping.c | 6 +++--- plugins/check_procs.c | 6 +++--- plugins/check_radius.c | 8 ++++---- plugins/check_real.c | 6 +++--- plugins/check_smtp.c | 6 +++--- plugins/check_snmp.c | 6 +++--- plugins/check_ssh.c | 6 +++--- plugins/check_swap.c | 6 +++--- plugins/check_tcp.c | 6 +++--- plugins/check_time.c | 6 +++--- plugins/check_ups.c | 8 ++++---- plugins/check_users.c | 6 +++--- plugins/common.h | 4 ++-- plugins/negate.c | 6 +++--- plugins/netutils.c | 4 ++-- plugins/netutils.h | 4 ++-- plugins/popen.c | 4 ++-- plugins/runcmd.c | 4 ++-- plugins/runcmd.h | 2 +- plugins/sslutils.c | 4 ++-- plugins/t/check_disk.t | 4 ++-- plugins/t/check_dns.t | 2 +- plugins/t/check_http.t | 22 +++++++++++----------- plugins/tests/check_http.t | 2 +- plugins/tests/var/ps_axwo.debian | 4 ++-- plugins/urlize.c | 16 ++++++++-------- plugins/utils.c | 2 +- plugins/utils.h | 17 +++++++++-------- 56 files changed, 183 insertions(+), 182 deletions(-) (limited to 'plugins') 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 libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c \ popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h -BASEOBJS = libnpcommon.a ../lib/libnagiosplug.a ../gl/libgnu.a +BASEOBJS = libnpcommon.a ../lib/libmonitoringplug.a ../gl/libgnu.a NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS) NETLIBS = $(NETOBJS) $(SOCKETLIBS) SSLOBJS = $(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 @@ /***************************************************************************** * -* Nagios check_apt plugin +* monitoring check_apt plugin * * License: GPL -* Copyright (c) 2006-2008 Nagios Plugins Development Team +* Copyright (c) 2006-2008 Monitoring Plugins Development Team * * Original author: Sean Finney * @@ -31,7 +31,7 @@ const char *progname = "check_apt"; const char *copyright = "2006-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_by_ssh plugin +* monitoring check_by_ssh plugin * * License: GPL -* Copyright (c) 2000-2008 Nagios Plugins Development Team +* Copyright (c) 2000-2008 Monitoring Plugins Development Team * * Description: * @@ -28,7 +28,7 @@ const char *progname = "check_by_ssh"; const char *copyright = "2000-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -246,7 +246,7 @@ process_arguments (int argc, char **argv) } service[services - 1] = p1; break; - case 'n': /* short name of host in nagios configuration */ + case 'n': /* short name of host in the monitoring configuration */ host_shortname = optarg; break; @@ -371,7 +371,7 @@ validate_arguments (void) die (STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname); if (passive && host_shortname == NULL) - die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the nagios configs.\n"), progname); + die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the monitoring configs.\n"), progname); return OK; } @@ -416,11 +416,11 @@ print_help (void) printf (" %s\n","-i, --identity=KEYFILE"); printf (" %s\n", _("identity of an authorized key [optional]")); printf (" %s\n","-O, --output=FILE"); - printf (" %s\n", _("external command file for nagios [optional]")); + printf (" %s\n", _("external command file for monitoring [optional]")); printf (" %s\n","-s, --services=LIST"); - printf (" %s\n", _("list of nagios service names, separated by ':' [optional]")); + printf (" %s\n", _("list of monitoring service names, separated by ':' [optional]")); printf (" %s\n","-n, --name=NAME"); - printf (" %s\n", _("short name of host in nagios configuration [optional]")); + printf (" %s\n", _("short name of host in the monitoring configuration [optional]")); printf (" %s\n","-o, --ssh-option=OPTION"); printf (" %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]")); 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 @@ /***************************************************************************** * -* check_cluster.c - Host and Service Cluster Plugin for Nagios 2.x +* check_cluster.c - Host and Service Cluster Plugin for Monitoring * * License: GPL * Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org) -* Copyright (c) 2007 Nagios Plugins Development Team +* Copyright (c) 2007 Monitoring Plugins Development Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ const char *progname = "check_cluster"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -227,7 +227,7 @@ print_help(void) printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n"); printf(COPYRIGHT, copyright, email); - printf(_("Host/Service Cluster Plugin for Nagios 2")); + printf(_("Host/Service Cluster Plugin for Monitoring")); printf("\n\n"); 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 @@ /***************************************************************************** * -* Nagios check_dbi plugin +* monitoring check_dbi plugin * * License: GPL -* Copyright (c) 2011 Nagios Plugins Development Team +* Copyright (c) 2011 Monitoring Plugins Development Team * Author: Sebastian 'tokkee' Harl * * Description: @@ -31,7 +31,7 @@ const char *progname = "check_dbi"; const char *copyright = "2011"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_dig plugin +* monitoring check_dig plugin * * License: GPL -* Copyright (c) 2002-2008 Nagios Plugins Development Team +* Copyright (c) 2002-2008 Monitoring Plugins Development Team * * Description: * @@ -34,7 +34,7 @@ const char *progname = "check_dig"; const char *copyright = "2002-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_disk plugin +* monitoring check_disk plugin * * License: GPL -* Copyright (c) 1999-2008 Nagios Plugins Development Team +* Copyright (c) 1999-2008 Monitoring Plugins Development Team * * Description: * @@ -29,7 +29,7 @@ const char *progname = "check_disk"; const char *program_name = "check_disk"; /* Required for coreutils libs */ const char *copyright = "1999-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #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 @@ /***************************************************************************** * -* Nagios check_dns plugin +* monitoring check_dns plugin * * License: GPL -* Copyright (c) 2000-2008 Nagios Plugins Development Team +* Copyright (c) 2000-2008 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_dns"; const char *copyright = "2000-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_dummy plugin +* monitoring check_dummy plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_dummy"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_fping plugin +* monitoring check_fping plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_fping"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_game plugin +* monitoring check_game plugin * * License: GPL -* Copyright (c) 2002-2007 Nagios Plugins Development Team +* Copyright (c) 2002-2007 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_game"; const char *copyright = "2002-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_hpjd plugin +* monitoring check_hpjd plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_hpjd"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_http plugin +* monitoring check_http plugin * * License: GPL -* Copyright (c) 1999-2013 Nagios Plugins Development Team +* Copyright (c) 1999-2013 Monitoring Plugins Development Team * * Description: * @@ -35,7 +35,7 @@ const char *progname = "check_http"; const char *copyright = "1999-2013"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -157,7 +157,7 @@ main (int argc, char **argv) /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */ server_url = strdup(HTTP_URL); server_url_length = strlen(server_url); - xasprintf (&user_agent, "User-Agent: check_http/v%s (nagios-plugins %s)", + xasprintf (&user_agent, "User-Agent: check_http/v%s (monitoring-plugins %s)", NP_VERSION, VERSION); /* 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 @@ /***************************************************************************** * -* Nagios check_ide_smart plugin +* monitoring check_ide_smart plugin * ide-smart 1.3 - IDE S.M.A.R.T. checking tool * * License: GPL * Copyright (C) 1998-1999 Ragnar Hojland Espinosa * 1998 Gadi Oxman * Copyright (c) 2000 Robert Dale -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -35,7 +35,7 @@ const char *progname = "check_ide_smart"; const char *copyright = "1998-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -592,7 +592,7 @@ print_help (void) { print_revision (progname, NP_VERSION); - printf ("Nagios feature - 1999 Robert Dale \n"); + printf ("monitoring feature - 1999 Robert Dale \n"); printf ("(C) 1999 Ragnar Hojland Espinosa \n"); printf (COPYRIGHT, copyright, email); @@ -616,8 +616,8 @@ print_help (void) printf (" %s\n", _("Turn on automatic offline tests")); printf (" %s\n", "-0, --auto-off"); printf (" %s\n", _("Turn off automatic offline tests")); - printf (" %s\n", "-n, --nagios"); - printf (" %s\n", _("Output suitable for Nagios")); + printf (" %s\n", "-n, --monitoring"); + printf (" %s\n", _("Output suitable for the monitoring system")); printf (UT_SUPPORT); } 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 @@ /***************************************************************************** * -* Nagios check_ldap plugin +* monitoring check_ldap plugin * * License: GPL -* Copyright (c) 2000-2008 Nagios Plugins Development Team +* Copyright (c) 2000-2008 Monitoring Plugins Development Team * * Description: * @@ -29,7 +29,7 @@ /* progname may be check_ldaps */ char *progname = "check_ldap"; const char *copyright = "2000-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_load plugin +* monitoring check_load plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_load"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_mrtg plugin +* monitoring check_mrtg plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_mrtg"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_mrtgtraf plugin +* monitoring check_mrtgtraf plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -34,7 +34,7 @@ const char *progname = "check_mrtgtraf"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; int process_arguments (int, char **); int 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 @@ /***************************************************************************** * -* Nagios check_mysql plugin +* monitoring check_mysql plugin * * License: GPL * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at) * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) -* Copyright (c) 1999-2011 Nagios Plugins Development Team +* Copyright (c) 1999-2011 Monitoring Plugins Development Team * * Description: * @@ -32,7 +32,7 @@ const char *progname = "check_mysql"; const char *copyright = "1999-2011"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #define SLAVERESULTSIZE 70 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 @@ /***************************************************************************** * -* Nagios check_mysql_query plugin +* monitoring check_mysql_query plugin * * License: GPL -* Copyright (c) 2006-2009 Nagios Plugins Development Team +* Copyright (c) 2006-2009 Monitoring Plugins Development Team * Original code from check_mysql, copyright 1999 Didi Rieder * * Description: @@ -31,7 +31,7 @@ const char *progname = "check_mysql_query"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_nagios plugin +* Monitoring check_nagios plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -34,7 +34,7 @@ const char *progname = "check_nagios"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_nt plugin +* monitoring check_nt plugin * * License: GPL * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com) -* Copyright (c) 2003-2007 Nagios Plugins Development Team +* Copyright (c) 2003-2007 Monitoring Plugins Development Team * * Description: * @@ -34,7 +34,7 @@ const char *progname = "check_nt"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -750,7 +750,7 @@ void print_help(void) printf (" %s\n", _("The purpose of this is to be run from command line to determine what instances")); printf (" %s\n", _(" are available for monitoring without having to log onto the Windows server")); printf (" %s\n", _(" to run Perfmon directly.")); - printf (" %s\n", _("It can also be used in scripts that automatically create Nagios service")); + printf (" %s\n", _("It can also be used in scripts that automatically create the monitoring service")); printf (" %s\n", _(" configuration files.")); printf (" %s\n", _("Some examples:")); 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 @@ /***************************************************************************** * -* Nagios check_ntp plugin +* monitoring check_ntp plugin * * License: GPL * Copyright (c) 2006 Sean Finney -* Copyright (c) 2006-2008 Nagios Plugins Development Team +* Copyright (c) 2006-2008 Monitoring Plugins Development Team * * Description: * @@ -32,7 +32,7 @@ const char *progname = "check_ntp"; const char *copyright = "2006-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_ntp_peer plugin +* monitoring check_ntp_peer plugin * * License: GPL * Copyright (c) 2006 Sean Finney -* Copyright (c) 2006-2008 Nagios Plugins Development Team +* Copyright (c) 2006-2008 Monitoring Plugins Development Team * * Description: * @@ -37,7 +37,7 @@ const char *progname = "check_ntp_peer"; const char *copyright = "2006-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_ntp_time plugin +* monitoring check_ntp_time plugin * * License: GPL * Copyright (c) 2006 Sean Finney -* Copyright (c) 2006-2008 Nagios Plugins Development Team +* Copyright (c) 2006-2008 Monitoring Plugins Development Team * * Description: * @@ -36,7 +36,7 @@ const char *progname = "check_ntp_time"; const char *copyright = "2006-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_nwstat plugin +* monitoring check_nwstat plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_nwstat"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_overcr plugin +* monitoring check_overcr plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_overcr"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_pgsql plugin +* monitoring check_pgsql plugin * * License: GPL -* Copyright (c) 1999-2011 Nagios Plugins Development Team +* Copyright (c) 1999-2011 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_pgsql"; const char *copyright = "1999-2011"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -563,7 +563,7 @@ print_help (void) printf (" %s\n", _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP")); printf (" %s\n\n", _("connections (start the postmaster with the -i option).")); - printf (" %s\n", _("Typically, the nagios user (unless the --logname option is used) should be")); + printf (" %s\n", _("Typically, the monitoring user (unless the --logname option is used) should be")); printf (" %s\n", _("able to connect to the database without a password. The plugin can also send")); printf (" %s\n", _("a password, but no effort is made to obsure or encrypt the password.")); 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 @@ /***************************************************************************** * -* Nagios check_ping plugin +* monitoring check_ping plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_ping"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_procs plugin +* monitoring check_procs plugin * * License: GPL -* Copyright (c) 2000-2008 Nagios Plugins Development Team +* Copyright (c) 2000-2008 Monitoring Plugins Development Team * * Description: * @@ -34,7 +34,7 @@ const char *progname = "check_procs"; const char *program_name = "check_procs"; /* Required for coreutils libs */ const char *copyright = "2000-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_radius plugin +* monitoring check_radius plugin * * License: GPL -* Copyright (c) 1999-2008 Nagios Plugins Development Team +* Copyright (c) 1999-2008 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_radius"; const char *copyright = "2000-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -370,7 +370,7 @@ print_help (void) printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); printf ("%s\n", _("The password option presents a substantial security issue because the")); printf ("%s\n", _("password can possibly be determined by careful watching of the command line")); - printf ("%s\n", _("in a process listing. This risk is exacerbated because nagios will")); + printf ("%s\n", _("in a process listing. This risk is exacerbated because the monitor will")); printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that")); printf ("%s\n", _("the password used does not allow access to sensitive system resources.")); 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 @@ /***************************************************************************** * -* Nagios check_real plugin +* monitoring check_real plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_real"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_smtp plugin +* monitoring check_smtp plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_smtp"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_snmp plugin +* monitoring check_snmp plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_snmp"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_ssh plugin +* monitoring check_ssh plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_ssh"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_disk plugin +* monitoring check_disk plugin * * License: GPL * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -29,7 +29,7 @@ const char *progname = "check_swap"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_tcp plugin +* monitoring check_tcp plugin * * License: GPL -* Copyright (c) 1999-2013 Nagios Plugins Development Team +* Copyright (c) 1999-2013 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ /* progname "check_tcp" changes depending on symlink called */ char *progname; const char *copyright = "1999-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include 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 @@ /***************************************************************************** * -* Nagios check_time plugin +* monitoring check_time plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_time"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_ups plugin +* monitoring check_ups plugin * * License: GPL * Copyright (c) 2000 Tom Shields * 2004 Alain Richard * 2004 Arnaud Quette -* Copyright (c) 2002-2007 Nagios Plugins Development Team +* Copyright (c) 2002-2007 Monitoring Plugins Development Team * * Description: * -* This file contains Network UPS Tools plugin for Nagios +* This file contains Network UPS Tools plugin for Monitoring * * This plugin tests the UPS service on the specified host. Network UPS Tools * from www.networkupstools.org must be running for this plugin to work. @@ -34,7 +34,7 @@ const char *progname = "check_ups"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios check_users plugin +* monitoring check_users plugin * * License: GPL -* Copyright (c) 2000-2012 Nagios Plugins Development Team +* Copyright (c) 2000-2012 Monitoring Plugins Development Team * * Description: * @@ -32,7 +32,7 @@ const char *progname = "check_users"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #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 @@ /***************************************************************************** * -* Nagios plugins common include file +* Monitoring Plugins common include file * * License: GPL * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) -* Copyright (c) 2003-2007 Nagios Plugins Development Team +* Copyright (c) 2003-2007 Monitoring Plugins Development Team * * Description: * 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 @@ /***************************************************************************** * -* Nagios negate plugin +* monitoring negate plugin * * License: GPL -* Copyright (c) 2002-2008 Nagios Plugins Development Team +* Copyright (c) 2002-2008 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "negate"; const char *copyright = "2002-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #define DEFAULT_TIMEOUT 11 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 @@ /***************************************************************************** * -* Nagios plugins network utilities +* Monitoring Plugins network utilities * * License: GPL * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) -* Copyright (c) 2003-2008 Nagios Plugins Development Team +* Copyright (c) 2003-2008 Monitoring Plugins Development Team * * Description: * 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 @@ /***************************************************************************** * -* Nagios plugins net utilities include file +* Monitoring Plugins net utilities include file * * License: GPL * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) -* Copyright (c) 2003-2007 Nagios Plugins Development Team +* Copyright (c) 2003-2007 Monitoring Plugins Development Team * * Description: * 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 @@ /***************************************************************************** * -* Nagios plugins popen +* Monitoring Plugins popen * * License: GPL -* Copyright (c) 2005-2007 Nagios Plugins Development Team +* Copyright (c) 2005-2007 Monitoring Plugins Development Team * * Description: * 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 @@ /***************************************************************************** * -* Nagios run command utilities +* Monitoring run command utilities * * License: GPL -* Copyright (c) 2005-2006 Nagios Plugins Development Team +* Copyright (c) 2005-2006 Monitoring Plugins Development Team * * Description : * 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 @@ /**************************************************************************** * * License: GPL -* Copyright (c) 2005 Nagios Plugins Development Team +* Copyright (c) 2005 Monitoring Plugins Development Team * Author: Andreas Ericsson * * 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 @@ /***************************************************************************** * -* Nagios plugins SSL utilities +* Monitoring Plugins SSL utilities * * License: GPL -* Copyright (c) 2005-2010 Nagios Plugins Development Team +* Copyright (c) 2005-2010 Monitoring Plugins Development Team * * Description: * 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 @@ # # -# TODO: Add in tests for perf data. Need to beef up Nagios::Plugin::Performance to cater for max, min, etc +# TODO: Add in tests for perf data. Need to beef up Monitoring::Plugin::Performance to cater for max, min, etc use strict; use Test::More; @@ -37,7 +37,7 @@ cmp_ok( $c, '==', 2, "Got two mountpoints in output"); # Get perf data -# Should use Nagios::Plugin +# Should use Monitoring::Plugin my @perf_data = sort(split(/ /, $result->perf_output)); 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/'; my $hostname_valid = getTestParameter( "NP_HOSTNAME_VALID", "A valid (known to DNS) hostname", - "nagios.com" + "monitoring-plugins.org" ); my $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", "yes"); my $host_tcp_http2 = getTestParameter( "NP_HOST_TCP_HTTP2", - "A host providing an index page containing the string 'nagios'", - "nagios.org" ); + "A host providing an index page containing the string 'monitoring'", + "monitoring-plugins.org" ); $res = NPTest->testCmd( @@ -62,23 +62,23 @@ cmp_ok( $res->return_code, '==', 2, "Webserver $hostname_invalid not valid" ); like( $res->output, "/Unable to open TCP socket|Socket timeout after/", "Output OK"); SKIP: { - skip "No host serving nagios in index file", 7 unless $host_tcp_http2; + skip "No host serving monitoring in index file", 7 unless $host_tcp_http2; - $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios'" ); - cmp_ok( $res->return_code, "==", 0, "Got a reference to 'nagios'"); + $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'monitoring'" ); + cmp_ok( $res->return_code, "==", 0, "Got a reference to 'monitoring'"); - $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs'" ); - cmp_ok( $res->return_code, "==", 2, "Not got 'nAGiOs'"); + $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'mONiTORing'" ); + cmp_ok( $res->return_code, "==", 2, "Not got 'mONiTORing'"); like ( $res->output, "/pattern not found/", "Error message says 'pattern not found'"); - $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -R 'nAGiOs'" ); - cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'nAGiOs'"); + $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -R 'mONiTORing'" ); + cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'mONiTORing'"); - $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios' --invert-regex" ); + $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'monitoring' --invert-regex" ); cmp_ok( $res->return_code, "==", 2, "Invert results work when found"); like ( $res->output, "/pattern found/", "Error message says 'pattern found'"); - $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs' --invert-regex" ); + $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'mONiTORing' --invert-regex" ); cmp_ok( $res->return_code, "==", 0, "And also when not found"); } SKIP: { 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 @@ # Country Name (2 letter code) [AU]:UK # State or Province Name (full name) [Some-State]:Derbyshire # Locality Name (eg, city) []:Belper -# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Nagios Plugins +# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Monitoring Plugins # Organizational Unit Name (eg, section) []: # Common Name (eg, YOUR name) []:Ton Voon # 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_ S 103 6944 6907 123220 27724 0.0 mysqld /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --user=mysql --pid-file=/var/run/mysqld/mysqld.pid --skip-locking --port=3306 --socket=/var/run/mysqld/mysqld.sock S 0 6945 6907 1488 420 0.0 logger logger -p daemon.err -t mysqld_safe -i -t mysqld S 1001 17778 1 6436 1588 0.0 snmpd /usr/sbin/snmpd -u nagios -Lsd -Lf /dev/null -p/var/run/snmpd.pid -Ss 0 17789 1 9496 5556 0.0 snmptrapd /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/nagios/snmp/load -p /var/run/snmptrapd.pid +Ss 0 17789 1 9496 5556 0.0 snmptrapd /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/monitoring/snmp/load -p /var/run/snmptrapd.pid Ss 0 847 2319 14452 1752 0.0 sshd sshd: tonvoon [priv] S 1000 857 847 14616 1832 0.0 sshd sshd: tonvoon@pts/3 Ss 1000 860 857 2984 1620 0.0 bash -bash @@ -79,6 +79,6 @@ Ss 1001 23783 1 3220 764 0.0 ndo2db /usr/local/nagios/bin/nd Ss 1001 23784 1 6428 4948 0.0 import_ndologsd import_ndologsd S+ 1001 9803 18955 4132 1936 0.0 ssh ssh altinity@cube02.lei.altinity S 1001 22505 22324 20256 1616 0.0 nagios ../../bin/nagios -d /usr/local/nagios/etc/nagios.cfg -S 1001 22506 22505 1676 608 0.0 check_ping /usr/local/nagios/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1 +S 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 S 1001 22507 22506 1660 492 0.0 ping /bin/ping -n -U -w 10 -c 1 192.168.10.23 R+ 1001 22508 23370 2308 680 0.0 ps ps axwo stat uid pid ppid vsz rss pcpu comm args diff --git a/plugins/urlize.c b/plugins/urlize.c index 30b2a353..781569dd 100644 --- a/plugins/urlize.c +++ b/plugins/urlize.c @@ -1,17 +1,17 @@ /***************************************************************************** * -* Nagios urlize plugin +* monitoring urlize plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * * This file contains the urlize plugin * * This plugin wraps the text output of another command (plugin) in HTML -* tags, thus displaying the child plugin's output as a clickable link in the -* Nagios status screen. This plugin returns the status of the invoked plugin. +* tags, thus displaying the child plugin's output as a clickable link in compatible +* monitoring status screen. This plugin returns the status of the invoked plugin. * * * This program is free software: you can redistribute it and/or modify @@ -32,7 +32,7 @@ const char *progname = "urlize"; const char *copyright = "2000-2006"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -166,9 +166,9 @@ print_help (void) printf ("Copyright (c) 2000 Karl DeBisschop \n"); printf (COPYRIGHT, copyright, email); - printf ("%s\n", _("This plugin wraps the text output of another command (plugin)")); - printf ("%s\n", _("in HTML tags, thus displaying the child plugin's output as a clickable link in")); - printf ("%s\n", _("the Nagios status screen. This plugin returns the status of the invoked plugin.")); + printf ("%s\n", _("This plugin wraps the text output of another command (plugin) in HTML ")); + printf ("%s\n", _("tags, thus displaying the child plugin's output as a clickable link in compatible")); + printf ("%s\n", _("monitoring status screen. This plugin returns the status of the invoked plugin.")); printf ("\n\n"); 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 @@ * * License: GPL * Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net) -* Copyright (c) 2002-2007 Nagios Plugin Development Team +* Copyright (c) 2002-2007 Monitoring Plugins Development Team * * This program is free software: you can redistribute it and/or modify * 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 @@ #ifndef NP_UTILS_H #define NP_UTILS_H -/* Header file for nagios plugins utils.c */ +/* Header file for monitoring plugins utils.c */ /* This file should be included in all plugins */ @@ -131,7 +131,7 @@ char *fperfdata (const char *, {"warning",required_argument,0,'w'},\ {"hostname",required_argument,0,'H'} -#define COPYRIGHT "Copyright (c) %s Nagios Plugin Development Team\n\ +#define COPYRIGHT "Copyright (c) %s Monitoring Plugins Development Team\n\ \t<%s>\n\n" #define UT_HLP_VRS _("\ @@ -159,7 +159,8 @@ char *fperfdata (const char *, #define UT_VERBOSE _("\ -v, --verbose\n\ - Show details for command-line debugging (Nagios may truncate output)\n") + Show details for command-line debugging (output may be truncated by\n\ + the monitoring system)\n") #define UT_WARN_CRIT _("\ -w, --warning=DOUBLE\n\ @@ -180,7 +181,7 @@ char *fperfdata (const char *, #ifdef NP_EXTRA_OPTS #define UT_EXTRA_OPTS _("\ --extra-opts=[section][@file]\n\ - Read options from an ini file. See http://nagiosplugins.org/extra-opts\n\ + Read options from an ini file. See http://monitoring-plugins.org/doc/extra-opts.html\n\ for usage and examples.\n") #else #define UT_EXTRA_OPTS "" @@ -188,16 +189,16 @@ char *fperfdata (const char *, #define UT_THRESHOLDS_NOTES _("\ See:\n\ - http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT\n\ + http://monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\ for THRESHOLD format and examples.\n") #define UT_SUPPORT _("\n\ -Send email to nagios-users@lists.sourceforge.net if you have questions\n\ +Send email to help@monitoring-plugins.org if you have questions\n\ regarding use of this software. To submit patches or suggest improvements,\n\ -send email to nagiosplug-devel@lists.sourceforge.net\n\n") +send email to devel@monitoring-plugins.org\n\n") #define UT_NOWARRANTY _("\n\ -The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\ +The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\ copies of the plugins under the terms of the GNU General Public License.\n\ For more information about these matters, see the file named COPYING.\n") -- cgit v1.2.3-74-g34f1 From a8c9b696f47c8abf777a0a67ee98616bc9a219a9 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Mon, 20 Jan 2014 02:20:28 +0100 Subject: Minor fixes to be amended into "rename" commit --- lib/extra_opts.c | 2 +- lib/parse_ini.c | 2 +- plugins/check_radius.c | 4 ++-- plugins/t/check_http.t | 2 +- plugins/urlize.c | 3 +-- tools/distclean | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) (limited to 'plugins') diff --git a/lib/extra_opts.c b/lib/extra_opts.c index 70e7dd27..f4d5e66a 100644 --- a/lib/extra_opts.c +++ b/lib/extra_opts.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* Monitoring-plugins extra_opts library +* Monitoring Plugins extra_opts library * * License: GPL * Copyright (c) 2007 Monitoring Plugins Development Team diff --git a/lib/parse_ini.c b/lib/parse_ini.c index dfa72d9c..a1da5038 100644 --- a/lib/parse_ini.c +++ b/lib/parse_ini.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* Monitoring-plugins parse_ini library +* Monitoring Plugins parse_ini library * * License: GPL * Copyright (c) 2007 Monitoring Plugins Development Team diff --git a/plugins/check_radius.c b/plugins/check_radius.c index 61ced532..d3549a6c 100644 --- a/plugins/check_radius.c +++ b/plugins/check_radius.c @@ -370,8 +370,8 @@ print_help (void) printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); printf ("%s\n", _("The password option presents a substantial security issue because the")); printf ("%s\n", _("password can possibly be determined by careful watching of the command line")); - printf ("%s\n", _("in a process listing. This risk is exacerbated because the monitor will")); - printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that")); + printf ("%s\n", _("in a process listing. This risk is exacerbated because the plugin will")); + printf ("%s\n", _("typically be executed at regular predictable intervals. Please be sure that")); printf ("%s\n", _("the password used does not allow access to sensitive system resources.")); printf (UT_SUPPORT); diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t index 5bd27d2b..a74220e2 100644 --- a/plugins/t/check_http.t +++ b/plugins/t/check_http.t @@ -32,7 +32,7 @@ my $internet_access = getTestParameter( "NP_INTERNET_ACCESS", my $host_tcp_http2 = getTestParameter( "NP_HOST_TCP_HTTP2", "A host providing an index page containing the string 'monitoring'", - "monitoring-plugins.org" ); + "test.monitoring-plugins.org" ); $res = NPTest->testCmd( diff --git a/plugins/urlize.c b/plugins/urlize.c index 781569dd..6803ddfc 100644 --- a/plugins/urlize.c +++ b/plugins/urlize.c @@ -10,8 +10,7 @@ * This file contains the urlize plugin * * This plugin wraps the text output of another command (plugin) in HTML -* tags, thus displaying the child plugin's output as a clickable link in compatible -* monitoring status screen. This plugin returns the status of the invoked plugin. +* tags. This plugin returns the status of the invoked plugin. * * * This program is free software: you can redistribute it and/or modify diff --git a/tools/distclean b/tools/distclean index 06d633e9..961cc801 100755 --- a/tools/distclean +++ b/tools/distclean @@ -6,7 +6,7 @@ # Please run this script from the top-level directory. if [ ! -f tools/distclean ]; then - echo "Please run this script from the top-level directory of Monitoring-plugins." + echo "Please run this script from the top-level directory of Monitoring Plugins." exit 1 fi -- cgit v1.2.3-74-g34f1 From c3e756a855704089ded8a126158454167c9e0581 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Mon, 20 Jan 2014 03:12:50 +0100 Subject: Capitalize "Monitoring" when it's the first word --- plugins-root/check_dhcp.c | 2 +- plugins-root/check_icmp.c | 2 +- plugins/check_apt.c | 2 +- plugins/check_by_ssh.c | 2 +- plugins/check_dbi.c | 2 +- plugins/check_dig.c | 2 +- plugins/check_disk.c | 2 +- plugins/check_dns.c | 2 +- plugins/check_dummy.c | 2 +- plugins/check_fping.c | 2 +- plugins/check_game.c | 2 +- plugins/check_hpjd.c | 2 +- plugins/check_http.c | 2 +- plugins/check_ide_smart.c | 2 +- plugins/check_ldap.c | 2 +- plugins/check_load.c | 2 +- plugins/check_mrtg.c | 2 +- plugins/check_mrtgtraf.c | 2 +- plugins/check_mysql.c | 2 +- plugins/check_mysql_query.c | 2 +- plugins/check_nt.c | 2 +- plugins/check_ntp.c | 2 +- plugins/check_ntp_peer.c | 2 +- plugins/check_ntp_time.c | 2 +- plugins/check_nwstat.c | 2 +- plugins/check_overcr.c | 2 +- plugins/check_pgsql.c | 2 +- plugins/check_ping.c | 2 +- plugins/check_procs.c | 2 +- plugins/check_radius.c | 2 +- plugins/check_real.c | 2 +- plugins/check_smtp.c | 2 +- plugins/check_snmp.c | 2 +- plugins/check_ssh.c | 2 +- plugins/check_swap.c | 2 +- plugins/check_tcp.c | 2 +- plugins/check_time.c | 2 +- plugins/check_ups.c | 2 +- plugins/check_users.c | 2 +- plugins/negate.c | 2 +- plugins/urlize.c | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) (limited to 'plugins') diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c index e682dd02..1ec5c396 100644 --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_dhcp plugin +* Monitoring check_dhcp plugin * * License: GPL * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org) diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c index 4c3df0bc..4c5b3326 100644 --- a/plugins-root/check_icmp.c +++ b/plugins-root/check_icmp.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_icmp plugin +* Monitoring check_icmp plugin * * License: GPL * Copyright (c) 2005-2008 Monitoring Plugins Development Team diff --git a/plugins/check_apt.c b/plugins/check_apt.c index 12038d07..dafce5b9 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_apt plugin +* Monitoring check_apt plugin * * License: GPL * Copyright (c) 2006-2008 Monitoring Plugins Development Team diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index e3ec1caf..b90c1520 100644 --- a/plugins/check_by_ssh.c +++ b/plugins/check_by_ssh.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_by_ssh plugin +* Monitoring check_by_ssh plugin * * License: GPL * Copyright (c) 2000-2008 Monitoring Plugins Development Team diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c index 692a600e..8d7b376e 100644 --- a/plugins/check_dbi.c +++ b/plugins/check_dbi.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_dbi plugin +* Monitoring check_dbi plugin * * License: GPL * Copyright (c) 2011 Monitoring Plugins Development Team diff --git a/plugins/check_dig.c b/plugins/check_dig.c index 246624ae..969945d4 100644 --- a/plugins/check_dig.c +++ b/plugins/check_dig.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_dig plugin +* Monitoring check_dig plugin * * License: GPL * Copyright (c) 2002-2008 Monitoring Plugins Development Team diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 7d6ab7f4..ebe877f1 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_disk plugin +* Monitoring check_disk plugin * * License: GPL * Copyright (c) 1999-2008 Monitoring Plugins Development Team diff --git a/plugins/check_dns.c b/plugins/check_dns.c index 4b3a0fb4..0736a75a 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_dns plugin +* Monitoring check_dns plugin * * License: GPL * Copyright (c) 2000-2008 Monitoring Plugins Development Team diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c index ab907731..3ed68717 100644 --- a/plugins/check_dummy.c +++ b/plugins/check_dummy.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_dummy plugin +* Monitoring check_dummy plugin * * License: GPL * Copyright (c) 1999-2007 Monitoring Plugins Development Team diff --git a/plugins/check_fping.c b/plugins/check_fping.c index 786276ea..46046b4f 100644 --- a/plugins/check_fping.c +++ b/plugins/check_fping.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_fping plugin +* Monitoring check_fping plugin * * License: GPL * Copyright (c) 2000-2007 Monitoring Plugins Development Team diff --git a/plugins/check_game.c b/plugins/check_game.c index 205f4678..7966e8cf 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_game plugin +* Monitoring check_game plugin * * License: GPL * Copyright (c) 2002-2007 Monitoring Plugins Development Team diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c index 0d86eb16..1e7605ba 100644 --- a/plugins/check_hpjd.c +++ b/plugins/check_hpjd.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_hpjd plugin +* Monitoring check_hpjd plugin * * License: GPL * Copyright (c) 2000-2007 Monitoring Plugins Development Team diff --git a/plugins/check_http.c b/plugins/check_http.c index 03465540..0956a186 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_http plugin +* Monitoring check_http plugin * * License: GPL * Copyright (c) 1999-2013 Monitoring Plugins Development Team diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c index 72fc707a..bce1f314 100644 --- a/plugins/check_ide_smart.c +++ b/plugins/check_ide_smart.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_ide_smart plugin +* Monitoring check_ide_smart plugin * ide-smart 1.3 - IDE S.M.A.R.T. checking tool * * License: GPL diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index 9c9b9c98..1f78ad6d 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_ldap plugin +* Monitoring check_ldap plugin * * License: GPL * Copyright (c) 2000-2008 Monitoring Plugins Development Team diff --git a/plugins/check_load.c b/plugins/check_load.c index 2a3436db..cde63e56 100644 --- a/plugins/check_load.c +++ b/plugins/check_load.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_load plugin +* Monitoring check_load plugin * * License: GPL * Copyright (c) 1999-2007 Monitoring Plugins Development Team diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c index 192aa928..ed75f4ce 100644 --- a/plugins/check_mrtg.c +++ b/plugins/check_mrtg.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_mrtg plugin +* Monitoring check_mrtg plugin * * License: GPL * Copyright (c) 1999-2007 Monitoring Plugins Development Team diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c index 4ce0f865..32ba0507 100644 --- a/plugins/check_mrtgtraf.c +++ b/plugins/check_mrtgtraf.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_mrtgtraf plugin +* Monitoring check_mrtgtraf plugin * * License: GPL * Copyright (c) 1999-2007 Monitoring Plugins Development Team diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index 8dc2000a..135aa18c 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_mysql plugin +* Monitoring check_mysql plugin * * License: GPL * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at) diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c index 10d47a32..e1d1cfe0 100644 --- a/plugins/check_mysql_query.c +++ b/plugins/check_mysql_query.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_mysql_query plugin +* Monitoring check_mysql_query plugin * * License: GPL * Copyright (c) 2006-2009 Monitoring Plugins Development Team diff --git a/plugins/check_nt.c b/plugins/check_nt.c index de99d3f5..1aa7ab51 100644 --- a/plugins/check_nt.c +++ b/plugins/check_nt.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_nt plugin +* Monitoring check_nt plugin * * License: GPL * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com) diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index d293d8b7..d0412978 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_ntp plugin +* Monitoring check_ntp plugin * * License: GPL * Copyright (c) 2006 Sean Finney diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index 56d7400d..fc4e731d 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_ntp_peer plugin +* Monitoring check_ntp_peer plugin * * License: GPL * Copyright (c) 2006 Sean Finney diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c index a117ab2a..5458babe 100644 --- a/plugins/check_ntp_time.c +++ b/plugins/check_ntp_time.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_ntp_time plugin +* Monitoring check_ntp_time plugin * * License: GPL * Copyright (c) 2006 Sean Finney diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c index 96635288..211f0b6e 100644 --- a/plugins/check_nwstat.c +++ b/plugins/check_nwstat.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_nwstat plugin +* Monitoring check_nwstat plugin * * License: GPL * Copyright (c) 2000-2007 Monitoring Plugins Development Team diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c index de41b372..6df63155 100644 --- a/plugins/check_overcr.c +++ b/plugins/check_overcr.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_overcr plugin +* Monitoring check_overcr plugin * * License: GPL * Copyright (c) 2000-2007 Monitoring Plugins Development Team diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c index a4e79e87..88916fab 100644 --- a/plugins/check_pgsql.c +++ b/plugins/check_pgsql.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_pgsql plugin +* Monitoring check_pgsql plugin * * License: GPL * Copyright (c) 1999-2011 Monitoring Plugins Development Team diff --git a/plugins/check_ping.c b/plugins/check_ping.c index c0747204..60d7c7d5 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_ping plugin +* Monitoring check_ping plugin * * License: GPL * Copyright (c) 2000-2007 Monitoring Plugins Development Team diff --git a/plugins/check_procs.c b/plugins/check_procs.c index 065f7226..973dd6ee 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_procs plugin +* Monitoring check_procs plugin * * License: GPL * Copyright (c) 2000-2008 Monitoring Plugins Development Team diff --git a/plugins/check_radius.c b/plugins/check_radius.c index d3549a6c..879fe12a 100644 --- a/plugins/check_radius.c +++ b/plugins/check_radius.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_radius plugin +* Monitoring check_radius plugin * * License: GPL * Copyright (c) 1999-2008 Monitoring Plugins Development Team diff --git a/plugins/check_real.c b/plugins/check_real.c index 92dd3d9e..b55b8e8e 100644 --- a/plugins/check_real.c +++ b/plugins/check_real.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_real plugin +* Monitoring check_real plugin * * License: GPL * Copyright (c) 2000-2007 Monitoring Plugins Development Team diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index e04e84d4..976821d9 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_smtp plugin +* Monitoring check_smtp plugin * * License: GPL * Copyright (c) 2000-2007 Monitoring Plugins Development Team diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 2ca36b0e..4a1a1ecb 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_snmp plugin +* Monitoring check_snmp plugin * * License: GPL * Copyright (c) 1999-2007 Monitoring Plugins Development Team diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c index f0a40320..42843613 100644 --- a/plugins/check_ssh.c +++ b/plugins/check_ssh.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_ssh plugin +* Monitoring check_ssh plugin * * License: GPL * Copyright (c) 2000-2007 Monitoring Plugins Development Team diff --git a/plugins/check_swap.c b/plugins/check_swap.c index 20257eb3..ce510e14 100644 --- a/plugins/check_swap.c +++ b/plugins/check_swap.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_disk plugin +* Monitoring check_disk plugin * * License: GPL * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index a9928011..005c5914 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_tcp plugin +* Monitoring check_tcp plugin * * License: GPL * Copyright (c) 1999-2013 Monitoring Plugins Development Team diff --git a/plugins/check_time.c b/plugins/check_time.c index e082723d..225a15e4 100644 --- a/plugins/check_time.c +++ b/plugins/check_time.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_time plugin +* Monitoring check_time plugin * * License: GPL * Copyright (c) 1999-2007 Monitoring Plugins Development Team diff --git a/plugins/check_ups.c b/plugins/check_ups.c index bba36ad9..66b93bd8 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_ups plugin +* Monitoring check_ups plugin * * License: GPL * Copyright (c) 2000 Tom Shields diff --git a/plugins/check_users.c b/plugins/check_users.c index 246130b0..458a7ca6 100644 --- a/plugins/check_users.c +++ b/plugins/check_users.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring check_users plugin +* Monitoring check_users plugin * * License: GPL * Copyright (c) 2000-2012 Monitoring Plugins Development Team diff --git a/plugins/negate.c b/plugins/negate.c index a6a43046..e1d7d0b1 100644 --- a/plugins/negate.c +++ b/plugins/negate.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring negate plugin +* Monitoring negate plugin * * License: GPL * Copyright (c) 2002-2008 Monitoring Plugins Development Team diff --git a/plugins/urlize.c b/plugins/urlize.c index 6803ddfc..6fda72d1 100644 --- a/plugins/urlize.c +++ b/plugins/urlize.c @@ -1,6 +1,6 @@ /***************************************************************************** * -* monitoring urlize plugin +* Monitoring urlize plugin * * License: GPL * Copyright (c) 2000-2007 Monitoring Plugins Development Team -- cgit v1.2.3-74-g34f1 From 6141cfebf6c42873e0181105d2051143d8c11eb7 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Tue, 21 Jan 2014 13:17:36 +0100 Subject: New default installation prefix: /usr/local Install into /usr/local instead of /usr/local/nagios by default, in order to comply with the Filesystem Hierarchy Standard (FHS) and presumably the expectations of most users. --- configure.in | 2 -- plugins/tests/var/ps_axwo.debian | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'plugins') diff --git a/configure.in b/configure.in index f0c696f4..2cec17d9 100644 --- a/configure.in +++ b/configure.in @@ -12,8 +12,6 @@ AC_CANONICAL_HOST RELEASE=1 AC_SUBST(RELEASE) -AC_PREFIX_DEFAULT(/usr/local/nagios) - dnl Deprecated configure options diff --git a/plugins/tests/var/ps_axwo.debian b/plugins/tests/var/ps_axwo.debian index 38e284af..37a2d35e 100644 --- a/plugins/tests/var/ps_axwo.debian +++ b/plugins/tests/var/ps_axwo.debian @@ -79,6 +79,6 @@ Ss 1001 23783 1 3220 764 0.0 ndo2db /usr/local/nagios/bin/nd Ss 1001 23784 1 6428 4948 0.0 import_ndologsd import_ndologsd S+ 1001 9803 18955 4132 1936 0.0 ssh ssh altinity@cube02.lei.altinity S 1001 22505 22324 20256 1616 0.0 nagios ../../bin/nagios -d /usr/local/nagios/etc/nagios.cfg -S 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 +S 1001 22506 22505 1676 608 0.0 check_ping /usr/local/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1 S 1001 22507 22506 1660 492 0.0 ping /bin/ping -n -U -w 10 -c 1 192.168.10.23 R+ 1001 22508 23370 2308 680 0.0 ps ps axwo stat uid pid ppid vsz rss pcpu comm args -- cgit v1.2.3-74-g34f1