summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMonitoring Plugins Development Team <devel@monitoring-plugins.org>2014-01-18 08:40:24 (GMT)
committerThomas Guyot-Sionnest <dermoth@aei.ca>2014-01-19 19:18:47 (GMT)
commit63734f52ab1b4b2c17545b26fc41016d6bbd80bd (patch)
treedcd7aa3fd9a2a6a69a47d3a7e6a18d034426087a
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.
-rw-r--r--.gitignore4
-rw-r--r--ACKNOWLEDGEMENTS4
-rw-r--r--AUTHORS2
-rw-r--r--CODING4
-rw-r--r--FAQ14
-rw-r--r--Makefile.am4
-rw-r--r--NEWS4
-rw-r--r--NPTest.pm14
-rw-r--r--README14
-rw-r--r--REQUIREMENTS2
-rw-r--r--SUPPORT24
-rw-r--r--configure.in14
-rw-r--r--doc/LEAVERS2
-rw-r--r--doc/NEW_STARTERS8
-rw-r--r--doc/RELEASING15
-rw-r--r--doc/developer-guidelines.sgml52
-rw-r--r--lib/Makefile.am6
-rw-r--r--lib/extra_opts.c4
-rw-r--r--lib/extra_opts.h2
-rw-r--r--lib/parse_ini.c4
-rw-r--r--lib/parse_ini.h2
-rw-r--r--lib/tests/Makefile.am2
-rw-r--r--lib/tests/test_utils.c48
-rw-r--r--lib/utils_base.c100
-rw-r--r--lib/utils_base.h4
-rw-r--r--lib/utils_cmd.c4
-rw-r--r--lib/utils_cmd.h2
-rw-r--r--lib/utils_disk.c2
-rw-r--r--lib/utils_tcp.c2
-rw-r--r--m4/np_mysqlclient.m44
-rw-r--r--monitoring-plugins.spec.in (renamed from nagios-plugins.spec.in)22
-rw-r--r--perlmods/install_order2
-rw-r--r--pkg/solaris/pkginfo.in8
-rw-r--r--plugins-root/Makefile.am4
-rw-r--r--plugins-root/check_dhcp.c6
-rw-r--r--plugins-root/check_icmp.c8
-rw-r--r--plugins-root/pst3.c2
-rwxr-xr-xplugins-scripts/check_disk_smb.pl6
-rwxr-xr-xplugins-scripts/check_file_age.pl5
-rwxr-xr-xplugins-scripts/check_flexlm.pl4
-rwxr-xr-xplugins-scripts/check_ifoperstatus.pl10
-rwxr-xr-xplugins-scripts/check_ifstatus.pl10
-rwxr-xr-xplugins-scripts/check_ircd.pl6
-rwxr-xr-xplugins-scripts/check_log.sh18
-rwxr-xr-xplugins-scripts/check_mssql.pl4
-rwxr-xr-xplugins-scripts/check_ntp.pl2
-rwxr-xr-xplugins-scripts/check_oracle.sh2
-rwxr-xr-xplugins-scripts/check_rpc.pl4
-rw-r--r--plugins-scripts/utils.pm.in4
-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
-rw-r--r--po/Makevars4
-rw-r--r--po/de.po36
-rw-r--r--po/fr.po52
-rw-r--r--po/monitoring-plugins.pot (renamed from po/nagios-plugins.pot)30
-rwxr-xr-xtools/distclean2
-rwxr-xr-xtools/generate-change-log4
-rwxr-xr-xtools/git-notify2
-rwxr-xr-xtools/git-post-receive-hook6
-rwxr-xr-xtools/tango4
-rwxr-xr-xtools/tinderbox_build6
115 files changed, 500 insertions, 505 deletions
diff --git a/.gitignore b/.gitignore
index ebd46e1..7040398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ NP-VERSION-FILE
21/Makefile 21/Makefile
22/Makefile.in 22/Makefile.in
23/missing 23/missing
24/nagios-plugins.spec 24/monitoring-plugins.spec
25/stamp-h1 25/stamp-h1
26/test.pl 26/test.pl
27/THANKS 27/THANKS
@@ -93,7 +93,7 @@ NP-VERSION-FILE
93# /lib/ 93# /lib/
94/lib/.deps 94/lib/.deps
95/lib/getopt.h 95/lib/getopt.h
96/lib/libnagiosplug.a 96/lib/libmonitoringplug.a
97/lib/Makefile 97/lib/Makefile
98/lib/Makefile.in 98/lib/Makefile.in
99 99
diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS
index 7b8dbe2..50c714c 100644
--- a/ACKNOWLEDGEMENTS
+++ b/ACKNOWLEDGEMENTS
@@ -1,6 +1,6 @@
1This file contains the origin of code copied verbatim into some or all of the Nagios plugins. 1This file contains the origin of code copied verbatim into some or all of the Monitoring Plugins.
2 2
3The NagiosPlugin team thanks the original authors. 3The Monitoring Plugins team thanks the original authors.
4 4
5Copied code is cited in the source by indented comments of the form 5Copied code is cited in the source by indented comments of the form
6 6
diff --git a/AUTHORS b/AUTHORS
index c761c38..50b6b3a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
1The Nagios Plugins are brought to you by the Nagios Plugins Development Team. 1The Monitoring Plugins are brought to you by the Monitoring Plugins Development Team.
2 2
3Jeremy T. Bouse 3Jeremy T. Bouse
4Peter Bray 4Peter Bray
diff --git a/CODING b/CODING
index 1581065..74438e7 100644
--- a/CODING
+++ b/CODING
@@ -12,8 +12,8 @@ Foundation Coding standards (which are currently available at
12http://www.gnu.org/prep/standards_toc.html). We also follow most of 12http://www.gnu.org/prep/standards_toc.html). We also follow most of
13the FSF guidelines. Developers may suggest deviations from the FSF 13the FSF guidelines. Developers may suggest deviations from the FSF
14style recommendations, which will be considered by open discussion on 14style recommendations, which will be considered by open discussion on
15the nagiosplug-devel mailing list. Any such deviations will apply to 15the Monitoring Plugins devel mailing list. Any such deviations will
16the entire code base to ensure consistency. 16apply to the entire code base to ensure consistency.
17 17
18Currently, the exceptions to FSF recommendations are roughly equivalent 18Currently, the exceptions to FSF recommendations are roughly equivalent
19to GNU indent with invoked as 'indent -ts 2 -br'. Specifically, the 19to GNU indent with invoked as 'indent -ts 2 -br'. Specifically, the
diff --git a/FAQ b/FAQ
index 4fb8653..20b837c 100644
--- a/FAQ
+++ b/FAQ
@@ -15,7 +15,7 @@ A: All plugins that comply with minimal development guideline for
15 this project include detailed version information. When executed 15 this project include detailed version information. When executed
16 with the '-V' option, a version string will be printed: 16 with the '-V' option, a version string will be printed:
17 17
18 check_radius v1.4.16 (nagios-plugins 1.4.16) 18 check_radius v1.4.16 (monitoring-plugins 1.4.16)
19 19
20 All bug reports and help requests should reference this 20 All bug reports and help requests should reference this
21 information. 21 information.
@@ -32,7 +32,7 @@ A: At a minimum, the output from 'uname -a' and the version string
32Q: I'm using Redhat Linux (or some other RPM-based distribution). 32Q: I'm using Redhat Linux (or some other RPM-based distribution).
33 Which packages should I install? 33 Which packages should I install?
34 34
35A: The package nagios-plugins-<version>.<arch>.rpm contains only 35A: The package monitoring-plugins-<version>.<arch>.rpm contains only
36 those plugins that should work on any POSIX compliant system. In 36 those plugins that should work on any POSIX compliant system. In
37 other words, you should be able to install this package on your 37 other words, you should be able to install this package on your
38 system, no matter what else is or in not installed. 38 system, no matter what else is or in not installed.
@@ -42,7 +42,7 @@ A: The package nagios-plugins-<version>.<arch>.rpm contains only
42 each dependency could be installed cleanly, but many people 42 each dependency could be installed cleanly, but many people
43 found that this resulted in too many packages. So in the end, 43 found that this resulted in too many packages. So in the end,
44 all the non-POSIX plugins were folded into one RPM 44 all the non-POSIX plugins were folded into one RPM
45 (nagios-plugins-<version>.<arch>.rpm). Most people will need to 45 (monitoring-plugins-<version>.<arch>.rpm). Most people will need to
46 use RPM's '--nodeps' option to install this package. 46 use RPM's '--nodeps' option to install this package.
47 47
48 48
@@ -59,10 +59,10 @@ Q: I prefer to build my own RPMs. Do I need to install all of the
59 59
60A: Beginning with the 1.2.9-1 release, you may run 60A: Beginning with the 1.2.9-1 release, you may run
61 61
62 rpm --define 'custom 1' -ta nagios-plugins-<release>.tar.gz 62 rpm --define 'custom 1' -ta monitoring-plugins-<release>.tar.gz
63 63
64 In prior releases, you must unpack the tarball and build the 64 In prior releases, you must unpack the tarball and build the
65 RPM using nagios-custom.spec with 'rpm -ba'. 65 RPM using monitoring-custom.spec with 'rpm -ba'.
66 66
67 67
68Q: I get an error like 68Q: I get an error like
@@ -84,8 +84,8 @@ A: Commonly, system administrators will make security as tight as
84 84
85Q: I have a plugin to offer. What can I do? 85Q: I have a plugin to offer. What can I do?
86 86
87A: You can make it available on NagiosExchange (http://nagiosexchange.org) 87A: You can make it available on MonitoringExchange (http://monitoringexchange.org)
88 where other people can find it for use. 88 where other people can find it for use.
89 89
90 You can also get feedback on improving the plugin via the 90 You can also get feedback on improving the plugin via the
91 nagiosplug-devel@lists.sourceforge.net mailing list. 91 devel@monitoring-plugins.org mailing list.
diff --git a/Makefile.am b/Makefile.am
index 98542b9..517068c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
5EXTRA_DIST = config.rpath \ 5EXTRA_DIST = config.rpath \
6 ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ LEGAL NEWS \ 6 ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ LEGAL NEWS \
7 NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \ 7 NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
8 NPTest.pm pkg nagios-plugins.spec \ 8 NPTest.pm pkg monitoring-plugins.spec \
9 config_test/Makefile config_test/run_tests config_test/child_test.c \ 9 config_test/Makefile config_test/run_tests config_test/child_test.c \
10 perlmods tools/build_perl_modules \ 10 perlmods tools/build_perl_modules \
11 tools/tinderbox_build 11 tools/tinderbox_build
@@ -51,7 +51,7 @@ solpkg:
51 cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR) 51 cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
52 52
53THANKS: THANKS.in 53THANKS: THANKS.in
54 @echo "This software is brought to you by the Nagios Plugins Development Team. However," > $@ 54 @echo "This software is brought to you by the Monitoring Plugins Development Team. However," > $@
55 @echo "there have been many contributors to this project. Everyone below has helped in " >> $@ 55 @echo "there have been many contributors to this project. Everyone below has helped in " >> $@
56 @echo "raising bug reports, creating patches or contributing new plugins." >> $@ 56 @echo "raising bug reports, creating patches or contributing new plugins." >> $@
57 @echo "" >> $@ 57 @echo "" >> $@
diff --git a/NEWS b/NEWS
index d7fe8f3..e8c27ab 100644
--- a/NEWS
+++ b/NEWS
@@ -293,7 +293,7 @@ This file documents the major additions and syntax changes between releases.
293 check_icmp fix for *BSD when running for long time 293 check_icmp fix for *BSD when running for long time
294 check_ping times out 1 second quicker if host is unreachable 294 check_ping times out 1 second quicker if host is unreachable
295 Root plugins installed with world executable 295 Root plugins installed with world executable
296 check_sybase from contrib now maintained in NagiosExchange 296 check_sybase from contrib now maintained in MonitoringExchange
297 --with-nagios-user/group reinstated ./configure option 297 --with-nagios-user/group reinstated ./configure option
298 New --without-world-permissions ./configure option 298 New --without-world-permissions ./configure option
299 299
@@ -317,7 +317,7 @@ This file documents the major additions and syntax changes between releases.
317 New C based check_ntp. The perl version is now deprecated. 317 New C based check_ntp. The perl version is now deprecated.
318 New check_apt plugin 318 New check_apt plugin
319 Notice: plugins in contrib/ will start to be removed from this distribution. 319 Notice: plugins in contrib/ will start to be removed from this distribution.
320 Please check at http://www.nagiosexchange.org for contributed plugins 320 Please check at http://www.monitoringexchange.org for contributed plugins
321 Major bug fixes to check_disk where values were incorrectly calculated and alerted on. 321 Major bug fixes to check_disk where values were incorrectly calculated and alerted on.
322 check_udp2 removed. check_udp is now linked to check_tcp.c 322 check_udp2 removed. check_udp is now linked to check_tcp.c
323 check_mailq now errors if the sub-program run returns non-zero return code. This would appear 323 check_mailq now errors if the sub-program run returns non-zero return code. This would appear
diff --git a/NPTest.pm b/NPTest.pm
index 9b85617..ebc2602 100644
--- a/NPTest.pm
+++ b/NPTest.pm
@@ -1,7 +1,7 @@
1package NPTest; 1package NPTest;
2 2
3# 3#
4# Helper Functions for testing Nagios Plugins 4# Helper Functions for testing Monitoring Plugins
5# 5#
6 6
7require Exporter; 7require Exporter;
@@ -25,14 +25,14 @@ $VERSION = "1556."; # must be all one line, for MakeMaker
25 25
26=head1 NAME 26=head1 NAME
27 27
28NPTest - Simplify the testing of Nagios Plugins 28NPTest - Simplify the testing of Monitoring Plugins
29 29
30=head1 DESCRIPTION 30=head1 DESCRIPTION
31 31
32This modules provides convenience functions to assist in the testing 32This modules provides convenience functions to assist in the testing
33of Nagios Plugins, making the testing code easier to read and write; 33of Monitoring Plugins, making the testing code easier to read and write;
34hopefully encouraging the development of a more complete test suite for 34hopefully encouraging the development of a more complete test suite for
35the Nagios Plugins. It is based on the patterns of testing seen in the 35the Monitoring Plugins. It is based on the patterns of testing seen in the
361.4.0 release, and continues to use the L<Test> module as the basis of 361.4.0 release, and continues to use the L<Test> module as the basis of
37testing. 37testing.
38 38
@@ -92,7 +92,7 @@ Testing of results would be done in your test script, not in this module.
92This function is obsolete. Use C<testCmd()> instead. 92This function is obsolete. Use C<testCmd()> instead.
93 93
94This function attempts to encompass the majority of test styles used 94This function attempts to encompass the majority of test styles used
95in testing Nagios Plugins. As each plug-in is a separate command, the 95in testing Monitoring Plugins. As each plug-in is a separate command, the
96typical tests we wish to perform are against the exit status of the 96typical tests we wish to perform are against the exit status of the
97command and the output (if any) it generated. Simplifying these tests 97command and the output (if any) it generated. Simplifying these tests
98into a single function call, makes the test harness easier to read and 98into a single function call, makes the test harness easier to read and
@@ -132,7 +132,7 @@ of either C<Test::ok(...)> or C<Test::skip(...)>, so remember this
132when counting the number of tests to place in the C<Test::plan(...)> 132when counting the number of tests to place in the C<Test::plan(...)>
133call. 133call.
134 134
135Many Nagios Plugins test network services, some of which may not be 135Many Monitoring Plugins test network services, some of which may not be
136present on all systems. To cater for this, C<checkCmd(...)> allows the 136present on all systems. To cater for this, C<checkCmd(...)> allows the
137tester to define exceptions based on the command's exit status. These 137tester to define exceptions based on the command's exit status. These
138exceptions are provided to skip tests if the test case developer 138exceptions are provided to skip tests if the test case developer
@@ -199,7 +199,7 @@ Copyright (c) 2005 Peter Bray. All rights reserved.
199 199
200This package is free software and is provided "as is" without express 200This package is free software and is provided "as is" without express
201or implied warranty. It may be used, redistributed and/or modified 201or implied warranty. It may be used, redistributed and/or modified
202under the same terms as the Nagios Plugins release. 202under the same terms as the Monitoring Plugins release.
203 203
204=cut 204=cut
205 205
diff --git a/README b/README
index b3d65de..7deb63b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
1Nagios Plugins 1Monitoring Plugins
2============== 2==============
3 3
4* For instructions on installing these plugins for use with Nagios, 4* For instructions on installing these plugins for use with Nagios,
@@ -21,19 +21,19 @@ Nagios Plugins
21 21
22You can check for the latest plugins at: 22You can check for the latest plugins at:
23 23
24* <https://www.nagios-plugins.org/> 24* <https://www.monitoring-plugins.org/>
25 25
26Send an email to <nagiosplug-help@lists.sourceforge.net> for assistance. 26Send an email to <help@monitoring-plugins.org> for assistance.
27Please include the OS type and version that you are using. Also, run the 27Please include the OS type and version that you are using. Also, run the
28plugin with the `-vvv` option and provide the resulting version information. 28plugin with the `-vvv` option and provide the resulting version information.
29Of course, there may be additional diagnostic information required as well. 29Of course, there may be additional diagnostic information required as well.
30Use good judgment. 30Use good judgment.
31 31
32Send an email to <nagiosplug-devel@lists.sourceforge.net> for developer 32Send an email to <devel@monitoring-plugins.org> for developer
33discussions. 33discussions.
34 34
35For patch submissions and bug reports, please use the appropriate resources 35For patch submissions and bug reports, please use the appropriate resources
36at <https://github.com/nagios-plugins/nagios-plugins>. 36at <https://github.com/monitoring-plugins/monitoring-plugins>.
37 37
38 38
39Installation Instructions 39Installation Instructions
@@ -45,7 +45,7 @@ Installation Instructions
45 ./tools/setup 45 ./tools/setup
46 46
47 For more detail, see the developer guidelines at 47 For more detail, see the developer guidelines at
48 <https://www.nagios-plugins.org/doc/guidelines.html>. 48 <https://www.monitoring-plugins.org/doc/guidelines.html>.
49 49
502. Run the configure script to initialize variables and create a Makefile, 502. Run the configure script to initialize variables and create a Makefile,
51 etc. 51 etc.
@@ -77,7 +77,7 @@ Installation Instructions
77 make install-root 77 make install-root
78 78
79That's it! If you have any problems or questions, feel free to send an 79That's it! If you have any problems or questions, feel free to send an
80email to <nagiosplug-help@lists.sourceforge.net>. 80email to <help@monitoring-plugins.org>.
81 81
82 82
83License Stuff 83License Stuff
diff --git a/REQUIREMENTS b/REQUIREMENTS
index 1f673e9..b2bd467 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -1,4 +1,4 @@
1Nagios Plugin Requirements 1Monitoring Plugins Requirements
2-------------------------- 2--------------------------
3 3
4Some plugins require that you have additional programs and/or 4Some plugins require that you have additional programs and/or
diff --git a/SUPPORT b/SUPPORT
index f1705aa..d2a2b7d 100644
--- a/SUPPORT
+++ b/SUPPORT
@@ -1,14 +1,14 @@
1SUPPORT 1SUPPORT
2 2
3Using the mailing lists and tracker databases at SourceForge are the 3Using the mailing lists and issue tracker at GitHub are the
4best ways to obtain direct support for the Nagios Plugins. There may 4best ways to obtain direct support for the Monitoring Plugins. There may
5also be commercial support options available to you -- check 5also be commercial support options available to you -- check
6http://www.nagios.org/ to track the current status of commercial 6http://www.nagios.org/ to track the current status of commercial
7support offerings. 7support offerings.
8 8
9There are two mailing lists associated with Nagios Plugin development: 9There are two mailing lists associated with Monitoring Plugins development:
10'help' (mailto:nagiosplug-help@lists.sourceforge.net), and 'devel' 10'help' (mailto:help@monitoring-plugins.org), and 'devel'
11(mailto:nagiosplug-devel@lists.sourceforge.net). Unless you are fairly 11(mailto:help@monitoring-plugins.org). Unless you are fairly
12certain you have found a bug or that you are requesting a new feature, 12certain you have found a bug or that you are requesting a new feature,
13please direct support requests to 'help'. 13please direct support requests to 'help'.
14 14
@@ -18,8 +18,8 @@ their time to fix bug and provide feature requests, it is generally in
18you interest to do a modest amount of legwork before posting to either 18you interest to do a modest amount of legwork before posting to either
19of these lists. 19of these lists.
20 20
21Plugins that are in the contrib directories are provided as-is. We will 21Plugins that are in the contrib directories are provided as-is. We will
22try to help, but sometimes the plugins have dependencies that the nagios-plugin 22try to help, but sometimes the plugins have dependencies that the monitoring-plugin
23developers do not have access to. You may be able to try the authors 23developers do not have access to. You may be able to try the authors
24directly. 24directly.
25 25
@@ -34,7 +34,7 @@ Requests to 'help' require posting the version number of the
34plugin. The best place to include the version information is in the 34plugin. The best place to include the version information is in the
35subject. A good post would have a subject like: 35subject. A good post would have a subject like:
36 36
37 Can I use SSL with check_imap (nagios-plugins 1.3.0-beta2) 1.12 37 Can I use SSL with check_imap (monitoring-plugins 1.3.0-beta2) 1.12
38 38
39If you do not include the version of the plugin, you risk having your 39If you do not include the version of the plugin, you risk having your
40post silently ignored. 40post silently ignored.
@@ -48,17 +48,17 @@ REPORTING BUGS AND SUBMITTING PATCHES
48 48
49Bug reports, investigations of possible bugs, feature requests, and 49Bug reports, investigations of possible bugs, feature requests, and
50patch submissions should be submitted to the development list at 50patch submissions should be submitted to the development list at
51mailto:nagiosplug-devel@lists.sourceforge.net. Please raise an issue first 51mailto:devel@monitoring-plugins.org. Please raise an issue first
52in GitHub, otherwise your email is likely to be missed over time. 52in GitHub, otherwise your email is likely to be missed over time.
53 53
54You should identify the version, preferably in the subject line. 54You should identify the version, preferably in the subject line.
55However, to best use developer resources, it is suggested that you 55However, to best use developer resources, it is suggested that you
56reference your report to one of the following sources: 56reference your report to one of the following sources:
57 57
58 1) The most recent release, including beta's 58 1) The most recent release, including beta's
59 59
60 2) The current snapshots (there's a link provided on 60 2) The current snapshots (there's a link provided on
61 https://www.nagios-plugins.org/download.html) 61 https://www.monitoring-plugins.org/download.html)
62 62
63 3) The current Git code from GitHub 63 3) The current Git code from GitHub
64 64
diff --git a/configure.in b/configure.in
index a20ca87..f0c696f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
1dnl Process this file with autoconf to produce a configure script. 1dnl Process this file with autoconf to produce a configure script.
2AC_PREREQ(2.59) 2AC_PREREQ(2.59)
3AC_INIT(nagios-plugins,1.5) 3AC_INIT(monitoring-plugins,1.5)
4AC_CONFIG_SRCDIR(NPTest.pm) 4AC_CONFIG_SRCDIR(NPTest.pm)
5AC_CONFIG_FILES([gl/Makefile 5AC_CONFIG_FILES([gl/Makefile
6 nagios-plugins.spec]) 6 monitoring-plugins.spec])
7AC_CONFIG_AUX_DIR(build-aux) 7AC_CONFIG_AUX_DIR(build-aux)
8AM_INIT_AUTOMAKE([1.8.3]) 8AM_INIT_AUTOMAKE([1.8.3])
9AC_CONFIG_HEADERS([config.h]) 9AC_CONFIG_HEADERS([config.h])
@@ -58,10 +58,10 @@ AC_SUBST(PLUGIN_TEST)dnl
58SCRIPT_TEST=`echo $srcdir/plugins-scripts/t/*.t|sed -e 's,\.*/plugins-scripts/,,g'` 58SCRIPT_TEST=`echo $srcdir/plugins-scripts/t/*.t|sed -e 's,\.*/plugins-scripts/,,g'`
59AC_SUBST(SCRIPT_TEST)dnl 59AC_SUBST(SCRIPT_TEST)dnl
60 60
61WARRANTY="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" 61WARRANTY="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"
62AC_SUBST(WARRANTY) 62AC_SUBST(WARRANTY)
63 63
64SUPPORT="Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n" 64SUPPORT="Send email to devel@monitoring-plugins.org if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to devel@monitoring-plugins.org.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n"
65AC_SUBST(SUPPORT) 65AC_SUBST(SUPPORT)
66 66
67dnl CGIURL has changed for Nagios with 1.0 beta 67dnl CGIURL has changed for Nagios with 1.0 beta
@@ -648,7 +648,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; then
648 ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" 648 ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
649 ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" 649 ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
650 ac_cv_ps_cols=9 650 ac_cv_ps_cols=9
651 AC_MSG_RESULT([using nagios-plugins internal ps command (pst3) for solaris]) 651 AC_MSG_RESULT([using monitoring-plugins internal ps command (pst3) for solaris])
652 if test `isainfo -b` = 64 ; then 652 if test `isainfo -b` = 64 ; then
653 pst3_use_64bit=1 653 pst3_use_64bit=1
654 AC_MSG_NOTICE([using 64bit pst3]) 654 AC_MSG_NOTICE([using 64bit pst3])
@@ -1731,7 +1731,7 @@ AC_ARG_ENABLE(redhat-pthread-workaround,
1731 [ac_cv_enable_redhat_pthread_workaround=test]) 1731 [ac_cv_enable_redhat_pthread_workaround=test])
1732if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then 1732if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then
1733 if echo $ac_cv_uname_r | egrep "\.EL(smp)?$" >/dev/null 2>&1 ; then 1733 if echo $ac_cv_uname_r | egrep "\.EL(smp)?$" >/dev/null 2>&1 ; then
1734 AC_MSG_NOTICE([See http://nagiosplugins.org/faq/compile/configure_appears_to_hang if this next part takes a long time]) 1734 AC_MSG_NOTICE([See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time])
1735 AC_MSG_CHECKING(for redhat spopen problem) 1735 AC_MSG_CHECKING(for redhat spopen problem)
1736 ( cd config_test && make && make test ) > /dev/null 2>&1 1736 ( cd config_test && make && make test ) > /dev/null 2>&1
1737 if test $? -eq 0 ; then 1737 if test $? -eq 0 ; then
@@ -1748,7 +1748,7 @@ fi
1748dnl Perl modules 1748dnl Perl modules
1749AC_ARG_ENABLE(perl-modules, 1749AC_ARG_ENABLE(perl-modules,
1750 AC_HELP_STRING([--enable-perl-modules], 1750 AC_HELP_STRING([--enable-perl-modules],
1751 [Enables installation of Nagios::Plugin and its dependencies (default: no)]), 1751 [Enables installation of Monitoring::Plugin and its dependencies (default: no)]),
1752 [enable_perl_modules=$enableval], 1752 [enable_perl_modules=$enableval],
1753 [enable_perl_modules=no]) 1753 [enable_perl_modules=no])
1754if test "$enable_perl_modules" = "yes" ; then 1754if test "$enable_perl_modules" = "yes" ; then
diff --git a/doc/LEAVERS b/doc/LEAVERS
index 65af310..a52a600 100644
--- a/doc/LEAVERS
+++ b/doc/LEAVERS
@@ -10,5 +10,5 @@ Administration tasks:
10 - Remove from GitHub's project members. This will include Git access. 10 - Remove from GitHub's project members. This will include Git access.
11 - Remove access from project server 11 - Remove access from project server
12 - If applicable, remove from mailing list administrators 12 - If applicable, remove from mailing list administrators
13 - Keep on nagiosplug-team mailing list, unless specifically requested to be removed 13 - Keep on team mailing list, unless specifically requested to be removed
14 14
diff --git a/doc/NEW_STARTERS b/doc/NEW_STARTERS
index ba19449..2c5aac8 100644
--- a/doc/NEW_STARTERS
+++ b/doc/NEW_STARTERS
@@ -4,12 +4,12 @@ These are the steps for adding someone to the team.
4 4
5Need to know: 5Need to know:
6 - Name 6 - Name
7 - Primary email for nagiosplug-team mailings 7 - Primary email for team mailings
8 - GitHub account 8 - GitHub account
9 - Type of member (translator, developer, release manager, project administrator) 9 - Type of member (translator, developer, release manager, project administrator)
10 10
111. Add member to nagiosplug-team mailing list (https://lists.sourceforge.net/lists/admin/nagiosplug-team) 111. Add member to team mailing list (https://www.monitoring-plugins.org/list/listinfo/team/)
12 and to the nagiosplug-checkins mailing list (https://lists.sourceforge.net/lists/admin/nagiosplug-checkins, 12 and to the commits mailing list (https://www.monitoring-plugins.org/list/listinfo/commits/),
13 add sourceforge email address via Privacy Options->Sender filters) 13 add sourceforge email address via Privacy Options->Sender filters)
142. Add Sourceforge access: 142. Add Sourceforge access:
15 - Translator: CVS access, Shell access, Release Tech (no) 15 - Translator: CVS access, Shell access, Release Tech (no)
@@ -21,4 +21,4 @@ Need to know:
213. Create account on project server 213. Create account on project server
22 - Add public ssh keys 22 - Add public ssh keys
234. Add Git access on repos.or.cz 234. Add Git access on repos.or.cz
245. Send email to nagiosplug-team introducing new member 245. Send email to team introducing new member
diff --git a/doc/RELEASING b/doc/RELEASING
index 34bed93..1eaec9d 100644
--- a/doc/RELEASING
+++ b/doc/RELEASING
@@ -1,8 +1,5 @@
1NOTES ON RELEASING NEW VERSION OF NAGIOSPLUG 1NOTES ON RELEASING NEW VERSION OF NAGIOSPLUG
2 2
3NB: A copy of this document is located at:
4 http://nagiosplugins.org/node/96
5
6*** Pre-release 3*** Pre-release
7git pull 4git pull
8. tools/devmode, if feeling adventurous 5. tools/devmode, if feeling adventurous
@@ -24,15 +21,15 @@ git push origin master
24git push origin release-1.4.14 21git push origin release-1.4.14
25 22
26*** Checkout new version 23*** Checkout new version
27rm -fr /tmp/nagioslug 24rm -fr /tmp/monitoringlug
28# If you need to checkout the tag, don't forget to "checkout master" later to 25# If you need to checkout the tag, don't forget to "checkout master" later to
29# get back to your development branch: 26# get back to your development branch:
30git checkout tags/release-1.4.14 27git checkout tags/release-1.4.14
31# Beware: the trailing slash of --prefix is REQUIRED 28# Beware: the trailing slash of --prefix is REQUIRED
32git checkout-index --prefix=/tmp/nagioslug/ -a 29git checkout-index --prefix=/tmp/monitoringlug/ -a
33 30
34*** Build the tarball 31*** Build the tarball
35cd /tmp/nagioslug 32cd /tmp/monitoringlug
36tools/setup 33tools/setup
37./configure 34./configure
38make dist 35make dist
@@ -43,7 +40,7 @@ SF username and password
43cd /uploads 40cd /uploads
44put file 41put file
45 42
46SF -> Submit News about release. Make sure it is called "Nagios Plugins" (with those caps) 43SF -> Submit News about release. Make sure it is called "Monitoring Plugins" (with those caps)
47Link to download at http://sourceforge.net/project/showfiles.php?group_id=29880 44Link to download at http://sourceforge.net/project/showfiles.php?group_id=29880
48Include contents of NEWS for this release 45Include contents of NEWS for this release
49List all people on team involved. 46List all people on team involved.
@@ -60,5 +57,5 @@ Step 3: *.tar.gz, Platform Independent, Source .gz
60Step 4: Send notice 57Step 4: Send notice
61 58
62*** Announce new release 59*** Announce new release
63Send email to nagiosplug-help, nagios-announce with the news text 60Send email to help, announce with the news text
64Add a news item to http://nagiosplugins.org 61Add a news item to https://monitoring-plugins.org
diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml
index 666d7cc..d934028 100644
--- a/doc/developer-guidelines.sgml
+++ b/doc/developer-guidelines.sgml
@@ -1,18 +1,18 @@
1<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" > 1<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" >
2<book> 2<book>
3 <title>Nagios Plugin Development Guidelines</title> 3 <title>Monitoring Plugins Development Guidelines</title>
4 4
5 <bookinfo> 5 <bookinfo>
6 <authorgroup> 6 <authorgroup>
7 <author> 7 <author>
8 <affiliation> 8 <affiliation>
9 <orgname>Nagios Plugins Development Team</orgname> 9 <orgname>Monitoring Plugins Development Team</orgname>
10 </affiliation> 10 </affiliation>
11 </author> 11 </author>
12 </authorgroup> 12 </authorgroup>
13 13
14 <pubdate>2013</pubdate> 14 <pubdate>2013</pubdate>
15 <title>Nagios Plugin Development Guidelines</title> 15 <title>Monitoring Plugins Development Guidelines</title>
16 16
17 <revhistory> 17 <revhistory>
18 <revision> 18 <revision>
@@ -23,7 +23,7 @@
23 23
24 <copyright> 24 <copyright>
25 <year>2000 - 2013</year> 25 <year>2000 - 2013</year>
26 <holder>Nagios Plugins Development Team</holder> 26 <holder>Monitoring Plugins Development Team</holder>
27 </copyright> 27 </copyright>
28 28
29</bookinfo> 29</bookinfo>
@@ -34,8 +34,8 @@
34 the plugin developers and encourage the standarization of the 34 the plugin developers and encourage the standarization of the
35 different kind of plugins: C, shell, perl, python, etc.</para> 35 different kind of plugins: C, shell, perl, python, etc.</para>
36 36
37 <para>Nagios Plugin Development Guidelines Copyright (C) 2000-2013 37 <para>Monitoring Plugins Development Guidelines Copyright (C) 2000-2013
38 (Nagios Plugins Team)</para> 38 (Monitoring Plugins Team)</para>
39 39
40 <para>Permission is granted to make and distribute verbatim 40 <para>Permission is granted to make and distribute verbatim
41 copies of this manual provided the copyright notice and this 41 copies of this manual provided the copyright notice and this
@@ -48,8 +48,8 @@
48<article> 48<article>
49<section id="DevRequirements"><title>Development platform requirements</title> 49<section id="DevRequirements"><title>Development platform requirements</title>
50 <para> 50 <para>
51 Nagios Plugins are developed to the GNU standard, so any OS which is supported by GNU 51 Monitoring Plugins are developed to the GNU standard, so any OS which is supported by GNU
52 should run the plugins. While the requirements for compiling the Nagios Plugins release 52 should run the plugins. While the requirements for compiling the Monitoring Plugins release
53 are very basic, developing from the Git repository requires additional software to be 53 are very basic, developing from the Git repository requires additional software to be
54 installed. These are the minimum levels of software required: 54 installed. These are the minimum levels of software required:
55 55
@@ -152,7 +152,7 @@
152 <section><title>Plugin Return Codes</title> 152 <section><title>Plugin Return Codes</title>
153 <para>The return codes below are based on the POSIX spec of returning 153 <para>The return codes below are based on the POSIX spec of returning
154 a positive value. Netsaint prior to v0.0.7 supported non-POSIX 154 a positive value. Netsaint prior to v0.0.7 supported non-POSIX
155 compliant return code of "-1" for unknown. Nagios supports POSIX return 155 compliant return code of "-1" for unknown. Nagios supports POSIX return
156 codes by default.</para> 156 codes by default.</para>
157 157
158 <para>Note: Some plugins will on occasion print on STDOUT that an error 158 <para>Note: Some plugins will on occasion print on STDOUT that an error
@@ -379,7 +379,7 @@
379 </listitem> 379 </listitem>
380 </orderedlist> 380 </orderedlist>
381 381
382 <para>It is up to third party programs to convert the Nagios Plugins 382 <para>It is up to third party programs to convert the Monitoring Plugins
383 performance data into graphs.</para> 383 performance data into graphs.</para>
384 </section> 384 </section>
385 385
@@ -715,7 +715,7 @@ properly on non-FreeBSD systems. Install with 'CPPFLAGS="-UHAVE_LIBPTHREAD" ./co
715</para> 715</para>
716 716
717<para> 717<para>
718When you run Nagios Plugins' configure, it will look for the tap library and will automatically 718When you run Monitoring Plugins' configure, it will look for the tap library and will automatically
719setup the tests. Run "make test" to run all the tests. 719setup the tests. Run "make test" to run all the tests.
720</para> 720</para>
721</section> 721</section>
@@ -747,9 +747,9 @@ setup the tests. Run "make test" to run all the tests.
747 </section> 747 </section>
748 748
749 <section><title>Commit Messages</title> 749 <section><title>Commit Messages</title>
750 <para>If the change is due to a contribution, please quote the contributor's name 750 <para>If the change is due to a contribution, please quote the contributor's name
751 and, if applicable, add the SourceForge Tracker number. Don't forget to 751 and, if applicable, add the GitHub Issue Tracker number. Don't forget to
752update the THANKS.in file.</para> 752 update the THANKS.in file.</para>
753 <para>If you have a change that is useful for noting in the next release, please 753 <para>If you have a change that is useful for noting in the next release, please
754 update the NEWS file.</para> 754 update the NEWS file.</para>
755 <para>All commits will be written to a ChangeLog at release time. 755 <para>All commits will be written to a ChangeLog at release time.
@@ -760,7 +760,7 @@ update the THANKS.in file.</para>
760 <para>To make the job easier for translators, please follow these guidelines:</para> 760 <para>To make the job easier for translators, please follow these guidelines:</para>
761 <orderedlist> 761 <orderedlist>
762 <listitem><para> 762 <listitem><para>
763 Before creating new strings, check the po/nagios-plugins.pot file to 763 Before creating new strings, check the po/monitoring-plugins.pot file to
764 see if a similar string 764 see if a similar string
765 already exists 765 already exists
766 </para></listitem> 766 </para></listitem>
@@ -790,15 +790,15 @@ update the THANKS.in file.</para>
790 version you are using. For new features, please supply a diff against 790 version you are using. For new features, please supply a diff against
791 the Git "master" branch.</para> 791 the Git "master" branch.</para>
792 792
793 <para>Patches should be submitted via 793 <para>Patches should be submitted via
794 <ulink url="http://sourceforge.net/tracker/?group_id=29880&amp;atid=397599">SourceForge's 794 <ulink url="https://github.com/monitoring-plugins/monitoring-plugins/pulls">GitHub's
795 tracker system for Nagiosplug patches</ulink> 795 Pull requests for Monitoring Plugins</ulink>
796 and be announced to the nagiosplug-devel mailing list.</para> 796 </para>
797 797
798 <para>Submission of a patch implies that the submmitter acknowledges that they 798 <para>Submission of a patch implies that the submmitter acknowledges that they
799 are the author of the code (or have permission from the author to release the code) 799 are the author of the code (or have permission from the author to release the code)
800 and agree that the code can be released under the GPL. The copyright for the changes will 800 and agree that the code can be released under the GPL. The copyright for the changes will
801 then revert to the Nagios Plugin Development Team - this is required so that any copyright 801 then revert to the Monitoring Plugins Development Team - this is required so that any copyright
802 infringements can be investigated quickly without contacting a huge list of copyright holders. 802 infringements can be investigated quickly without contacting a huge list of copyright holders.
803 Credit will always be given for any patches through a THANKS file in the distribution.</para> 803 Credit will always be given for any patches through a THANKS file in the distribution.</para>
804 </section> 804 </section>
@@ -806,22 +806,22 @@ update the THANKS.in file.</para>
806 806
807 <section id="Contributedplugins"><title>Contributed plugins</title> 807 <section id="Contributedplugins"><title>Contributed plugins</title>
808 <para>Plugins that have been contributed to the project and 808 <para>Plugins that have been contributed to the project and
809 distributed with the Nagios Plugin files are held in the contrib/ directory and are not installed 809 distributed with the Monitoring Plugins files are held in the contrib/ directory and are not installed
810 by default. These plugins are not officially supported by the team. 810 by default. These plugins are not officially supported by the team.
811 The current policy is that these plugins should be owned and maintained by the original 811 The current policy is that these plugins should be owned and maintained by the original
812 contributor, preferably hosted on <ulink url="http://exchange.nagios.org">Nagios Exchange</ulink>. 812 contributor, preferably hosted on <ulink url="http://monitoringexchange.org">Monitoring Exchange</ulink>.
813 </para> 813 </para>
814 <para>If patches or bugs are raised to an contributed plugin, we will start communications with the 814 <para>If patches or bugs are raised to an contributed plugin, we will start communications with the
815 original contributor, but seek to remove the plugin from our distribution. 815 original contributor, but seek to remove the plugin from our distribution.
816 </para> 816 </para>
817 <para>The aim is to distribute only code that the Nagios Plugin team are responsible for. 817 <para>The aim is to distribute only code that the Monitoring Plugins team are responsible for.
818 </para> 818 </para>
819 </section> 819 </section>
820 820
821 <section id="Newplugins"><title>New plugins</title> 821 <section id="Newplugins"><title>New plugins</title>
822 <para>If you would like others to use your plugins, please add it to 822 <para>If you would like others to use your plugins, please add it to
823 the official 3rd party plugin repository, 823 the official 3rd party plugin repository,
824 <ulink url="http://exchange.nagios.org">Nagios Exchange</ulink>. 824 <ulink url="http://monitoringexchange.org">Monitoring Exchange</ulink>.
825 </para> 825 </para>
826 826
827 <para>We are not accepting requests for inclusion of plugins into 827 <para>We are not accepting requests for inclusion of plugins into
@@ -832,7 +832,7 @@ update the THANKS.in file.</para>
832 <orderedlist> 832 <orderedlist>
833 <listitem> 833 <listitem>
834 <para>Include copyright and license information in all files. Copyright must be solely 834 <para>Include copyright and license information in all files. Copyright must be solely
835 granted to the Nagios Plugin Development Team</para> 835 granted to the Monitoring Plugins Development Team</para>
836 </listitem> 836 </listitem>
837 <listitem> 837 <listitem>
838 <para>The standard command options are supported (--help, --version, 838 <para>The standard command options are supported (--help, --version,
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 99fa591..1515312 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,15 +2,15 @@
2 2
3SUBDIRS = . tests 3SUBDIRS = . tests
4 4
5noinst_LIBRARIES = libnagiosplug.a 5noinst_LIBRARIES = libmonitoringplug.a
6 6
7AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" 7AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\"
8 8
9libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c 9libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c
10EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h 10EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h
11 11
12if USE_PARSE_INI 12if USE_PARSE_INI
13libnagiosplug_a_SOURCES += parse_ini.c extra_opts.c 13libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c
14endif USE_PARSE_INI 14endif USE_PARSE_INI
15 15
16INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins 16INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index 2939c7a..70e7dd2 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -1,9 +1,9 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* Nagios-plugins extra_opts library 3* Monitoring-plugins extra_opts library
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 2007 Nagios Plugins Development Team 6* Copyright (c) 2007 Monitoring Plugins Development Team
7* 7*
8* This program is free software: you can redistribute it and/or modify 8* This program is free software: you can redistribute it and/or modify
9* it under the terms of the GNU General Public License as published by 9* it under the terms of the GNU General Public License as published by
diff --git a/lib/extra_opts.h b/lib/extra_opts.h
index 4bb7b73..8ff14a1 100644
--- a/lib/extra_opts.h
+++ b/lib/extra_opts.h
@@ -2,7 +2,7 @@
2#define _EXTRA_OPTS_H_ 2#define _EXTRA_OPTS_H_
3 3
4/* 4/*
5 * extra_opts.h: routines for loading nagios-plugin defaults from ini 5 * extra_opts.h: routines for loading monitoring-plugin defaults from ini
6 * configuration files. 6 * configuration files.
7 */ 7 */
8 8
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 004396f..dfa72d9 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -1,9 +1,9 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* Nagios-plugins parse_ini library 3* Monitoring-plugins parse_ini library
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 2007 Nagios Plugins Development Team 6* Copyright (c) 2007 Monitoring Plugins Development Team
7* 7*
8* This program is free software: you can redistribute it and/or modify 8* This program is free software: you can redistribute it and/or modify
9* it under the terms of the GNU General Public License as published by 9* it under the terms of the GNU General Public License as published by
diff --git a/lib/parse_ini.h b/lib/parse_ini.h
index e0ba816..a3a494e 100644
--- a/lib/parse_ini.h
+++ b/lib/parse_ini.h
@@ -2,7 +2,7 @@
2#define _PARSE_INI_H_ 2#define _PARSE_INI_H_
3 3
4/* 4/*
5 * parse_ini.h: routines for loading nagios-plugin defaults from ini 5 * parse_ini.h: routines for loading monitoring-plugin defaults from ini
6 * configuration files. 6 * configuration files.
7 */ 7 */
8 8
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 1af5891..c0411ac 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -28,7 +28,7 @@ endif
28 28
29AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags) 29AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
30AM_LDFLAGS = $(tap_ldflags) -ltap 30AM_LDFLAGS = $(tap_ldflags) -ltap
31LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a 31LDADD = $(top_srcdir)/lib/libmonitoringplug.a $(top_srcdir)/gl/libgnu.a
32 32
33SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c 33SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c
34 34
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 79e1110..7a1a1fa 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -40,20 +40,20 @@ main (int argc, char **argv)
40 40
41 plan_tests(150); 41 plan_tests(150);
42 42
43 ok( this_nagios_plugin==NULL, "nagios_plugin not initialised"); 43 ok( this_monitoring_plugin==NULL, "monitoring_plugin not initialised");
44 44
45 np_init( "check_test", argc, argv ); 45 np_init( "check_test", argc, argv );
46 46
47 ok( this_nagios_plugin!=NULL, "nagios_plugin now initialised"); 47 ok( this_monitoring_plugin!=NULL, "monitoring_plugin now initialised");
48 ok( !strcmp(this_nagios_plugin->plugin_name, "check_test"), "plugin name initialised" ); 48 ok( !strcmp(this_monitoring_plugin->plugin_name, "check_test"), "plugin name initialised" );
49 49
50 ok( this_nagios_plugin->argc==argc, "Argc set" ); 50 ok( this_monitoring_plugin->argc==argc, "Argc set" );
51 ok( this_nagios_plugin->argv==argv, "Argv set" ); 51 ok( this_monitoring_plugin->argv==argv, "Argv set" );
52 52
53 np_set_args(0,0); 53 np_set_args(0,0);
54 54
55 ok( this_nagios_plugin->argc==0, "argc changed" ); 55 ok( this_monitoring_plugin->argc==0, "argc changed" );
56 ok( this_nagios_plugin->argv==0, "argv changed" ); 56 ok( this_monitoring_plugin->argv==0, "argv changed" );
57 57
58 np_set_args(argc, argv); 58 np_set_args(argc, argv);
59 59
@@ -296,11 +296,11 @@ main (int argc, char **argv)
296 diag( "You are probably running in wrong directory. Must run as ./test_utils" ); 296 diag( "You are probably running in wrong directory. Must run as ./test_utils" );
297 297
298 298
299 this_nagios_plugin->argc=4; 299 this_monitoring_plugin->argc=4;
300 this_nagios_plugin->argv[0] = "./test_utils"; 300 this_monitoring_plugin->argv[0] = "./test_utils";
301 this_nagios_plugin->argv[1] = "here"; 301 this_monitoring_plugin->argv[1] = "here";
302 this_nagios_plugin->argv[2] = "--and"; 302 this_monitoring_plugin->argv[2] = "--and";
303 this_nagios_plugin->argv[3] = "now"; 303 this_monitoring_plugin->argv[3] = "now";
304 temp_string = (char *) _np_state_generate_key(); 304 temp_string = (char *) _np_state_generate_key();
305 ok(!strcmp(temp_string, "94b5e17bf5abf51cb15aff5f69b96f2f8dac5ecd"), "Got based on expected argv" ); 305 ok(!strcmp(temp_string, "94b5e17bf5abf51cb15aff5f69b96f2f8dac5ecd"), "Got based on expected argv" );
306 306
@@ -320,16 +320,16 @@ main (int argc, char **argv)
320 320
321 ok(temp_state_key==NULL, "temp_state_key initially empty"); 321 ok(temp_state_key==NULL, "temp_state_key initially empty");
322 322
323 this_nagios_plugin->argc=1; 323 this_monitoring_plugin->argc=1;
324 this_nagios_plugin->argv[0] = "./test_utils"; 324 this_monitoring_plugin->argv[0] = "./test_utils";
325 np_enable_state(NULL, 51); 325 np_enable_state(NULL, 51);
326 temp_state_key = this_nagios_plugin->state; 326 temp_state_key = this_monitoring_plugin->state;
327 ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" ); 327 ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
328 ok( !strcmp(temp_state_key->name, "83d877b6cdfefb5d6f06101fd6fe76762f21792c"), "Got generated filename" ); 328 ok( !strcmp(temp_state_key->name, "83d877b6cdfefb5d6f06101fd6fe76762f21792c"), "Got generated filename" );
329 329
330 330
331 np_enable_state("allowedchars_in_keyname", 77); 331 np_enable_state("allowedchars_in_keyname", 77);
332 temp_state_key = this_nagios_plugin->state; 332 temp_state_key = this_monitoring_plugin->state;
333 ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" ); 333 ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
334 ok( !strcmp(temp_state_key->name, "allowedchars_in_keyname"), "Got key name with valid chars" ); 334 ok( !strcmp(temp_state_key->name, "allowedchars_in_keyname"), "Got key name with valid chars" );
335 ok( !strcmp(temp_state_key->_filename, "/usr/local/nagios/var/check_test/allowedchars_in_keyname"), "Got internal filename" ); 335 ok( !strcmp(temp_state_key->_filename, "/usr/local/nagios/var/check_test/allowedchars_in_keyname"), "Got internal filename" );
@@ -338,12 +338,12 @@ main (int argc, char **argv)
338 /* Don't do this test just yet. Will die */ 338 /* Don't do this test just yet. Will die */
339 /* 339 /*
340 np_enable_state("bad^chars$in@here", 77); 340 np_enable_state("bad^chars$in@here", 77);
341 temp_state_key = this_nagios_plugin->state; 341 temp_state_key = this_monitoring_plugin->state;
342 ok( !strcmp(temp_state_key->name, "bad_chars_in_here"), "Got key name with bad chars replaced" ); 342 ok( !strcmp(temp_state_key->name, "bad_chars_in_here"), "Got key name with bad chars replaced" );
343 */ 343 */
344 344
345 np_enable_state("funnykeyname", 54); 345 np_enable_state("funnykeyname", 54);
346 temp_state_key = this_nagios_plugin->state; 346 temp_state_key = this_monitoring_plugin->state;
347 ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" ); 347 ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
348 ok( !strcmp(temp_state_key->name, "funnykeyname"), "Got key name" ); 348 ok( !strcmp(temp_state_key->name, "funnykeyname"), "Got key name" );
349 349
@@ -367,9 +367,9 @@ main (int argc, char **argv)
367 367
368 temp_state_key->_filename="var/statefile"; 368 temp_state_key->_filename="var/statefile";
369 temp_state_data = np_state_read(); 369 temp_state_data = np_state_read();
370 ok( this_nagios_plugin->state->state_data!=NULL, "Got state data now" ) || diag("Are you running in right directory? Will get coredump next if not"); 370 ok( this_monitoring_plugin->state->state_data!=NULL, "Got state data now" ) || diag("Are you running in right directory? Will get coredump next if not");
371 ok( this_nagios_plugin->state->state_data->time==1234567890, "Got time" ); 371 ok( this_monitoring_plugin->state->state_data->time==1234567890, "Got time" );
372 ok( !strcmp((char *)this_nagios_plugin->state->state_data->data, "String to read"), "Data as expected" ); 372 ok( !strcmp((char *)this_monitoring_plugin->state->state_data->data, "String to read"), "Data as expected" );
373 373
374 temp_state_key->data_version=53; 374 temp_state_key->data_version=53;
375 temp_state_data = np_state_read(); 375 temp_state_data = np_state_read();
@@ -379,7 +379,7 @@ main (int argc, char **argv)
379 temp_state_key->_filename="var/nonexistant"; 379 temp_state_key->_filename="var/nonexistant";
380 temp_state_data = np_state_read(); 380 temp_state_data = np_state_read();
381 ok( temp_state_data==NULL, "Missing file gives NULL" ); 381 ok( temp_state_data==NULL, "Missing file gives NULL" );
382 ok( this_nagios_plugin->state->state_data==NULL, "No state information" ); 382 ok( this_monitoring_plugin->state->state_data==NULL, "No state information" );
383 383
384 temp_state_key->_filename="var/oldformat"; 384 temp_state_key->_filename="var/oldformat";
385 temp_state_data = np_state_read(); 385 temp_state_data = np_state_read();
@@ -426,7 +426,7 @@ main (int argc, char **argv)
426 temp_state_data = np_state_read(); 426 temp_state_data = np_state_read();
427 /* Check time is set to current_time */ 427 /* Check time is set to current_time */
428 ok(system("cmp var/generated var/statefile > /dev/null")!=0, "Generated file should be different this time"); 428 ok(system("cmp var/generated var/statefile > /dev/null")!=0, "Generated file should be different this time");
429 ok(this_nagios_plugin->state->state_data->time-current_time<=1, "Has time generated from current time"); 429 ok(this_monitoring_plugin->state->state_data->time-current_time<=1, "Has time generated from current time");
430 430
431 431
432 /* Don't know how to automatically test this. Need to be able to redefine die and catch the error */ 432 /* Don't know how to automatically test this. Need to be able to redefine die and catch the error */
@@ -438,7 +438,7 @@ main (int argc, char **argv)
438 438
439 np_cleanup(); 439 np_cleanup();
440 440
441 ok( this_nagios_plugin==NULL, "Free'd this_nagios_plugin" ); 441 ok( this_monitoring_plugin==NULL, "Free'd this_monitoring_plugin" );
442 442
443 return exit_status(); 443 return exit_status();
444} 444}
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 54463e9..57d01e2 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -3,7 +3,7 @@
3* utils_base.c 3* utils_base.c
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 2006 Nagios Plugins Development Team 6* Copyright (c) 2006 Monitoring Plugins Development Team
7* 7*
8* Library of useful functions for plugins 8* Library of useful functions for plugins
9* 9*
@@ -33,53 +33,53 @@
33 33
34#define np_free(ptr) { if(ptr) { free(ptr); ptr = NULL; } } 34#define np_free(ptr) { if(ptr) { free(ptr); ptr = NULL; } }
35 35
36nagios_plugin *this_nagios_plugin=NULL; 36monitoring_plugin *this_monitoring_plugin=NULL;
37 37
38int _np_state_read_file(FILE *); 38int _np_state_read_file(FILE *);
39 39
40void np_init( char *plugin_name, int argc, char **argv ) { 40void np_init( char *plugin_name, int argc, char **argv ) {
41 if (this_nagios_plugin==NULL) { 41 if (this_monitoring_plugin==NULL) {
42 this_nagios_plugin = calloc(1, sizeof(nagios_plugin)); 42 this_monitoring_plugin = calloc(1, sizeof(monitoring_plugin));
43 if (this_nagios_plugin==NULL) { 43 if (this_monitoring_plugin==NULL) {
44 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), 44 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
45 strerror(errno)); 45 strerror(errno));
46 } 46 }
47 this_nagios_plugin->plugin_name = strdup(plugin_name); 47 this_monitoring_plugin->plugin_name = strdup(plugin_name);
48 if (this_nagios_plugin->plugin_name==NULL) 48 if (this_monitoring_plugin->plugin_name==NULL)
49 die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno)); 49 die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
50 this_nagios_plugin->argc = argc; 50 this_monitoring_plugin->argc = argc;
51 this_nagios_plugin->argv = argv; 51 this_monitoring_plugin->argv = argv;
52 } 52 }
53} 53}
54 54
55void np_set_args( int argc, char **argv ) { 55void np_set_args( int argc, char **argv ) {
56 if (this_nagios_plugin==NULL) 56 if (this_monitoring_plugin==NULL)
57 die(STATE_UNKNOWN, _("This requires np_init to be called")); 57 die(STATE_UNKNOWN, _("This requires np_init to be called"));
58 58
59 this_nagios_plugin->argc = argc; 59 this_monitoring_plugin->argc = argc;
60 this_nagios_plugin->argv = argv; 60 this_monitoring_plugin->argv = argv;
61} 61}
62 62
63 63
64void np_cleanup() { 64void np_cleanup() {
65 if (this_nagios_plugin!=NULL) { 65 if (this_monitoring_plugin!=NULL) {
66 if(this_nagios_plugin->state!=NULL) { 66 if(this_monitoring_plugin->state!=NULL) {
67 if(this_nagios_plugin->state->state_data) { 67 if(this_monitoring_plugin->state->state_data) {
68 np_free(this_nagios_plugin->state->state_data->data); 68 np_free(this_monitoring_plugin->state->state_data->data);
69 np_free(this_nagios_plugin->state->state_data); 69 np_free(this_monitoring_plugin->state->state_data);
70 } 70 }
71 np_free(this_nagios_plugin->state->name); 71 np_free(this_monitoring_plugin->state->name);
72 np_free(this_nagios_plugin->state); 72 np_free(this_monitoring_plugin->state);
73 } 73 }
74 np_free(this_nagios_plugin->plugin_name); 74 np_free(this_monitoring_plugin->plugin_name);
75 np_free(this_nagios_plugin); 75 np_free(this_monitoring_plugin);
76 } 76 }
77 this_nagios_plugin=NULL; 77 this_monitoring_plugin=NULL;
78} 78}
79 79
80/* Hidden function to get a pointer to this_nagios_plugin for testing */ 80/* Hidden function to get a pointer to this_monitoring_plugin for testing */
81void _get_nagios_plugin( nagios_plugin **pointer ){ 81void _get_monitoring_plugin( monitoring_plugin **pointer ){
82 *pointer = this_nagios_plugin; 82 *pointer = this_monitoring_plugin;
83} 83}
84 84
85void 85void
@@ -89,7 +89,7 @@ die (int result, const char *fmt, ...)
89 va_start (ap, fmt); 89 va_start (ap, fmt);
90 vprintf (fmt, ap); 90 vprintf (fmt, ap);
91 va_end (ap); 91 va_end (ap);
92 if(this_nagios_plugin!=NULL) { 92 if(this_monitoring_plugin!=NULL) {
93 np_cleanup(); 93 np_cleanup();
94 } 94 }
95 exit (result); 95 exit (result);
@@ -375,14 +375,14 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
375char *_np_state_generate_key() { 375char *_np_state_generate_key() {
376 struct sha1_ctx ctx; 376 struct sha1_ctx ctx;
377 int i; 377 int i;
378 char **argv = this_nagios_plugin->argv; 378 char **argv = this_monitoring_plugin->argv;
379 unsigned char result[20]; 379 unsigned char result[20];
380 char keyname[41]; 380 char keyname[41];
381 char *p=NULL; 381 char *p=NULL;
382 382
383 sha1_init_ctx(&ctx); 383 sha1_init_ctx(&ctx);
384 384
385 for(i=0; i<this_nagios_plugin->argc; i++) { 385 for(i=0; i<this_monitoring_plugin->argc; i++) {
386 sha1_process_bytes(argv[i], strlen(argv[i]), &ctx); 386 sha1_process_bytes(argv[i], strlen(argv[i]), &ctx);
387 } 387 }
388 388
@@ -401,9 +401,9 @@ char *_np_state_generate_key() {
401} 401}
402 402
403void _cleanup_state_data() { 403void _cleanup_state_data() {
404 if (this_nagios_plugin->state->state_data!=NULL) { 404 if (this_monitoring_plugin->state->state_data!=NULL) {
405 np_free(this_nagios_plugin->state->state_data->data); 405 np_free(this_monitoring_plugin->state->state_data->data);
406 np_free(this_nagios_plugin->state->state_data); 406 np_free(this_monitoring_plugin->state->state_data);
407 } 407 }
408} 408}
409 409
@@ -432,7 +432,7 @@ void np_enable_state(char *keyname, int expected_data_version) {
432 char *temp_keyname = NULL; 432 char *temp_keyname = NULL;
433 char *p=NULL; 433 char *p=NULL;
434 434
435 if(this_nagios_plugin==NULL) 435 if(this_monitoring_plugin==NULL)
436 die(STATE_UNKNOWN, _("This requires np_init to be called")); 436 die(STATE_UNKNOWN, _("This requires np_init to be called"));
437 437
438 this_state = (state_key *) calloc(1, sizeof(state_key)); 438 this_state = (state_key *) calloc(1, sizeof(state_key));
@@ -456,15 +456,15 @@ void np_enable_state(char *keyname, int expected_data_version) {
456 p++; 456 p++;
457 } 457 }
458 this_state->name=temp_keyname; 458 this_state->name=temp_keyname;
459 this_state->plugin_name=this_nagios_plugin->plugin_name; 459 this_state->plugin_name=this_monitoring_plugin->plugin_name;
460 this_state->data_version=expected_data_version; 460 this_state->data_version=expected_data_version;
461 this_state->state_data=NULL; 461 this_state->state_data=NULL;
462 462
463 /* Calculate filename */ 463 /* Calculate filename */
464 asprintf(&temp_filename, "%s/%s/%s", _np_state_calculate_location_prefix(), this_nagios_plugin->plugin_name, this_state->name); 464 asprintf(&temp_filename, "%s/%s/%s", _np_state_calculate_location_prefix(), this_monitoring_plugin->plugin_name, this_state->name);
465 this_state->_filename=temp_filename; 465 this_state->_filename=temp_filename;
466 466
467 this_nagios_plugin->state = this_state; 467 this_monitoring_plugin->state = this_state;
468} 468}
469 469
470/* 470/*
@@ -479,11 +479,11 @@ state_data *np_state_read() {
479 FILE *statefile; 479 FILE *statefile;
480 int rc = FALSE; 480 int rc = FALSE;
481 481
482 if(this_nagios_plugin==NULL) 482 if(this_monitoring_plugin==NULL)
483 die(STATE_UNKNOWN, _("This requires np_init to be called")); 483 die(STATE_UNKNOWN, _("This requires np_init to be called"));
484 484
485 /* Open file. If this fails, no previous state found */ 485 /* Open file. If this fails, no previous state found */
486 statefile = fopen( this_nagios_plugin->state->_filename, "r" ); 486 statefile = fopen( this_monitoring_plugin->state->_filename, "r" );
487 if(statefile!=NULL) { 487 if(statefile!=NULL) {
488 488
489 this_state_data = (state_data *) calloc(1, sizeof(state_data)); 489 this_state_data = (state_data *) calloc(1, sizeof(state_data));
@@ -492,7 +492,7 @@ state_data *np_state_read() {
492 strerror(errno)); 492 strerror(errno));
493 493
494 this_state_data->data=NULL; 494 this_state_data->data=NULL;
495 this_nagios_plugin->state->state_data = this_state_data; 495 this_monitoring_plugin->state->state_data = this_state_data;
496 496
497 rc = _np_state_read_file(statefile); 497 rc = _np_state_read_file(statefile);
498 498
@@ -503,10 +503,10 @@ state_data *np_state_read() {
503 _cleanup_state_data(); 503 _cleanup_state_data();
504 } 504 }
505 505
506 return this_nagios_plugin->state->state_data; 506 return this_monitoring_plugin->state->state_data;
507} 507}
508 508
509/* 509/*
510 * Read the state file 510 * Read the state file
511 */ 511 */
512int _np_state_read_file(FILE *f) { 512int _np_state_read_file(FILE *f) {
@@ -544,7 +544,7 @@ int _np_state_read_file(FILE *f) {
544 break; 544 break;
545 case STATE_DATA_VERSION: 545 case STATE_DATA_VERSION:
546 i=atoi(line); 546 i=atoi(line);
547 if(i != this_nagios_plugin->state->data_version) 547 if(i != this_monitoring_plugin->state->data_version)
548 failure++; 548 failure++;
549 else 549 else
550 expected=STATE_DATA_TIME; 550 expected=STATE_DATA_TIME;
@@ -555,13 +555,13 @@ int _np_state_read_file(FILE *f) {
555 if(data_time > current_time) 555 if(data_time > current_time)
556 failure++; 556 failure++;
557 else { 557 else {
558 this_nagios_plugin->state->state_data->time = data_time; 558 this_monitoring_plugin->state->state_data->time = data_time;
559 expected=STATE_DATA_TEXT; 559 expected=STATE_DATA_TEXT;
560 } 560 }
561 break; 561 break;
562 case STATE_DATA_TEXT: 562 case STATE_DATA_TEXT:
563 this_nagios_plugin->state->state_data->data = strdup(line); 563 this_monitoring_plugin->state->state_data->data = strdup(line);
564 if(this_nagios_plugin->state->state_data->data==NULL) 564 if(this_monitoring_plugin->state->state_data->data==NULL)
565 die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno)); 565 die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
566 expected=STATE_DATA_END; 566 expected=STATE_DATA_END;
567 status=TRUE; 567 status=TRUE;
@@ -596,8 +596,8 @@ void np_state_write_string(time_t data_time, char *data_string) {
596 current_time=data_time; 596 current_time=data_time;
597 597
598 /* If file doesn't currently exist, create directories */ 598 /* If file doesn't currently exist, create directories */
599 if(access(this_nagios_plugin->state->_filename,F_OK)!=0) { 599 if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) {
600 asprintf(&directories, "%s", this_nagios_plugin->state->_filename); 600 asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
601 if(directories==NULL) 601 if(directories==NULL)
602 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), 602 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
603 strerror(errno)); 603 strerror(errno));
@@ -607,7 +607,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
607 *p='\0'; 607 *p='\0';
608 if((access(directories,F_OK)!=0) && (mkdir(directories, S_IRWXU)!=0)) { 608 if((access(directories,F_OK)!=0) && (mkdir(directories, S_IRWXU)!=0)) {
609 /* Can't free this! Otherwise error message is wrong! */ 609 /* Can't free this! Otherwise error message is wrong! */
610 /* np_free(directories); */ 610 /* np_free(directories); */
611 die(STATE_UNKNOWN, _("Cannot create directory: %s"), directories); 611 die(STATE_UNKNOWN, _("Cannot create directory: %s"), directories);
612 } 612 }
613 *p='/'; 613 *p='/';
@@ -616,7 +616,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
616 np_free(directories); 616 np_free(directories);
617 } 617 }
618 618
619 asprintf(&temp_file,"%s.XXXXXX",this_nagios_plugin->state->_filename); 619 asprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename);
620 if(temp_file==NULL) 620 if(temp_file==NULL)
621 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), 621 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
622 strerror(errno)); 622 strerror(errno));
@@ -636,7 +636,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
636 636
637 fprintf(fp,"# NP State file\n"); 637 fprintf(fp,"# NP State file\n");
638 fprintf(fp,"%d\n",NP_STATE_FORMAT_VERSION); 638 fprintf(fp,"%d\n",NP_STATE_FORMAT_VERSION);
639 fprintf(fp,"%d\n",this_nagios_plugin->state->data_version); 639 fprintf(fp,"%d\n",this_monitoring_plugin->state->data_version);
640 fprintf(fp,"%lu\n",current_time); 640 fprintf(fp,"%lu\n",current_time);
641 fprintf(fp,"%s\n",data_string); 641 fprintf(fp,"%s\n",data_string);
642 642
@@ -654,7 +654,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
654 die(STATE_UNKNOWN, _("Error writing temp file")); 654 die(STATE_UNKNOWN, _("Error writing temp file"));
655 } 655 }
656 656
657 if(rename(temp_file, this_nagios_plugin->state->_filename)!=0) { 657 if(rename(temp_file, this_monitoring_plugin->state->_filename)!=0) {
658 unlink(temp_file); 658 unlink(temp_file);
659 np_free(temp_file); 659 np_free(temp_file);
660 die(STATE_UNKNOWN, _("Cannot rename state temp file")); 660 die(STATE_UNKNOWN, _("Cannot rename state temp file"));
diff --git a/lib/utils_base.h b/lib/utils_base.h
index 0cb371f..3b00da5 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -1,6 +1,6 @@
1#ifndef _UTILS_BASE_ 1#ifndef _UTILS_BASE_
2#define _UTILS_BASE_ 2#define _UTILS_BASE_
3/* Header file for nagios plugins utils_base.c */ 3/* Header file for monitoring plugins utils_base.c */
4 4
5#include "sha1.h" 5#include "sha1.h"
6 6
@@ -52,7 +52,7 @@ typedef struct np_struct {
52 state_key *state; 52 state_key *state;
53 int argc; 53 int argc;
54 char **argv; 54 char **argv;
55 } nagios_plugin; 55 } monitoring_plugin;
56 56
57range *parse_range_string (char *); 57range *parse_range_string (char *);
58int _set_thresholds(thresholds **, char *, char *); 58int _set_thresholds(thresholds **, char *, char *);
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 0c853dc..4c6d0be 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.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/lib/utils_cmd.h b/lib/utils_cmd.h
index 8ebb589..36a6ff0 100644
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -2,7 +2,7 @@
2#define _UTILS_CMD_ 2#define _UTILS_CMD_
3 3
4/* 4/*
5 * Header file for nagios plugins utils_cmd.c 5 * Header file for monitoring plugins utils_cmd.c
6 * 6 *
7 * 7 *
8 */ 8 */
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index 5be2b2c..efe35fc 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -3,7 +3,7 @@
3* Library for check_disk 3* Library for check_disk
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*
diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c
index 46ad7f7..b37c446 100644
--- a/lib/utils_tcp.c
+++ b/lib/utils_tcp.c
@@ -3,7 +3,7 @@
3* Library for check_tcp 3* Library for check_tcp
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*
diff --git a/m4/np_mysqlclient.m4 b/m4/np_mysqlclient.m4
index cd36c4f..c2a4d2a 100644
--- a/m4/np_mysqlclient.m4
+++ b/m4/np_mysqlclient.m4
@@ -1,6 +1,6 @@
1# np_mysqlclient.m4 1# np_mysqlclient.m4
2dnl Copyright (C) 2007 Nagios Plugins Team 2dnl Copyright (C) 2007 Monitoring Plugins Team
3dnl This file is free software; the Nagios Plugin Team 3dnl This file is free software; the Monitoring Plugins Team
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
6 6
diff --git a/nagios-plugins.spec.in b/monitoring-plugins.spec.in
index 17a44c3..62e5e4f 100644
--- a/nagios-plugins.spec.in
+++ b/monitoring-plugins.spec.in
@@ -15,15 +15,15 @@
15%define nphome /opt/nagios 15%define nphome /opt/nagios
16%define npgrp nagios 16%define npgrp nagios
17 17
18Name: nagios-plugins 18Name: monitoring-plugins
19Version: @PACKAGE_VERSION@ 19Version: @PACKAGE_VERSION@
20Release: @RELEASE@ 20Release: @RELEASE@
21Summary: Host/service/network monitoring program plugins for Nagios 21Summary: Host/service/network monitoring program plugins for Nagios and compatible
22 22
23Group: Applications/System 23Group: Applications/System
24License: GPL 24License: GPL
25URL: http://nagiosplug.sourceforge.net/ 25URL: https://www.monitoring-plugins.org/
26Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz 26Source0: https://www.monitoring-plugins.org/download/%{name}-%{version}.tar.gz
27BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 27BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
28 28
29%define npdir %{_builddir}/%{name}-%{version} 29%define npdir %{_builddir}/%{name}-%{version}
@@ -34,11 +34,11 @@ Prefix: %{_prefix}
34Prefix: %{_prefix}/lib/nagios/plugins 34Prefix: %{_prefix}/lib/nagios/plugins
35%endif 35%endif
36Packager: Karl DeBisschop <kdebisschop@users.sourceforge.net> 36Packager: Karl DeBisschop <kdebisschop@users.sourceforge.net>
37Vendor: Nagios Plugin Development Group 37Vendor: Monitoring Plugins Development Team
38Provides: nagios-plugins 38Provides: monitoring-plugins
39 39
40%{!?custom:%global custom 0} 40%{!?custom:%global custom 0}
41Obsoletes: nagios-plugins-custom nagios-plugins-extras 41Obsoletes: monitoring-plugins-custom monitoring-plugins-extras
42 42
43 43
44# Requires 44# Requires
@@ -105,8 +105,8 @@ network, and to email or page you when a problem arises or is
105resolved. Nagios runs on a unix server as a background or daemon 105resolved. Nagios runs on a unix server as a background or daemon
106process, intermittently running checks on various services that you 106process, intermittently running checks on various services that you
107specify. The actual service checks are performed by separate "plugin" 107specify. The actual service checks are performed by separate "plugin"
108programs which return the status of the checks to Nagios. This package 108programs which return the status of the checks to the monitoring
109contains those plugins. 109system. This package contains those plugins.
110 110
111 111
112%prep 112%prep
@@ -184,8 +184,8 @@ rm -rf $RPM_BUILD_ROOT
184%doc CODING COPYING FAQ INSTALL LEGAL README REQUIREMENTS SUPPORT THANKS 184%doc CODING COPYING FAQ INSTALL LEGAL README REQUIREMENTS SUPPORT THANKS
185%doc ChangeLog command.cfg 185%doc ChangeLog command.cfg
186%if ! %{isaix} 186%if ! %{isaix}
187%{_datadir}/locale/de/LC_MESSAGES/nagios-plugins.mo 187%{_datadir}/locale/de/LC_MESSAGES/monitoring-plugins.mo
188%{_datadir}/locale/fr/LC_MESSAGES/nagios-plugins.mo 188%{_datadir}/locale/fr/LC_MESSAGES/monitoring-plugins.mo
189%endif 189%endif
190 190
191%changelog 191%changelog
diff --git a/perlmods/install_order b/perlmods/install_order
index c44c872..287cf8f 100644
--- a/perlmods/install_order
+++ b/perlmods/install_order
@@ -13,4 +13,4 @@ Params-Validate
13Math-Calc-Units 13Math-Calc-Units
14Class-Accessor 14Class-Accessor
15Config-Tiny 15Config-Tiny
16Nagios-Plugin 16Monitoring-Plugin
diff --git a/pkg/solaris/pkginfo.in b/pkg/solaris/pkginfo.in
index 3bed346..eedd20d 100644
--- a/pkg/solaris/pkginfo.in
+++ b/pkg/solaris/pkginfo.in
@@ -1,11 +1,11 @@
1PKG="NGOSplugin" 1PKG="NGOSplugin"
2NAME="nagios-plugins" 2NAME="monitoring-plugins"
3DESC="Nagios network monitoring plugins" 3DESC="Network monitoring plugins for Nagios and compatible"
4ARCH="@PKG_ARCH@" 4ARCH="@PKG_ARCH@"
5VERSION="@PACKAGE_VERSION@,REV=@REV_DATESTAMP@" 5VERSION="@PACKAGE_VERSION@,REV=@REV_DATESTAMP@"
6CATEGORY="application" 6CATEGORY="application"
7VENDOR="Nagios Plugin Development Team" 7VENDOR="Monitoring Plugins Development Team"
8EMAIL="nagiosplug-devel@lists.sourceforge.net" 8EMAIL="devel@monitoring-plugins.org"
9PSTAMP="nag@REV_TIMESTAMP@" 9PSTAMP="nag@REV_TIMESTAMP@"
10BASEDIR="/" 10BASEDIR="/"
11CLASSES="none" 11CLASSES="none"
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 9623b1f..a1ebb6d 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_PROGRAMS = pst3
26 26
27EXTRA_DIST = t pst3.c 27EXTRA_DIST = t pst3.c
28 28
29BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../gl/libgnu.a 29BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a
30NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS) 30NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
31NETLIBS = $(NETOBJS) $(SOCKETLIBS) 31NETLIBS = $(NETOBJS) $(SOCKETLIBS)
32 32
@@ -83,7 +83,7 @@ check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS)
83# -m64 needed at compiler and linker phase 83# -m64 needed at compiler and linker phase
84pst3_CFLAGS = @PST3CFLAGS@ 84pst3_CFLAGS = @PST3CFLAGS@
85pst3_LDFLAGS = @PST3CFLAGS@ 85pst3_LDFLAGS = @PST3CFLAGS@
86# pst3 must not use nagiosplug/gnulib includes! 86# pst3 must not use monitoringplug/gnulib includes!
87pst3_CPPFLAGS = 87pst3_CPPFLAGS =
88 88
89check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 89check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS)
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 42eedec..e682dd0 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -1,10 +1,10 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* Nagios check_dhcp plugin 3* monitoring check_dhcp plugin
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2001-2007 Nagios Plugin Development Team 7* Copyright (c) 2001-2007 Monitoring Plugins Development Team
8* 8*
9* Description: 9* Description:
10* 10*
@@ -35,7 +35,7 @@
35 35
36const char *progname = "check_dhcp"; 36const char *progname = "check_dhcp";
37const char *copyright = "2001-2007"; 37const char *copyright = "2001-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 "netutils.h" 41#include "netutils.h"
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 56685f8..4c3df0b 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -1,9 +1,9 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* Nagios check_icmp plugin 3* monitoring check_icmp plugin
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 2005-2008 Nagios Plugins Development Team 6* Copyright (c) 2005-2008 Monitoring Plugins Development Team
7* Original Author : Andreas Ericsson <ae@op5.se> 7* Original Author : Andreas Ericsson <ae@op5.se>
8* 8*
9* Description: 9* Description:
@@ -40,9 +40,9 @@
40/* char *progname = "check_icmp"; */ 40/* char *progname = "check_icmp"; */
41char *progname; 41char *progname;
42const char *copyright = "2005-2008"; 42const char *copyright = "2005-2008";
43const char *email = "nagiosplug-devel@lists.sourceforge.net"; 43const char *email = "devel@monitoring-plugins.org";
44 44
45/** nagios plugins basic includes */ 45/** monitoring plugins basic includes */
46#include "common.h" 46#include "common.h"
47#include "netutils.h" 47#include "netutils.h"
48#include "utils.h" 48#include "utils.h"
diff --git a/plugins-root/pst3.c b/plugins-root/pst3.c
index 8ca5281..ee9d108 100644
--- a/plugins-root/pst3.c
+++ b/plugins-root/pst3.c
@@ -3,7 +3,7 @@
3* pst3 3* pst3
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 2008 Nagios Plugin Development Team 6* Copyright (c) 2008 Monitoring Plugins Development Team
7* 7*
8* Description: 8* Description:
9* 9*
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index 0c89db5..8b6cd2e 100755
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -3,7 +3,7 @@
3# 3#
4# check_disk.pl <host> <share> <user> <pass> [warn] [critical] [port] 4# check_disk.pl <host> <share> <user> <pass> [warn] [critical] [port]
5# 5#
6# Nagios host script to get the disk usage from a SMB share 6# Monitoring host script to get the disk usage from a SMB share
7# 7#
8# Changes and Modifications 8# Changes and Modifications
9# ========================= 9# =========================
@@ -171,7 +171,7 @@ my $res = undef;
171my $perfdata = ""; 171my $perfdata = "";
172my @lines = undef; 172my @lines = undef;
173 173
174# Just in case of problems, let's not hang Nagios 174# Just in case of problems, let's not hang the monitoring system
175$SIG{'ALRM'} = sub { 175$SIG{'ALRM'} = sub {
176 print "No Answer from Client\n"; 176 print "No Answer from Client\n";
177 exit $ERRORS{"UNKNOWN"}; 177 exit $ERRORS{"UNKNOWN"};
@@ -293,7 +293,7 @@ sub print_help () {
293 print_revision($PROGNAME,'@NP_VERSION@'); 293 print_revision($PROGNAME,'@NP_VERSION@');
294 print "Copyright (c) 2000 Michael Anthon/Karl DeBisschop 294 print "Copyright (c) 2000 Michael Anthon/Karl DeBisschop
295 295
296Perl Check SMB Disk plugin for Nagios 296Perl Check SMB Disk plugin for monitoring
297 297
298"; 298";
299 print_usage(); 299 print_usage();
diff --git a/plugins-scripts/check_file_age.pl b/plugins-scripts/check_file_age.pl
index dcd5efa..2ae1138 100755
--- a/plugins-scripts/check_file_age.pl
+++ b/plugins-scripts/check_file_age.pl
@@ -17,9 +17,8 @@
17# GNU General Public License for more details. 17# GNU General Public License for more details.
18# 18#
19# you should have received a copy of the GNU General Public License 19# you should have received a copy of the GNU General Public License
20# along with this program (or with Nagios); if not, write to the 20# along with this program if not, write to the Free Software Foundation,
21# Free Software Foundation, Inc., 59 Temple Place - Suite 330, 21# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
22# Boston, MA 02111-1307, USA
23 22
24use strict; 23use strict;
25use English; 24use English;
diff --git a/plugins-scripts/check_flexlm.pl b/plugins-scripts/check_flexlm.pl
index 54d933c..574c1cc 100755
--- a/plugins-scripts/check_flexlm.pl
+++ b/plugins-scripts/check_flexlm.pl
@@ -9,7 +9,7 @@
9# Check and interpret the output of lmstat 9# Check and interpret the output of lmstat
10# and create returncodes and output. 10# and create returncodes and output.
11# 11#
12# Contrary to the nagios concept, this script takes 12# Contrary to most other plugins, this script takes
13# a file, not a hostname as an argument and returns 13# a file, not a hostname as an argument and returns
14# the status of hosts and services described in that 14# the status of hosts and services described in that
15# file. Use these hosts.cfg entries as an example 15# file. Use these hosts.cfg entries as an example
@@ -72,7 +72,7 @@ unless (defined $opt_F) {
72 print_usage(); 72 print_usage();
73 exit $ERRORS{'UNKNOWN'}; 73 exit $ERRORS{'UNKNOWN'};
74} 74}
75# Just in case of problems, let's not hang Nagios 75# Just in case of problems, let's not hang the monitoring system
76$SIG{'ALRM'} = sub { 76$SIG{'ALRM'} = sub {
77 print "Timeout: No Answer from Client\n"; 77 print "Timeout: No Answer from Client\n";
78 exit $ERRORS{'UNKNOWN'}; 78 exit $ERRORS{'UNKNOWN'};
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl
index 588993b..abcec68 100755
--- a/plugins-scripts/check_ifoperstatus.pl
+++ b/plugins-scripts/check_ifoperstatus.pl
@@ -1,9 +1,9 @@
1#!/usr/local/bin/perl -w 1#!/usr/local/bin/perl -w
2# 2#
3# check_ifoperstatus.pl - nagios plugin 3# check_ifoperstatus.pl - monitoring plugin
4# 4#
5# Copyright (C) 2000 Christoph Kron, 5# Copyright (C) 2000 Christoph Kron,
6# Modified 5/2002 to conform to updated Nagios Plugin Guidelines 6# Modified 5/2002 to conform to updated Monitoring Plugins Guidelines
7# Added support for named interfaces per Valdimir Ivaschenko (S. Ghosh) 7# Added support for named interfaces per Valdimir Ivaschenko (S. Ghosh)
8# Added SNMPv3 support (10/2003) 8# Added SNMPv3 support (10/2003)
9# 9#
@@ -22,7 +22,7 @@
22# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 22# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
23# 23#
24# 24#
25# Report bugs to: nagiosplug-help@lists.sourceforge.net 25# Report bugs to: help@monitoring-plugins.org
26# 26#
27# 11.01.2000 Version 1.0 27# 11.01.2000 Version 1.0
28# 28#
@@ -97,7 +97,7 @@ my %session_opts;
97$status = process_arguments(); 97$status = process_arguments();
98 98
99 99
100# Just in case of problems, let's not hang Nagios 100# Just in case of problems, let's not hang the monitoring system
101$SIG{'ALRM'} = sub { 101$SIG{'ALRM'} = sub {
102 print ("ERROR: No snmp response from $hostname (alarm)\n"); 102 print ("ERROR: No snmp response from $hostname (alarm)\n");
103 exit $ERRORS{"UNKNOWN"}; 103 exit $ERRORS{"UNKNOWN"};
@@ -288,7 +288,7 @@ sub print_usage() {
288sub print_help() { 288sub print_help() {
289 print_revision($PROGNAME, '@NP_VERSION@'); 289 print_revision($PROGNAME, '@NP_VERSION@');
290 print_usage(); 290 print_usage();
291 printf "check_ifoperstatus plugin for Nagios monitors operational \n"; 291 printf "check_ifoperstatus plugin for monitoring operational \n";
292 printf "status of a particular network interface on the target host\n"; 292 printf "status of a particular network interface on the target host\n";
293 printf "\nUsage:\n"; 293 printf "\nUsage:\n";
294 printf " -H (--hostname) Hostname to query - (required)\n"; 294 printf " -H (--hostname) Hostname to query - (required)\n";
diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl
index 63c71ff..a4be960 100755
--- a/plugins-scripts/check_ifstatus.pl
+++ b/plugins-scripts/check_ifstatus.pl
@@ -1,10 +1,10 @@
1#!/usr/local/bin/perl -w 1#!/usr/local/bin/perl -w
2# 2#
3# check_ifstatus.pl - nagios plugin 3# check_ifstatus.pl - monitoring plugin
4# 4#
5# 5#
6# Copyright (C) 2000 Christoph Kron 6# Copyright (C) 2000 Christoph Kron
7# Modified 5/2002 to conform to updated Nagios Plugin Guidelines (S. Ghosh) 7# Modified 5/2002 to conform to updated Monitoring Plugins Guidelines (S. Ghosh)
8# Added -x option (4/2003) 8# Added -x option (4/2003)
9# Added -u option (4/2003) 9# Added -u option (4/2003)
10# Added -M option (10/2003) 10# Added -M option (10/2003)
@@ -25,7 +25,7 @@
25# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 25# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
26# 26#
27# 27#
28# Report bugs to: ck@zet.net, nagiosplug-help@lists.sf.net 28# Report bugs to: ck@zet.net, help@monitoring-plugins.org
29# 29#
30# 11.01.2000 Version 1.0 30# 11.01.2000 Version 1.0
31# 31#
@@ -99,7 +99,7 @@ my %session_opts;
99 99
100 100
101 101
102# Just in case of problems, let's not hang Nagios 102# Just in case of problems, let's not hang the monitoring system
103$SIG{'ALRM'} = sub { 103$SIG{'ALRM'} = sub {
104 print ("ERROR: No snmp response from $hostname (alarm timeout)\n"); 104 print ("ERROR: No snmp response from $hostname (alarm timeout)\n");
105 exit $ERRORS{"UNKNOWN"}; 105 exit $ERRORS{"UNKNOWN"};
@@ -239,7 +239,7 @@ sub print_usage() {
239sub print_help() { 239sub print_help() {
240 print_revision($PROGNAME, '@NP_VERSION@'); 240 print_revision($PROGNAME, '@NP_VERSION@');
241 print_usage(); 241 print_usage();
242 printf "check_ifstatus plugin for Nagios monitors operational \n"; 242 printf "check_ifstatus plugin for monitoring operational \n";
243 printf "status of each network interface on the target host\n"; 243 printf "status of each network interface on the target host\n";
244 printf "\nUsage:\n"; 244 printf "\nUsage:\n";
245 printf " -H (--hostname) Hostname to query - (required)\n"; 245 printf " -H (--hostname) Hostname to query - (required)\n";
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl
index 42a9bca..7612a0e 100755
--- a/plugins-scripts/check_ircd.pl
+++ b/plugins-scripts/check_ircd.pl
@@ -16,8 +16,6 @@
16# ----------------------------------------------------------------------------- 16# -----------------------------------------------------------------------------
17# Copyright 1999 (c) Richard Mayhew 17# Copyright 1999 (c) Richard Mayhew
18# 18#
19# Credits go to Ethan Galstad for coding Nagios
20#
21# If any changes are made to this script, please mail me a copy of the 19# If any changes are made to this script, please mail me a copy of the
22# changes :) 20# changes :)
23# 21#
@@ -121,7 +119,7 @@ sub print_help ()
121 print_revision($PROGNAME,'@NP_VERSION@'); 119 print_revision($PROGNAME,'@NP_VERSION@');
122 print "Copyright (c) 2000 Richard Mayhew/Karl DeBisschop 120 print "Copyright (c) 2000 Richard Mayhew/Karl DeBisschop
123 121
124Perl Check IRCD plugin for Nagios 122Perl Check IRCD plugin for monitoring
125 123
126"; 124";
127 print_usage(); 125 print_usage();
@@ -205,7 +203,7 @@ MAIN:
205 203
206 if ($opt_t && $opt_t =~ /^([0-9]+)$/) { $TIMEOUT = $1; } 204 if ($opt_t && $opt_t =~ /^([0-9]+)$/) { $TIMEOUT = $1; }
207 205
208 # Just in case of problems, let's not hang Nagios 206 # Just in case of problems, let's not hang the monitoring system
209 $SIG{'ALRM'} = sub { 207 $SIG{'ALRM'} = sub {
210 print "Somthing is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n"; 208 print "Somthing is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
211 exit $ERRORS{"UNKNOWN"}; 209 exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index ca5810a..54408cb 100755
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# Log file pattern detector plugin for Nagios 3# Log file pattern detector plugin for monitoring
4# Written by Ethan Galstad (nagios@nagios.org) 4# Written by Ethan Galstad (nagios@nagios.org)
5# Last Modified: 07-31-1999 5# Last Modified: 07-31-1999
6# 6#
@@ -29,15 +29,15 @@
29# 29#
30# If you use this plugin make sure to keep the following in mind: 30# If you use this plugin make sure to keep the following in mind:
31# 31#
32# 1. The "max_attempts" value for the service should be 1, as this 32# 1. The "max_attempts" value for the service should be 1, as this will
33# will prevent Nagios from retrying the service check (the 33# prevent the monitoring system from retrying the service check (the
34# next time the check is run it will not produce the same results). 34# next time the check is run it will not produce the same results).
35# 35#
36# 2. The "notify_recovery" value for the service should be 0, so that 36# 2. The "notify_recovery" value for the service should be 0, so that the
37# Nagios does not notify you of "recoveries" for the check. Since 37# monitoring system does not notify you of "recoveries" for the check.
38# pattern matches in the log file will only be reported once and not 38# Since pattern matches in the log file will only be reported once and
39# the next time, there will always be "recoveries" for the service, even 39# not the next time, there will always be "recoveries" for the service,
40# though recoveries really don't apply to this type of check. 40# even though recoveries really don't apply to this type of check.
41# 41#
42# 3. You *must* supply a different <old_file_log> for each service that 42# 3. You *must* supply a different <old_file_log> for each service that
43# you define to use this plugin script - even if the different services 43# you define to use this plugin script - even if the different services
@@ -85,7 +85,7 @@ print_help() {
85 echo "" 85 echo ""
86 print_usage 86 print_usage
87 echo "" 87 echo ""
88 echo "Log file pattern detector plugin for Nagios" 88 echo "Log file pattern detector plugin for monitoring"
89 echo "" 89 echo ""
90 support 90 support
91} 91}
diff --git a/plugins-scripts/check_mssql.pl b/plugins-scripts/check_mssql.pl
index 9a8fc51..e3e7391 100755
--- a/plugins-scripts/check_mssql.pl
+++ b/plugins-scripts/check_mssql.pl
@@ -21,7 +21,7 @@
21# along with this program; if not, write to the Free Software 21# along with this program; if not, write to the Free Software
22# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 22# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
23# 23#
24# Report bugs to: nagiosplug-help@lists.sourceforge.net 24# Report bugs to: help@monitoring-plugins.org
25# 25#
26# 26#
27 27
@@ -44,7 +44,7 @@ my $exitcode = $ERRORS{'OK'};
44 44
45process_arguments(); 45process_arguments();
46 46
47# Just in case of problems, let's not hang Nagios 47# Just in case of problems, let's not hang the monitoring system
48$SIG{'ALRM'} = sub { 48$SIG{'ALRM'} = sub {
49 print ("SQL UNKNOWN: ERROR connection $server (alarm timeout)\n"); 49 print ("SQL UNKNOWN: ERROR connection $server (alarm timeout)\n");
50 exit $ERRORS{"UNKNOWN"}; 50 exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_ntp.pl b/plugins-scripts/check_ntp.pl
index 5c87e0a..d452b1b 100755
--- a/plugins-scripts/check_ntp.pl
+++ b/plugins-scripts/check_ntp.pl
@@ -172,7 +172,7 @@ if ($utils::PATH_TO_NTPQ && -x $utils::PATH_TO_NTPQ ) {
172 $have_ntpq = 0; 172 $have_ntpq = 0;
173} 173}
174 174
175# Just in case of problems, let's not hang Nagios 175# Just in case of problems, let's not hang the monitoring system
176$SIG{'ALRM'} = sub { 176$SIG{'ALRM'} = sub {
177 print ("ERROR: No response from ntp server (alarm)\n"); 177 print ("ERROR: No response from ntp server (alarm)\n");
178 exit $ERRORS{"UNKNOWN"}; 178 exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index 2a8ab21..73a19cf 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -3,7 +3,7 @@
3# latigid010@yahoo.com 3# latigid010@yahoo.com
4# 01/06/2000 4# 01/06/2000
5# 5#
6# This Nagios plugin was created to check Oracle status 6# This Monitoring plugin was created to check Oracle status
7# 7#
8 8
9PROGNAME=`basename $0` 9PROGNAME=`basename $0`
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl
index d2701e9..474067e 100755
--- a/plugins-scripts/check_rpc.pl
+++ b/plugins-scripts/check_rpc.pl
@@ -1,6 +1,6 @@
1#!/usr/local/bin/perl -w 1#!/usr/local/bin/perl -w
2# 2#
3# check_rpc plugin for nagios 3# check_rpc plugin for monitoring
4# 4#
5# usage: 5# usage:
6# check_rpc host service 6# check_rpc host service
@@ -254,7 +254,7 @@ $proto = 't' if ($opt_t);
254$proto = 'u' if ($opt_u); 254$proto = 'u' if ($opt_u);
255 255
256 256
257# Just in case of problems, let's not hang Nagios 257# Just in case of problems, let's not hang the monitoring system
258$SIG{'ALRM'} = sub { 258$SIG{'ALRM'} = sub {
259 print ("ERROR: No response from RPC server (alarm)\n"); 259 print ("ERROR: No response from RPC server (alarm)\n");
260 exit $ERRORS{"UNKNOWN"}; 260 exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/utils.pm.in b/plugins-scripts/utils.pm.in
index 37cd62c..b25def5 100644
--- a/plugins-scripts/utils.pm.in
+++ b/plugins-scripts/utils.pm.in
@@ -1,6 +1,6 @@
1# Utility drawer for Nagios plugins. 1# Utility drawer for monitoring plugins.
2# 2#
3# This will be deprecated soon. Please use Nagios::Plugin from CPAN 3# This will be deprecated soon. Please use Monitoring::Plugin from CPAN
4# for new plugins 4# for new plugins
5 5
6package utils; 6package utils;
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 031dd25..d2ac4be 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -48,7 +48,7 @@ noinst_LIBRARIES = libnpcommon.a
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 daeb757..12038d0 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 c5f0d52..e3ec1ca 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 d4e39e0..cf699e1 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -1,10 +1,10 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* check_cluster.c - Host and Service Cluster Plugin for Nagios 2.x 3* check_cluster.c - Host and Service Cluster Plugin for Monitoring
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2007 Nagios Plugins Development Team 7* Copyright (c) 2007 Monitoring Plugins Development Team
8* 8*
9* This program is free software: you can redistribute it and/or modify 9* This program is free software: you can redistribute it and/or modify
10* it under the terms of the GNU General Public License as published by 10* it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
24 24
25const char *progname = "check_cluster"; 25const char *progname = "check_cluster";
26const char *copyright = "2000-2007"; 26const char *copyright = "2000-2007";
27const char *email = "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 8c4a511..692a600 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 c113d87..246624a 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 04d588f..7d6ab7f 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 ac6cfc3..4b3a0fb 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 3cfc9ed..ab90773 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 dad000e..786276e 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 89bb4b1..205f467 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 60e922e..0d86eb1 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 c36d916..0346554 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 0a8009a..72fc707 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 b05aca9..9c9b9c9 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 296a823..2a3436d 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 d6162f3..192aa92 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 a822651..4ce0f86 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 db670e2..8dc2000 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 0bb83c3..10d47a3 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 4fd6342..791b6db 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -1,9 +1,9 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* Nagios check_nagios plugin 3* Monitoring check_nagios plugin
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Monitoring Plugins Development Team
7* 7*
8* Description: 8* Description:
9* 9*
@@ -34,7 +34,7 @@
34 34
35const char *progname = "check_nagios"; 35const char *progname = "check_nagios";
36const char *copyright = "1999-2007"; 36const char *copyright = "1999-2007";
37const char *email = "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 52bbd1c..de99d3f 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 16be7c5..d293d8b 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 76152e1..56d7400 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 bbcaa0b..a117ab2 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 6ebe8f8..9663528 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 95977e9..de41b37 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 324bd5f..a4e79e8 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 eef2195..c074720 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 c2239db..065f722 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 e54105b..61ced53 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 18240f3..92dd3d9 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 d477a51..e04e84d 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 52ad31e..2ca36b0 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 6e8a5fc..f0a4032 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 1b2a8dd..20257eb 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 6ab8261..a992801 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 7ee014e..e082723 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 59dcc26..bba36ad 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 ff2aedd..246130b 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 f135838..01003b3 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -1,10 +1,10 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* Nagios plugins common include file 3* Monitoring Plugins common include file
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2003-2007 Nagios Plugins Development Team 7* Copyright (c) 2003-2007 Monitoring Plugins Development Team
8* 8*
9* Description: 9* Description:
10* 10*
diff --git a/plugins/negate.c b/plugins/negate.c
index ef7d4e0..a6a4304 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 9f18723..0044046 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -1,10 +1,10 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* Nagios plugins network utilities 3* Monitoring Plugins network utilities
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2003-2008 Nagios Plugins Development Team 7* Copyright (c) 2003-2008 Monitoring Plugins Development Team
8* 8*
9* Description: 9* Description:
10* 10*
diff --git a/plugins/netutils.h b/plugins/netutils.h
index 347509e..c5aa18f 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -1,10 +1,10 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* Nagios plugins net utilities include file 3* Monitoring Plugins net utilities include file
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2003-2007 Nagios Plugins Development Team 7* Copyright (c) 2003-2007 Monitoring Plugins Development Team
8* 8*
9* Description: 9* Description:
10* 10*
diff --git a/plugins/popen.c b/plugins/popen.c
index 716bd52..592263f 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -1,9 +1,9 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* Nagios plugins popen 3* Monitoring Plugins popen
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 2005-2007 Nagios Plugins Development Team 6* Copyright (c) 2005-2007 Monitoring Plugins Development Team
7* 7*
8* Description: 8* Description:
9* 9*
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index 8aba1e3..4352e60 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -1,9 +1,9 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* Nagios run command utilities 3* Monitoring run command utilities
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 2005-2006 Nagios Plugins Development Team 6* Copyright (c) 2005-2006 Monitoring Plugins Development Team
7* 7*
8* Description : 8* Description :
9* 9*
diff --git a/plugins/runcmd.h b/plugins/runcmd.h
index fe66067..2dcdadf 100644
--- a/plugins/runcmd.h
+++ b/plugins/runcmd.h
@@ -1,7 +1,7 @@
1/**************************************************************************** 1/****************************************************************************
2* 2*
3* License: GPL 3* License: GPL
4* Copyright (c) 2005 Nagios Plugins Development Team 4* Copyright (c) 2005 Monitoring Plugins Development Team
5* Author: Andreas Ericsson <ae@op5.se> 5* Author: Andreas Ericsson <ae@op5.se>
6* 6*
7* 7*
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 2ec9190..2732125 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -1,9 +1,9 @@
1/***************************************************************************** 1/*****************************************************************************
2* 2*
3* Nagios plugins SSL utilities 3* Monitoring Plugins SSL utilities
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 2005-2010 Nagios Plugins Development Team 6* Copyright (c) 2005-2010 Monitoring Plugins Development Team
7* 7*
8* Description: 8* Description:
9* 9*
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index 39b4ca9..7e0f74b 100644
--- a/plugins/t/check_disk.t
+++ b/plugins/t/check_disk.t
@@ -4,7 +4,7 @@
4# 4#
5# 5#
6 6
7# TODO: Add in tests for perf data. Need to beef up Nagios::Plugin::Performance to cater for max, min, etc 7# TODO: Add in tests for perf data. Need to beef up Monitoring::Plugin::Performance to cater for max, min, etc
8 8
9use strict; 9use strict;
10use Test::More; 10use Test::More;
@@ -37,7 +37,7 @@ cmp_ok( $c, '==', 2, "Got two mountpoints in output");
37 37
38 38
39# Get perf data 39# Get perf data
40# Should use Nagios::Plugin 40# Should use Monitoring::Plugin
41my @perf_data = sort(split(/ /, $result->perf_output)); 41my @perf_data = sort(split(/ /, $result->perf_output));
42 42
43 43
diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t
index 64aaf0c..2c903db 100644
--- a/plugins/t/check_dns.t
+++ b/plugins/t/check_dns.t
@@ -17,7 +17,7 @@ my $successOutput = '/DNS OK: [\.0-9]+ seconds? response time/';
17my $hostname_valid = getTestParameter( 17my $hostname_valid = getTestParameter(
18 "NP_HOSTNAME_VALID", 18 "NP_HOSTNAME_VALID",
19 "A valid (known to DNS) hostname", 19 "A valid (known to DNS) hostname",
20 "nagios.com" 20 "monitoring-plugins.org"
21 ); 21 );
22 22
23my $hostname_valid_ip = getTestParameter( 23my $hostname_valid_ip = getTestParameter(
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index 2908673..5bd27d2 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 c3085e1..2c89beb 100755
--- a/plugins/tests/check_http.t
+++ b/plugins/tests/check_http.t
@@ -7,7 +7,7 @@
7# Country Name (2 letter code) [AU]:UK 7# Country Name (2 letter code) [AU]:UK
8# State or Province Name (full name) [Some-State]:Derbyshire 8# State or Province Name (full name) [Some-State]:Derbyshire
9# Locality Name (eg, city) []:Belper 9# Locality Name (eg, city) []:Belper
10# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Nagios Plugins 10# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Monitoring Plugins
11# Organizational Unit Name (eg, section) []: 11# Organizational Unit Name (eg, section) []:
12# Common Name (eg, YOUR name) []:Ton Voon 12# Common Name (eg, YOUR name) []:Ton Voon
13# Email Address []:tonvoon@mac.com 13# Email Address []:tonvoon@mac.com
diff --git a/plugins/tests/var/ps_axwo.debian b/plugins/tests/var/ps_axwo.debian
index 0d7d7bc..38e284a 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 30b2a35..781569d 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 b57d5e1..58b153d 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -4,7 +4,7 @@
4* 4*
5* License: GPL 5* License: GPL
6* Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net) 6* Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
7* Copyright (c) 2002-2007 Nagios Plugin Development Team 7* Copyright (c) 2002-2007 Monitoring Plugins Development Team
8* 8*
9* This program is free software: you can redistribute it and/or modify 9* This program is free software: you can redistribute it and/or modify
10* it under the terms of the GNU General Public License as published by 10* it under the terms of the GNU General Public License as published by
diff --git a/plugins/utils.h b/plugins/utils.h
index 657d4bf..6a89a9b 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
diff --git a/po/Makevars b/po/Makevars
index 152edec..5d4d786 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -18,12 +18,12 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --flag=error:3:c-format --flag=error
18# or entity, or to disclaim their copyright. The empty string stands for 18# or entity, or to disclaim their copyright. The empty string stands for
19# the public domain; in this case the translators are expected to disclaim 19# the public domain; in this case the translators are expected to disclaim
20# their copyright. 20# their copyright.
21COPYRIGHT_HOLDER = Nagios Plugin Development Group 21COPYRIGHT_HOLDER = Monitoring Plugin Development Team
22 22
23# This is the list of locale categories, beyond LC_MESSAGES, for which the 23# This is the list of locale categories, beyond LC_MESSAGES, for which the
24# message catalogs shall be used. It is usually empty. 24# message catalogs shall be used. It is usually empty.
25EXTRA_LOCALE_CATEGORIES = 25EXTRA_LOCALE_CATEGORIES =
26 26
27# Email address were to send bug report for the .po translation files 27# Email address were to send bug report for the .po translation files
28PACKAGE_BUGREPORT = nagiosplug-devel@lists.sourceforge.net 28PACKAGE_BUGREPORT = devel@monitoring-plugins.org
29 29
diff --git a/po/de.po b/po/de.po
index cb886f9..5b02203 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
1# translation of de.po to 1# translation of de.po to
2# German Language Translation File. 2# German Language Translation File.
3# This file is distributed under the same license as the nagios-plugins package. 3# This file is distributed under the same license as the monitoring-plugins package.
4# Copyright (C) 2004 Nagios Plugin Development Group. 4# Copyright (C) 2004 Monitoring Plugin Development Team.
5# Karl DeBisschop <kdebisschop@users.sourceforge.net>, 2003, 2004. 5# Karl DeBisschop <kdebisschop@users.sourceforge.net>, 2003, 2004.
6# 6#
7# 7#
8msgid "" 8msgid ""
9msgstr "" 9msgstr ""
10"Project-Id-Version: nagiosplug\n" 10"Project-Id-Version: monitoringplug\n"
11"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" 11"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
12"POT-Creation-Date: 2010-07-09 19:30-0400\n" 12"POT-Creation-Date: 2010-07-09 19:30-0400\n"
13"PO-Revision-Date: 2004-12-23 17:46+0100\n" 13"PO-Revision-Date: 2004-12-23 17:46+0100\n"
14"Last-Translator: <>\n" 14"Last-Translator: <>\n"
@@ -171,7 +171,7 @@ msgid "list of nagios service names, separated by ':' [optional]"
171msgstr "" 171msgstr ""
172 172
173#: plugins/check_by_ssh.c:418 173#: plugins/check_by_ssh.c:418
174msgid "short name of host in nagios configuration [optional]" 174msgid "short name of host in the monitoring configuration [optional]"
175msgstr "" 175msgstr ""
176 176
177#: plugins/check_by_ssh.c:420 177#: plugins/check_by_ssh.c:420
@@ -248,7 +248,7 @@ msgstr ""
248 248
249#: plugins/check_cluster.c:230 249#: plugins/check_cluster.c:230
250#, c-format 250#, c-format
251msgid "Host/Service Cluster Plugin for Nagios 2" 251msgid "Host/Service Cluster Plugin for Monitoring"
252msgstr "" 252msgstr ""
253 253
254#: plugins/check_cluster.c:236 plugins/check_nt.c:661 254#: plugins/check_cluster.c:236 plugins/check_nt.c:661
@@ -2091,7 +2091,7 @@ msgid "Could not locate a running Nagios process!"
2091msgstr "" 2091msgstr ""
2092 2092
2093#: plugins/check_nagios.c:172 2093#: plugins/check_nagios.c:172
2094msgid "Cannot parse Nagios log file for valid time" 2094msgid "Cannot parse monitoring log file for valid time"
2095msgstr "" 2095msgstr ""
2096 2096
2097#: plugins/check_nagios.c:183 plugins/check_procs.c:295 2097#: plugins/check_nagios.c:183 plugins/check_procs.c:295
@@ -2126,7 +2126,7 @@ msgstr "%s: Hostname muss angegeben werden\n"
2126#: plugins/check_nagios.c:281 2126#: plugins/check_nagios.c:281
2127#, fuzzy 2127#, fuzzy
2128msgid "" 2128msgid ""
2129"This plugin checks the status of the Nagios process on the local machine" 2129"This plugin checks the status of the monitoring process on the local machine"
2130msgstr "" 2130msgstr ""
2131"Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem\n" 2131"Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem\n"
2132"und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte " 2132"und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte "
@@ -2135,7 +2135,7 @@ msgstr ""
2135 2135
2136#: plugins/check_nagios.c:282 2136#: plugins/check_nagios.c:282
2137msgid "" 2137msgid ""
2138"The plugin will check to make sure the Nagios status log is no older than" 2138"The plugin will check to make sure the monitoring status log is no older than"
2139msgstr "" 2139msgstr ""
2140 2140
2141#: plugins/check_nagios.c:283 2141#: plugins/check_nagios.c:283
@@ -2476,7 +2476,7 @@ msgid " to run Perfmon directly."
2476msgstr "" 2476msgstr ""
2477 2477
2478#: plugins/check_nt.c:738 2478#: plugins/check_nt.c:738
2479msgid "It can also be used in scripts that automatically create Nagios service" 2479msgid "It can also be used in scripts that automatically create the monitoring service"
2480msgstr "" 2480msgstr ""
2481 2481
2482#: plugins/check_nt.c:739 2482#: plugins/check_nt.c:739
@@ -3941,7 +3941,7 @@ msgid ""
3941msgstr "" 3941msgstr ""
3942 3942
3943#: plugins/check_radius.c:373 3943#: plugins/check_radius.c:373
3944msgid "in a process listing. This risk is exacerbated because nagios will" 3944msgid "in a process listing. This risk is exacerbated because the monitoring will"
3945msgstr "" 3945msgstr ""
3946 3946
3947#: plugins/check_radius.c:374 3947#: plugins/check_radius.c:374
@@ -5129,7 +5129,7 @@ msgid "Turn off automatic offline tests"
5129msgstr "" 5129msgstr ""
5130 5130
5131#: plugins/check_ide_smart.c:507 5131#: plugins/check_ide_smart.c:507
5132msgid "Output suitable for Nagios" 5132msgid "Output suitable for the monitoring system"
5133msgstr "" 5133msgstr ""
5134 5134
5135#: plugins/negate.c:96 5135#: plugins/negate.c:96
@@ -5334,7 +5334,7 @@ msgstr ""
5334 5334
5335#: plugins/urlize.c:171 5335#: plugins/urlize.c:171
5336msgid "" 5336msgid ""
5337"the Nagios status screen. This plugin returns the status of the invoked " 5337"the monitoring status screen. This plugin returns the status of the invoked "
5338"plugin." 5338"plugin."
5339msgstr "" 5339msgstr ""
5340 5340
@@ -5419,7 +5419,7 @@ msgstr ""
5419#: plugins/utils.h:163 5419#: plugins/utils.h:163
5420msgid "" 5420msgid ""
5421" -v, --verbose\n" 5421" -v, --verbose\n"
5422" Show details for command-line debugging (Nagios may truncate output)\n" 5422" Show details for command-line debugging (monitoring may truncate output)\n"
5423msgstr "" 5423msgstr ""
5424 5424
5425#: plugins/utils.h:167 5425#: plugins/utils.h:167
@@ -5455,7 +5455,7 @@ msgstr ""
5455#: plugins/utils.h:192 5455#: plugins/utils.h:192
5456msgid "" 5456msgid ""
5457" See:\n" 5457" See:\n"
5458" http://nagiosplug.sourceforge.net/developer-guidelines." 5458" http://monitoring-plugins.org/doc/guidelines.html"
5459"html#THRESHOLDFORMAT\n" 5459"html#THRESHOLDFORMAT\n"
5460" for THRESHOLD format and examples.\n" 5460" for THRESHOLD format and examples.\n"
5461msgstr "" 5461msgstr ""
@@ -5463,9 +5463,9 @@ msgstr ""
5463#: plugins/utils.h:197 5463#: plugins/utils.h:197
5464msgid "" 5464msgid ""
5465"\n" 5465"\n"
5466"Send email to nagios-users@lists.sourceforge.net if you have questions\n" 5466"Send email to help@monitoring-plugins.org if you have questions\n"
5467"regarding use of this software. To submit patches or suggest improvements,\n" 5467"regarding use of this software. To submit patches or suggest improvements,\n"
5468"send email to nagiosplug-devel@lists.sourceforge.net\n" 5468"send email to devel@monitoring-plugins.org\n"
5469"\n" 5469"\n"
5470msgstr "" 5470msgstr ""
5471 5471
@@ -5984,7 +5984,7 @@ msgstr ""
5984#~ " -s, --services=LIST\n" 5984#~ " -s, --services=LIST\n"
5985#~ " list of nagios service names, separated by ':' [optional]\n" 5985#~ " list of nagios service names, separated by ':' [optional]\n"
5986#~ " -n, --name=NAME\n" 5986#~ " -n, --name=NAME\n"
5987#~ " short name of host in nagios configuration [optional]\n" 5987#~ " short name of host in the monitoring configuration [optional]\n"
5988#~ msgstr "" 5988#~ msgstr ""
5989#~ " -C, --command='COMMAND STRING'\n" 5989#~ " -C, --command='COMMAND STRING'\n"
5990#~ " Befehl der auf der entfernten Maschine ausgeführt werden soll\n" 5990#~ " Befehl der auf der entfernten Maschine ausgeführt werden soll\n"
diff --git a/po/fr.po b/po/fr.po
index 125b51e..144f41b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
1# translation of fr.po to 1# translation of fr.po to
2# Messages français pour Nagios Plugins 2# Messages français pour Monitoring Plugins
3# Copyright (C) 2003-2004 Nagios Plugin Development Group 3# Copyright (C) 2003-2004 Monitoring Plugin Development Team
4# This file is distributed under the same license as the nagiosplug package. 4# This file is distributed under the same license as the monitoringplug package.
5# 5#
6# Karl DeBisschop <kdebisschop@users.sourceforge.net>, 2003. 6# Karl DeBisschop <kdebisschop@users.sourceforge.net>, 2003.
7# Benoit Mortier <benoit.mortier@opensides.be>, 2004, 2006, 2007. 7# Benoit Mortier <benoit.mortier@opensides.be>, 2004, 2006, 2007.
@@ -9,12 +9,12 @@
9msgid "" 9msgid ""
10msgstr "" 10msgstr ""
11"Project-Id-Version: fr\n" 11"Project-Id-Version: fr\n"
12"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" 12"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
13"POT-Creation-Date: 2010-07-09 19:30-0400\n" 13"POT-Creation-Date: 2010-07-09 19:30-0400\n"
14"PO-Revision-Date: 2010-04-21 23:38-0400\n" 14"PO-Revision-Date: 2010-04-21 23:38-0400\n"
15"Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n" 15"Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n"
16"Language-Team: Nagios Plugin Development Mailing List <nagiosplug-" 16"Language-Team: Monitoring Plugin Development Mailing List "
17"devel@lists.sourceforge.net>\n" 17"<devel@monitoring-plugins.org>\n"
18"MIME-Version: 1.0\n" 18"MIME-Version: 1.0\n"
19"Content-Type: text/plain; charset=UTF-8\n" 19"Content-Type: text/plain; charset=UTF-8\n"
20"Content-Transfer-Encoding: 8bit\n" 20"Content-Transfer-Encoding: 8bit\n"
@@ -169,8 +169,8 @@ msgid "list of nagios service names, separated by ':' [optional]"
169msgstr "liste des services nagios, séparés par ':' [optionnel] " 169msgstr "liste des services nagios, séparés par ':' [optionnel] "
170 170
171#: plugins/check_by_ssh.c:418 171#: plugins/check_by_ssh.c:418
172msgid "short name of host in nagios configuration [optional]" 172msgid "short name of host in the monitoring configuration [optional]"
173msgstr "nom court de l'hôte dans la configuration nagios [optionnel]" 173msgstr "nom court de l'hôte dans la configuration monitoring [optionnel]"
174 174
175#: plugins/check_by_ssh.c:420 175#: plugins/check_by_ssh.c:420
176msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]" 176msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]"
@@ -250,8 +250,8 @@ msgstr "Utilisation:"
250 250
251#: plugins/check_cluster.c:230 251#: plugins/check_cluster.c:230
252#, c-format 252#, c-format
253msgid "Host/Service Cluster Plugin for Nagios 2" 253msgid "Host/Service Cluster Plugin for Monitoring"
254msgstr "Plugin de Cluster d'Hôte/Service pour Nagios 2" 254msgstr "Plugin de Cluster d'Hôte/Service pour Monitorin"
255 255
256#: plugins/check_cluster.c:236 plugins/check_nt.c:661 256#: plugins/check_cluster.c:236 plugins/check_nt.c:661
257msgid "Options:" 257msgid "Options:"
@@ -2140,7 +2140,7 @@ msgid "Could not locate a running Nagios process!"
2140msgstr "Impossible de trouver un processus Nagios actif!" 2140msgstr "Impossible de trouver un processus Nagios actif!"
2141 2141
2142#: plugins/check_nagios.c:172 2142#: plugins/check_nagios.c:172
2143msgid "Cannot parse Nagios log file for valid time" 2143msgid "Cannot parse monitoring log file for valid time"
2144msgstr "" 2144msgstr ""
2145"Impossible de trouver une date/heure valide dans le fichier de log de Nagios" 2145"Impossible de trouver une date/heure valide dans le fichier de log de Nagios"
2146 2146
@@ -2172,13 +2172,13 @@ msgstr "Vous devez fournir un nom de processus\n"
2172 2172
2173#: plugins/check_nagios.c:281 2173#: plugins/check_nagios.c:281
2174msgid "" 2174msgid ""
2175"This plugin checks the status of the Nagios process on the local machine" 2175"This plugin checks the status of the monitoring process on the local machine"
2176msgstr "Ce plugin vérifie l'état du processus Nagios sur la machine locale." 2176msgstr "Ce plugin vérifie l'état du processus Monitoring sur la machine locale."
2177 2177
2178#: plugins/check_nagios.c:282 2178#: plugins/check_nagios.c:282
2179msgid "" 2179msgid ""
2180"The plugin will check to make sure the Nagios status log is no older than" 2180"The plugin will check to make sure the monitoring status log is no older than"
2181msgstr "Ce plugin vérifie que le status log de Nagios n'est pas plus vieux que" 2181msgstr "Ce plugin vérifie que le status log de Monitoring n'est pas plus vieux que"
2182 2182
2183#: plugins/check_nagios.c:283 2183#: plugins/check_nagios.c:283
2184msgid "the number of minutes specified by the expires option." 2184msgid "the number of minutes specified by the expires option."
@@ -2523,7 +2523,7 @@ msgid " to run Perfmon directly."
2523msgstr "" 2523msgstr ""
2524 2524
2525#: plugins/check_nt.c:738 2525#: plugins/check_nt.c:738
2526msgid "It can also be used in scripts that automatically create Nagios service" 2526msgid "It can also be used in scripts that automatically create the monitoring service"
2527msgstr "" 2527msgstr ""
2528 2528
2529#: plugins/check_nt.c:739 2529#: plugins/check_nt.c:739
@@ -4004,7 +4004,7 @@ msgid ""
4004msgstr "" 4004msgstr ""
4005 4005
4006#: plugins/check_radius.c:373 4006#: plugins/check_radius.c:373
4007msgid "in a process listing. This risk is exacerbated because nagios will" 4007msgid "in a process listing. This risk is exacerbated because the monitoring will"
4008msgstr "" 4008msgstr ""
4009 4009
4010#: plugins/check_radius.c:374 4010#: plugins/check_radius.c:374
@@ -5207,7 +5207,7 @@ msgid "Turn off automatic offline tests"
5207msgstr "" 5207msgstr ""
5208 5208
5209#: plugins/check_ide_smart.c:507 5209#: plugins/check_ide_smart.c:507
5210msgid "Output suitable for Nagios" 5210msgid "Output suitable for the monitoring system"
5211msgstr "" 5211msgstr ""
5212 5212
5213#: plugins/negate.c:96 5213#: plugins/negate.c:96
@@ -5431,7 +5431,7 @@ msgstr ""
5431 5431
5432#: plugins/urlize.c:171 5432#: plugins/urlize.c:171
5433msgid "" 5433msgid ""
5434"the Nagios status screen. This plugin returns the status of the invoked " 5434"the monitoring status screen. This plugin returns the status of the invoked "
5435"plugin." 5435"plugin."
5436msgstr "" 5436msgstr ""
5437 5437
@@ -5530,7 +5530,7 @@ msgstr ""
5530#: plugins/utils.h:163 5530#: plugins/utils.h:163
5531msgid "" 5531msgid ""
5532" -v, --verbose\n" 5532" -v, --verbose\n"
5533" Show details for command-line debugging (Nagios may truncate output)\n" 5533" Show details for command-line debugging (monitoring may truncate output)\n"
5534msgstr "" 5534msgstr ""
5535" -v, --verbose\n" 5535" -v, --verbose\n"
5536" Affiche les informations de déboguage en ligne de commande (Nagios peut " 5536" Affiche les informations de déboguage en ligne de commande (Nagios peut "
@@ -5584,29 +5584,29 @@ msgstr ""
5584#: plugins/utils.h:192 5584#: plugins/utils.h:192
5585msgid "" 5585msgid ""
5586" See:\n" 5586" See:\n"
5587" http://nagiosplug.sourceforge.net/developer-guidelines." 5587" http://monitoring-plugins.org/doc/guidelines.html"
5588"html#THRESHOLDFORMAT\n" 5588"html#THRESHOLDFORMAT\n"
5589" for THRESHOLD format and examples.\n" 5589" for THRESHOLD format and examples.\n"
5590msgstr "" 5590msgstr ""
5591" Voir:\n" 5591" Voir:\n"
5592" http://nagiosplug.sourceforge.net/developer-guidelines." 5592" http://monitoring-plugins.org/doc/guidelines.html"
5593"html#THRESHOLDFORMAT\n" 5593"html#THRESHOLDFORMAT\n"
5594" pour le format et examples des seuils (THRESHOLD).\n" 5594" pour le format et examples des seuils (THRESHOLD).\n"
5595 5595
5596#: plugins/utils.h:197 5596#: plugins/utils.h:197
5597msgid "" 5597msgid ""
5598"\n" 5598"\n"
5599"Send email to nagios-users@lists.sourceforge.net if you have questions\n" 5599"Send email to help@monitoring-plugins.org if you have questions\n"
5600"regarding use of this software. To submit patches or suggest improvements,\n" 5600"regarding use of this software. To submit patches or suggest improvements,\n"
5601"send email to nagiosplug-devel@lists.sourceforge.net\n" 5601"send email to devel@monitoring-plugins.org\n"
5602"\n" 5602"\n"
5603msgstr "" 5603msgstr ""
5604"\n" 5604"\n"
5605"Envoyez un email à nagios-users@lists.sourceforge.net si vous avez des " 5605"Envoyez un email à help@monitoring-plugins.org si vous avez des "
5606"questions\n" 5606"questions\n"
5607"reliées à l'utilisation de ce logiciel. Pour envoyer des patches ou suggérer " 5607"reliées à l'utilisation de ce logiciel. Pour envoyer des patches ou suggérer "
5608"des\n" 5608"des\n"
5609"améliorations, envoyez un email à nagiosplug-devel@lists.sourceforge.net\n" 5609"améliorations, envoyez un email à devel@monitoring-plugins.org\n"
5610"\n" 5610"\n"
5611 5611
5612#: plugins/utils.h:202 5612#: plugins/utils.h:202
diff --git a/po/nagios-plugins.pot b/po/monitoring-plugins.pot
index 53ccf50..3d021cb 100644
--- a/po/nagios-plugins.pot
+++ b/po/monitoring-plugins.pot
@@ -1,5 +1,5 @@
1# SOME DESCRIPTIVE TITLE. 1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR Nagios Plugin Development Group 2# Copyright (C) YEAR Monitoring Plugin Development Team
3# This file is distributed under the same license as the PACKAGE package. 3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5# 5#
@@ -7,7 +7,7 @@
7msgid "" 7msgid ""
8msgstr "" 8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n" 9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" 10"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
11"POT-Creation-Date: 2012-02-16 17:35-0600\n" 11"POT-Creation-Date: 2012-02-16 17:35-0600\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -162,7 +162,7 @@ msgid "list of nagios service names, separated by ':' [optional]"
162msgstr "" 162msgstr ""
163 163
164#: plugins/check_by_ssh.c:418 164#: plugins/check_by_ssh.c:418
165msgid "short name of host in nagios configuration [optional]" 165msgid "short name of host in the monitoring configuration [optional]"
166msgstr "" 166msgstr ""
167 167
168#: plugins/check_by_ssh.c:420 168#: plugins/check_by_ssh.c:420
@@ -239,7 +239,7 @@ msgstr ""
239 239
240#: plugins/check_cluster.c:230 240#: plugins/check_cluster.c:230
241#, c-format 241#, c-format
242msgid "Host/Service Cluster Plugin for Nagios 2" 242msgid "Host/Service Cluster Plugin for Monitoring"
243msgstr "" 243msgstr ""
244 244
245#: plugins/check_cluster.c:236 plugins/check_nt.c:666 245#: plugins/check_cluster.c:236 plugins/check_nt.c:666
@@ -2032,7 +2032,7 @@ msgid "Could not locate a running Nagios process!"
2032msgstr "" 2032msgstr ""
2033 2033
2034#: plugins/check_nagios.c:172 2034#: plugins/check_nagios.c:172
2035msgid "Cannot parse Nagios log file for valid time" 2035msgid "Cannot parse monitoring log file for valid time"
2036msgstr "" 2036msgstr ""
2037 2037
2038#: plugins/check_nagios.c:183 plugins/check_procs.c:295 2038#: plugins/check_nagios.c:183 plugins/check_procs.c:295
@@ -2063,12 +2063,12 @@ msgstr ""
2063 2063
2064#: plugins/check_nagios.c:281 2064#: plugins/check_nagios.c:281
2065msgid "" 2065msgid ""
2066"This plugin checks the status of the Nagios process on the local machine" 2066"This plugin checks the status of the monitoring process on the local machine"
2067msgstr "" 2067msgstr ""
2068 2068
2069#: plugins/check_nagios.c:282 2069#: plugins/check_nagios.c:282
2070msgid "" 2070msgid ""
2071"The plugin will check to make sure the Nagios status log is no older than" 2071"The plugin will check to make sure the monitoring status log is no older than"
2072msgstr "" 2072msgstr ""
2073 2073
2074#: plugins/check_nagios.c:283 2074#: plugins/check_nagios.c:283
@@ -2406,7 +2406,7 @@ msgid " to run Perfmon directly."
2406msgstr "" 2406msgstr ""
2407 2407
2408#: plugins/check_nt.c:743 2408#: plugins/check_nt.c:743
2409msgid "It can also be used in scripts that automatically create Nagios service" 2409msgid "It can also be used in scripts that automatically create the monitoring service"
2410msgstr "" 2410msgstr ""
2411 2411
2412#: plugins/check_nt.c:744 2412#: plugins/check_nt.c:744
@@ -3839,7 +3839,7 @@ msgid ""
3839msgstr "" 3839msgstr ""
3840 3840
3841#: plugins/check_radius.c:373 3841#: plugins/check_radius.c:373
3842msgid "in a process listing. This risk is exacerbated because nagios will" 3842msgid "in a process listing. This risk is exacerbated because the monitoring will"
3843msgstr "" 3843msgstr ""
3844 3844
3845#: plugins/check_radius.c:374 3845#: plugins/check_radius.c:374
@@ -4990,7 +4990,7 @@ msgid "Turn off automatic offline tests"
4990msgstr "" 4990msgstr ""
4991 4991
4992#: plugins/check_ide_smart.c:507 4992#: plugins/check_ide_smart.c:507
4993msgid "Output suitable for Nagios" 4993msgid "Output suitable for the monitoring system"
4994msgstr "" 4994msgstr ""
4995 4995
4996#: plugins/negate.c:96 4996#: plugins/negate.c:96
@@ -5188,7 +5188,7 @@ msgstr ""
5188 5188
5189#: plugins/urlize.c:171 5189#: plugins/urlize.c:171
5190msgid "" 5190msgid ""
5191"the Nagios status screen. This plugin returns the status of the invoked " 5191"the monitoring status screen. This plugin returns the status of the invoked "
5192"plugin." 5192"plugin."
5193msgstr "" 5193msgstr ""
5194 5194
@@ -5271,7 +5271,7 @@ msgstr ""
5271#: plugins/utils.h:163 5271#: plugins/utils.h:163
5272msgid "" 5272msgid ""
5273" -v, --verbose\n" 5273" -v, --verbose\n"
5274" Show details for command-line debugging (Nagios may truncate output)\n" 5274" Show details for command-line debugging (monitoring may truncate output)\n"
5275msgstr "" 5275msgstr ""
5276 5276
5277#: plugins/utils.h:167 5277#: plugins/utils.h:167
@@ -5307,7 +5307,7 @@ msgstr ""
5307#: plugins/utils.h:192 5307#: plugins/utils.h:192
5308msgid "" 5308msgid ""
5309" See:\n" 5309" See:\n"
5310" http://nagiosplug.sourceforge.net/developer-guidelines." 5310" http://monitoring-plugins.org/doc/guidelines.html"
5311"html#THRESHOLDFORMAT\n" 5311"html#THRESHOLDFORMAT\n"
5312" for THRESHOLD format and examples.\n" 5312" for THRESHOLD format and examples.\n"
5313msgstr "" 5313msgstr ""
@@ -5315,9 +5315,9 @@ msgstr ""
5315#: plugins/utils.h:197 5315#: plugins/utils.h:197
5316msgid "" 5316msgid ""
5317"\n" 5317"\n"
5318"Send email to nagios-users@lists.sourceforge.net if you have questions\n" 5318"Send email to help@monitoring-plugins.org if you have questions\n"
5319"regarding use of this software. To submit patches or suggest improvements,\n" 5319"regarding use of this software. To submit patches or suggest improvements,\n"
5320"send email to nagiosplug-devel@lists.sourceforge.net\n" 5320"send email to devel@monitoring-plugins.org\n"
5321"\n" 5321"\n"
5322msgstr "" 5322msgstr ""
5323 5323
diff --git a/tools/distclean b/tools/distclean
index f4ec20b..06d633e 100755
--- a/tools/distclean
+++ b/tools/distclean
@@ -6,7 +6,7 @@
6# Please run this script from the top-level directory. 6# Please run this script from the top-level directory.
7 7
8if [ ! -f tools/distclean ]; then 8if [ ! -f tools/distclean ]; then
9 echo "Please run this script from the top-level directory of Nagios-plugins." 9 echo "Please run this script from the top-level directory of Monitoring-plugins."
10 exit 1 10 exit 1
11fi 11fi
12 12
diff --git a/tools/generate-change-log b/tools/generate-change-log
index 03321fd..3a6b38e 100755
--- a/tools/generate-change-log
+++ b/tools/generate-change-log
@@ -1,10 +1,10 @@
1#!/usr/bin/env perl 1#!/usr/bin/env perl
2# 2#
3# Copyright (c) 2013 Nagios Plugins Development Team 3# Copyright (c) 2013 Monitoring Plugins Development Team
4# 4#
5# Originally written by Holger Weiss <holger@zedat.fu-berlin.de>. 5# Originally written by Holger Weiss <holger@zedat.fu-berlin.de>.
6# 6#
7# This file is free software; the Nagios Plugins Development Team gives 7# This file is free software; the Monitoring Plugins Development Team gives
8# unlimited permission to copy and/or distribute it, with or without 8# unlimited permission to copy and/or distribute it, with or without
9# modifications, as long as this notice is preserved. 9# modifications, as long as this notice is preserved.
10# 10#
diff --git a/tools/git-notify b/tools/git-notify
index 8514296..ff59d39 100755
--- a/tools/git-notify
+++ b/tools/git-notify
@@ -3,7 +3,7 @@
3# Tool to send git commit notifications 3# Tool to send git commit notifications
4# 4#
5# Copyright 2005 Alexandre Julliard 5# Copyright 2005 Alexandre Julliard
6# Copyright 2009 Nagios Plugins Development Team 6# Copyright 2009 Monitoring Plugins Development Team
7# 7#
8# This program is free software; you can redistribute it and/or 8# This program is free software; you can redistribute it and/or
9# modify it under the terms of the GNU General Public License as 9# 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 db9ad9e..c822a63 100755
--- a/tools/git-post-receive-hook
+++ b/tools/git-post-receive-hook
@@ -1,11 +1,11 @@
1#!/bin/sh 1#!/bin/sh
2 2
3prefix="${0%/*}/notifications" # $GIT_DIR/hooks/notifications 3prefix="${0%/*}/notifications" # $GIT_DIR/hooks/notifications
4recipient='Nagios Plugin Commits <nagiosplug-checkins@lists.sourceforge.net>' 4recipient='Monitoring Plugins Commits <commits@monitoring-plugins.org>'
5maxcommits=100 5maxcommits=100
6maxdiffsize=$((300 * 1024)) 6maxdiffsize=$((300 * 1024))
7project='nagiosplug' 7project='monitoring-plugins'
8gitweburl='http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug' 8gitweburl='https://github.com/monitoring-plugins/monitoring-plugins'
9gitnotify="$prefix/git-notify.pl" 9gitnotify="$prefix/git-notify.pl"
10statefile="$prefix/git-notify.dat" 10statefile="$prefix/git-notify.dat"
11 11
diff --git a/tools/tango b/tools/tango
index 7f418d7..0d07b1f 100755
--- a/tools/tango
+++ b/tools/tango
@@ -14,9 +14,9 @@ my $REVISION = '$Revision$ ';
14$REVISION =~ s/^\$Revision: //; 14$REVISION =~ s/^\$Revision: //;
15$REVISION =~ s/ \$ $//; 15$REVISION =~ s/ \$ $//;
16 16
17my $PACKAGE = 'Nagios Plugins'; 17my $PACKAGE = 'Monitoring Plugins';
18my $RELEASE = '1.3'; 18my $RELEASE = '1.3';
19my $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"; 19my $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";
20 20
21my $version = undef; 21my $version = undef;
22my $help = undef; 22my $help = undef;
diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index 12528d9..48836b1 100755
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
@@ -1,6 +1,6 @@
1#!/usr/bin/perl 1#!/usr/bin/perl
2# tinderbox_build.pl 2# tinderbox_build.pl
3# This script builds the nagiosplugins and then sends 3# This script builds the monitoringplugins and then sends
4# logs back to the master tinderbox server 4# logs back to the master tinderbox server
5# 5#
6# This script is based on mozilla-unix.pl which comes with tinderbox2 6# 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
34my $Tinderbox_server = '-p 1022 -o StrictHostKeyChecking=no tinderbox2@tinderbox.opsera.com'; 34my $Tinderbox_server = '-p 1022 -o StrictHostKeyChecking=no tinderbox2@tinderbox.opsera.com';
35 35
36# These shouldn't really need to be changed 36# These shouldn't really need to be changed
37my $BuildTree = 'nagiosplug'; 37my $BuildTree = 'monitoringplug';
38my $BuildName = ''; 38my $BuildName = '';
39my $ConfigureArgs = $ENV{CONFIGURE_ARGS}; 39my $ConfigureArgs = $ENV{CONFIGURE_ARGS};
40 40
@@ -81,7 +81,7 @@ sub BuildIt {
81 chdir("$StartDir"); 81 chdir("$StartDir");
82 82
83 my $StartTime = time; 83 my $StartTime = time;
84 if (-e (my $file = "nagios-plugins.spec")) { 84 if (-e (my $file = "monitoring-plugins.spec")) {
85 open F, $file; 85 open F, $file;
86 while (<F>) { 86 while (<F>) {
87 if (/^Version: trunk-(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) { 87 if (/^Version: trunk-(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {