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. --- tools/distclean | 2 +- tools/generate-change-log | 4 ++-- tools/git-notify | 2 +- tools/git-post-receive-hook | 6 +++--- tools/tango | 4 ++-- tools/tinderbox_build | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tools') diff --git a/tools/distclean b/tools/distclean index f4ec20bd..06d633e9 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 Nagios-plugins." + echo "Please run this script from the top-level directory of Monitoring-plugins." exit 1 fi diff --git a/tools/generate-change-log b/tools/generate-change-log index 03321fd8..3a6b38e7 100755 --- a/tools/generate-change-log +++ b/tools/generate-change-log @@ -1,10 +1,10 @@ #!/usr/bin/env perl # -# Copyright (c) 2013 Nagios Plugins Development Team +# Copyright (c) 2013 Monitoring Plugins Development Team # # Originally written by Holger Weiss . # -# This file is free software; the Nagios Plugins Development Team gives +# This file is free software; the Monitoring Plugins Development Team gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. # diff --git a/tools/git-notify b/tools/git-notify index 85142965..ff59d39d 100755 --- a/tools/git-notify +++ b/tools/git-notify @@ -3,7 +3,7 @@ # Tool to send git commit notifications # # Copyright 2005 Alexandre Julliard -# Copyright 2009 Nagios Plugins Development Team +# Copyright 2009 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 diff --git a/tools/git-post-receive-hook b/tools/git-post-receive-hook index db9ad9ef..c822a63b 100755 --- a/tools/git-post-receive-hook +++ b/tools/git-post-receive-hook @@ -1,11 +1,11 @@ #!/bin/sh prefix="${0%/*}/notifications" # $GIT_DIR/hooks/notifications -recipient='Nagios Plugin Commits ' +recipient='Monitoring Plugins Commits ' maxcommits=100 maxdiffsize=$((300 * 1024)) -project='nagiosplug' -gitweburl='http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug' +project='monitoring-plugins' +gitweburl='https://github.com/monitoring-plugins/monitoring-plugins' gitnotify="$prefix/git-notify.pl" statefile="$prefix/git-notify.dat" diff --git a/tools/tango b/tools/tango index 7f418d73..0d07b1fb 100755 --- a/tools/tango +++ b/tools/tango @@ -14,9 +14,9 @@ my $REVISION = '$Revision$ '; $REVISION =~ s/^\$Revision: //; $REVISION =~ s/ \$ $//; -my $PACKAGE = 'Nagios Plugins'; +my $PACKAGE = 'Monitoring Plugins'; my $RELEASE = '1.3'; -my $WARRANTY = "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n"; +my $WARRANTY = "The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n"; my $version = undef; my $help = undef; diff --git a/tools/tinderbox_build b/tools/tinderbox_build index 12528d9b..48836b1e 100755 --- a/tools/tinderbox_build +++ b/tools/tinderbox_build @@ -1,6 +1,6 @@ #!/usr/bin/perl # tinderbox_build.pl -# This script builds the nagiosplugins and then sends +# This script builds the monitoringplugins and then sends # logs back to the master tinderbox server # # This script is based on mozilla-unix.pl which comes with tinderbox2 @@ -34,7 +34,7 @@ my $ReportStatus = 0; # Do not send results to server my $Tinderbox_server = '-p 1022 -o StrictHostKeyChecking=no tinderbox2@tinderbox.opsera.com'; # These shouldn't really need to be changed -my $BuildTree = 'nagiosplug'; +my $BuildTree = 'monitoringplug'; my $BuildName = ''; my $ConfigureArgs = $ENV{CONFIGURE_ARGS}; @@ -81,7 +81,7 @@ sub BuildIt { chdir("$StartDir"); my $StartTime = time; - if (-e (my $file = "nagios-plugins.spec")) { + if (-e (my $file = "monitoring-plugins.spec")) { open F, $file; while () { if (/^Version: trunk-(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) { -- 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 'tools') 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