diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS index 7b8dbe2..50c714c 100644 --- a/ACKNOWLEDGEMENTS +++ b/ACKNOWLEDGEMENTS @@ -1,6 +1,6 @@ -This file contains the origin of code copied verbatim into some or all of the Nagios plugins. +This file contains the origin of code copied verbatim into some or all of the Monitoring Plugins. -The NagiosPlugin team thanks the original authors. +The Monitoring Plugins team thanks the original authors. Copied code is cited in the source by indented comments of the form diff --git a/AUTHORS b/AUTHORS index c761c38..0c667f6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -The Nagios Plugins are brought to you by the Nagios Plugins Development Team. +The Monitoring Plugins are brought to you by the Monitoring Plugins Development Team. Jeremy T. Bouse Peter Bray @@ -11,6 +11,7 @@ Subhendu Ghosh Thomas Guyot-Sionnest Stanley Hopcroft Matthew Kent +Sam Kottler Harper Mann Benoit Mortier Sven Nierlein 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 http://www.gnu.org/prep/standards_toc.html). We also follow most of the FSF guidelines. Developers may suggest deviations from the FSF style recommendations, which will be considered by open discussion on -the nagiosplug-devel mailing list. Any such deviations will apply to -the entire code base to ensure consistency. +the Monitoring Plugins devel mailing list. Any such deviations will +apply to the entire code base to ensure consistency. Currently, the exceptions to FSF recommendations are roughly equivalent to GNU indent with invoked as 'indent -ts 2 -br'. Specifically, the diff --git a/ChangeLog b/ChangeLog index 1e3d4bb..ea57b8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1 +1,19335 @@ -Not a Git repository, so I won't update the ChangeLog. +2014-07-11 Holger Weiss + + * NEWS: Fix typo + + * NEWS, NP-VERSION-GEN, configure.ac: Prepare for the 2.0 release + + * NEWS: Wrap overly long line + +2014-07-10 Holger Weiss + + * THANKS.in: Update THANKS.in file with latest author + +2014-07-10 Mikael Falkvidd + + * plugins/t/check_procs.t: check_procs: Add delay after forking in test + + Forking raises a race condition, where the parent might run the + test before the child has had time to fork. If that happens, + an error similar to this is produced: + Failed test 'Output correct' + at ./t/check_procs.t line 32. + 'PROCS OK: 0 processes with args 'sleep 7' | processes=0;;;0;' + doesn't match '/^PROCS OK: 1 process?/' + + Sleeping a bit should avoid the problem. It might be enough to + sleep less than a second, but perl's built-in sleep function only + supports integer seconds. + + In our build environment, the build failed 3 of 4 times before + this patch. After the patch it failed 0 of 7 times. + + Signed-off-by: Mikael Falkvidd + +2014-07-07 Holger Weiss + + * NEWS: Add a warning regarding check_snmp + + Tell users that check_snmp might now return CRITICAL in cases where it + used to return OK, and how to deal with that. + + * NEWS: Update version number + + We're going to release version 2.0, not 1.6. + + * plugins/netutils.h: Adjust UNIX_PATH_MAX for BSD + + On at least FreeBSD, NetBSD, OpenBSD, DragonFly, and OS X, this is + hard-coded at 104 bytes. + + Closes #1267. + +2014-07-06 Holger Weiss + + * plugins-scripts/Makefile.am, plugins-scripts/check_breeze.pl, + plugins-scripts/check_disk_smb.pl, plugins-scripts/check_file_age.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_mailq.pl, plugins-scripts/check_mssql.pl, + plugins-scripts/check_netdns.pl, plugins-scripts/check_rpc.pl, + plugins-scripts/check_wave.pl: Don't rely on FindBin module to locate + utils.pm + + As the FindBin module doesn't work with ePN, set the path to utils.pm + explicitly at build time. Keep using FindBin additionally, so that the + plugins can also be executed from the build directory. + + Closes #1271. + +2014-07-06 Jan Wagner + + * lib/utils_base.c, lib/utils_base.h, plugins-root/check_dhcp.c, + plugins-root/check_icmp.c: check_icmp/check_dhcp: disable check, if we + are root + + As it is possible to use capabilities(7) on linux or solaris + privileges for example, it is not necessary in all cases to + have those binaries making use of setuid. + +2014-07-06 Holger Weiss + + * NEWS: Add missing entries + + * THANKS.in: Add new authors + + Update the THANKS.in file with the new Git commit authors. + +2014-03-03 abrist + + * plugins/t/check_jabber.t: check_jabber.t - fixed tests for new status + output including hostname + +2014-06-28 Sven Nierlein + + * plugins/t/check_dns.t: tests: added check_dns performance data test + + Signed-off-by: Sven Nierlein + +2014-02-26 abrist + + * plugins/check_dns.c: check_dns.c Added a bit more logic to thresholds + + Added two if elses to cover when only one threshold is set. + +2014-02-26 Jean-Claude Computing + + * plugins/check_dns.c: check_dns: add warning and critical thresholds to + perfdata + +2014-02-20 abrist + + * plugins/check_tcp.c: Cleaned up status output of check_tcp changes + +2014-02-20 Davide Madrisan + + * plugins/check_tcp.c: check_tcp: also display the server addr when + host_specified is set. This will help the admins when multiple checks + are configured + + Signed-off-by: Davide Madrisan + +2014-05-19 abrist + + * plugins/check_nt.c: check_nt.c - Changed 'Mb' to 'MB' in MEMUSE. + +2014-06-23 Spenser Reinhardt + + * lib/utils_cmd.c: lib/utils_cmd.c - Free file descriptor + + Coverity 66502 - File descriptor fd in cmd_file_read is never closed, and thus file is left open after usage throughout runtime. - SR + +2014-06-22 Spenser Reinhardt + + * plugins/negate.c: plugins/negate.c - Function should not return. + + Coverity 66479 - validate_arguments has no need to return anything, as it dies on error, yet was set to return an int. Set to void to resolve warning. + + * plugins/negate.c: plugins/negate.c - Reorder if statement, aiob + + Coverity 66480 - Potential array index out of bounds, since result was not verified to be positive prior to using as an index for state[]. Simply reording the if statement should resolve the issue. - SR + + * plugins-root/check_dhcp.c: plugins-root/check_dhcp.c - array out of + bounds + + Coverity 66488 - offer_packet->options has a max size of 312. It was being used in a loop verifying less than 311, but increasing by 2 per loop, causing a possible array index out of bounds. Changed to checking less than max length - 1. - SR + + * plugins/check_http.c: plugins/check_http.c - leakage fix + + Coverity 66514 - Possible leakage and overflow with addr in redirect functionality. Not confirmed as null terminated, and externally gathered. Restrict string comparisons and duplications by size. - SR + + * plugins/check_ntp.c: plugins/check_ntp.c - Verify struct from response + + Coverity 66524 - req.data is not neccessarily null terminated but still feed to printf statements. This both does that, and verifies the struct more so than before. - SR + +2014-06-05 Spenser Reinhardt + + * plugins/check_real.c: plugins/check_real.c - recv string null + terminate + + Recv into buffer is not properly null terminated prior to strstr and possible other string functions expecting a null termination. Simply take bytes received and use as an index to append \0 after. We are creating buffer[] with size of MAX_INPUT_BUFFER and recv with MAX_INPUT_BUFFER-1 so this should never overflow. + + * plugins/check_apt.c: plugins/check_apt.c - Print uninitialized ereg + + Coverity 66531 - ereg.buffer can be printed without being initialized if do_include and do_exclude are null and critical is an invalid regex. While minor this may leak memory and cause undefined behavior. + +2014-06-05 Eric J. Mislivec + + * plugins/check_tcp.c, plugins/negate.c: Include common.h before any + system headers. + + This should fix some problems building on AIX. + +2014-06-24 Sven Nierlein + + * .travis.yml, plugins/t/NPTest.cache.travis, plugins/t/check_ntp.t, + plugins/t/check_snmp.t, plugins/t/check_udp.t: tests: always build and + test on travis + + also make test is now working on travis-ci + + Signed-off-by: Sven Nierlein + +2014-06-23 Jan Wagner + + * plugins/check_ide_smart.c, po/de.po, po/fr.po, + po/monitoring-plugins.pot: check_ide_smart: Fixing spelling bug + + * plugins/check_mrtg.c, po/de.po, po/fr.po, po/monitoring-plugins.pot: + check_mrtg: Fixing spelling bug + + * plugins/check_dbi.c, plugins/check_ups.c: check_ups/check_dbi: Fixing + spelling bug + +2014-06-23 Holger Weiss + + * NEWS: Add missing entries for the upcoming release + +2014-06-22 Holger Weiss + + * THANKS.in: Add new authors + + Add the new Git commit authors to the THANKS.in file. + + * NEWS: Add missing tab characters + + * plugins/check_radius.c: check_radius.c: Add newline to die() calls + + Our die() function doesn't append a newline character to the message. + + * configure.ac: Change RADIUS library preferences + + Prefer the FreeRADIUS Client library over radiusclient-ng, and prefer + that one over the original radiusclient library. + + * NEWS, REQUIREMENTS, configure.ac, plugins/check_radius.c: + check_radius: Support FreeRADIUS Client library + + Allow for using the FreeRADIUS Client library instead of radiusclient or + radiusclient-ng. The latter two projects are dead. + + Closes #1231. + + * REQUIREMENTS: Update radiusclient-ng URL + + The project was moved to SourceForge.net. + +2014-06-21 Holger Weiss + + * NEWS, lib/tests/test_utils.c, lib/utils_base.c: Add UID to state + retention file path + + Add the UID of the invoking user to the state retention file path. This + helps solving permission issues when different users run the same + plugin. + +2014-06-20 Holger Weiss + + * NEWS: s/MP_STATE_DIRECTORY/MP_STATE_PATH/ + + NAGIOS_PLUGIN_STATE_DIRECTORY was renamed to MP_STATE_PATH, not to + MP_STATE_DIRECTORY. + +2014-06-18 Holger Weiss + + * lib/parse_ini.c: Print proper read error message + + Print a useful error message if opening the configuration file fails. + + * lib/parse_ini.c: Drop privileges for reading file + + Read the configuration file with privileges temporarily dropped if the + code is used by a setuid plugin. + + * lib/parse_ini.c: Add newline to die() calls + + Our die() function doesn't append a newline character to the message. + + * lib/parse_ini.c: Cosmetic change + + Replace an "if" with the ternary operator. + + * gl/Makefile.am, gl/idpriv-droptemp.c, gl/idpriv.h, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4, gl/m4/idpriv.m4: Add Gnulib + module "idpriv-droptemp" + + * plugins-scripts/check_file_age.pl, plugins-scripts/check_mssql.pl: Use + FindBin consistently across Perl plugins + + Use Perl's FindBin module to locate the path to utils.pm in + check_file_age.pl and check_mssql.pl, just as we do in other Perl + plugins. + + * plugins/runcmd.c: Remove superfluous newline + + The puts(3) function already appends a newline character to the string. + + * lib/parse_ini.c: Search for INI file in subdirs + + Add two path names to the list of default INI file locations, as some + users/distributions prefer to put configuration files into + subdirectories. + + * lib/parse_ini.c: Add comment on NAGIOS_CONFIG_PATH + + We might want to spit out a warning when NAGIOS_CONFIG_PATH is used. + + While at it, move the function that handles this environment variable to + the bottom. + + * lib/parse_ini.c: Cosmetic changes to comments + + * lib/parse_ini.c: Fix Clang warnings + + * lib/parse_ini.c, lib/parse_ini.h: lib/parse_ini.[ch]: Change code + formatting + + Change the indentation and formatting of the code in lib/parse_ini.c. + This breaks patches against that file and makes it harder to track its + history, but it (hopefully) improves readability a lot. + + * lib/parse_ini.c: Don't cast malloc(3) result + + There's no need to cast malloc(3)'s return value. + + * lib/parse_ini.c: Remove outdated comment and code + + The lib/parse_ini.c:np_get_defaults() function now dies if no + configuration file is found. + + * lib/parse_ini.c: Read $MP_CONFIG_FILE + + Read $MP_CONFIG_FILE if that variable is set in the environment. + + * lib/parse_ini.c: Read "monitoring-plugins.ini" + + Read "monitoring-plugins.ini" if that file exists, but fall back to + reading "plugins.ini" or "nagios-plugins.ini" for backward + compatibility. + + * lib/parse_ini.c, lib/parse_ini.h: lib/parse_ini.[ch]: Simplify code + + Rewrite the code that looks up the INI configuration file path (used by + the Extra-Opts feature) in order to improve readability. The behaviour + should not have changed. + +2014-06-13 Sven Nierlein + + * plugins/tests/check_snmp.t: tests: freebsds snmpd does not use quotes + + when returning syscontact. So make them optional since we want to test + check_snmp and not the snmpd. + + Signed-off-by: Sven Nierlein + + * plugins/tests/check_procs.t: tests: check_proc tests fail if uid -2 + does not map to nobody + + so make sure our tests only run if -2 maps to nobody + + Signed-off-by: Sven Nierlein + + * NPTest.pm, plugins/t/check_fping.t: tests: fping checks require being + root or setuid root + + on the fping binary. Check this before running the test. + + Signed-off-by: Sven Nierlein + + * plugins/tests/check_http.t: require at least HTTP::Daemon 6.01 + + since the test uses send_header from HTTP::Daemon::ClientConn which has been introduced in + HTTP::Daemon 6.01 + +2014-06-12 Sven Nierlein + + * NPTest.pm, plugins/tests/check_http.t: tests: testCmd has own timeout + which overwrites local one + + so add configurable/optional timeout to testCmd. + + Signed-off-by: Sven Nierlein + + * plugins/tests/check_procs.t: tests: parts of the check_procs test only + work when uid -2 exists + + skip those tests if the uid does not exist + + Signed-off-by: Sven Nierlein + +2014-06-12 Holger Weiss + + * configure.ac: Remove unused code + + We no longer set LIBGNUTLS_CONFIG, as GnuTLS no longer ships a + "libgnutls-config" tool. + + * plugins/sslutils.c: Fix compilation with GnuTLS + + GnuTLS doesn't provide a SSL_CTX_check_private_key() function. + + Closes #1254. + +2014-04-21 Gunnar Beutner + + * plugins/check_disk.c: Make check_disk work on Windows. + + * configure.ac, plugins/Makefile.am, plugins/check_users.c: Make + check_users work on Windows. + + * configure.ac, plugins/check_ping.c: Make check_ping work on Windows. + + * configure.ac: Add missing file extensions for some of the plugins. + +2014-03-07 Anton Lofgren + + * plugins/check_snmp.c, plugins/t/check_snmp.t: check_snmp: Handle + SNMPv3 noAuthNoPriv properly + + The SNMPv3 noAuthNoPriv security level, somewhat unintuitively, requires + a security name to be passed along together with the request. Check_snmp + previously did not do this, causing snmpget to throw an error: + + "External command error: No log handling enabled - turning on stderr + logging + snmpget: No securityName specified" + + This patch fixes the issue by always providing the security name when + noAuthNoPriv is specified. + + See also: + https:://bugs.op5.com/view.php?id=8385. + + Signed-off-by: Anton Lofgren + +2014-04-03 Sam Kottler + + * plugins/check_apt.c: Remove the suggestion to run check_apt with + --verbose since it doesn't do anything + +2014-04-04 Holger Weiss + + * AUTHORS: Add Sam Kottler to the list of AUTHORS + +2014-04-04 Jan Wagner + + * THANKS.in, plugins/check_nt.c: check_nt: add UPTIME to perfdata + [sf#3434647] + +2013-10-05 awiddersheim + + * plugins/check_mysql.c: Fix check_mysql.c client options from file + + If you don't specify a group or a file to read data from the plugin tries to read from several files that don't exist and no groups. + +2014-03-20 Sam Kottler + + * plugins-scripts/check_mssql.pl: Update the last remaining instance of + the old FSF address + +2014-03-13 Holger Weiss + + * plugins/check_pgsql.c: check_pgsql: Add missing newline to --help + output + +2014-03-08 Davide Madrisan + + * lib/Makefile.am, lib/tests/Makefile.am, plugins/Makefile.am: build - + avoid deprecated INCLUDES + + Signed-off-by: Davide Madrisan + +2014-02-28 Holger Weiss + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_wave.pl: Disable Perl's "taint" checks + + Perl's "taint" checks don't like `use lib "$FindBin::Bin"'. + + Cf. http://www.perlmonks.org/?node_id=585299 + +2014-02-28 Jan Wagner + + * .travis.yml: travis-ci: remove mawk build-deps + +2014-02-28 Holger Weiss + + * configure.ac: Remove unused AC_PATH_PROG() calls + + * NEWS, configure.ac, plugins-scripts/Makefile.am, + plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_file_age.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_log.sh, plugins-scripts/check_mailq.pl, + plugins-scripts/check_mssql.pl, plugins-scripts/check_netdns.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_oracle.sh, + plugins-scripts/check_rpc.pl, plugins-scripts/check_sensors.sh, + plugins-scripts/check_wave.pl, plugins-scripts/subst.in: Replace + "plugins-scripts/subst.in" foo + + Remove the buggy and complex awk(1) magic in "plugins-scripts/subst.in" + in favor of simple sed(1) substitutions. + + The plugins in the "plugins-scripts" directory now always use the PATH + specified via "./configure --trusted-path", or the default PATH + hard-coded in "configure.ac". + + Fixes #1242. + +2014-02-27 Jan Wagner + + * .travis.yml: travis-ci: Remove gawk to build against mawk + +2014-02-26 Evgeni Golov + + * plugins-scripts/subst.in: subst.in: remove the led() function + + It was only used to replace the 'use lib utils.pm' with the proper + libexec dir, which is now solved by using Perl's FinBin. + + Closes #1241 + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_mailq.pl, plugins-scripts/check_netdns.pl, + plugins-scripts/check_rpc.pl, plugins-scripts/check_wave.pl: utils.pm: + use FindBin instead of awk to find the path to + + 'use lib utils.pm' is not valid Perl syntax: + Bareword "utils" not allowed while "strict subs" in use at plugins-scripts/check_ircd.pl line 52. + Bareword "pm" not allowed while "strict subs" in use at plugins-scripts/check_ircd.pl line 52. + + This makes it impossible to use the plugins directly from the git tree, + e.g. while hacking on them. + + Using FindBin::Bin as the library path allows that, while preserving + the original behaviour of adding the libexec path when the plugin is + properly installed. + +2014-02-27 Jan Wagner + + * NEWS, THANKS.in: NEWS: Adding check_mailq auto detection + +2014-02-27 Evgeni Golov + + * plugins-scripts/check_mailq.pl: check_mailq: add $mailq to check + output, so it is easily visible what was autodetected + + Closes: #1242 + + * plugins-scripts/check_mailq.pl: check_mailq: document autodetection in + the usage output + + * plugins-scripts/check_mailq.pl: check_mailq: try to autodetect which + mailq implementation we are using + + This is done by looking at some common directories and files each + MTA installs on the system. If no known file is found, the old default + sendmail is used. Of course this still can be overridden by -M. + +2014-02-21 Holger Weiss + + * configure.ac: Support --disable-maintainer-mode + + This + + | allows you to choose whether the so called "rebuild rules" should be + | enabled or disabled. With AM_MAINTAINER_MODE([enable]), they are + | enabled by default, otherwise they are disabled by default. In the + | latter case, if you have AM_MAINTAINER_MODE in configure.ac, and run + | `./configure && make', then make will *never* attempt to rebuild + | configure, Makefile.ins, Lex or Yacc outputs, etc. I.e., this + | disables build rules for files that are usually distributed and that + | users should normally not have to update. + | + | The user can override the default setting by passing either + | `--enable-maintainer-mode' or `--disable-maintainer-mode' to + | configure. + | + | People use AM_MAINTAINER_MODE either because they do not want their + | users (or themselves) annoyed by timestamps lossage (see CVS), or + | because they simply can't stand the rebuild rules and prefer running + | maintainer tools explicitly. + + [ https://www.gnu.org/software/automake/manual/automake.html ] + + * configure.ac: Rename configure.in to configure.ac + + The old name has been deprecated years ago. The Autoconf documentation + says: + + | Previous versions of Autoconf promoted the name configure.in, which is + | somewhat ambiguous (the tool needed to process this file is not + | described by its extension), and introduces a slight confusion with + | config.h.in and so on (for which `.in' means "to be processed by + | configure"). Using configure.ac is now preferred. + + [ https://www.gnu.org/software/autoconf/manual/autoconf.html ] + +2014-02-20 Davide Madrisan + + * plugins/check_swap.c: check_swap: Fix the plugin name that appears in + the comment + + Signed-off-by: Davide Madrisan + +2014-02-20 Holger Weiss + + * .travis.yml: travis-ci: Don't use Clang + + Currently, there doesn't seem to be a way to configure Travis CI to omit + the Clang build on the coverity/* branches. + + See: https://github.com/travis-ci/travis-ci/issues/1975 + + * .travis.yml: travis-ci: Adjust "branch_pattern" + + Modify the "branch_pattern" for the Coverity add-on so that it also + matches "coverity/master" and "coverity/maint". + +2014-02-18 Sven Nierlein + + * plugins/tests/check_procs.t: check_procs test fails if there is no + user with uid 501 + + thats because check_procs verifys there is a user for a + given uid filter. So even we use sample data for this + test, we still need a real user. + + Signed-off-by: Sven Nierlein + +2014-02-17 Jan Wagner + + * plugins/check_ssh.c: check_ssh: Reverting a387120 + + This seems to result into more problems in the wild then before 'fixing' it + + Closes Debian #739254 + Reopen Debian #734811 + +2014-02-16 Jan Wagner + + * .travis.yml: travis-ci: remove heading dash accordingly docs + +2014-02-16 Holger Weiss + + * .travis.yml: travis-ci: Cosmetic changes + + Use two spaces for indentation. + + * .travis.yml: travis-ci: Enable email notifications + + Have Travis CI send build failure and recovery notifications to the + team@ list. + +2014-02-16 Jan Wagner + + * .travis.yml: travis-ci: Add configuration for Coverity Scan + + Run Coverity Scan builds on Travis CI, but only when pushing into the + "coverity" branch. + + * .travis.yml: travis-ci: Make use of before_script target + + * .travis.yml: travis-ci: Update package list in before_install + [skip ci] + + * .travis.yml: travis-ci: Move all into install target + + just keeped 'make' in script target + + * .travis.yml: travis-ci: Add clang and gcc as compiler + +2014-02-15 Jan Wagner + + * .travis.yml: travis-ci: Enable IRC notification + +2014-02-14 Jan Wagner + + * .travis.yml: Add travis config + +2014-02-07 Sam Kottler + + * plugins/Makefile.am: Remove unnecessary whitespace in Makefile.am + +2014-01-31 Thomas Guyot-Sionnest + + * plugins/tests/check_procs.t: Add perfdata in check_proc output tests + + * plugins/tests/check_snmp.t: Fix snmpd tests + + * NPTest.pm, plugins/tests/check_procs.t, test.pl.in: Enable tests in + tests/ subdirs + +2013-11-15 Stephane Lapie + + * lib/utils_base.h, plugins/check_snmp.c: Handle negative values + properly with check_snmp + + check_snmp becomes capable of evaluating negative values properly, + but it might be returning CRITICALs where it used to return OK and was ignored, + if a negative value turns out to actually be a valid value. + If negative values are valid, this can be worked around, + by adding "~:" to the warning/critical threshold : 100 -> ~:100 + +2014-01-31 Thomas Guyot-Sionnest + + * plugins/tests/check_snmp.t, plugins/tests/check_snmp_agent.pl: Add + tests for negative thresholds in check_snmp + + Next commit will work on fixing these! + + * lib/tests/test_utils.c: Add tests for negative thresholds in + test_utils + +2014-01-30 Holger Weiss + + * plugins/check_dig.c: check_dig: Declare variable at the top + + C89 doesn't allow variable declarations to be intermingled with code. + +2014-01-30 Jan Wagner + + * plugins/check_dig.c: check_dig: stick with integer devision + + This change saves us from having to link check_dig against "libm" + + * plugins/check_dig.c: check_dig: timeout_interval is a global variable + which is already set to 10 seconds + + * THANKS.in, plugins/check_dig.c: check_dig: patch to make dig honor -t + option + + When a timeout value is specified with the -t option, dig will sometimes + timeout before the timer is actually reached. + + The problem occurs because the check_dig plugin does not pass the specified + timeout value to dig, leaving dig to timeout with it's default value which + seems to be around 10-15seconds. + + To reproduce: + time ./check_dig -H 127.0.0.2 -l www.google.com -t 30 + + It will not run for 30secs, which is the expected behaviour. + + The following will work, because the timeout is less than the default dig + timeout, so the plugin cancels the dig command: + time ./check_dig -H 127.0.0.2 -l www.google.com -t 2 + + This fix passes the timeout value to dig, and sets the number of retries which tends to vary from system to system by default. + + Closes #1168 + +2014-01-29 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c: Add tests for mp_translate_state() + +2013-10-01 Jan Wagner + + * THANKS.in, plugins-scripts/check_mailq.pl: check_mailq: adding + nullmailer support + + Adding nullmailer support to check_mailq submitted by Luca Corti + + Closes: #740 + Closes: #1189 + +2014-01-29 Jan Wagner + + * plugins-scripts/check_mailq.pl: Just fixing small typo in comment + +2014-01-29 Thomas Guyot-Sionnest + + * plugins/check_swap.c: Update check_swap usage + + * .gitignore: AUpdate .gitignore for new gnulib module + + * NEWS, plugins/check_swap.c: check_swap: add supports for a + configurable state when there is no swap + + Check_swap used to allow no swap when thresholds were only specified in + percent. This is no longer the case and the state now must be specified + explicitly. The default is to always return CRITICAL when the swap is + absent regardless of thresholds. + + * lib/utils_base.c, lib/utils_base.h, plugins/negate.c: Move negate' + translate_state() to utils_base.h mp_translate_state() + + Also use strcasecmp imported from gnulib for simplicity + + * gl/Makefile.am, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4, + gl/m4/strcase.m4, gl/m4/strings_h.m4, gl/strcasecmp.c, gl/strings.in.h, + gl/strncasecmp.c: Add strcase gnulib module + + * plugins/t/negate.t: Typo + + * plugins/check_swap.c: Fix check_swap returning OK on & thresholds and + no swap + + Return 0% free instead of 100% free when total swap is 0 + +2013-09-30 Jan Wagner + + * plugins/check_disk.c: check_disk: precise the help output + + Clarifying in the help output that we need either a device or mount point + listed by the mount(8) command. + + (Closes: #1118) + (Closes: #1170) + +2014-01-28 Thomas Guyot-Sionnest + + * plugins/t/check_mysql.t: Clarify check_mysql test prompts + + Also default to "-u test -ptest" which are default MySQL accounts only + missing the prescribed privileges. + + The database is no longer specified as it is not used. + If wanted is should be its own parameter/tests. + +2014-01-27 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_dig.c: check_dig: fix wrong IPv6 + arguments order + + * lib/tests/test_utils.c, lib/utils_base.c, plugins/tests/check_snmp.t: + Rename MP_STATE_DIRECTORY to MP_STATE_PATH + + * NEWS, lib/utils_base.c: And release notes for previous change + (MP_STATE_DIRECTORY) + + The change has also been updated in + https://www.monitoring-plugins.org/doc/state-retention.html + +2014-01-26 Thomas Guyot-Sionnest + + * NPTest.pm: Fix tests with an empty NPTest.cache file + + The NPTest.cache cannot be loaded when empty, and this prevents + getting the data and populating the file. This patch skips the file when + empty as if it didn't exist. + +2014-01-25 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c, lib/utils_base.c, lib/utils_base.h: Ignore + MP_STATE_DIRECTORY in suid plugins + + If a plugin still has suid privileges at the time np_enable_state() is + called, the MP_STATE_DIRECTORY environment will be ignored. + + There is no need for a NEWS entry as no suid plugins use np_enable_state + yet. + + * lib/parse_ini.c: Clean up parse_ini error messages, add missing + newlines + + * lib/tests/test_utils.c, lib/utils_base.c, plugins/tests/check_snmp.t: + Rename ENV variable, keep backward compatibility + + Rename NAGIOS_PLUGIN_STATE_DIRECTORY to MP_STATE_DIRECTORY + +2013-10-01 Jan Wagner + + * plugins-scripts/check_file_age.pl, plugins-scripts/t/check_file_age.t: + check_file_age: support for --ignore-missing + + Patch to provide for a -i | --ignore-missing option. This allows files that + don't exist to be monitored for without causing an error. The use case is: + + * one process periodically pushes files to an "input" queue for a second + process + * the second process, when running cleanly will "consume" (process and remove) + these files + + So the conditions to meet are: + 1. If the file doesn't exist, that's fine (OK) + 2. If the file exists, but is less than X seconds, that's fine (OK) + 3. If the file exists, but greater than X seconds, no good (CRITICAL) + + Since now check_file_age doesn't permit this behavior, as a non-existent file + is considered CRITICAL. + + Test case was contributed by our lovely Holger. + + Closes #1181, Closes #989, Closes #862, Closes #1187, Closes #845 + Closes Debian Bug #496307 + +2014-01-24 Jan Wagner + + * THANKS.in, plugins/check_ping.c: check_ping: Fixing "time of day goes + back" + by Geoff Oakham + + Patch of check_ping that allows it to gracefully handle when ping outputs + to stderr "Warning: time of day goes back (-XXXXus), taking countermeasures." + + Closes: #809 and #1195 + + * plugins/check_ntp.c, plugins/check_ntp_time.c: Fixing bug in average + calculation (Submitted by Lars) + + The more important change: A fix for a bug which caused the check_ntp_time + and check_ntp_time check to always take the first response from ntp and not + the avarage since "j" is not increased anywhere. "i" should be used there + instead. + + Partly Closes #956 and Closes #1166 + Closes: #1089 + + * plugins/check_ntp.c, plugins/check_ntp_time.c: Making AVG_NUM + configurable by compiler define (Submitted by Lars) + + A minor change which makes the AVG_NUM configurable by compiler define. + Partly Closed #956 and Closes #1166 + +2014-01-24 Thomas Guyot-Sionnest + + * lib/parse_ini.c: Use access() instead of stat() in parse_ini.c + + * lib/tests/test_base64.t, lib/tests/test_cmd.t, lib/tests/test_disk.t, + lib/tests/test_ini1.t, lib/tests/test_ini3.t, lib/tests/test_opts1.t, + lib/tests/test_opts2.t, lib/tests/test_opts3.t, lib/tests/test_tcp.t, + lib/tests/test_utils.t: Update comments + + 1. libtab is now bundled, so suggest to enable it rather than install it + 2. "parse-ini" feature has been called "extra-opts" + +2014-01-23 Thomas Guyot-Sionnest + + * plugins-scripts/Makefile.am, plugins-scripts/check_ntp.pl: Remove + obsolete check_ntp.pl + +2011-10-25 Tilmann Bubeck + + * plugins/check_ide_smart.c: fix smart attribute comparison + + Each S.M.A.R.T. attribute is compared against a threshold. If it is LESSTHAN + that threshold an error is reported. This patch fixes the problem, that + attribute values EQUAL to the threshold are reported as error, which is wrong. + Only LESSTHAN the threshold is an error. + + For more information see: http://www.hdsentinel.com/smart/index.php + + My SSD has some attributes which value and threshold are "0". Without the patch + this is reported as errornous. + + ID# ATTRIBUTE_NAME FLAG VALUE WORST THRESH TYPE UPDATED WHEN_FAILED RAW_VALUE + ... + 172 Unknown_Attribute 0x0032 000 000 000 Old_age Always - 0 + 174 Unknown_Attribute 0x0030 000 000 000 Old_age Offline - 13 + 177 Wear_Leveling_Count 0x0000 000 000 000 Old_age Offline - 0 + ... + + See also: + + * http://sourceforge.net/p/nagiosplug/patches/365/ + * https://bugzilla.redhat.com/913085 + +2014-01-23 Thomas Guyot-Sionnest + + * NEWS, configure.in: Enable extra-opts by default + + * plugins/check_ide_smart.c: Fix misleading option text + + As soon as a device is specified without using -d, anything else on the + command line is ignored. + + * NEWS, plugins/check_ide_smart.c: Disable SMART test commands in + check_ide_smart + + check_ide_smart could disable offline auto tests but could not re-enable + them. For this reason all SMART command modes have been disabled + + The disabled commands are -0/--auto-off, -1/--auto-on and + -i/--immediate + + * plugins/utils.h: Remove accidental tabs inserted in macro + + * NEWS, plugins/check_ide_smart.c: Make check_ide_smart default to + nagios output + + check_ide_smart was originally a smard control utility later converted + to a monitoring plugin. the -n option (Nagios check) should therefore be + the default. + + This patch deprecates the -n and -q switches, and make the other + switches return nagios-compatible output (they are most likely used in + eventhandlers, but returning nagios-compatible output makes it clear and + easy to handle the return status) + +2014-01-22 Ricardo Maraschini + + * plugins/utils.h: avoiding warnings on empty printf statements + + while compiling i keep receiving an warning statement as follow: + + warning: zero-length gnu_printf format string + + using an unorthodox method to remove them + + Signed-off-by: Ricardo Maraschini + +2014-01-22 Lars Vogdt + + * plugins-scripts/check_file_age.pl, + plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_mailq.pl: fix + outdated Free Software Foundation address + +2014-01-21 Holger Weiss + + * README: Minor fixes regarding new project name + + Talk about "monitoring systems", not just about "Nagios". Also, the + default installation prefix has changed to /usr/local. + + (While at it, wrap lines consistently at 76 characters.) + + * configure.in, lib/utils_base.h, lib/utils_cmd.h, + pkg/solaris/pkginfo.in, plugins-root/check_icmp.c, + plugins-scripts/utils.pm.in, plugins/utils.h, po/de.po, po/fr.po, + po/monitoring-plugins.pot, tools/tango: Capitalize "Monitoring Plugins" + + "Monitoring Plugins" is a name. + + * configure.in, plugins/tests/var/ps_axwo.debian: New default + installation prefix: /usr/local + + Install into /usr/local instead of /usr/local/nagios by default, in + order to comply with the Filesystem Hierarchy Standard (FHS) and + presumably the expectations of most users. + +2014-01-20 Spenser Reinhardt + + * plugins/check_apt.c, plugins/check_disk.c, plugins/check_procs.c, + plugins/negate.c: plugins/*.c: Non-network timeout changes + + Changes to non-network checks for clarity on timeout value. Adapted from pull request #1209 tracker from user awiddersheim. (Closes: #1209) + Files: check_apt.c, check_disk.c, check_procs.c, negate.c + + * plugins/utils.h: Addition of plugin timeout msg. + + Addition of timeout message for non-network plugins(UT_PLUG_TIMEOUT), and alteration of UT_TIMEOUT to UT_CONN_TIMEOUT for networked checks. Alteration of pull request #1209 tracker by user awiddersheim. + + * plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_dbi.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_game.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_ups.c, plugins/negate.c: plugins/*.c: Alterations for + timeout messages. + + .c file changes for misleading timeout messages in help functions. Solution to pull request #1209 tracker by awiddersheim. + + Files: plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_dbi.c, plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, plugins/check_game.c, plugins/check_http.c, plugins/check_ldap.c, plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, plugins/check_tcp.c, plugins/check_time.c, plugins/check_ups.c, plugins/negate.c + +2014-01-21 Jan Wagner + + * plugins/check_mysql_query.c: Revert renaming value + + As suggested by sreinhardt in 045d38a6 over there in nagios-plugins + +2013-10-14 awiddersheim + + * plugins/check_mysql_query.c: Add performance data to + check_mysql_query.c (Closes: #1202) + +2014-01-20 Thomas Guyot-Sionnest + + * NPTest.pm: Fix NPTest.pm not asking for unconfigured variables + + It appeats STDERR isn't a tty anymore during tests, but since we type + from tty to STDIN it should be bound to our tty (and works for me). + +2014-01-20 Sven Nierlein + + * perlmods/Monitoring-Plugin-0.37.tar.gz, + perlmods/Nagios-Plugin-0.36.tar.gz: updated perldod with a renamed pkg + + Signed-off-by: Sven Nierlein + +2014-01-20 Holger Weiss + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_dbi.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c: Capitalize "Monitoring" when it's + the first word + + * lib/extra_opts.c, lib/parse_ini.c, plugins/check_radius.c, + plugins/t/check_http.t, plugins/urlize.c, tools/distclean: Minor fixes + to be amended into "rename" commit + +2014-01-19 Thomas Guyot-Sionnest + + * po/fr.po: Minor mailinglist corrections for french + + * po/Makevars, po/de.po, po/fr.po, po/monitoring-plugins.pot: Reprocess + L10n files + +2014-01-18 Monitoring Plugins Development Team + + * .gitignore, ACKNOWLEDGEMENTS, AUTHORS, CODING, FAQ, Makefile.am, NEWS, + NPTest.pm, README, REQUIREMENTS, SUPPORT, configure.in, doc/LEAVERS, + doc/NEW_STARTERS, doc/RELEASING, doc/developer-guidelines.sgml, + lib/Makefile.am, lib/extra_opts.c, lib/extra_opts.h, lib/parse_ini.c, + lib/parse_ini.h, lib/tests/Makefile.am, lib/tests/test_utils.c, + lib/utils_base.c, lib/utils_base.h, lib/utils_cmd.c, lib/utils_cmd.h, + lib/utils_disk.c, lib/utils_tcp.c, m4/np_mysqlclient.m4, + monitoring-plugins.spec.in, perlmods/install_order, + pkg/solaris/pkginfo.in, plugins-root/Makefile.am, + plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins-root/pst3.c, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_file_age.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_log.sh, plugins-scripts/check_mssql.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_oracle.sh, + plugins-scripts/check_rpc.pl, plugins-scripts/utils.pm.in, + plugins/Makefile.am, plugins/check_apt.c, plugins/check_by_ssh.c, + plugins/check_cluster.c, plugins/check_dbi.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/common.h, plugins/negate.c, plugins/netutils.c, + plugins/netutils.h, plugins/popen.c, plugins/runcmd.c, plugins/runcmd.h, + plugins/sslutils.c, plugins/t/check_disk.t, plugins/t/check_dns.t, + plugins/t/check_http.t, plugins/tests/check_http.t, + plugins/tests/var/ps_axwo.debian, plugins/urlize.c, plugins/utils.c, + plugins/utils.h, po/Makevars, po/de.po, po/fr.po, + po/monitoring-plugins.pot, tools/distclean, tools/generate-change-log, + tools/git-notify, tools/git-post-receive-hook, tools/tango, + tools/tinderbox_build: 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. + +2014-01-13 Holger Weiss + + * NEWS, plugins-scripts/check_log.sh, plugins-scripts/utils.sh.in: + utils.sh: Don't define $ECHO + + In utils.sh, $ECHO was set to printf(1) or echo(1), depending on whether + printf(1) is available in /usr/bin. This resulted in various bugs, as + printf(1) cannot be used in the same way as echo(1). + + Thanks to Trevor Hemsley for reporting one of those bugs: If $ECHO was + set to printf(1), check_log stumbled when reporting a log line with a + "%" character. + +2014-01-10 Jan Wagner + + * plugins/check_ssh.c: check_ssh: Get rid of sshd: Read from socket + failed: Connection reset by peer + + This fix was grabbed from FreeBSD downstream and provided by Dmitry Sivachenko. + Fixes Debian Bug #734811 + +2014-01-10 Holger Weiss + + * configure.in: Call AC_CONFIG_HEADERS + + AM_CONFIG_HEADER is deprecated. + +2013-12-27 Sven Nierlein + + * plugins/t/check_http.t, plugins/t/check_tcp.t: fixed tests when there + is no direct internet connection + + - check http had wrong number of skipped tests + - check tcp did not use the 'no internet' flag at all + +2013-12-20 Holger Weiss + + * NEWS: Mention fix for check_http's -S option + + Closes #1220. + +2013-12-20 Joseph Gooch + + * plugins/check_http.c: Fix for SSL Versioning when multiple options are + used. + + If you specify -S1 -C 30... The -C option will reset the ssl_version to 0. This is not a good thing. + + Instead we set the default to 0 and retain the version when later args are passed. + +2013-12-16 Damian Myerscough + + * nagios-plugins.spec.in: Fix #1217 spec file fails to build due to + duplicate files and unused files + +2013-12-05 Holger Weiss + + * plugins/check_http.c: check_http: Don't let "-N" expect an argument + + Fix the problem that check_http's "-N" option expects an argument + although it shouldn't. The corresponding long option ("--no-body") + wasn't affected. + + This error was introduced in ee3c4014d511e105489b081390636cacd4c53e3f. + Thanks to Kerry Hughes for reporting it on the devel@ list. + +2013-11-20 Sven Nierlein + + * plugins/t/check_procs.t: make testing check_proc not rely on bash + + also grandparents make this test fail but is not a problem in real live. + NPTest->testCmd uses "sh -c" already, so there is no need to do that twice. + +2013-11-20 Holger Weiss + + * NEWS: Add WARNING regarding the check_procs change + + Closes #1205. + +2013-10-18 Anton Lofgren + + * plugins/check_procs.c, plugins/t/check_procs.t: check_procs: ignore + plugin parent process + + This fixes an issue that appears when running check_procs over NRPE, + where the default shell is configured to (for example) dash, as is the + case on Debian. + + dash (and tcsh, and mksh, and probably others), when invoked with -c forks an additional process + to execute the argument string. Contrast this with bash, which does not + do this, provided that the argument string simply can be exec()'d as-is. + + To demonstrate: + $ bash -c pstree + init─┬ .. + ... + ├─sshd─-─sshd───pstree + + versus + $ dash -c pstree + init─┬ .. + ... + ├─sshd─-─sshd───dash───pstree + + The consequence of this fork is that the following invocation: + /opt/plugins/check_procs -a init + + will result in this output: + + PROCS OK: 2 processes with args 'init' | processes=2;;;0; + + because the check_procs, in addition to finding the actual init process, + finds its parent shell as well. + + This example is a bit contrived, but I think it illustrates the + point. + + This wouldn't really be a problem, and normally isn't, if it weren't + for the fact that NRPE uses a call to popen() which does exactly the + above (executes '/bin/sh -c ...'), causing inconsistent behaviour + between distributions and much confusion for end users. + + The argument may be made that the dash process spawned by NRPE is just a + process like any other, and should therefore be included in the process + count just like any other. However, this is not very intuitive, because + of the previously mentioned inconsistencies. + + The argument might also well be made that we're _never_ interested in the + immediate ancestor of the plugin, and while it is unknown how many + installations have already made the necessary modifications to their + setups to make up for the fact that the plugin behaves the way it does, + it is not deemed worthwhile to entertain such workarounds. + + Thus, this patch ignores the parent process. + + See also these bug reports: + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626913 + http://sourceforge.net/p/nagiosplug/bugs/512/ + https://github.com/nagios-plugins/nagios-plugins/issues/999 + https://bugs.op5.com/view.php?id=4398 + +2013-11-05 Holger Weiss + + * README: Change GitHub URL + + Link to our main project home page on GitHub instead of referencing only + the "nagios-plugins.git" repository. (And put the URL on its own line.) + + * README: Clarify license notice + + Note that we permit redistribution and modification under the terms of + future GPL versions, and state the exclusion of warranty. This is in + accordance with the license notices at the top of our source files. + +2013-10-28 Holger Weiss + + * FAQ, README, SUPPORT, configure.in, nagios-plugins.spec.in, + pkg/solaris/pkginfo.in, plugins-root/check_dhcp.c, + plugins-root/check_icmp.c, plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_mssql.pl, plugins/check_apt.c, + plugins/check_by_ssh.c, plugins/check_cluster.c, plugins/check_dbi.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c, plugins/utils.h, po/Makevars, + po/de.po, po/fr.po, po/nagios-plugins.pot: Update URLs and mailing list + addresses + + Now that we moved our infrastructure away from SourceForge, update the + URLs and mailing list addresses accordingly. + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Fix URL + + Fix the Test::Simple tutorial URL. + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Remove + Tinderbox link + + We don't run a Tinderbox instance anymore. (Noted by "zathras" on IRC.) + +2013-10-22 awiddersheim + + * configure.in, plugins-scripts/check_breeze.pl, + plugins-scripts/check_disk_smb.pl, plugins-scripts/check_file_age.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_log.sh, plugins-scripts/check_mailq.pl, + plugins-scripts/check_mssql.pl, plugins-scripts/check_netdns.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_oracle.sh, + plugins-scripts/check_rpc.pl, plugins-scripts/check_sensors.sh, + plugins-scripts/check_wave.pl, plugins-scripts/subst.in: Fix trusted + path + + When configuring the plugins you have the option to specify a trusted path with --with-trusted-path. This option seems to have been deprecated at some point for unknown reasons and had typically had no affect. This commit makes this option work again for those who have a desire to use it. There should be no affect on those who have not chosen to specify a trusted path. + +2013-10-22 Jan Wagner + + * plugins-scripts/check_oracle.sh: Just using the posix conform extended + regular expression grep + + * plugins-scripts/check_oracle.sh: check_oracle: --db +ASM bad string + matching + check_oracle doesn't correctly check for pmon +ASM instance from at least Oracle 11 as the pmon proces was renamed from ora_pmon_.* to asm_pmon_.*. + -- + Just turning attached patch of github issue #1207 into a push request. + (Closes #1207) + +2013-10-08 Holger Weiss + + * plugins/utils.h: Update web site URLs + + The Nagios Plugin Development Guidelines and the Extra-Opts + documentation were moved to our new project server. + +2013-10-05 awiddersheim + + * plugins/check_mysql_query.c: Add additional usage data for new options + in check_mysql_query.c + + * plugins/check_mysql_query.c: Add ability to read from options file to + check_mysql_query.c + + This is the same code that was added to check_mysql.c in 5ed7194. + +2013-10-03 Holger Weiss + + * NEWS: Mention "contrib" removal + + Add a note regarding the removal of the "contrib" directory to the NEWS + file. This note is missing from the NEWS file shipped with the 1.5 + release, though. + +2013-10-02 Holger Weiß + + * NEWS, NP-VERSION-GEN, configure.in: Prepare for the 1.5 release + +2013-10-02 Holger Weiss + + * FAQ: Update CVS references + + We moved from CVS to Git. + +2013-10-02 Jan Wagner + + * doc/LEAVERS, doc/NEW_STARTERS, tools/README: tools: Update CVS + references + + We moved our stuff from CVS/SourceForge to Git/GitHub. + + * doc/LEAVERS, doc/NEW_STARTERS: doc: Updated CVS references + + We moved our stuff from CVS/SourceForge to Git/GitHub. + +2013-10-02 Holger Weiss + + * README: Update URLs + + We moved the Nagios Plugins site from SourceForge to our project server. + + * SUPPORT: Update CVS/SourceForge references + + We moved our stuff from CVS/SourceForge to Git/GitHub. + +2013-10-01 Jan Wagner + + * plugins/check_ssh.c: check_ssh: check protocol + + It would be useful to be able to detect the protocols supported by the remote + ssh server to locate any using the insecure ssh v1 protocol. This patch + attempts to match against the protocol string in the ssh response. + + Example: + + check_ssh -H my.host.com -P 2.0 + -- + Just turning attached patch of github issue #780 into a push request. + (Closes #780) + +2013-09-30 Holger Weiss + + * THANKS.in: Update THANKS file + + Add all new Git commit authors to the THANKS.in file. + + * AUTHORS: Tiny cosmetic change + + * AUTHORS: Add Jan Wagner to the list of AUTHORS + + * AUTHORS: Add Eric Stanley to the list of AUTHORS + +2013-09-29 Holger Weiss + + * plugins/t/check_dig.t, plugins/t/check_http.t: Change default host + names for some tests + + Testing "nagiosplugins.org" will currently not work. + +2013-09-28 Holger Weiss + + * .gitignore, ChangeLog, Makefile.am, tools/generate-change-log: Add + tools/generate-change-log + + Add the tools/generate-change-log script for auto-generating the + ChangeLog file from the Git history when running "make dist". + +2013-09-27 Holger Weiss + + * tools/mail_error, tools/np_build_from_sf, tools/sfsnapshot, + tools/sfsnapshot-upload, tools/sfsnapshotgit, tools/sfupload, + tools/sfwebcron, tools/sync_website, tools/update_man_pages: tools: + Remove Drupal/SourceForge scripts + + We moved our web site away from Drupal and the snapshots/guidelines away + from SourceForge. The new infrastructure scripts will be maintained in + a separate repository together with the Markdown source of the new web + site. + + * tools/git2svn.pl: Remove tools/git2svn.pl + + We no longer mirror out Git repositories into Subversion. + +2013-09-26 awiddersheim + + * plugins/check_http.c: Die on SSL initialization errors + + Fixes issue where if an SSL initialization error occurs on a redirect + using -f follow the plugin still returns an OK state. + + Closes #1159. + +2013-09-25 Holger Weiss + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Normalize + spelling + + - Write "plugin" instead of "plug-in". + - Write "development guidelines" instead of "developer guidelines" + - Capitalize "Nagios Plugin Development Guidelines". + +2013-09-22 Holger Weiss + + * README: Minor cosmetic change + +2013-09-20 Holger Weiss + + * README: Apply another few cosmetic changes + + * README.md: Add symlink: README.md -> README + + Add a symlink so that GitHub renders the README file as Markdown. + + * README: Use code blocks for commands + + * BUGS, Makefile.am, README: Remove the BUGS file + + The BUGS file wasn't maintained properly anymore. And doing so makes no + sense. That's what the bug tracker is for. + + * README: Convert to Markdown and apply cleanups + + Use the Markdown format for the README file and apply various minor + cosmetic changes. + + * README: Remove outdated information + +2013-09-19 Holger Weiss + + * plugins/check_pgsql.c: check_pgsql: Don't exit UNKNOWN instead of OK + + Since commit 912df3ef9b188c82893dace1e9b56c42a558fdba, check_pgsql + exited UNKNOWN instead of OK if the new --query option was *not* + specified. This bug is fixed now. + +2013-09-18 Sven Nierlein + + * NPTest.pm: tests: only write cache file if it changed + + Tests sometimes fila when running multiple parallel tests using the + same cache file because it is written everytime a test parameter + is read. Since there is no locking, this might fail from time to time. + +2013-09-17 Sven Nierlein + + * plugins/t/check_disk.t: check_disk: die with a reasonable error + message if one mount point hits average value + + * plugins-root/check_dhcp.c: check_dhcp: fix mac address and interface + number detection on solaris + + newer (or x86) solaris implementations have interface names like e1000g0 + which includes numbers. So we reverse the interface number detection to + get the last number, instead of the first number. + + * plugins-root/t/check_dhcp.t: check_dhcp: fix tests interface detection + + * plugins/t/check_ssh.t: check_ssh: added test case + + * plugins/t/check_by_ssh.t: check_by_ssh: tests expand key and config + path + + some systems do not expand the path automatically. + + * plugins/t/check_udp.t: check_udp: skip tests which rely on udp listen + + solaris netcat does not listen in udp mode due to + http://sourceforge.net/p/netcat/bugs/27/ + +2013-09-17 Sven Nierlein + + * plugins-scripts/t/check_disk_smb.t: check_disk_smb: fixed number of + tests to skip + +2013-09-16 Sven Nierlein + + * plugins/check_disk.c: check_disk: get_fs_usage hasn't been run if + using groups + + the reason why it still worked sometimes was fsu_blocks beeing uninitialized + which resulted in a true test sometimes. + + * plugins-scripts/check_disk_smb.pl: check_disk_smb: verify path to + smbclient + + * plugins/t/check_procs.t: check_procs: fix test with sleeping processes + + at least on freebsd, there are a processes with state 'S', they always + use two character status. + + * plugins/t/check_http.t: check_http: tests use supplied value if + possible + + * plugins-root/t/check_dhcp.t: check_dhcp: fix tests for machines with + default interace != eth0 + +2013-09-16 Sven Nierlein + + * NPTest.pm: tests: don't skip utils test + + * plugins-root/t/check_dhcp.t: check_dhcp test: skip subtests if no + variable is set + +2013-09-15 Sven Nierlein + + * plugins-root/t/check_dhcp.t: check_dhcp: add test file + + * plugins-root/t/check_icmp.t: check_icmp: tests do not require sudo if + run by root + + * plugins-root/Makefile.am: plugins-root: include t folder in release + tarball + +2013-09-15 Sven Nierlein + + * plugins/check_tcp.c: check_tcp: use receive timeout for checks that + expect response + + if check_imap expects a string that never occurs, it currently waits forever + because thats how the imap protocoll works. Use a receive timeout in that case + so we can exit early with a proper error message. + +2013-09-14 Sven Nierlein + + * plugins/t/check_ping.t: check_ping: increase test timeout + + freebsds ping takes a few seconds till it returns, so a 1 second timeout does + not work for the test. + + * plugins/check_load.c: check_load: add alternative uptime syntax + + check_load parses load from the uptime command if no proc filesystem is available. Seems + like there are at least 2 different uptime outputs. + + linux: + 20:44:34 up 25 days, 2:07, 13 users, load average: 0.13, 0.17, 0.22 + + freebsd 8: + 8:44PM up 4:29, 1 user, load averages: 0.00, 0.00, 0.00 + +2013-09-14 Sven Nierlein + + * plugins/t/check_udp.t: check_udp: try nc.traditional too + + nc.traditional is available on (at least) ubuntu systems and uses traditional nc syntax + +2013-09-14 Sven Nierlein + + * NPTest.pm, plugins/t/check_dig.t, plugins/t/check_tcp.t: tests: move + ipv6 detection into NPTest module + +2013-09-13 Sven Nierlein + + * plugins/t/check_udp.t: unified nc syntax + + older netcats do not understand -p, they expect host and port as additional argument. + This is backwards compatibel to newer clients. Also support netcat instead of nc. + + * plugins/check_fping.c: fping: some fping versions set loss to 0% by + mistake + + fping v2.4b2 returns + 10.99.0.1 : xmt/rcv/%loss = 0/0/0% + for a failed host, so we assume the host is down if xmt is zero + + * NPTest.pm: NPTest: ensure all systems use same amount of whitespace + +2013-09-12 Sven Nierlein + + * plugins/check_snmp.c: check_snmp: add timeout handler befor running + snmpget + + * plugins/t/check_tcp.t: check_tcp: only test ipv6 if ping6 works + + * NPTest.pm: tests: sort cached settings before save + + * NPTest.pm: tests: make sure tests don't hang + +2013-09-12 Holger Weiss + + * plugins/check_tcp.c: check_tcp: Fix checks without --expect string + + Commit e8044713d41f5ef1d9ce814df4a079d8f92306b0 broke check_tcp checks + without --expect string, this commit fixes that regression. + + * lib/tests/test_tcp.c, lib/utils_tcp.c: Minor cosmetic changes + + * lib/tests/test_tcp.c, lib/utils_tcp.c, lib/utils_tcp.h, + plugins/check_tcp.c: check_tcp: Properly deal will partial recv(3)s + + The np_expect_match() function now returns one of three possible states + instead of just TRUE or FALSE: + + - NP_MATCH_SUCCESS + - NP_MATCH_FAILURE + - NP_MATCH_RETRY + + The NP_MATCH_RETRY state indicates that matching might succeed if + np_expect_match() is called with a longer input string. This allows + check_tcp to decide whether it makes sense to wait for additional data + from the server. + + * lib/tests/test_tcp.c, lib/utils_tcp.c, lib/utils_tcp.h, + plugins/check_tcp.c: Improve interface of np_expect_match() function + + Replace the three boolean parameters of lib/utils_tcp.c's + np_expect_match() function with a single "flags" parameter. + +2013-09-10 Holger Weiss + + * plugins/sslutils.c: Don't mark SSL_METHOD variable as "const" + + The SSL_CTX_new(3) function expects a non-"const" SSL_METHOD value. + + * plugins/netutils.c, plugins/netutils.h, plugins/sslutils.c, + plugins/utils.c, plugins/utils.h: Move global variables from .h to .c + files + + Simplify things by moving the definition of global variables into .c + files, where they belong. + + * lib/utils_base.c, plugins/check_ide_smart.c, plugins/check_tcp.c, + plugins/negate.c, plugins/runcmd.h: Fix GCC's + -Wimplicit-function-declaration warnings + + Fix the issues found by GCC when the -Wimplicit-function-declaration + flag is specified. + + * lib/tests/test_disk.c, plugins/check_http.c, plugins/check_procs.c: + Fix GCC's -Wuninitialized warnings + + Fix the issues found by GCC when the -Wuninitialized flag is specified. + +2013-09-10 juliopedreira + + * plugins/check_tcp.c: check_tcp: Don't close connection too early + + Closing the connection because the bytes received are less than the + buffer size assumes that all the bytes will be received in one go. This + is not always true! + +2013-09-10 Holger Weiss + + * NEWS, plugins/check_http.c: + s/--proxy_authorization/--proxy-authorization/ + + The check_http option "--proxy_authorization" is now called + "--proxy-authorization" instead. It was always documented this way, and + we don't usually use underscores in option names. + +2013-09-05 Holger Weiss + + * plugins/check_snmp.c: check_snmp: Initialize size_t value to 0, not + NULL + + * build-aux/ltmain.sh, gl/m4/libtool.m4, gl/m4/ltoptions.m4, + gl/m4/ltversion.m4, gl/m4/lt~obsolete.m4: Update bundled libtool files + + Import the current libtool version 2.4.2. + +2013-09-04 Holger Weiss + + * plugins-root/check_icmp.c: check_icmp: Minor whitespace/indentation + fixes + + * plugins-root/check_icmp.c: check_icmp: Support "--help" and + "--version" + + Let check_icmp provide "--help" and "--version" flags (in addition to + "-h" and "-V"), just as the other plugins do. + +2013-09-02 Holger Weiss + + * Makefile.am, contrib-reporting/process_perfdata.pl, + contrib/README.TXT, contrib/aix/check_failed, contrib/aix/check_io, + contrib/aix/check_kerberos, contrib/aix/check_queue, + contrib/aix/pg_stat, contrib/check_adptraid.sh, contrib/check_apache.pl, + contrib/check_apc_ups.pl, contrib/check_appletalk.pl, + contrib/check_arping.pl, contrib/check_asterisk.pl, + contrib/check_axis.sh, contrib/check_backup.pl, + contrib/check_bgpstate.pl, contrib/check_breeze.pl, + contrib/check_cluster.c, contrib/check_cluster2.README, + contrib/check_cluster2.c, contrib/check_compaq_insight.pl, + contrib/check_cpqarray.c, contrib/check_digitemp.pl, + contrib/check_dlswcircuit.pl, contrib/check_dns_random.pl, + contrib/check_email_loop.pl, contrib/check_fan_cpq_present, + contrib/check_fan_fsc_present, contrib/check_flexlm.pl, + contrib/check_frontpage, contrib/check_hltherm.c, + contrib/check_hprsc.pl, contrib/check_hw.sh, + contrib/check_ica_master_browser.pl, + contrib/check_ica_metaframe_pub_apps.pl, + contrib/check_ica_program_neigbourhood.pl, + contrib/check_inodes-freebsd.pl, contrib/check_inodes.pl, + contrib/check_ipxping.c, contrib/check_javaproc.pl, + contrib/check_joy.sh, contrib/check_linux_raid.pl, + contrib/check_lmmon.pl, contrib/check_log2.pl, contrib/check_lotus.pl, + contrib/check_maxchannels.pl, contrib/check_maxwanstate.pl, + contrib/check_mem.pl, contrib/check_ms_spooler.pl, + contrib/check_mssql.sh, contrib/check_nagios.pl, + contrib/check_nagios_db.pl, contrib/check_nagios_db_pg.pl, + contrib/check_netapp.pl, contrib/check_nmap.py, + contrib/check_ora_table_space.pl, contrib/check_oracle_instance.pl, + contrib/check_oracle_tbs, contrib/check_pcpmetric.py, + contrib/check_pfstate, contrib/check_qmailq.pl, contrib/check_rbl.c, + contrib/check_remote_nagios_status.pl, contrib/check_rrd_data.pl, + contrib/check_sap.sh, contrib/check_smart.pl, contrib/check_smb.sh, + contrib/check_snmp_disk_monitor.pl, contrib/check_snmp_printer.pl, + contrib/check_snmp_process_monitor.pl, contrib/check_snmp_procs.pl, + contrib/check_sockets.pl, contrib/check_temp_cpq, + contrib/check_temp_fsc, contrib/check_timeout.c, + contrib/check_traceroute-pure_perl.pl, contrib/check_traceroute.pl, + contrib/check_uptime.c, contrib/check_vcs.pl, contrib/check_wave.pl, + contrib/check_wins.pl, contrib/checkciscotemp.pl, contrib/mrtgext.pl, + contrib/nagios_sendim.pl, contrib/packet_utils.pm, contrib/rblcheck-dns, + contrib/rblcheck-web, contrib/restrict.pl, contrib/sched_downtime.pl, + contrib/tarballs/bowen-langley_plugins.tar.gz, + contrib/tarballs/check_bgp-1.0.tar.gz, + contrib/tarballs/check_radius.tar.gz, + contrib/tarballs/check_traffic-0.91b.tar.gz, + contrib/tarballs/fetchlog-0.94.tar.gz, contrib/urlize.pl, + contrib/utils.py: Remove "contrib" plugins + + These days, sites such as "Nagios Exchange" are a much better place for + publishing plugins not maintained by the Plugins Development Team. + + * command.cfg.in, configure.in: Remove the outdated "command.cfg" file + +2013-08-27 Holger Weiss + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Update + copyright year + + We touched the Development Guidelines this year. + + * NEWS: Mention that check_snmp now supports >8 OIDs + + Closes #37. + + * plugins/common.h: Partially revert "check_snmp: Close potential for + using uninitialized memory" + + This reverts the changes to plugins/common.h applied by commit + a20611d4357c3c3ebe0a62776a1642e7904c1410. + + - Clang defines __GNUC__. + - The new name of the __attribute__ parameter was misleading. + + * plugins/check_snmp.c: check_snmp: Fix --help segfault + +2013-08-26 Holger Weiss + + * NEWS: Mention new "check_disk -f" option + + Closes #22. + +2013-08-23 Ton Voon + + * tools/build_perl_modules: Use own variable instead of ENV + + * perlmods/Makefile.am, perlmods/install_order, + tools/build_perl_modules: Updated with last working copy of + build_perl_modules used by Opsview + +2013-08-23 Sven Nierlein + + * perlmods/install_order, tools/build_perl_modules: perlmods: fixed + install_order + + on older systems Module::Build is not available by default, therefore we have + to change the order of installation. + +2013-08-22 Holger Weiss + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Multiline + output + + Document the multiline output format properly. + + Thanks to Jochen Bern for providing this patch. + +2013-08-21 Holger Weiss + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Allow + special value "U" + + Allow a literal "U" to be specified in place of an actual value within + the performance data string. An "U" corresponds to RRDtool's "UNKNOWN" + value; i.e., it's meant to indicate that data acquisition failed for + some reason. PNP4Nagios already supports this extension. + +2013-08-21 Sven Nierlein + + * doc/developer-guidelines.sgml: removed duplicate entry + + * plugins/t/check_tcp.t: fixed check_tcp test + + A check with thresholds 9000,1 must exit with warning if the certificate expires in less + than 9000 but more than one day. + + * test.pl.in: no need to set verbose mode, thats what "make test-debug" + is for + + * plugins/t/check_snmp.t: check_snmp: added threshold tests + +2013-08-21 Holger Weiss + + * plugins/check_snmp.c: check_snmp: Fix support for inverse thresholds + + Commit bd782990566eec91b8312cfc2765a7e2bd9e67da reintroduced support for + inverse threshold ranges such as "2:1", but it broke standard thresholds + such as "1:2" (by converting this range into "1") or "1:" (by converting + this range into "@:2"). This commit fixes those two bugs, plus an + off-by-one error while computing the number of bytes to allocate when + handling inverse thresholds (two additional bytes were allocated where + three were required to hold '@' and ':' and '\0'). While at it, we also + check whether malloc(3) succeeded. + +2013-08-21 Ton Voon + + * perlmods/Class-Accessor-0.31.tar.gz, + perlmods/Class-Accessor-0.34.tar.gz, perlmods/Config-Tiny-2.10.tar.gz, + perlmods/Config-Tiny-2.14.tar.gz, perlmods/Math-Calc-Units-1.06.tar.gz, + perlmods/Math-Calc-Units-1.07.tar.gz, + perlmods/Module-Build-0.4007.tar.gz, + perlmods/Module-Implementation-0.07.tar.gz, + perlmods/Module-Metadata-1.000014.tar.gz, + perlmods/Module-Runtime-0.013.tar.gz, perlmods/Perl-OSType-1.003.tar.gz, + perlmods/Test-Simple-0.70.tar.gz, perlmods/Test-Simple-0.98.tar.gz, + perlmods/Try-Tiny-0.18.tar.gz, perlmods/install_order, + perlmods/parent-0.226.tar.gz, perlmods/version-0.9903.tar.gz, + tools/build_perl_modules: Updated perl modules + +2013-08-19 Holger Weiss + + * perlmods/Params-Validate-0.88.tar.gz, + perlmods/Params-Validate-1.08.tar.gz, tools/build_perl_modules: Update + the bundled Params::Validate module + + Building the old version fails with recent Perl releases: + + | Validate.xs: In function `get_type': + | Validate.xs:208:5: error: duplicate case value + | Validate.xs:205:5: error: previously used here + +2013-08-20 Holger Weiss + + * plugins/sslutils.c: Set SSL_MODE_AUTO_RETRY flag + + We use OpenSSL (or GnuTLS) with blocking semantics, and we don't want + SSL_read(3) or SSL_write(3) calls to return SSL_ERROR_WANT_READ or + SSL_ERROR_WANT_WRITE (see #3614716). + + * contrib/check_http-with-client-certificate.c: Ditch + contrib/check_http-with-client-certificate.c + + The standard check_http plugin now supports client certificate + authentication. + + * .gitignore: Add new Gnulib files to .gitignore + + * configure.in: Check for who(1) only if utmpx(5) isn't available + + The who(1) command is only called by check_users if the system doesn't + provide an utmpx(5) interface. + + * configure.in, plugins/Makefile.am, plugins/check_users.c: check_users: + Use utmpx(5) only if available + + For systems that don't provide an utmpx(5) interface, restore the code + that was replaced in commit 3e622f3a47bc7d31f22513a79892c3c52febd2d3. + +2013-08-20 Sven Nierlein + + * lib/utils_base.c, plugins/common.h: added missing header to fix build + on freebsd + + * po/Makefile.in.in: changed obsolete automake macro + +2013-08-20 Holger Weiss + + * plugins/check_ide_smart.c: check_ide_smart: "__linux__" instead of + "linux" + + C compilers in standards compliance mode will not define "linux", as it + doesn't begin with an underscore. + + * NEWS, THANKS.in, configure.in, plugins/check_ide_smart.c: + check_ide_smart: Add support for NetBSD + + Thanks to Emmanuel Dreyfus for providing the patch. + +2013-08-19 Holger Weiss + + * gl/Makefile.am, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4: Replace + Gnulib's "getopt" module with "getopt-gnu" + + The "getopt" module is marked as deprecated, these days we're supposed + to choose either "getopt-posix" or "getopt-gnu". + + * build-aux/config.rpath, build-aux/snippet/_Noreturn.h, + build-aux/snippet/arg-nonnull.h, build-aux/snippet/c++defs.h, + build-aux/snippet/warn-on-use.h, gl/Makefile.am, gl/alignof.h, + gl/alloca.in.h, gl/arpa_inet.in.h, gl/asnprintf.c, gl/asprintf.c, + gl/base64.c, gl/base64.h, gl/basename-lgpl.c, gl/basename.c, gl/btowc.c, + gl/c-strtod.c, gl/c-strtod.h, gl/cloexec.c, gl/cloexec.h, + gl/close-hook.c, gl/close-hook.h, gl/config.charset, gl/dirname-lgpl.c, + gl/dirname.c, gl/dirname.h, gl/dosname.h, gl/dup-safer.c, gl/dup2.c, + gl/errno.in.h, gl/error.c, gl/error.h, gl/exitfail.c, gl/exitfail.h, + gl/fcntl--.h, gl/fcntl-safer.h, gl/fcntl.c, gl/fcntl.in.h, gl/fd-hook.c, + gl/fd-hook.h, gl/fd-safer.c, gl/float+.h, gl/float.c, gl/float.in.h, + gl/floor.c, gl/floorf.c, gl/fsusage.c, gl/fsusage.h, gl/full-read.c, + gl/full-read.h, gl/full-write.c, gl/full-write.h, gl/gai_strerror.c, + gl/getaddrinfo.c, gl/getdtablesize.c, gl/gethostname.c, gl/getloadavg.c, + gl/getopt.c, gl/getopt.in.h, gl/getopt1.c, gl/getopt_int.h, + gl/gettext.h, gl/glthread/lock.c, gl/glthread/lock.h, + gl/glthread/threadlib.c, gl/inet_ntop.c, gl/intprops.h, gl/itold.c, + gl/langinfo.in.h, gl/localcharset.c, gl/localcharset.h, gl/locale.in.h, + gl/localeconv.c, gl/m4/00gnulib.m4, gl/m4/alloca.m4, + gl/m4/arpa_inet_h.m4, gl/m4/asm-underscore.m4, gl/m4/base64.m4, + gl/m4/btowc.m4, gl/m4/c-strtod.m4, gl/m4/codeset.m4, + gl/m4/configmake.m4, gl/m4/dirname.m4, gl/m4/dos.m4, + gl/m4/double-slash-root.m4, gl/m4/dup2.m4, gl/m4/eealloc.m4, + gl/m4/environ.m4, gl/m4/errno_h.m4, gl/m4/error.m4, gl/m4/exponentd.m4, + gl/m4/extensions.m4, gl/m4/extern-inline.m4, gl/m4/fcntl-o.m4, + gl/m4/fcntl-safer.m4, gl/m4/fcntl.m4, gl/m4/fcntl_h.m4, + gl/m4/float_h.m4, gl/m4/floorf.m4, gl/m4/fstypename.m4, + gl/m4/fsusage.m4, gl/m4/getaddrinfo.m4, gl/m4/getdtablesize.m4, + gl/m4/gethostname.m4, gl/m4/getloadavg.m4, gl/m4/getopt.m4, + gl/m4/gettext.m4, gl/m4/glibc2.m4, gl/m4/glibc21.m4, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, + gl/m4/gnulib-tool.m4, gl/m4/hostent.m4, gl/m4/iconv.m4, + gl/m4/include_next.m4, gl/m4/inet_ntop.m4, gl/m4/inline.m4, + gl/m4/intdiv0.m4, gl/m4/intl.m4, gl/m4/intldir.m4, gl/m4/intlmacosx.m4, + gl/m4/intmax.m4, gl/m4/intmax_t.m4, gl/m4/inttypes-pri.m4, + gl/m4/inttypes_h.m4, gl/m4/langinfo_h.m4, gl/m4/largefile.m4, + gl/m4/lcmessage.m4, gl/m4/lib-ld.m4, gl/m4/lib-link.m4, + gl/m4/lib-prefix.m4, gl/m4/localcharset.m4, gl/m4/locale-fr.m4, + gl/m4/locale-ja.m4, gl/m4/locale-zh.m4, gl/m4/locale_h.m4, + gl/m4/localeconv.m4, gl/m4/lock.m4, gl/m4/longlong.m4, + gl/m4/ls-mntd-fs.m4, gl/m4/malloc.m4, gl/m4/malloca.m4, gl/m4/math_h.m4, + gl/m4/mbrtowc.m4, gl/m4/mbsinit.m4, gl/m4/mbstate_t.m4, gl/m4/mbtowc.m4, + gl/m4/memchr.m4, gl/m4/mktime.m4, gl/m4/mmap-anon.m4, gl/m4/mode_t.m4, + gl/m4/mountlist.m4, gl/m4/msvc-inval.m4, gl/m4/msvc-nothrow.m4, + gl/m4/multiarch.m4, gl/m4/netdb_h.m4, gl/m4/netinet_in_h.m4, + gl/m4/nl_langinfo.m4, gl/m4/nls.m4, gl/m4/nocrash.m4, gl/m4/off_t.m4, + gl/m4/onceonly.m4, gl/m4/open.m4, gl/m4/po.m4, gl/m4/printf-posix.m4, + gl/m4/printf.m4, gl/m4/progtest.m4, gl/m4/read.m4, gl/m4/regex.m4, + gl/m4/safe-read.m4, gl/m4/safe-write.m4, gl/m4/servent.m4, + gl/m4/setenv.m4, gl/m4/sha1.m4, gl/m4/size_max.m4, gl/m4/snprintf.m4, + gl/m4/socketlib.m4, gl/m4/sockets.m4, gl/m4/socklen.m4, + gl/m4/sockpfaf.m4, gl/m4/ssize_t.m4, gl/m4/stat.m4, gl/m4/stdalign.m4, + gl/m4/stdbool.m4, gl/m4/stddef_h.m4, gl/m4/stdint.m4, gl/m4/stdint_h.m4, + gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, gl/m4/strdup.m4, gl/m4/strerror.m4, + gl/m4/string_h.m4, gl/m4/strndup.m4, gl/m4/strnlen.m4, gl/m4/strsep.m4, + gl/m4/strstr.m4, gl/m4/sys_socket_h.m4, gl/m4/sys_stat_h.m4, + gl/m4/sys_types_h.m4, gl/m4/sys_uio_h.m4, gl/m4/threadlib.m4, + gl/m4/time_h.m4, gl/m4/time_r.m4, gl/m4/timegm.m4, gl/m4/uintmax_t.m4, + gl/m4/unistd-safer.m4, gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, + gl/m4/vasprintf.m4, gl/m4/visibility.m4, gl/m4/vsnprintf.m4, + gl/m4/warn-on-use.m4, gl/m4/wchar_h.m4, gl/m4/wchar_t.m4, + gl/m4/wcrtomb.m4, gl/m4/wctype_h.m4, gl/m4/wint_t.m4, gl/m4/write.m4, + gl/m4/xalloc.m4, gl/m4/xsize.m4, gl/m4/xstrndup.m4, gl/malloc.c, + gl/malloca.c, gl/malloca.h, gl/math.c, gl/math.in.h, gl/mbrtowc.c, + gl/mbsinit.c, gl/mbtowc-impl.h, gl/mbtowc.c, gl/memchr.c, gl/mktime.c, + gl/mountlist.c, gl/mountlist.h, gl/msvc-inval.c, gl/msvc-inval.h, + gl/msvc-nothrow.c, gl/msvc-nothrow.h, gl/netdb.in.h, gl/netinet_in.in.h, + gl/nl_langinfo.c, gl/open-safer.c, gl/open.c, gl/pipe-safer.c, + gl/printf-args.c, gl/printf-args.h, gl/printf-parse.c, + gl/printf-parse.h, gl/read.c, gl/ref-add.sin, gl/ref-del.sin, + gl/regcomp.c, gl/regex.c, gl/regex.h, gl/regex_internal.c, + gl/regex_internal.h, gl/regexec.c, gl/safe-read.c, gl/safe-read.h, + gl/safe-write.c, gl/safe-write.h, gl/setenv.c, gl/sha1.c, gl/sha1.h, + gl/size_max.h, gl/snprintf.c, gl/sockets.c, gl/sockets.h, gl/stat.c, + gl/stdalign.in.h, gl/stdbool.in.h, gl/stddef.in.h, gl/stdint.in.h, + gl/stdio-write.c, gl/stdio.in.h, gl/stdlib.in.h, gl/str-two-way.h, + gl/strdup.c, gl/streq.h, gl/strerror-override.c, gl/strerror-override.h, + gl/strerror.c, gl/string.in.h, gl/stripslash.c, gl/strndup.c, + gl/strnlen.c, gl/strsep.c, gl/strstr.c, gl/sys_socket.c, + gl/sys_socket.in.h, gl/sys_stat.in.h, gl/sys_types.in.h, + gl/sys_uio.in.h, gl/time.in.h, gl/time_r.c, gl/timegm.c, gl/unistd--.h, + gl/unistd-safer.h, gl/unistd.c, gl/unistd.in.h, gl/unsetenv.c, + gl/vasnprintf.c, gl/vasnprintf.h, gl/vasprintf.c, gl/verify.h, + gl/vsnprintf.c, gl/w32sock.h, gl/wchar.in.h, gl/wcrtomb.c, + gl/wctype-h.c, gl/wctype.in.h, gl/write.c, gl/xalloc-die.c, + gl/xalloc-oversized.h, gl/xalloc.h, gl/xmalloc.c, gl/xsize.c, + gl/xsize.h, gl/xstrndup.c, gl/xstrndup.h: Sync with the latest Gnulib + code (6f2d632) + + * configure.in, plugins/common.h: Clean up check for + _SC_NPROCESSORS_ONLN + + Closes #62. + +2013-08-19 Booker C. Bense + + * configure.in, plugins/common.h: Bug fix for ncpus if hyperthreading + turned off in linux + +2013-08-18 Holger Weiss + + * plugins/check_http.c: check_http: Document the new -E option + + Mention the -E/--extended-perfdata flag in the --help output. + + * plugins/check_http.c, plugins/netutils.h, plugins/sslutils.c: + Abbreviate function name + + Make a very long function name at least a little bit shorter. + + * NEWS: Mention the new "check_http -J/-K" options + + Closes #48. + + * NEWS: Mention the new "check_mysql -f/-g" options + + Closes #32. + + * plugins/check_mysql.c: check_mysql: Don't accept new positional + arguments + + Do not also accept the new -f/--file and -g/--group options as + positional arguments (especially not prior to "db_pass" and "db", as + that would break backward compatibility). + + * plugins/check_mysql.c: check_mysql: Use xasprintf instead of asprintf + + * plugins/check_mysql.c: check_mysql: Fix copy'n'pasted comments + +2013-08-18 Steve Weinreich + + * plugins/check_fping.c: check_fping error handling enhanced, generates + UNKNOWN on + fping parameter error (i.e. wrong interface, missing perms ..) + +2013-08-18 Holger Weiss + + * NEWS, plugins/check_snmp.c: NEWS: Mention the new "check_snmp + --offset" option + + ... and apply two small cosmetic changes to check_snmp.c. + + Closes #59. + +2013-08-05 Simon Kainz + + * plugins/check_snmp.c: added --offset option to allow adjustment of + sensor data + +2013-08-18 Holger Weiss + + * plugins/check_http.c: check_http: Use xasprintf instead of asprintf + + * plugins/check_http.c: check_http: s/--header_string/--header-string/ + + The name of the new option is "--header-string". + + * plugins/check_snmp.c: check_snmp: Allocate space for the new -Le + option + + Closes #41. + +2013-03-14 Mark Keisler + + * plugins/check_snmp.c: Add -Le option to snmpcmd to avoid error message + of 'No Log Handling Enabled...' + +2013-08-18 Holger Weiss + + * NEWS: Mention the check_mysql changes + + Closes #14. + +2012-11-20 Tim Laszlo + + * plugins/check_mysql.c: check_mysql: Connections should have been + defined as a counter + + * plugins/check_mysql.c: Counter increments were incorrect; remove the + leading space from perfdata + +2012-08-06 Tim Laszlo + + * plugins/check_mysql.c: check_mysql: add perfromance metrics for all + checks + +2012-08-03 Tim Laszlo + + * plugins/check_mysql.c: check_mysql: when checking slave thread add + performance data for seconds behind master + +2013-08-18 Holger Weiss + + * NEWS: Mention the new "check_http -d" option + + Closes #7. + + * plugins/tests/check_http.t: Fix the "check_http -d" tests + +2012-06-06 linkslice + + * plugins/check_http.c, plugins/tests/check_http.t: added ability to + check regex against http headers. booyah! + +2013-08-18 Holger Weiss + + * NEWS: Mention the new check_procs behavior + + Closes #60. + +2013-08-18 Sebastian Schmidt + + * plugins/check_procs.c: check_procs: clarify debug message + + * plugins/check_procs.c: check_procs: Assume we have stat() + + stat() is in gnulib anyway, so we can safely depend on it. + + * configure.in, plugins/check_procs.c: check_procs: Get rid of + HAVE_PROC_PID_EXE + + Don't check for /proc/pid/exe at compile time, it could be gone in a + build chroot or the like. Checking at runtime (once) is sufficient. + +2012-12-09 Sebastian Schmidt + + * plugins/check_procs.c: check_procs: Ignore ENOENT when checking for + myself + + Previously, when a process exited between the call to /bin/ps and + stat("/proc/his/exe") was exiting it was not considered as possible + instance of check_procs. This commit makes check_procs ignore all + processes where /proc/pid/exe does not exist. + +2012-11-07 Sebastian Schmidt + + * plugins/check_procs.c: check_procs: fix typo + + Fix a typo in previous commit where st_ was missing in the mock + struct_stat_t, causing check_procs.c to not compile without sys/stat.h. + + * configure.in, plugins/check_procs.c: check_procs: filter out self by + /proc/pid/exe + + Make check_procs filter out itself in the process list by comparing the + file pointed to by /proc/pid/exe. On platforms where this is not + available or when check_procs is passed the -T flag, the old behaviour + (check whether PID equals getpid()) is retained. + + This fixes some false alarms when e.g. Nagios has, for whatever reasons, + some backlog of checks to run and check_procs with -a is called more + than once in a short time, matching its sister process. + +2013-08-18 Holger Weiss + + * gl/Makefile.am, gl/fsusage.c, gl/m4/fcntl-o.m4, gl/m4/fsusage.m4, + gl/m4/gnulib-comp.m4, gl/m4/lib-link.m4, gl/m4/malloc.m4, + gl/m4/stdlib_h.m4, gl/stdlib.in.h, gl/str-two-way.h, gl/string.in.h: + Sync with the latest Gnulib code (6f2d632) + + * NEWS: Mention check_mysql's SSL support + + Closes #51. + + * plugins/check_mysql.c: check_mysql: Cosmetic changes to SSL support + + Use (slightly) more intuitive option names etc. + +2013-05-22 Juan Carlos Fernandez + + * plugins/check_mysql.c: Added ssl support to check_myslq + +2013-08-18 Holger Weiss + + * NEWS: Mention the new check_procs -k option + + Closes #53. + +2013-05-29 Richard Leitner + + * plugins/check_procs.c: Fixed SF.net bug #3552839, check_procs: added + -k option to ignore kernel threads + + This commit fixes sourceforge.net bug #3552839. + It adds a -k|--no-kthreads option to ignore kernel thread processes. + Please note: currently this feature only works for GNU/Linux systems (due to the fact I have no other systems to test/develop on) + Sorry for that, but I'm sure this can be accomplished by somebody else ;-) + +2013-08-18 Holger Weiss + + * contrib/check_linux_raid.pl: Fix whitespace errors + + Use tabs instead of spaces for indentation. + +2013-06-11 Erwan Ben Souiden + + * contrib/check_linux_raid.pl: update check_linux_raid to take in + consideration resync status and rise up a warning alert + +2013-08-18 Holger Weiss + + * NEWS: Mention the new check_fping features + + * configure.in, plugins/check_fping.c: check_fping: Use fping6(8) only + if available + + Let check_fping use IPv6 only if + + - the operating system supports IPv6, + - the user didn't specify --without-ipv6, and + - the "configure" script found the fping6(8) binary. + +2013-08-17 Holger Weiss + + * plugins/check_fping.c: check_fping: Remove unused printf(3) arguments + +2012-12-20 Steve Weinreich + + * plugins/check_fping.c: Added -S und -I parameter to match fping -S and + -I parameters. + + -S allows to specify the source ip for ICMP pakets + -I allows to specify a interface to bind to + +2013-08-17 Holger Weiss + + * plugins/check_pgsql.c: check_pgsql: Add missing printf(3) argument + + * NEWS: Mention the new check_pgsql features + + Closes #16. + + * plugins/check_pgsql.c: check_pgsql: Remove -4/-6 flags from help + output + + The -4/-6 options are currently not supported. + + * plugins/t/check_procs.t: Expect performance data + + The check_procs plugin now emits performance data, fix the test(s) + accordingly. + + * plugins/t/check_apt.t: Expect performance data + + The check_apt plugin now emits performance data, fix the test(s) + accordingly. + +2013-01-26 Dominique Broeglin + + * lib/tests/test_utils.c: Adding tests for range @1:1 + +2013-08-15 Sven Nierlein + + * NEWS, THANKS.in, plugins/check_http.c, plugins/t/check_http.t: cleanup + after check_http patch (fixes #50) + + - cleanup whitespace + - added test cases + - print time_ssl only if ssl is in use + - updated news and thanks file + +2013-05-19 Sebastian Nohn + + * plugins/check_http.c: log more perfdata in check_http + +2013-08-15 Sven Nierlein + + * NEWS, THANKS.in: updated news and thanks file + + * plugins/t/check_http.t: corrected http test + + multiple headers have to be set by multiple -k switches. Seperating them + by semicolons is not longer supported as semicolons are valid characters in + http headers. + +2013-08-12 Rafael + + * plugins-scripts/check_disk_smb.pl: Changed the smbclient command used + to fetch the free space available on the samba shares. Using du instead + of ls, since it's much faster, specially with shares that have a lot of + files. + +2013-07-11 Jan Wagner + + * THANKS.in, plugins/check_smtp.c: Fixed SF.net bug 2555775, threshold + can be double for check_smtp + + Thanks to Roman Fiedler for reporting the issue and providing a fix + +2013-07-08 Jan Wagner + + * THANKS.in, plugins/check_nt.c: check_nt: Fixes NULL pointer + dereference + + Thanks to Vaclav Ovsik for reporting the issue and providing a fix + +2013-06-30 Holger Weiss + + * .gitignore: Add libnpcommon.a file to .gitignore + + * plugins/check_ntp_peer.c: check_ntp_peer: Verify type of response + packets + + The check_ntp_peer plugin now ignores response packets with an + unexpected "Operation Code" and/or "Sequence" number (cf. RFC 1305, + Appendix B). This fixes an issue where the check_ntp_peer requests got + duplicated on their way to the server (due to some network switch bug), + and the server therefore sent multiple responses per request. + + Thanks to Marc Haber for reporting the issue. + +2013-06-25 Holger Weiss + + * NEWS: Mention that check_apt spits out perfdata + +2013-06-25 Jan Wagner + + * plugins/check_apt.c: Fixed SF.net bug 1614553, Debian bug #708343, + Adding performace data + +2013-05-30 Richard Leitner + + * plugins/check_apt.c: check_apt now correctly exits when apt-get return + != 0 + + This commit fixes an issue with check_apt where check_apt doesn't exit + with the appropriate return code when apt-get returned a non-zero value. + +2013-05-29 Richard Leitner + + * plugins/check_http.c: Fixed SF.net bug #3571331, check_http converts + semicolon to newline in -k + + This commit fixes sourceforge.net bug id 3571331. + The semicolon was defined as input delimiter for multiple values in the -k arguments. + Due to the fact the semicolon is a valid character for HTTP header fields this input delimiter function was removed. + It is still possible to pass multiple header fields via multiple -k (like described in helptext). + +2013-05-19 Gabriele Tozzi + + * plugins-scripts/check_sensors.sh: Made verbose output of check_sensors + compilant + +2013-05-17 Lionel Cons + + * plugins/check_http.c, plugins/netutils.h, plugins/sslutils.c: added + support for client authentication via SSL + +2013-05-12 Holger Weiss + + * NEWS, THANKS.in: NEWS, THANKS: Mention the latest changes + +2012-08-17 Diego Elio Pettenò + + * configure.in: configure: add --without-ldap, --without-radius and + --without-dbi options. + + When building for distributions such as Gentoo Linux, or FreeBSD + ports, it's convenient to be able to disable building certain + functionalities even if the dependencies are present, to avoid what + are called "automagic dependendencies". + + Adding these parameters solve the issue. + + * plugins/Makefile.am: build: fix building with parallel make. + + By using a more automake-style handling of dependencies and a single + convenience library, it's tremendously easy to build in parallel. + + Note that since the linking happens with the static archives, the + unused objects are discarded and provide no overhead whatsoever. + + * plugins/check_dig.c, plugins/check_dns.c, plugins/runcmd.c, + plugins/runcmd.h: plugins: rename runcmd's signal handler. + + The previous name would collide with popen's. Even if the two are + never used together, it's still a good idea not to have the same + symbol in multiple object files. + +2013-03-25 Holger Weiss + + * NEWS, THANKS.in: NEWS, THANKS: Mention Richard Leitner's changes + +2013-03-22 Richard Leitner + + * plugins/check_disk.c: Fixed SF.net bug 3560976, added + --include-type/-N option + +2013-03-17 Richard Leitner + + * plugins/check_nagios.c: Fixed SF.net bug 3602586, added timeout option + for check_nagios + + * plugins/check_apt.c: Fixed SF.net bug 3539317, typo in --help of + check_apt + +2013-03-25 Holger Weiss + + * NEWS, THANKS.in: NEWS, THANKS: Mention check_oracle --connect flag + +2013-01-15 Brian De Wolf + + * plugins-scripts/check_oracle.sh: Add option to perform real login in + check_oracle + + The Oracle plugin has no option for testing for a successful login. The + closest option to this is --login, which uses a fixed set of credentials and + expects to receive the logon failure error code. + + This patch adds an option called --connect. This option takes a full SID and + returns success if it doesn't detect any error codes. With this, we can check + that a database is allowing logins from valid credentials (and avoid filling up + DB logs with failed authentications). + +2013-02-27 Joerg Linge + + * plugins/check_procs.c: Update plugins/check_procs.c + + added missing longopt --user + +2013-02-27 Fabio Rueda + + * contrib/check_nmap.py: working on ubuntu precise12.04 + + * contrib/check_nmap.py: ported use whrandom to random + +2013-02-10 Sven Nierlein + + * plugins/check_tcp.c, plugins/t/check_tcp.t: check_tcp: don't ignore + trailing options + + "./check_tcp -6 -p 80 host" leads to an error: + TCP CRITICAL - Invalid hostname, address or socket: 127.0.0.1 + because 127.0.0.1 is the fallback host, the tailing hostname + was ignored. + +2013-01-29 Robin Sonefors + + * plugins/check_snmp.c, plugins/common.h: check_snmp: Close potential + for using uninitialized memory + + This was reported by clang, and in order for it to understand attributes + properly, I had to modify the macro that checks for non-gcc compilers. + + Signed-off-by: Robin Sonefors + + * plugins/check_snmp.c: check_snmp: Dynamically grow all data structures + + Before this patch, there was a constant, MAX_OIDS, that determined the + amount of slots most (but not all - see labels) array data structures + would have. It was set to 8. + + Some users would like to use more than that, but rather than bumping the + constant, let's use the same type of logic we already use for labels - + grow the space 8 slots at a time. This will allow us to potentially + support an infinite amount of oids - or at least as many as the + packetsize on the SNMP server allows, which is usually significantly + smaller than infinity, yet often larger than 8. + + Signed-off-by: Robin Sonefors + +2013-01-24 Daniël van Eeden + + * REQUIREMENTS, plugins/check_mysql.c: Apply my patch from: + http://sourceforge.net/tracker/index.php?func=detail&aid=3269273&group_id=29880&atid=397597 + +2013-01-23 Sven Nierlein + + * NEWS, THANKS.in: added latest commits to NEWS file + + * plugins/t/check_dig.t: updated check dig tests + + nagios.com seems to have changed their ip address. Also added tests + about -4/-6 option. + +2012-12-28 Ville Mattila + + * plugins/check_dig.c: check_dig: query transport selection support + + Add command line options -4 and -6 (--use-ipv4 and + --use-ipv6) to check_dig. + + Effectively this adds no new functionality, just a + shortcut for: + check_dig -A "-4" + check_dig -A "-6" + + Needed for using check_dig with the check_v46 wrapper + (see e.g. + https://gitorious.org/nagios-monitoring-tools/nagios-monitoring-tools/blobs/master/check_v46) + which requires -4/-6 command line option support. + +2013-01-23 Sven Nierlein + + * ChangeLog, THANKS.in: updated changelog and thanks file for previous + patch + +2013-01-23 Robin Sonefors + + * plugins/check_snmp.c: check_snmp: Don't thrash memory when using + multiple label/unit argument + + The memory allocation mixed up number of bytes with number of pointers, + meaning as soon as we'd reach (on 64 bit systems) the second argument, + we'd start writing it outside of our allocated memory. + + Normally, this isn't too visible, but as soon as you (again, on my 64 + bit system) reach argument number 8, you get a segfault. It is easily + reproducible with: + check_snmp -o '' -l '' -o '' -l '' -o '' -l '' -o '' -l '' \ + -o '' -l '' -o '' -l '' -o '' -l '' -o '' -l '' + + This patch allocates the proper amount of memory, to fix the issue. + + Signed-off-by: Robin Sonefors + +2012-12-28 Jonathan Milby + + * plugins/check_mysql.c: Updated check_mysql.c to take client options + file and group parameters + +2012-12-28 Ville Mattila + + * configure.in, plugins/check_fping.c: check_fping: IPv6 support + + Add command line options -4 and -6 (--use-ipv4 and + --use-ipv6) to check_fping. IPv4 is used by default, + maintaining backwards compatibility with older + check_fping versions. IPv6 support requires the + fping6 program. + + The implementation is really just an imitation of + check_ping IPv6 support: Plugin command line option + -4/-6 designates whether to run fping/fping6. + + Please note that especially the changes to + configure.in might be all wrong - I don't know + what's the proper autoconf way, patching + configure.in just seemed to work for me. + +2012-12-03 palli + + * doc/developer-guidelines.sgml: Table 4 example 5 updated + + Description did not specify that it condition is critical if "stuff" + is less than zero. + + * doc/developer-guidelines.sgml: Description for table4 example7 + + My original patch was based on the online version which was apparently out of date. + + In the meantime someone changed the description of example7 instead of the example. I think this is better because + otherwise example 6 and 7 are basically the same. + +2012-10-24 Pall Sigurdsson + + * doc/developer-guidelines.sgml: Bugfix, fixed a broken command-line + example + + The last example in the table contradicted the previous example. Surely + it's purpose was to showcase the @ behaviour to invert threshold, but the + @ sign was missing. + + I also clarified the description to the second last example so it is in same + style as the others. + +2012-11-28 Sven Nierlein + + * plugins/check_ntp.c, plugins/check_ntp_time.c: check_ntp(_time): don't + die on connect errors + + connect errors may happen if clients check agains dual + stacked ipv4/6 ntp servers. + + * plugins/check_ldap.c, plugins/check_ntp.c, plugins/check_ntp_peer.c, + plugins/check_ntp_time.c, plugins/check_pgsql.c, plugins/check_ssh.c: + unified ipv4/6 usage and help text + +2012-11-14 Holger Weiss + + * NEWS: Mention the check_procs performance data + + * plugins/check_procs.c: check_procs: Remove superfluous newline + character + +2011-04-08 Sebastian Harl + + * plugins/check_procs.c: check_procs: Added performance data to plugin + output. + + * plugins/check_procs.c: check_procs: Use the range/threshold support + functions from libnagiosplug. + + This adds support for @ and makes stuff a bit simpler by removing code + duplications. + + Note: Previously, the compatibility code for 'check_procs ' + accepted something like 'check_procs -w 10:-1 -c 10:-1 20 50' as well + (treating it as if '-w 10:20 -c 10:50' was specified). This is no longer the + case ... additional arguments are only used as warn/crit thresholds in case + -w/-c is not specified at all. + +2012-11-07 Thomas Guyot-Sionnest + + * .gitignore, doc/makefile, tools/sfwebcron: Fix sfwebcron probe file + + The initial file was created in the user's home and later tested in the + doc directory. Instead, just rsync if the file is missing. + + Also add some temporary files to gitignore/make clean + +2012-11-04 dermoth + + * NEWS: Update NEWS for bd78299 - check_snmp reverse ranges fix + +2012-11-03 dermoth + + * tools/sfwebcron, tools/snapshot: Update tools + + - fix sfwebcron (tool updating sf developer guidelines) + - remove obsolete snapshot script + + * tools/np_build_from_sf, tools/update_man_pages: Add scripts that + update man pages in drupal + +2012-11-02 Andreas Ericsson + + * plugins/check_snmp.c: plugins/check_snmp: Show snmp error when we fail + to parse its output + + Dying without a hint of what went wrong is just plain annoying. With + this patch we at least get a hint. + + While at it, we fix the string offset so the output we're interested + in doesn't keep the equal sign that snmpget prints. + + Signed-off-by: Andreas Ericsson + + * lib/utils_base.c: Stop dumping core on bad args to check_snmp + + Since the state patch introduction, we've been freeing uninitialized + memory in lib/utils_base.c::np_cleanup(), which caused coredumps + with check_snmp when illegal threshold ranges (for example) were + passed, or when we called 'die' without having read any state. + + This patch fixes it by replacing the malloc() calls in there (all of + them, since using malloc() is almost always an error) with calloc(). + + malloc() either doesn't initialize the memory at all, or taints it + with a special marker so it can tell us when we're free()'ing memory + that hasn't been initialized. calloc() explicitly initializes the + allocated memory to nul bytes, which is a zero-cost operation when + we get the memory from the kernel (which alread does that) and almost + always desirable everywhere else. + + Signed-off-by: Andreas Ericsson + + * plugins/check_snmp.c: Make check_snmp backwards compatible in how it + parses thresholds + + Once upon a time, check_snmp used to accept inverse ranges in the + format of '2:1' to mean "alert if value is inside this range". + + Since commit 7cb3ae09334796f3b54e4e6438e38c2cc679b360, ranges such + as those have instead triggered the error "Range format incorrect" + and resulted in an UNKNOWN warning state. This patch attempts to + fix the situation so that the old-style ranges continues to mean + exactly what the once did and people with lots of snmp checks can + avoid a bazillion false positives from their environments. + + Signed-off-by: Andreas Ericsson + +2012-10-12 chl + + * plugins/check_disk.c: check_disk: option to ignore reserved space + + This commit add a runtime option to ignore the root-reserved space + when calculating perfdata. + + Before / after: + ./check_disk -w 2% -c 1% /home + ./check_disk -w 2% -c 1% -f /home + DISK CRITICAL - free space: /home 272 MB (1% inode=83%);| /home=17551MB;18401;18589;0;18777 + DISK CRITICAL - free space: /home 272 MB (1% inode=83%);| /home=17551MB;17466;17644;0;17823 + + Well, it doesn't really give me more space :) but the perfdata are a + little bit more coherent. + + Note that there are still a rounding issue on the percent calculation + (cf calculate_percent() comments, taken from coreutils 'df' command). + 272/17823 -> 1.526% + + Since the warning/critical/min/max data are usually not saved in RRD DB, + you can activate the option without seeing landslides in the graphs. + +2012-10-09 Holger Weiss + + * NEWS: Mention the OPENSSL_config(3) support + +2012-10-05 Marc Huffnagle + + * plugins-scripts/utils.sh.in: Added additional documentation to the + check_range function + +2012-10-09 Holger Weiss + + * plugins/common.h: Allow for configuring OpenSSL + + Let OpenSSL load its configuration file. See the OPENSSL_config(3) man + page for details. + + (Suggested by Max Kosmach in Debian bug report #689960, forwarded by Jan + Wagner.) + +2012-10-03 Alex Bradley + + * plugins/check_apt.c, plugins/t/check_apt.t, + plugins/t/check_apt_input/debian1, plugins/t/check_apt_input/debian2, + plugins/t/check_apt_input/debian3, plugins/t/check_apt_input/ubuntu1, + plugins/t/check_apt_input/ubuntu2: Tests for check_apt + + Add a hidden "--input-file" option to check_apt (modelled on + check_procs) so that it can take files with sample apt output as input. + + Add tests for my SECURITY_RE fix (debian3) and for the include, exclude + and critical options. + + * plugins/check_apt.c: Fix SourceForge bug 1904965 - check_apt: + SECURITY_RE is not correct + + For the default security upgrade detection regular expression, match + "Debian-Security" in package description when it's anywhere after the + first parenthesis (not just the second space-delimited word). For + example: + + ... (4.0.1-5.4 Debian:6.0.6/stable, Debian-Security:6.0/stable ... + +2012-10-02 Alex Bradley + + * plugins/check_apt.c: Don't prepend "^Inst" or append a space to the + "include", "exclude", or + "critical" regular expressions. Instead, check for lines beginning + with "Inst" using strncmp and apply the regular expressions only when + such lines are found. + + Fixes Debian bug #522812, along the lines suggested by the bug + submitter, Justin T Pryzby. + +2012-09-25 Gianluca Varisco + + * plugins/check_disk.c: Update plugins/check_disk.c + + CRITCAL -> CRITICAL typo + +2012-09-21 Alex Bradley + + * contrib/check_linux_raid.pl: This patch fixes the regular expression + for the array recovery + completion percentage to detect the percentage when there is more than + one space between between "recovery =" and the percentage. (When + the percentage is less than 10%, /proc/mdstat shows it left-padded + with an extra space: "recovery = 7.6%".) + +2012-08-10 Holger Weiss + + * plugins/check_http.c: check_http: Update description of -C option + + Mention that the -C option now accepts two comma-separated values. + + * plugins/check_http.c: check_http: Add missing newline to --help output + +2012-07-26 William Leibzon + + * plugins/check_http.c, plugins/check_smtp.c, plugins/check_tcp.c: + fixing bug in certificate experiation patch checking for bad warning + threshold data + +2012-08-10 Holger Weiss + + * plugins/tests/check_http.t: tests/check_http.t: Fix whitespace issues + + In tests/check_http.t, tabs are used for indentation. + + While at it, apply another few cosmetic changes. + + * plugins/tests/check_http.t: tests/check_http.t: Update the number of + SSL tests + + * plugins/tests/check_http.t: tests/check_http.t: Fix test case + + Fix the test case which is meant to make sure that + + check_http -C , [...] + + returns a CRITICAL state if is large enough. + +2012-08-06 Holger Weiss + + * NEWS: Mention fixed compilation without SSL + + * plugins/check_ntp_peer.c: check_ntp_peer: Fix --help output for -m and + -n + + Fix the threshold specifications in the example for checking the number + of truechimers. + + Reported by Marc Haber on the "nagios-users" mailing list (Message-ID: + <20120722142840.GA6931@torres.zugschlus.de>). + + * plugins/check_ntp_peer.c: check_ntp_peer: Fix --help output for -W and + -C + + Mention that the check_ntp_peer plugin checks the stratum of the + synchronization peer, not the stratum of the monitored server itself. + + Thanks to Marc Haber for bringing this up on the "nagios-users" mailing + list (Message-ID: <20120722142840.GA6931@torres.zugschlus.de>). + +2012-07-18 Holger Weiss + + * plugins/check_http.c: check_http: Fix whitespace issues + + In check_http.c, tabs aren't used for indentation. + + * plugins/check_http.c: check_http: Fix compilation without SSL support + + The "ssl_version" variable was undeclared when the plugins were compiled + --without-openssl and --without-gnutls. + + Bug reported by Michael LaCorte on the "nagiosplug-help" mailing list + (Message-ID: ). + +2011-04-08 Sebastian Harl + + * plugins/check_pgsql.c: check_pgsql: Determine connection time in + µs-resolution. + + … thus, treat "elapsed time" and the thresholds as floating point values. + + * plugins/check_pgsql.c: check_pgsql: Leave 'min' value in query + perfdata empty. + + There is no reasonable default value for that. + +2011-04-07 Sebastian Harl + + * plugins/check_pgsql.c: check_pgsql: Updated copyright. + + * plugins/check_pgsql.c: check_pgsql: Added support for the -o command + line option. + + This option may be used to specify further connection parameters to be passed + to PQconnectdb(). For example, this may be used to specify a service name in + pg_service.conf to be used for additional connection parameters: -o + 'service=' or to specify the SSL mode: -o 'sslmode=require'. + + See the chapter "libpq - C Library" in the PostgreSQL manual for details. + + * plugins/check_pgsql.c: check_pgsql: Removed -4/-6 flags from help + output. + + These options are not currently supported. + + * plugins/check_pgsql.c: check_pgsql: Allow UNIX socket directories as + hostname as well. + + PostgreSQL accepts the directory name of its UNIX socket as hostname as well, + e.g. /var/run/postgresql/. + + * plugins/check_pgsql.c: check_pgsql: Use PQconnectdb() rather than + PQsetdbLogin(). + + This is more flexible and the recommended way to connect to a PostgreSQL + database. + + Also, the verbose output now includes detailed information about the + connection. + +2011-04-06 Sebastian Harl + + * plugins/check_pgsql.c: check_pgsql: Fixed query perfdata output for + empty warn/crit ranges. + + Previously, "(null)" was printed (when using GNU's libc). This has been + changed to print the empty string instead. + + * plugins/check_pgsql.c: check_pgsql: Added support for executing + queries. + + The query result (the double value of the first column in the first row, to be + precise) will be checked against threshold ranges specified using the -C and + -W options. + + Note that this also allows to query PostgreSQL internal values using the + information available from the database daemon's "statistics collector" -- see + the chapter "Monitoring Database Activity" in the PostgreSQL manual for + details. + +2012-07-04 Holger Weiss + + * NEWS: Mention the new check_dbi plugin + +2012-07-04 Eric Stanley + + * plugins/check_smtp.c: Re-added missing variable declarations to + check_smtp.c + + A recent update removed the declarations for a couple variables in + check_smtp.c that are still being used, which caused a failure + in the compilation of check_smtp.c. This commit restores those variable + declarations so the check_smtp.c will again compile. + +2012-06-29 Holger Weiss + + * plugins/check_smtp.c: check_smtp: Remove a comment regarding MAIL FROM + + Earlier versions of check_smtp generated an (invalid) "MAIL FROM" + command without arguments by default. These days, a "MAIL FROM" command + is only sent if the --from option is specified. + + This commit removes a comment which explains the old behaviour, and it + updates a variable name accordingly. + + * plugins/check_smtp.c: check_smtp: Fix help and usage output regarding + -R + + * NEWS, THANKS.in: NEWS, THANKS: Mention Anders Kaseorg's changes + +2012-06-29 Anders Kaseorg + + * plugins/check_smtp.c: check_smtp: Fix strcat overflows + + Signed-off-by: Anders Kaseorg + + * contrib/check_http-with-client-certificate.c, plugins/check_by_ssh.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c, plugins/utils.c, plugins/utils.h: + Die when asprintf fails + + Fixes many instances of + warning: ignoring return value of 'asprintf', declared with attribute warn_unused_result [-Wunused-result] + + Signed-off-by: Anders Kaseorg + + * plugins/check_smtp.c: check_smtp: Strip angle brackets from -f + argument, if provided + + Apparently some people used -f '' to work around + the bug I just fixed in the MAIL FROM: command generation. Although + the resulting command wasn't RFC-compliant, it was working with some + MTAs, so let's continue to support this syntax now that we generate + RFC-compliant commands. + + Signed-off-by: Anders Kaseorg + +2012-06-28 Anders Kaseorg + + * plugins/check_smtp.c: check_smtp: Change MAIL FROM: command to comply + with the SMTP standard + + Every version of the SMTP standard (from RFC 821 to the current RFC + 5321) requires the address following MAIL FROM: to follow the colon + immediately (with no space) and to be surrounded by angle brackets. + + Signed-off-by: Anders Kaseorg + +2012-06-28 Holger Weiss + + * package.def: Remove the package.def file + + The package.def file is not included in release tarballs, and I'm not + aware of anyone (still) using it. + +2012-06-27 Holger Weiss + + * BUGS: Remove #990948 from the BUGS file + + Issue #990948 has been fixed by commit + 0892c4ac28c4c2e3b6275187f845813b4cd6d320. + + * BUGS, ChangeLog, NEWS, NP-VERSION-GEN, configure.in, package.def: + Prepare for the 1.4.16 release + + * plugins/check_tcp.c: check_tcp: Print performance data even with -D + + When using the 1.4.15 release of the Nagios Plugins, a command such as + + check_tcp -H pop.example.com -p 995 -D 14 + + usually produced two lines of output, e.g.: + + OK - Certificate will expire on 12/13/2014 23:59. + TCP OK - 0.009 second response time on port 995|time=0.008849s;;;0.000000;10.000000 + + The second line was removed by 4d06603060fc1233861b164870f0d3a2e0d8d2eb. + However, as the old two-line output is a valid (though in this case + unintended) way to spit out performance data, removing the second line + might break current setups. Therefore, we revert to the old behaviour, + at least for the moment. + + The issue was reported by Jochen Bern on the "nagiosplug-devel" mailing + list (Message-ID: <4FEAE812.8030309@LINworks.de>). + + * BUGS: Update the BUGS file + + Remove the bug reports that were closed, and add two new items. + +2012-06-27 Sven Nierlein + + * plugins/check_snmp.c, plugins/tests/check_snmp.t: check_snmp: use + single quotes for perf data labels + +2012-06-26 Sven Nierlein + + * NEWS, THANKS.in, plugins/check_snmp.c, plugins/tests/check_snmp.t: Fix + performance data label containing spaces in check_snmp (Jochen Bern) + + Add --perf-oids option for check_snmp to retain optional 1.4.14 compatibility + +2012-06-26 Holger Weiss + + * THANKS.in: Remove team members from the THANKS file + + The (current and past) team members are listed in the AUTHORS file. + + * AUTHORS, THANKS.in: Add Sven Nierlein to the list of AUTHORS + +2012-06-25 William Leibzon + + * plugins/tests/check_http.t: added test case for certificate checs with + both warning and critical values + +2012-06-25 Sven Nierlein + + * plugins/sslutils.c, plugins/t/check_http.t, plugins/t/check_tcp.t: + check_http: added test for warning thresholds + + fixed typo in sslutils + + * NEWS, THANKS.in: updated changelog + +2012-05-21 William Leibzon + + * plugins/check_http.c, plugins/check_smtp.c, plugins/check_tcp.c, + plugins/netutils.h, plugins/sslutils.c: applied patch that adds both + critical and warning thresholds to certificate expiration checks of + check_tcp, check_http, check_smtp + +2012-06-25 Holger Weiss + + * plugins/check_ping.c: check_ping: Add missing newline to die() calls + + Our die() function expects the caller to append the trailing newline + character. + + * NEWS: Improve the wording a bit + +2012-06-24 Holger Weiss + + * THANKS.in, plugins/check_ping.c: check_ping: Ignore ping(1)'s exit + status + + Don't return a WARNING state if the number of lost packets is greater + than zero but below the specified warning threshold. This happened + because the check_ping plugin used the exit status of the ping(1) + utility. (#3535140 - Tobias Brox) + +2012-06-23 Holger Weiss + + * NEWS, THANKS.in, plugins-scripts/check_disk_smb.pl: check_disk_smb: + Add performance data + + (Debian #654259 - Charles-Henri Larose) + +2012-06-22 Holger Weiss + + * plugins/t/check_by_ssh.t: Fix check_by_ssh test for non-Bash login + shells + + In the C shell and in the Z shell, the "?" character must be quoted or + backslash-escaped in order to use it verbatim. Therefore, a command + such as + + check_by_ssh -H test.example.com -l joe echo huh? + + might fail, depending on joe's login shell on test.example.com. + + Just to make sure, this commit removes most punctuation characters from + our test strings. + +2012-06-14 Holger Weiss + + * THANKS.in, plugins-root/check_dhcp.c: check_dhcp: Don't misinterpret + the "siaddr" field + + RFC 2131 (2.) says: "DHCP clarifies the interpretation of the 'siaddr' + field as the address of the server to use in the next step of the + client's bootstrap process." So, we shouldn't interpret this field as + the DHCP server's own address. (#3503921 - Jason Ellison) + +2012-06-13 Holger Weiss + + * NEWS, plugins-root/check_dhcp.c: check_dhcp: Fix handling of "pad" + options + + Don't let "pad" options[*] terminate the parsing of DHCP options. This + bug was triggered by using check_dhcp against Windows 2003 DHCP servers + (see #3503921). + + [*] Cf. RFC 2132, 3.1. + +2012-06-11 Holger Weiss + + * NEWS, THANKS.in, plugins/check_ping.c: Improve parsing of ping6(1) + output + + The ping6(1) implementation provided by Debian's iputils-ping package + may produce output such as the following: + + | 3 packets transmitted, 0 received, +3 errors, 100% packet loss, time 2009ms + + There's a corresponding pattern in check_ping.c:458: + + | "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss" + + Without this fix, the pattern in check_ping.c:456 matched first (as + sscanf(3) interprets "+3" as a match for "%d"): + + | "%*d packets transmitted, %*d received, %d%% loss, time" + + (#1894850 - Debian bug report #514588 - Matej Vela) + + * plugins/sslutils.c: Fix whitespace and capitalization issues + + Fix indentation and whitespace issues, and correct some capitalization + errors in error messages. The behaviour is unchanged. + + * plugins/sslutils.c: Don't use SSLv2 when compiling against GnuTLS + + GnuTLS doesn't support SSL version 2. + +2012-06-08 Sebastian Harl + + * plugins/t/check_dbi.t: t/check_dbi.t: Don't use 'INSERT … VALUES + (a,b), (c,d)' with SQLite3. + + Older versions of SQLite3 don't seem to support that. + +2012-06-08 Sebastian Harl + + * plugins/t/check_dbi.t: Added a few test cases for the check_dbi + plugin. + + All tests use sqlite3. A temporary database is created for the purpose of the + tests. + +2012-06-07 Holger Weiss + + * plugins/check_users.c: check_users: Whitespace fixes, etc. + + * NEWS, THANKS.in: Update NEWS and THANKS w.r.t. check_users change + +2012-04-17 M. Remy + + * plugins/Makefile.am, plugins/check_users.c: check_users: improve + performance + + This patch use the utxent function family to collect the user data. It improve the check speed. + Need a system conforming to POSIX.1-2001. + +2012-06-06 Sebastian Harl + + * plugins/check_dbi.c: check_dbi: Hint the user about cause when dbi + init fails. + +2011-04-18 Sebastian Harl + + * plugins/check_dbi.c: check_dbi: Added simple regex example to help + output. + + * plugins/check_dbi.c: check_dbi: Added SERVER_VERSION metric. + + This metric compares the database engine server version with the specified + ranges. The version string [[[[A.]B.]C.]D.]E[.] is returned as E + D*100 + + C*10000 + B*1000000 + A*100000000 (see libdbi's dbi_conn_get_engine_version() + documentation). + + * plugins/check_dbi.c: check_dbi: Added -r and -R options. + + These options may be used to specify an extended POSIX regular expression that + is applied to the query result. When using -R, a case-insensitive match is + done. + + The options may not be mixed with -w/-c/-e. + +2011-04-15 Sebastian Harl + + * plugins/check_dbi.c: check_dbi: Added -e option. + + This option may be used to specify a string that is expected as the query + return value. The string is compared to the query result using strcmp(). + + The option may not be mixed with -w/-c. + + * plugins/check_dbi.c: check_dbi: Added some examples to the help + output. + + * plugins/check_dbi.c: check_dbi: Added QUERY_TIME metric. + + This metric checks the execution time of the specified query. In case the + query does not return any (parsable) data, this is not treated as an error + when using this metric. + + * plugins/check_dbi.c: check_dbi: Replaced -W/-C with -m. + + The -m option may be used to specify a metric to check the thresholds against. + This is more flexible than --conntime-warning/--conntime-critical (-W/-C) as + it may be extended to support further metrics without introducing tons of + arguments. Also, it does not make much sense to check the conntime and query + result at the same time. + + Currently, the metrics CONN_TIME and QUERY_RESULT are available. + + A query is no longer required unless QUERY_RESULT (the default) is used. + +2011-04-08 Sebastian Harl + + * plugins/check_dbi.c: check_dbi: Fixed/improved perfdata output. + + - do not use zero as 'min' value for the query result perfdata + + - added all semicolons + +2011-04-07 Sebastian Harl + + * plugins/check_dbi.c: check_dbi: Check and report the time used by the + query. + + * plugins/check_dbi.c: check_dbi: Added threshold ranges for the + connection time. + + The -W and -C options are used for that. The plugin return value is determined + by the worst check result. + + * plugins/check_dbi.c: check_dbi: Include extra opts in help output. + + * .gitignore, REQUIREMENTS, configure.in, plugins/Makefile.am, + plugins/check_dbi.c: Initial version of the 'check_dbi' plugin. + + This plugin connects to an SQL database using libdbi, thus supporting all + database backends supported by libdbi. It will then issue the specified SQL + query and check the result (the numeric value of the first column of the first + row to be precise) against the specified warning/critical ranges. + + The performance data includes the connection time (µs-resolution as provided + by gettimeofday()) and the query result. + +2012-06-06 Sebastian Harl + + * plugins/sslutils.c: sslutils: Check if OpenSSL supports SSLv2. + + Recent versions/builds seem to disable that feature. + +2012-05-29 Holger Weiss + + * NEWS, THANKS.in, plugins-scripts/utils.sh.in: Mention the check_range + function in NEWS, etc. + +2012-04-18 Alex Griffin + + * plugins-scripts/utils.sh.in: Added check_range shell function to + utils.sh.in + +2012-05-29 Holger Weiss + + * plugins/check_http.c: check_http: Fix -C/--certificate option handling + + The support for specifying the desired SSL protocol version via an + optional -S/--ssl argument broke the -C/--certificate option. This is + fixed now. + +2012-05-28 Holger Weiss + + * plugins/check_http.c: check_http: Don't ignore SSL initialization + errors + + SSL initialization errors are now handled properly by check_http + (#3095106 - Eric Schoeller). + + * NEWS, THANKS.in, plugins/check_http.c, plugins/sslutils.c: Add support + for specifying SSL protocol version + + The check_http -S/--ssl option now takes an optional argument which + specifies the desired SSL/TLS protocol version (#3285367 - Jason Lunn). + +2012-05-07 Holger Weiss + + * NEWS, plugins/sslutils.c: Disable stateless SSL session resumption + + Some versions of OpenSSL fail to negotiate the SSL connection with at + least some versions of Tomcat if stateless SSL session resumption + support (see RFC4507) is enabled: + + | CRITICAL - Cannot make SSL connection + | 140099330348712:error:140943F2:SSL routines:SSL3_READ_BYTES:sslv3 alert unexpected message:s3_pkt.c:1195:SSL alert number 10 + + The problem is reproducible with OpenSSL 1.0.0h, but not with OpenSSL + 0.9.8o-4squeeze12 (as shipped with Debian 6.0.4). We work around it by + disabling the RFC4507 functionality when using OpenSSL versions which + support it. + + Thanks to Dag Bakke for reporting the issue and for giving me access to + a server I could use to reproduce the problem. + +2012-04-17 Holger Weiss + + * .gitignore: Add nagios-plugins.spec file to .gitignore + + The nagios-plugins.spec file is created from nagios-plugins.spec.in and + should be ignored by Git. + +2012-04-17 Jan Wagner + + * NEWS, plugins/check_ping.c: Fix check_ping where output of ping6 when + unreachable (Debian #662638) + +2012-04-09 Holger Weiss + + * NEWS: Mention check_by_ssh -F option in NEWS file + +2012-04-09 Sven Nierlein + + * plugins/check_by_ssh.c, plugins/t/check_by_ssh.t: check_by_ssh: added + -F config file to specify alternative ssh config + +2012-04-06 Eric Stanley + + * Makefile.am, configure.in, nagios-plugins.spec.in, + po/nagios-plugins.pot: Updated to support compiling and building RPM on + AIX. + +2012-02-24 Holger Weiss + + * plugins/check_http.c: Clarify that check_http won't verify + certificates + + Add a note to the --help output which clarifies that check_http doesn't + perform certificate verification (beyond what the "-C" option does). + + (Suggested by Michael Renner in Debian bug report #644627, forwarded by + Jan Wagner.) + + * plugins/check_snmp.c: Cosmetic change + + Replace all occurrences of "strstr(s, "c") == s" with "s[0] == 'c'". + + * plugins/check_snmp.c: Accept multiple labels specified with "-l" + + Fix the code which accepts a comma-separated list of labels specified + via the "-l" option. + + (Spotted by Oskar Liljeblad in Debian bug report #647020, forwarded by + Jan Wagner.) + +2012-02-10 Eric Stanley + + * configure.in, plugins/common.h: Enable compiling on AIX 6.1 + +2012-01-20 Eric Stanley + + * Makefile.am, pkg/solaris/solpkg: Added pst3 to Solaris package. + +2011-12-25 Holger Weiss + + * NEWS, perlmods/Nagios-Plugin-0.34.tar.gz, + perlmods/Nagios-Plugin-0.36.tar.gz: Updated Nagios::Plugin library + +2011-12-16 Eric Stanley + + * Makefile.am, pkg/solaris/pkginfo.in, pkg/solaris/solpkg: Commit files + which were inadvertently omitted from the previous commit. + + * pkg/solaris/preinstall: Updated Solaris package creation to newer + standards + + The Solaris package creation has been updated to newer standards to match those + of the NRPE package. The following changes have been made: + - the plugins now install under /opt/nagios + - the name of package is now NGOSplugin + - the files installed are now owned by the nagios user + - the package includes a pre-installation script that creates a nagios user + and a nagios group if one did not previously exist + + * m4/np_mysqlclient.m4: Fixed issue for compiling mysql plugin on + Solaris + + On Solaris, in the case where the mysql libraries were compiled using a + non-gcc compiler, but the plugins are being compiled with gcc, the configure + process would incorrectly determine the MYSQLCFLAGS. This has been corrected + in the m4/np_mysqlclient.m4 file. + +2011-09-07 Holger Weiss + + * plugins-scripts/check_sensors.sh: check_sensors: Use symbolic exit + codes + + Specify the exit codes by using the constants from utils.sh. + + * plugins-scripts/check_sensors.sh: check_sensors: Minor whitespace + fixes + + * NEWS, plugins-scripts/check_sensors.sh: check_sensors: Detect FAULT + status + + Return an UNKNOWN status if a faulty sensor is detected. This can be + suppressed with the new "--ignore-fault" option. + + (Fixes Debian bug #615133, patch suggested by Jan Wagner.) + +2011-09-06 Thomas Guyot-Sionnest + + * plugins/check_radius.c: Make GCC happy + + It won't trust us about msg containing no format string, and fail miserably + when compiled with -Werror=format-security. Reported by spy6 on IRC. + +2011-08-13 Matthias Eble + + * plugins/check_ldap.c: Fix: check_ldap now correctly handles the long + option --hostname for -H + + The undocumented --host has been changed to --hostname which is actually + mentioned in --help. Thanks to lgarrett (#3191388) + +2011-07-15 Ton Voon + + * NEWS, plugins/check_smtp.c, plugins/check_tcp.c: Fix check_smtp and + check_tcp where duplicate messages were displayed for certificate errors + (Opsview team) + + * NEWS, plugins/check_smtp.c: New option to check_smtp to ignore + failures when sending QUIT (#3358348 - Duncan Ferguson) + +2011-04-28 Sebastian Harl + + * NEWS, THANKS.in, plugins-root/check_icmp.c: check_host: Allocate a + large-enough buffer for the host table. + + When specifying a host-name on the command line, each of its IPs is added to + the host table (and each one is pinged). So, the buffer has to be large enough + to hold all of the respective host objects. (argc - 1) only fits hosts with a + single IP. + + Thanks to Max Kosmach for reporting this in Debian bug #623702. + +2011-03-26 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_ssh.c: Add perfdata to check_ssh + (#3244097 - Marco Beck) + +2011-02-08 Holger Weiss + + * plugins/check_smtp.c: check_smtp: Abort on missing/unexpected greeting + + Abort immediately if we don't receive a server greeting or if the + greeting doesn't contain the "--expect"ed string (by default: "220") + instead of blindly sending the EHLO/HELO line. + + Spotted by Daniel Piddock, see Debian bug report #611914. + +2011-02-04 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/sslutils.c, plugins/t/check_http.t, + plugins/tests/check_http.t: check_http: check for and print the + certificate cn + + This patch adds a check for the certificate cn (hostname) to normal + certificate checks. It returns CRITICAL if th cn is missing, otherwise it + prints it in the normal output. + + Patch by Stéphane Urbanovski + +2011-01-21 Ton Voon + + * NEWS, plugins/check_procs.c, plugins/tests/check_procs.t: Fix for + regex input of '|', being output causing problems with Nagios' parsing + of + performance data. Now replaced with ',' + +2011-01-05 Thomas Guyot-Sionnest + + * plugins/t/check_snmp.t, plugins/tests/check_snmp.t, + plugins/tests/check_snmp_agent.pl: Test updates... + + 1. Timetick test could fail with uptime > 115 days. Thresholds are + double type, so it's safe to put a large number even for 32bit systems. + 2. Add a test based on an invalid bug report, worthy anyway. + +2011-01-01 Thomas Guyot-Sionnest + + * tools/sfsnapshot-upload: Update the README text + + * NEWS, plugins/check_http.c: Make check_http use standard threshold + functions + + This enables floating point and ranges, and make the code more standard. + +2010-12-23 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ldap.c: Fix check_ldap overriding the port when + --ssl was specified after -p + +2010-11-30 Thomas Guyot-Sionnest + + * plugins/tests/check_http.t, plugins/tests/check_snmp.t: Fix minor test + issues + + My Test::More wouldn't print the total number of tests anymore, moving + the plan at the top appears to fix it. + + At the same time I made check-http.t eval the special modules so it can + skip the tests instead of failing. + + * NEWS, plugins/check_snmp.c, plugins/tests/check_snmp.t: Revert + "check_snmp now considers strings returned by SNMP that contain just" + + This reverts commit 896962a1ad1b7d7c75d42c565b06cc799feb0a7c. + + Conflicts: + + NEWS + plugins/tests/check_snmp.t + + Notes: + Reverting because I rebased a patch that was doing the same thing, plus + fixing more related regressions, and both didn't work together. + I kept the tests intact except for one that wouldn't pass on 1.4.14 + either + + * plugins/tests/check_snmp.t: State-based tests enhancements + + - Use /var/tmp for state if no state dir environment variable is set, + this avoid the need for a writable localstatedir during tests. + - Use "rm -f", mostly to avoid printing out garbage of the directory + doesn't exists + + * NEWS, plugins/check_snmp.c, plugins/t/check_snmp.t: check_snmp: Remove + that is_numeric madness + + Original patch to make Timeticks works as in check_snmp v1.4.14, it turns + out is_numeric isn't so useful and treating all types as numeric works + best for backwards-compatibility. This is how it used to work in 1.4.14. + + As a special case, I also make calculate_rate look up for numeric values + as it would otherwise return the last value instead. + +2010-11-28 Matthias Eble + + * plugins-scripts/t/check_disk_smb.t: add test cases for check_disk_smb + + * NEWS, plugins-scripts/check_disk_smb.pl: check_disk_smb now handles + NT_STATUS_ACCESS_DENIED properly (Debian #601696) + + * NEWS, plugins-scripts/check_disk_smb.pl: Make check_disk_smb accept + spaces in share names (#990948, #1370031, Debian #601699) + +2010-11-15 Matthias Eble + + * NEWS, lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: Fix + check_disk free space calculation if blocksizes differ within a disk + group (Bekar - #2973603) + + Various values (dused_pct, dfree_pct, inodes_free, inodes_total, ...) are now carried in + the parameter_list structure. Assignments have been moved to a subroutine preventing + code redundancies. + Group metrics are now calculated based on units rather than blocks. This fixes freespace calculation + when blocksizes differ within a group. + +2010-11-15 nagios + + * NEWS, plugins/check_snmp.c, plugins/tests/check_snmp.t, + plugins/tests/check_snmp_agent.pl: check_snmp now considers strings + returned by SNMP that contain just + numbers (according to strtod) to be a numeric value for threshold and + performance data + +2010-10-16 Thomas Guyot-Sionnest + + * NEWS: Update NEWS for last commit + +2010-10-13 Thomas Guyot-Sionnest + + * THANKS.in, plugins/check_nt.c: check_nt: make UPTIME accept + warning/critical levels + + Patch originally by Ryan Kelly + +2010-10-11 Thomas Guyot-Sionnest + + * tools/sfsnapshotgit: sfsnapshotgit: Better handling of remote refs + + This commit allow to track branches from unusually-named remote refs and + makes possible using external remotes (other than origin) for snapshots. + +2010-10-05 Thomas Guyot-Sionnest + + * contrib/check_linux_raid.pl: Patch for check_linux_raid with on + linear/raid0 arrays + + Fixes bug #3049988, Debian bug #579049 + +2010-08-31 Ton Voon + + * plugins/check_http.c: Fix typos in -f help text + +2010-07-27 Holger Weiss + + * COPYING: Update the COPYING file to the GPLv3 + + We switched to the GPLv3 early in 2008, but we forgot to update the + COPYING file accordingly. + +2010-07-27 Ton Voon + + * BUGS, ChangeLog, NEWS, NP-VERSION-GEN, configure.in, package.def: + 1.4.15 prep + +2010-07-14 Ton Voon + + * tools/sfsnapshot-upload: Added text re: MD5SUM updates in nightlies, + but tarballs not + +2010-07-09 Thomas Guyot-Sionnest + + * plugins/check_snmp.c, po/de.po, po/fr.po, po/nagios-plugins.pot: Fix + --help output when MAX_OIDS is altered. + +2010-07-07 Ton Voon + + * NEWS, plugins/check_disk.c: Fix examples in check_disk, where it + implied was possible to suffix unit values to warn/crit parameters + + * NEWS, THANKS.in, plugins-scripts/check_ifstatus.pl: Allow + check_ifstatus to accept version=2c + +2010-07-02 Thomas Guyot-Sionnest + + * NEWS, lib/utils_cmd.c: Fix cmd_run overwriting the environment + + Some commands need the environment to function properly. One such + example is check_ssh and check_by_ssh when a SOCKS proxy is required. + + This patch use setenv and extern char **environ to alter and pass the + new environment to the child process Those modules have been added to + Gnulib for portability. + + * gl/Makefile.am, gl/m4/gnulib-cache.m4: Import the environ module from + gnulib (86ba51) + +2010-07-02 Holger Weiss + + * tools/git-notify: git-notify: Be careful with "--no-merge" + + The "-X" option (which asks git-notify to not report merge commits) was + implemented by setting the "--no-merge" option on each invocation of + git-rev-list(1). However, we do not only use git-rev-list(1) to get the + list of new commits, but also to check whether the old branch head (or + tag) is a parent of the new branch head (or tag). For this latter + check, the "--no-merge" option should not be set; otherwise, git-notify + would be fooled to believe that the branch has been rewritten if the old + head was a merge commit. + +2010-06-30 tonvoon + + * plugins/check_snmp.c, plugins/tests/check_snmp.t: Corrected + rate_multiplier calculation + + * plugins/check_snmp.c, plugins/tests/check_snmp.t: Removed suffix of + "-rate" and let user decide label via --label + + * plugins/check_snmp.c, plugins/tests/check_snmp.t: Tests for + --rate-multiplier option + +2010-06-30 Ton Voon + + * plugins/check_snmp.c: Fixed rate-multiplier option + +2010-06-25 tonvoon + + * lib/tests/Makefile.am: Add test file directory + +2010-06-24 Ton Voon + + * lib/tests/test_utils.c, lib/utils_base.c: Cleanup some warnings + displayed from IRIX tinderbox server + + * gl/Makefile.am, gl/m4/eealloc.m4, gl/m4/environ.m4, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4, gl/m4/malloca.m4, + gl/m4/setenv.m4, gl/malloca.c, gl/malloca.h, gl/malloca.valgrind, + gl/setenv.c, gl/unsetenv.c: Added unsetenv and setenv from gnulib + + * gl/Makefile.am, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4, + gl/m4/strsep.m4, gl/strsep.c: Added strsep to gnulib, for check_snmp.c + +2010-06-23 tonvoon + + * NEWS, plugins/check_snmp.c, plugins/tests/check_snmp.t, + plugins/tests/check_snmp_agent.pl, po/de.po, po/fr.po, + po/nagios-plugins.pot: Added option to invert search results + + * NEWS, plugins/check_http.c, plugins/tests/check_http.t: Display + missing search string and URL when failed (Duncan Ferguson #2999924) + +2010-06-17 Ton Voon + + * NEWS, build-aux/c++defs.h, build-aux/warn-on-use.h, gl/Makefile.am, + gl/alloca.c, gl/config.charset, gl/error.c, gl/getopt.c, + gl/getopt_int.h, gl/localcharset.c, gl/m4/asm-underscore.m4, + gl/m4/getopt.m4, gl/m4/gettext.m4, gl/m4/gnulib-cache.m4, + gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, gl/m4/iconv.m4, + gl/m4/intl.m4, gl/m4/lib-link.m4, gl/m4/netdb_h.m4, gl/m4/onceonly.m4, + gl/m4/po.m4, gl/m4/printf.m4, gl/m4/sha1.m4, gl/m4/sockpfaf.m4, + gl/m4/stdint.m4, gl/m4/stdio_h.m4, gl/m4/string_h.m4, gl/m4/strnlen.m4, + gl/m4/time_h.m4, gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, + gl/m4/visibility.m4, gl/netdb.in.h, gl/regex_internal.c, + gl/regex_internal.h, gl/sha1.c, gl/sha1.h, gl/stdbool.in.h, + gl/stdio-write.c, gl/stdio.in.h, gl/strerror.c, gl/string.in.h, + gl/sys_stat.in.h, gl/time.in.h, gl/unistd.in.h, gl/vasnprintf.c, + gl/verify.h, gl/wchar.in.h, lib/Makefile.am, lib/tests/Makefile.am, + lib/tests/test_utils.c, lib/tests/var/.gitignore, lib/tests/var/baddate, + lib/tests/var/missingdataline, lib/tests/var/oldformat, + lib/tests/var/statefile, lib/utils_base.c, lib/utils_base.h, + plugins/Makefile.am, plugins/check_snmp.c, plugins/tests/check_snmp.t, + plugins/tests/check_snmp_agent.pl: Added state retention APIs. + Implemented for check_snmp with --rate option. + + See http://nagiosplugin.org/c-api-private for more details on the API. + + Also updated check_snmp -l option to change the perfdata label. + +2010-06-18 Thomas Guyot-Sionnest + + * NEWS: NEWS entry for last commit + +2009-08-05 Thomas Guyot-Sionnest + + * configure.in: Attempt at detecting 64bit compilation flags between + gcc, old, and new versions of sun cc + + Gcc accepts -m64, just as newer version of Suncc. + Older Suncc required -xarch=v9 (SPARC) or -xarch=amd64 (x86-64) to generate 64bit code. + +2010-05-08 Thomas Guyot-Sionnest + + * plugins/check_smtp.c: Add missing --fqdn help (Jan Wagner) + +2010-04-28 Thomas Guyot-Sionnest + + * plugins/utils.h, po/de.po, po/fr.po, po/nagios-plugins.pot: Update + extra-opts help text based on ML agreement + + * .gitignore, tools/distclean: use git-clean when possible + + git-clean is much faster and more reliable... + + Also add confdefs.h in gitignore, although this file is normally removed + at the end of the configure script. + + * build-aux/ltmain.sh, gl/m4/libtool.m4, gl/m4/ltoptions.m4, + gl/m4/ltsugar.m4, gl/m4/ltversion.m4, gl/m4/lt~obsolete.m4: Update + libtool + + Nagios-plugins wouldn't compile on Ubuntu 10.04 (Lucid) with the old libtool + +2010-04-22 Thomas Guyot-Sionnest + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c: Add newline after "Usage:" in --help + + * plugins/check_cluster.c: Split long line in check_cluster --help + +2010-04-21 Thomas Guyot-Sionnest + + * po/de.po, po/fr.po, po/nagios-plugins.pot: Update French translations + with extra-opts change + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/utils.h: Standardize the extra-opts notes + + * NEWS, plugins/tests/check_snmp.t: Fix tests and update NEWS file + +2010-04-15 Thomas Guyot-Sionnest + + * plugins/check_snmp.c: Replace the lousy multiline parser with a robust + one. + + This one counts double quotes and backslashes so it should handle any + level of escaping. + +2009-09-17 Thomas Guyot-Sionnest + + * plugins/check_snmp.c, plugins/tests/check_snmp_agent.pl: Attempt at + fixing check_snmp multiline output: + + This patch tries to detect and output nicely multi-line strings. This + method is broken by design; only a count of double-quotes and escapes + could work in every situation. + +2010-04-15 tonvoon + + * NEWS, perlmods/Nagios-Plugin-0.27.tar.gz, + perlmods/Nagios-Plugin-0.34.tar.gz: Updated Nagios::Plugin library + +2010-04-14 Holger Weiss + + * tools/git-notify: git-notify: Fix the ordering of commits + + If notifications for multiple commits are created, sort them + chronologically instead of in reverse chronological order. + +2010-04-14 Thomas Guyot-Sionnest + + * NEWS, plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c, plugins/utils.h, po/POTFILES.in, + po/de.po, po/fr.po, po/nagios-plugins.pot: Fix translations when + extra-opts aren't enabled + + Bug #2832884 reported problem with translations outputting pot file + headers. This is caused by "" matching the header of the translation + files. + + This patch moves gettext macros inside utils macros and update some + french translations. + + * plugins/check_ntp.c, plugins/negate.c, po/de.po, po/fr.po, + po/nagios-plugins.pot: Update french translation (fix all fuzzy's) + + * NEWS, THANKS.in, plugins/check_radius.c: Fix check_radius returning OK + on unexpected results + + REJECT_RC is defined on some radiusclient versions and differenciates + between auth errors and bad responses. This patch will affect only the + behaviour of those clients exporting REJECT_RC. + + In addition, unexpected return codes are now handled properly and + return UNKNOWN. + + * NEWS: Typo + +2010-04-08 Thomas Guyot-Sionnest + + * NEWS, plugins-root/Makefile.am, plugins-root/pst3.c: pst3.c must not + use nagiosplug/gnulib includes + +2010-04-07 Thomas Guyot-Sionnest + + * .gitignore, build-aux/arg-nonnull.h, build-aux/c++defs.h, + build-aux/config.rpath, build-aux/mkinstalldirs, + build-aux/warn-on-use.h, gl/Makefile.am, gl/alignof.h, gl/alloca.c, + gl/alloca.in.h, gl/arpa_inet.in.h, gl/asnprintf.c, gl/asprintf.c, + gl/base64.c, gl/base64.h, gl/basename-lgpl.c, gl/basename.c, gl/btowc.c, + gl/c-strtod.c, gl/c-strtod.h, gl/cloexec.c, gl/cloexec.h, + gl/close-hook.c, gl/close-hook.h, gl/config.charset, gl/creat-safer.c, + gl/dirname-lgpl.c, gl/dirname.c, gl/dirname.h, gl/dup-safer.c, + gl/dup2.c, gl/errno.in.h, gl/error.c, gl/error.h, gl/exitfail.c, + gl/exitfail.h, gl/fcntl--.h, gl/fcntl-safer.h, gl/fcntl.c, + gl/fcntl.in.h, gl/fd-safer.c, gl/float+.h, gl/float.in.h, gl/floor.c, + gl/floorf.c, gl/fsusage.c, gl/fsusage.h, gl/full-read.c, gl/full-read.h, + gl/full-write.c, gl/full-write.h, gl/gai_strerror.c, gl/getaddrinfo.c, + gl/getdtablesize.c, gl/gethostname.c, gl/getloadavg.c, gl/getopt.c, + gl/getopt.in.h, gl/getopt1.c, gl/getopt_int.h, gl/gettext.h, + gl/inet_ntop.c, gl/intprops.h, gl/langinfo.in.h, gl/localcharset.c, + gl/localcharset.h, gl/locale.in.h, gl/m4/00gnulib.m4, gl/m4/alloca.m4, + gl/m4/arpa_inet_h.m4, gl/m4/base64.m4, gl/m4/btowc.m4, + gl/m4/c-strtod.m4, gl/m4/cloexec.m4, gl/m4/codeset.m4, gl/m4/dirname.m4, + gl/m4/dos.m4, gl/m4/double-slash-root.m4, gl/m4/dup2.m4, + gl/m4/errno_h.m4, gl/m4/error.m4, gl/m4/exitfail.m4, + gl/m4/extensions.m4, gl/m4/fcntl-o.m4, gl/m4/fcntl-safer.m4, + gl/m4/fcntl.m4, gl/m4/fcntl_h.m4, gl/m4/float_h.m4, gl/m4/floorf.m4, + gl/m4/fstypename.m4, gl/m4/fsusage.m4, gl/m4/getaddrinfo.m4, + gl/m4/getdtablesize.m4, gl/m4/gethostname.m4, gl/m4/getloadavg.m4, + gl/m4/getopt.m4, gl/m4/gettext.m4, gl/m4/glibc2.m4, gl/m4/glibc21.m4, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, + gl/m4/gnulib-tool.m4, gl/m4/hostent.m4, gl/m4/iconv.m4, + gl/m4/include_next.m4, gl/m4/inet_ntop.m4, gl/m4/inline.m4, + gl/m4/intdiv0.m4, gl/m4/intl.m4, gl/m4/intldir.m4, gl/m4/intlmacosx.m4, + gl/m4/intmax.m4, gl/m4/intmax_t.m4, gl/m4/inttypes-pri.m4, + gl/m4/inttypes_h.m4, gl/m4/langinfo_h.m4, gl/m4/lcmessage.m4, + gl/m4/lib-ld.m4, gl/m4/lib-link.m4, gl/m4/lib-prefix.m4, + gl/m4/localcharset.m4, gl/m4/locale-fr.m4, gl/m4/locale-ja.m4, + gl/m4/locale-zh.m4, gl/m4/locale_h.m4, gl/m4/lock.m4, gl/m4/longlong.m4, + gl/m4/ls-mntd-fs.m4, gl/m4/malloc.m4, gl/m4/math_h.m4, gl/m4/mbrtowc.m4, + gl/m4/mbsinit.m4, gl/m4/mbstate_t.m4, gl/m4/memchr.m4, gl/m4/mktime.m4, + gl/m4/mmap-anon.m4, gl/m4/mode_t.m4, gl/m4/mountlist.m4, + gl/m4/multiarch.m4, gl/m4/netdb_h.m4, gl/m4/netinet_in_h.m4, + gl/m4/nl_langinfo.m4, gl/m4/nls.m4, gl/m4/onceonly.m4, gl/m4/open.m4, + gl/m4/po.m4, gl/m4/printf-posix.m4, gl/m4/printf.m4, gl/m4/progtest.m4, + gl/m4/regex.m4, gl/m4/safe-read.m4, gl/m4/safe-write.m4, + gl/m4/servent.m4, gl/m4/size_max.m4, gl/m4/snprintf.m4, + gl/m4/sockets.m4, gl/m4/socklen.m4, gl/m4/sockpfaf.m4, gl/m4/ssize_t.m4, + gl/m4/stat.m4, gl/m4/stdbool.m4, gl/m4/stddef_h.m4, gl/m4/stdint.m4, + gl/m4/stdint_h.m4, gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, gl/m4/strdup.m4, + gl/m4/strerror.m4, gl/m4/string_h.m4, gl/m4/strndup.m4, + gl/m4/strnlen.m4, gl/m4/strstr.m4, gl/m4/sys_socket_h.m4, + gl/m4/sys_stat_h.m4, gl/m4/threadlib.m4, gl/m4/time_h.m4, + gl/m4/time_r.m4, gl/m4/timegm.m4, gl/m4/uintmax_t.m4, + gl/m4/unistd-safer.m4, gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, + gl/m4/vasprintf.m4, gl/m4/visibility.m4, gl/m4/vsnprintf.m4, + gl/m4/warn-on-use.m4, gl/m4/wchar_h.m4, gl/m4/wchar_t.m4, + gl/m4/wcrtomb.m4, gl/m4/wctype_h.m4, gl/m4/wint_t.m4, gl/m4/write.m4, + gl/m4/xalloc.m4, gl/m4/xsize.m4, gl/m4/xstrndup.m4, gl/malloc.c, + gl/math.in.h, gl/mbrtowc.c, gl/mbsinit.c, gl/memchr.c, + gl/memchr.valgrind, gl/mktime-internal.h, gl/mktime.c, gl/mountlist.c, + gl/mountlist.h, gl/netdb.in.h, gl/netinet_in.in.h, gl/nl_langinfo.c, + gl/open-safer.c, gl/open.c, gl/pipe-safer.c, gl/printf-args.c, + gl/printf-args.h, gl/printf-parse.c, gl/printf-parse.h, gl/ref-add.sin, + gl/ref-del.sin, gl/regcomp.c, gl/regex.c, gl/regex.h, + gl/regex_internal.c, gl/regex_internal.h, gl/regexec.c, gl/safe-read.c, + gl/safe-read.h, gl/safe-write.c, gl/safe-write.h, gl/size_max.h, + gl/snprintf.c, gl/sockets.c, gl/sockets.h, gl/stat.c, gl/stdbool.in.h, + gl/stddef.in.h, gl/stdint.in.h, gl/stdio-write.c, gl/stdio.in.h, + gl/stdlib.in.h, gl/str-two-way.h, gl/strdup.c, gl/streq.h, + gl/strerror.c, gl/string.in.h, gl/stripslash.c, gl/strndup.c, + gl/strnlen.c, gl/strstr.c, gl/sys_socket.in.h, gl/sys_stat.in.h, + gl/time.in.h, gl/time_r.c, gl/timegm.c, gl/unistd--.h, + gl/unistd-safer.h, gl/unistd.in.h, gl/vasnprintf.c, gl/vasnprintf.h, + gl/vasprintf.c, gl/verify.h, gl/vsnprintf.c, gl/w32sock.h, + gl/wchar.in.h, gl/wcrtomb.c, gl/wctype.in.h, gl/write.c, + gl/xalloc-die.c, gl/xalloc.h, gl/xmalloc.c, gl/xsize.h, gl/xstrndup.c, + gl/xstrndup.h, tools/setup: Sync with the latest Gnulib code (177f525) + + Signed-off-by: Thomas Guyot-Sionnest + +2010-04-13 Holger Weiss + + * plugins/check_ntp_peer.c: Fix typo + +2010-04-12 Holger Weiss + + * contrib/check_linux_raid.pl: Fix Debian bug #574612: Return WARNING on + rebuild + + Let check_linux_raid return a WARNING instead of an OK state during + volume recovery. + + See: http://bugs.debian.org/574612 + + (Fixed by Christoph Martin, forwarded by Jan Wagner.) + + * contrib/check_linux_raid.pl: Fix Debian bug #534604: Checking md10 and + above + + | check_linux_raid malfunctions if system has software RAID devices with + | two or more digits. For example, for system having /dev/md10, + | /dev/md11 etc, the plugin returns 'UNKNOWN' in automatic mode (if RAID + | devices are manually specified it works). Also, if system has both + | one-digit, and two-digit RAID devices, the two-digit devices are + | silently ignored in checks, which is even more problematic. + + [ http://bugs.debian.org/534604 ] + + (Fixed by Matija Nalis, forwarded by Jan Wagner.) + + * NEWS, plugins-scripts/check_ircd.pl: Fix Debian bug #545940: Failure + when run via ePN + + If Perl's "shift" function is called outside of a subroutine and without + any argument, it usually shifts @ARGV. However, if a plugin is executed + via ePN, such a call will shift @_ instead, so we must explicitly + specify @ARGV for this to work as expected. + + This fixes Debian bug #545940, see: http://bugs.debian.org/545940 + + Commit de7191e3424e02ba278a39b86e8b1906a25d0362 fixed the same issue for + check_disk_smb. + + (Reported by Hendrik Jaeger, forwarded by Jan Wagner.) + +2010-04-11 Holger Weiss + + * NEWS, plugins/check_radius.c: Fix Debian bug #482947: No + --nas-ip-address option + + | check_radius doesn't seem to provide any way to modify the + | NAS-IP-Address attribute that it uses in the packets it sends, but it + | does so for NAS-Identifier. + | + | Instead, it hardcodes the IP address that it gets from the + | rc_own_ipaddress() library call, and that in turn translates into + | calling gethostbyname() on the result of uname(). This call can easily + | fail, and its result can easily be unsuitable - for example when the + | Nagios instance uses its own virtual host, and you don't want the + | original system hostname leaked to the RADIUS servers you monitor with + | this. + | + | Furthermore, this behaviour is inconsistent with RFC 2865, which + | defines the two attributes as analogous and never suggests hardcoding + | the value of either of them in client software. + + Therefore, this commit adds the "-N, --nas-ip-address" option which + allows for specifying the value of the NAS-IP-Address attribute. + + | I've also noticed that the original code for NAS-IP-Address hardcoding + | is broken in its error handling - it does "return (ERROR_PC)", which + | is meaningless in the context of check_radius.c. That actually seems + | to be copy&waste from radiusclient-0.3.2/src/radexample.c. :) I fixed + | that. + | + | While debugging, I also took the opportunity to decouple the + | nas-identifier rc_avpair_add() instance from the initial three, + | because this is just bad practice to lump a fourth optional attribute + | into the same block with the required attributes, the error handling + | for which is throwing the same daft message "Out of Memory?"... + + [ http://bugs.debian.org/482947 ] + + (Contributed by Josip Rodin, forwarded by Jan Wagner.) + + * NEWS, plugins/check_ldap.c: Fix Debian bug #479984: Allow empty LDAP + base + + The check_ldap plugin did not allow for specifying an empty LDAP base. + + See: http://bugs.debian.org/479984 + + (Fixed by Stephane Chazelas, forwarded by Jan Wagner.) + + * plugins/check_http.c: Fix Debian bug #460097: check_http -M broken + + See: http://bugs.debian.org/460097 + + One instance of this bug has already been fixed in commit + 888358122004b9571c8fbdfa52ceee1ba5e5f4f2. + + (Fixed by Hilko Bengen, forwarded by Jan Wagner.) + + * plugins-scripts/check_disk_smb.pl: Fix Debian bug #478942: Fragile + argument passing + + Fix some problems regarding the way check_disk_smb passes command line + arguments to smbclient(1). + + | It runs: + | + | $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup \ + | -U $user $smbclientoptions -I $address -c ls/; + | + | [...] + | + | The documentation says that if the password is not passed, it + | defaults to "". That is not true above, as $pass expands to + | nothing which leaves no argument at all (instead of an empty + | argument) so is different from providing with an empty password + | or with the -N option. + | + | Also, if the password starts with "-", you're in trouble, that's + | why -U $user%$pass may be prefered. + | + | Also, the doc says that if $user is not provided, then it + | defaults to "guest" but the problem is that if it is provided + | but empty, it is changed to "guest" as well, which prevents us + | from querying hosts that don't do user authentication. + + [ http://bugs.debian.org/478942 ] + + (Fixed by Stephane Chazelas, forwarded by Jan Wagner.) + + * NEWS, THANKS.in, plugins-scripts/check_disk_smb.pl: Fix Debian bug + #478906: Failure when run via ePN + + | When perl plugin scripts are run with the embedded perl interpreter in + | nagios3, the "shift" perl command doesn't shift @ARGV, but @_ (which + | happens to contain the same thing as @ARGV at the time the script was + | started). + | + | [...] + | + | A fix is to replace all the instances of "shift" with "shift @ARGV". + + [ http://bugs.debian.org/478906 ] + + (Fixed by Stephane Chazelas, forwarded by Jan Wagner.) + + * THANKS.in, plugins/check_ldap.c: Fix Debian bug #463322: Use + deprecated libldap API + + | Our automated build log filter[1] detected a problem that is likely to + | cause your package to segfault on architectures where the size of a + | pointer is greater than the size of an integer, such as ia64 and + | amd64. + | + | This is often due to a missing function prototype definition. For + | more information, see [2]. + | + | Function `ldap_init' implicitly converted to pointer at + | check_ldap.c:124 + | + | [1] http://people.debian.org/~dannf/check-implicit-pointer-functions + | [2] http://wiki.debian.org/ImplicitPointerConversions + | + | The libldap API has been updated and many functions used by the ldap + | plugin are now deprecated. This package should either update to the + | new API or define LDAP_DEPRECATED to continue using the deprecated + | interfaces. + | + | This patch implements the lazy solution. + + [ http://bugs.debian.org/463322 ] + + (Contributed by Dann Frazier, forwarded by Jan Wagner.) + + * NEWS, THANKS.in, plugins-scripts/check_disk_smb.pl: Fix Debian bug + #425129: SMB guest mode won't work + + | The check_disk_smb plugin purports to support guest users, but it + | doesn't work out, because it doesn't specify the -N command line + | option to smbclient when no password is specified, making smbclient + | stop and ask. + + [ http://bugs.debian.org/425129 ] + + (Fixed by Josip Rodin, forwarded by Jan Wagner.) + + * plugins/check_game.c: Fix Debian bug #307905: Incorrect usage output + + The usage output of check_game was wrong, see: + + http://bugs.debian.org/307905 + + (Fixed by Sean Finney, forwarded by Jan Wagner.) + + * NEWS, plugins-scripts/check_disk_smb.pl: check_disk_smb: Allow for + specifying an IP address + + Add the "-a, --address option" which allows for specifying the IP + address of the server to connect to. If this option is used, the IP + address will be handed over to smbclient(1)'s "-I" option. (Contributed + by Sean Finney, forwarded by Jan Wagner.) + +2010-04-06 Thomas Guyot-Sionnest + + * NEWS: check_http: Add warning about SNI not enabled by default anymore + +2010-04-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_http.c: Fix regression in check_http ssl checks on + some servers + + The fix is making SNI an option. + +2010-03-31 Thomas Guyot-Sionnest + + * plugins/check_snmp.c: check_snmp: Update last patch to copy value + verbatim + + Rework last patch, copying the converted portion of the string rather + than re-converting it. This is safer for backwards-compatibility as the + value is never modified. + +2010-03-30 Thomas Guyot-Sionnest + + * NEWS, plugins/check_snmp.c: check_snmp: Fix regression introduced in + #1867716 + + Bug #1867716 fixed what it meant to fix: broken perfdata strings. + Unfortunately some users relied on half-broken perfdata string where at + least the first token was OK. This patch do a two-way conversion + (string to double then back to string) instead and use the conversion + result for the performance data. + + A possible caveat is that the string may change where it normally + shouldn't but the result should be somewhat similar. + +2010-03-27 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_ide_smart.c: Fix compilation with GCC + 2.96 (Konstantin Khomoutov - #2977105) + +2010-03-18 Holger Weiss + + * NEWS, plugins/check_ntp_peer.c, plugins/t/check_ntp.t: Let + check_ntp_peer check the number of truechimers + + Add support for checking the number of usable time sources (i.e., the + number of peers which are classified as so-called "truechimers" by NTP's + intersection algorithm). The new "-m" and "-n" options allow for + specifying the according WARNING and CRITICAL thresholds (and thereby + activating the truechimers check), respectively. + +2010-03-16 Thomas Guyot-Sionnest + + * NEWS: Typo in NEWS + +2010-03-15 Ton Voon + + * doc/developer-guidelines.sgml: Corrected example + +2010-02-26 Ton Voon + + * NEWS, THANKS.in, plugins/check_http.c: Fix memory leak in check_http + for large pages (Jimmy Bergman - #2957455) + +2009-12-07 Holger Weiss + + * tools/git-notify, tools/git-post-receive-hook: git-notify: Pipe + e-mails directly to sendmail(8) + + Use sendmail(8) instead of mail(1) in order to be able to set the + "Content-Type" header field on systems where the available mail(1) + command doesn't allow for setting it. This makes the "-H" flag (cf. + commit 71350c5a) unnecessary. + +2009-12-06 Holger Weiss + + * tools/git-notify, tools/git-post-receive-hook: Enable CIA's commit + notifications + + We now use CIA's service to send commit notifications to IRC. They are + currently sent to the #Nagios-Devel channel on Freenode. See: + + http://cia.vc/stats/project/nagiosplug/ + http://cia.vc/account/bots/15699/ + +2009-12-04 Thomas Guyot-Sionnest + + * NEWS, configure.in: Detect arguments passed via --with-ping[6]-command + (#2908236) + + * configure.in: Whitespace fixes + +2009-12-02 Thomas Guyot-Sionnest + + * plugins/check_http.c: Fix short help using "warn" for the -f option + instead of "warning" (onredirect). + +2009-11-19 Ton Voon + + * tools/sfsnapshot-upload: Updated link to sfsnapshotgit + +2009-11-18 Thomas Guyot-Sionnest + + * doc/developer-guidelines.sgml: Update developer guideline regarding + CVS Commits + (mostly for testing my snapshot script, though it had to be updated anyway) + +2009-11-11 Thomas Guyot-Sionnest + + * tools/sfsnapshotgit: Fix fetching of remote branches + +2009-11-11 dermoth + + * tools/sfsnapshot-upload, tools/sfsnapshotgit: Many fixes to snapshot + scripts + + sfsnapshotgit: + - Use fetch/reset instead to pull to avoid merges on forced updates + + sfsnapshot-upload: + - Fix link deletion walking the entire home dir + - Allow CLEAN_TIME=0 (no retention) + - Re-add per-branch links when CLEAN_TIME > 0 + - Add many comments + +2009-11-07 Holger Weiss + + * tools/git-post-receive-hook, tools/git-update-mirror: Git commit + notifications via post-receive hook + + Now that we moved our Git repositories to SourceForge, we don't need to + maintain local clones for generating commit notifications anymore, as + SourceForge provides shell access to the repositories. Instead, we now + run git-notify as a post-receive hook on the SourceForge server. + Actually, we use a wrapper which executes git-notify with the desired + options and which makes it easy to add other post-receive hooks in the + future. + + * tools/git-notify: git-notify: Support SourceForge repositories + + The Gitweb URLs for repositories hosted by SourceForge are slightly + different than other Gitweb URLs. The correct URL cannot be specified + via "-u" if we append "/$repos_name.git/?" to that URL as we usually do. + If the new "-S" flag is specified or "notify.sourceforge" is set, we'll + append "/$repos_name;" instead, which makes the "-u" option usable for + SourceForge repositories. + + * tools/git-notify: git-notify: Optionally call mail(1) without "-a" + + Not all mail(1) implementations support specifying additional header + fields via "-a": with some, this flag is used for attaching files, + others don't provide an "-a" flag at all (this is true for the /bin/mail + utility currently installed on the SourceForge servers, for example). + We now provide the "-H" flag and the "notify.legacyMail" configuration + key for these cases. + + * tools/git-notify: git-notify: Polish up the "tag notifications" + + Use better labels for the tag ref and the SHA1 name of the tag object. + + * tools/git-notify: git-notify: Distinguish between tag types + + Distinguish between annotated tags and lightweight tags. In the former + case, send an annotated "tag notification", in the latter case, send a + "ref change notification" (as we did in both cases before). + + * tools/git-notify: git-notify: Fix "global" notifications + + If the number of commits included with a single push exceeds the maximum + specified via "-n", a single notification will be generated instead of + individual e-mails. For listing the commits within such a notification, + git-rev-list(1)'s "--pretty" option is used. This yields output which + the git_rev_list() subroutine didn't accept. That's now fixed. + + * tools/git-notify: git-notify: Optionally [tag] the subject + + If the new "-T" option is specified or "notify.emitRepository" is set, + the subject of e-mail notifications will be prefixed with [], where + is the name of the updated repository. + + * tools/git-notify: git-notify: Optionally omit the author name + + If the new "-A" option is specified (or "notify.omitAuthor" is set), the + author name will be omitted from the subject of e-mail notifications. + + * tools/git-notify: git-notify: Make abbreviating Gitweb URLs optional + + The SHA1 object name part of Gitweb URLs is now only shortened if the + user requested this by specifying the new "-z" option (or by setting + "notify.shortURLs"). + + While at it, also shorten the additional URL which references a diff in + e-mail notifications which don't include that diff inline because its + size exceeds the maximum number of bytes specified via "-s". + + Note that while the abbreviated SHA1 object names will be unique at push + time, this cannot be guaranteed for the future, so the shortened URLs + might break some day. + + * tools/git-notify: git-notify: Make showing the committer optional + + Only the author's name and address will now be mentioned in a commit + notification by default. However, if the "-C" option is specified (or + "notify.showCommitter" is set), the committer's name and address will + also be included in the notification if the committer is not the author + of the commit (as we previously did by default). + + * tools/git-notify: git-notify: Make using a state file optional + + Making use of a state file in order to prevent duplicate notifications + is now optional. The user must explicitly specify a file path via the + "-t" option or by setting the git-config(1) variable "notify.statefile" + to activate this functionality. + + * tools/git-notify: git-notify: Don't abort if mail(1) exits non-zero + + As nothing in git-notify depends on the success of the mail(1) call, + don't abort if it fails, just spit out a warning. + + * tools/git-notify: git-notify: Drop the $sent_notices variable + + Now that we don't ignore empty commits anymore, there's no need to keep + track of the number of commits actually notified about, as that will + always be equal to the number of commits returned by get_new_commits(). + + * tools/git-notify: Revert "git-notify: Ignore `empty' commits" + + This reverts commit db63fbfa036f5cd757aedf4547fef9e195a8c285, as it is + no longer needed and we'd like to keep the diff against the git-notify + version maintained by the Wine people as small as possible. The purpose + of db63fbfa was to suppress notifications on empty merge commits, which + can now be requested directly by specifying git-notify's "-X" option. + (Our change was implemented before the "-X" option was available, even + though the Git history suggests otherwise.) + + Conflicts: + + tools/git-notify + + * tools/git-notify: Revert "git-notify: Remove unused [...] code" + + This reverts commit 5445b9769f254781e482062bacc6603a5cd63059. Alexandre + Julliard pointed out that the code in question was used if git-notify + was explicitly called with the SHA1 name of an annotated tag object. At + the moment, the code in question actually _is_ unused due to later + modifications, but it wasn't at the time 5445b976 was committed, and + we'll add further changes so that the code will be used again in the + future. + + Conflicts: + + tools/git-notify + +2009-11-06 Holger Weiss + + * tools/git-notify: git-notify: Minor cosmetic changes + + Fix the description of the "-U" option. + +2009-10-25 Thomas Guyot-Sionnest + + * tools/sfsnapshot-upload: Allow rsyncing to local paths + + * tools/sfsnapshot-upload: Add snapshots upload scripts + +2009-10-26 Holger Weiss + + * tools/git-notify: git-notify: Make the state file group writable + + For shared repositories, the state file used by git-notify should + usually be group writable, so we now set the umask to 0002 by default. + This can be adjusted by setting the "notify.umask" configuration key or + by using the "-U" option on the command line. + + * tools/git-notify: git-notify: Remove an empty subroutine + + The gitweb_url() subroutine was an unused and empty hangover. + +2009-10-25 Holger Weiss + + * tools/git-update-mirror: git-update-mirror: Remove a useless sed(1) + call + + The sed(1) command in question was a hangover which had no effect + anymore. + +2009-10-24 Holger Weiss + + * tools/git-notify: git-notify: Check the exit status of pipes + + Properly check the exit status of all processes we execute and abort on + error. + + * tools/git-notify: git-notify: Handle non-UTF-8 commits + + Make sure that commit messages which use an encoding other than US-ASCII + or UTF-8 are handled correctly. Also, assume that the diff contents use + the same encoding as the commit message. This assumption may well be + wrong, but that's the best we can do. + + * tools/git-notify: git-notify: Don't generate duplicate notifications + + Never notify on a given commit more than once, even if it's referenced + via multiple branch heads. We make sure this won't happen simply by + maintaining a list of commits we notified about. The file path used for + saving this list can be specified using the new "-t" option. (The + contrib/hooks/post-receive-email script distributed with Git tries hard + to avoid such a list, but it doesn't get the necessary magic right.) + + * tools/git-notify: git-nofity: Try to shorten Gitweb URLs + + Instead of using the full SHA1 values of commit object names within + Gitweb URLs, try to abbreviate them to a shorter unique name. + + * tools/git-notify: git-notify: Move the Gitweb URL to the bottom + + In commit notifications, specify the Gitweb URL (if any) at the bottom + of the ASCII "table" which summarizes the commit. That looks better. + + * tools/git-notify: git-notify: Truncate summary after 50 characters + + If the first line of a commit message is longer than 50 characters, + truncate it before adding the resulting string to the subject line of a + notification. This makes sure the subject line won't get too long + (unless the commit author name is unusually long, which we don't check). + The Git User's Manual recommends keeping the first line of a commit + message shorter than that, anyway: + + | Though not required, it's a good idea to begin the commit message with + | a single short (less than 50 character) line summarizing the change, + | followed by a blank line and then a more thorough description. Tools + | that turn commits into email, for example, use the first line on the + | Subject line and the rest of the commit in the body. + + [ http://www.kernel.org/pub/software/scm/git/docs/user-manual.html ] + + * tools/git-notify: git-notify: Send notifications on ref changes, too + + Do not only generate notifications on commits, but also if a branch head + or lightweight tag was created, removed, or modified. Notifications on + branch head updates are omitted if one or more commit notification have + been generated and the branch head now references a descendant of the + originally referenced commit (which should be the usual case). + + * tools/git-notify: git-notify: Call git-rev-list(1) via a subroutine + + Add a subroutine which abstracts away executing git-rev-list(1) and + checking the result in order to avoid code duplication. + + * tools/git-notify: git-notify: Mention the committer where applicable + + If the committer is not the author of the commit, mention the committer + in addition to the author. + + * tools/git-notify: git-notify: New subroutine for column alignment + + Most notifications include an ASCII "table" with two columns. The + formatting of these columns is now handled by the new format_table() + subroutine, so that the alignment can easily be changed in the future. + + * tools/git-notify: git-notify: Ignore "empty" commits + + Omit notifications regarding commits which don't change the tree + whatsoever. + + * tools/git-notify: git-notify: Remove unused tag notification code + + The code which handles notifications regarding tags was unused, as only + objects listed by git-rev-list(1) are considered, and git-rev-list(1) + never spits out the sha1 of a tag object. + + * tools/git-notify: git-notify: Save author without trailing space + + Adjust the regular expression which catches the commit author name so + that it doesn't include the space character which follows that name. + + * tools/git-notify, tools/git-update-mirror: Import git-update-mirror + and git-notify + + Import the (self-written) git-update-mirror script, which updates clones + of Git repositories and then calls git-notify (in just the same way as a + post-receive hook would be called by Git). The git-notify script is + imported from git://source.winehq.org/git/tools.git (commit: 03d66f34) + and generates notifications on repository changes. We'll use these + scripts for generating our commit e-mails. + +2009-10-22 Thomas Guyot-Sionnest + + * NEWS, plugins/check_snmp.c, plugins/t/check_snmp.t: Fix usage of + repeated -o options in check_snmp + +2009-10-15 Thomas Guyot-Sionnest + + * plugins-root/check_icmp.c: Set proper network byte order for icmp_id + and icmp_seq in icmp packets + +2009-10-14 Thomas Guyot-Sionnest + + * NEWS, plugins-root/check_icmp.c: Increment per-host sequence in + check_icmp + +2009-09-26 Thomas Guyot-Sionnest + + * tools/sfsnapshotgit: Change default for SFSNAP_DEST + + * tools/sfsnapshotgit: Correcting name and email address + + * tools/sfsnapshotgit: Enhancements to tools/sfsnapshotgit + +2009-09-25 Thomas Guyot-Sionnest + + * configure.in: Using $srcdir is the proper way to go + +2009-09-25 nagiosplugins + + * tools/sfsnapshotgit: Add sfsnapshotgit + + * configure.in, plugins-root/Makefile.am, plugins-scripts/Makefile.am, + plugins/Makefile.am: Allow custom versions with the release file... + +2009-09-24 Ton Voon + + * NEWS, doc/developer-guidelines.sgml: Updated documentation re: no + equals sign and single quote + + * NEWS: Updated NEWS file with docs changes + +2009-09-23 Thomas Guyot-Sionnest + + * NEWS: Test, again + + * NEWS: Test + +2009-09-21 Thomas Guyot-Sionnest + + * NEWS, THANKS.in: Oops - wrong author/bug in last commit! + + * NEWS, THANKS.in, plugins/check_http.c: Add proxy-authorization option + to check_http (Peter Doherty - #2863772, Bryan Irvine - #2863925) + +2009-09-19 Thomas Guyot-Sionnest + + * NEWS, plugins-scripts/check_ircd.pl: Fix check_ircd binding to wrong + interface (#668778) + + * doc/RELEASING: Update RELEASING document with proper tag creation and + push commands + +2009-09-16 Ton Voon + + * BUGS, ChangeLog, NEWS, NP-VERSION-GEN, configure.in, package.def: Prep + for 1.4.14 release + +2009-09-14 Ton Voon + + * plugins-root/pst3.c: Ensure dirhandle is closed (Duncan Ferguson) + +2009-09-11 Ton Voon + + * plugins/t/check_snmp.t: Fix skip number + +2009-09-05 Thomas Guyot-Sionnest + + * plugins/tests/check_snmp.t: Add a test that succeeds on check_snmp + v1.4.13. Newer versions skip additional + lines so this new test fails on the current head. + + Note: check_snmp v1.4.13 with multi-line strings return somewhat v3 output; + it's not exactly what the specs say but it doesn't appears to break them + either. The fix could eventually supports both v2 and v3 output formats. + +2009-08-05 Thomas Guyot-Sionnest + + * plugins/check_snmp.c: Fix segfault in check_snmp (definitive fix is + still in the works - see bug #2832451) + +2009-07-31 Thomas Guyot-Sionnest + + * plugins/check_snmp.c: Fix check_snmp passing single-quotes as -m + argument when it should be empty + + * plugins/check_snmp.c, plugins/t/check_snmp.t: check_snmp: Add some + verbose output and tests + + * plugins/tests/check_snmp.t, plugins/tests/check_snmp_agent.pl, + plugins/tests/conf/snmpd.conf: Add tests using custom snmp agent + + Only multi-line string test for now (regression test), counter rollover + tests planed with my snmp_counters_new branch. + + NB: 64bit counters are broken in NetSNMP::agent from NetSNMP version 5.4.1 + and lower, but might come in handy one day + + * plugins/t/check_snmp.t: Fix check_snmp Timetick test with <1 day + uptime + +2009-07-23 Thomas Guyot-Sionnest + + * doc/RELEASING: Add accidentally removed line plus a note about the web + copy + + * doc/RELEASING: Merge changes from web + +2009-07-17 Ton Voon + + * doc/developer-guidelines.sgml: Updated links for exchange.nagios.org + +2009-07-14 Ton Voon + + * NEWS, THANKS.in, plugins-root/pst3.c: pst3 compile with Sun Studio + Compiler + +2009-06-22 Ton Voon + + * plugins/check_cluster.c: Added example for check_cluster to alert if + more than X non-OK states + +2009-06-16 Matthias Eble + + * NPTest.pm: Switch back to "use Test" and plain prints instead of + diag() + + * NPTest.pm: Tinderbox output testing commit + +2009-06-15 Matthias Eble + + * NPTest.pm, test.pl.in: Make output of "make test" more verbose + + This is intended to make error fixing based on tinderbox output + easier. + +2009-06-14 Matthias Eble + + * plugins-root/check_icmp.c: Fixed error in rtt/rta calculation in case + of system clock problems + + Time differences are now set to 0 in case of backward timejumps so there are no wrap-around problems any more. + The RTA calculation hopefully gets a more accurate value in these cases also. + +2009-06-13 Matthias Eble + + * plugins-scripts/t/check_ifoperstatus.t, + plugins-scripts/t/check_ifstatus.t, plugins/t/check_snmp.t: Fixed + testcases for check_snmp, check_ifstatus and check_ifoperstatus when no + snmp community is specified + + The checks for invalid/unavailable hosts need a complete command line. + They failed on hosts where no community was specified. Now, an invalid community is used so + the tests can run on hosts w/o snmp host/community in NPTest.cache. Execution will fail anyway. + + * plugins-scripts/t/check_ifoperstatus.t, + plugins-scripts/t/check_ifstatus.t: Further test parameters and skip + blocks for check_ifoperstatus.t. getTestparam changes for + check_ifstatus.t and ifoperstatus.t + + Added snmp_interface and snmp_ifxtable test parameters to check_ifoperstatus.t. + Also getTestParameter calls for both plugins were converted to use three arguments + instead of undocumented >3 arg behaviour which led to redundant data in NPTest.cache. + +2009-06-11 Matthias Eble + + * NEWS, plugins-scripts/check_ifoperstatus.pl: renamed + check_ifoperstatus' newly introdced -x to -P so it fits check_ifstatus + + check_ifstatus already used -x so both plugins can use same short option, now. + to specify privacy protocol. + + * NEWS, plugins-scripts/check_ifstatus.pl, + plugins-scripts/t/check_ifstatus.t: Fixed SNMPv3 behaviour of + check_ifstatus. Added -P to define privprotocol (#2343438 - Robin + Schroeder) + + check_ifstatus didn't function correctly with SNMPv3. This is fixed now. + Created argument-hash for SNMP session creation. This removes redundant code. + Session creation was moved out of process_arguments() and now takes place + after setting the timeout handler. + + Additionally the -P argument was added to specify the privprotocol. + + * plugins-scripts/t/check_ifoperstatus.t: Added testcases for + check_ifoperstatus + + Added testcases for check_ifoperstatus. No SNMPv3 testing + included for now. + + * plugins-scripts/check_ifoperstatus.pl: minor fixes to + check_ifoperstatus + + Minor output fixes for check_ifoperstatus. + Fixed typo so that -n now implies -I as documented. + +2009-06-10 Thomas Guyot-Sionnest + + * lib/extra_opts.h, lib/tests/test_opts1.c, lib/tests/test_opts2.c: Use + a more "natural" way of writing argument lists in extra-opts tests. + +2009-06-11 Matthias Eble + + * NEWS, plugins-scripts/check_ifoperstatus.pl: check_ifoperstatus is now + more user friendly in case of missing arguments + + Added proper usage messages in case of missing arguments. + Removed accidently committed Data::Dumper call. + Minor whitespace fixes. + + * plugins-scripts/check_ifoperstatus.pl: Whitespace and indent fixes for + check_ifoperstatus + + * NEWS, plugins-scripts/check_ifoperstatus.pl: Fixed SNMPv3 behaviour of + check_ifoperstatus. Added -x to define privprotocol (#2343438 - Robin + Schroeder) + + check_ifoperstatus didn't function correctly with SNMPv3. This is fixed now. + Created argument-hash for SNMP session creation. This removes redundant code. + Session creation was moved out of process_arguments() and now takes place + after setting the timeout handler. + + Additionally the -x argument was added to specify the privprotocol. + +2009-06-02 Holger Weiss + + * THANKS.in, lib/utils_base.c: Fix the memory allocation for the + thresholds data + + Allocate the appropriate amount of memory for storing the thresholds + data. Before, we allocated the amount of memory required for storing a + _pointer_ to the thresholds data. This crashed (at least) check_mysql + when using its "-S" option on FreeBSD/amd64 (as reported and analyzed by + Nikita Kalabukhov - 2797757). + + Signed-off-by: Holger Weiss + + * plugins-root/check_icmp.c: Don't use the plain char type for data + buffers + + Buffers which are used for holding arbitrary data should be referenced + using pointers to void and accessed using pointers to unsigned char. + + Signed-off-by: Holger Weiss + +2009-06-01 Matthias Eble + + * plugins/check_pgsql.c: Whitespace indent fixes for check_pgsql + + * plugins-root/check_icmp.c: Fixed check_icmp compiler warnings by + including float.h + + Self defined DBL_MAX caused compiler warnings. Now float.h + which defines DBL_MAX is included. + + * plugins-root/check_icmp.c: Fixed --help output for warn and critical + thresholds (sf.net #2796624, debian #530553) + + check_icmp wrongly calculated the current thresholds in --help output. + + * plugins/check_pgsql.c: Added verbose output to check_pgsql (#2799281 - + Jun Kuriyama) + + check_pgsql displayed the -v flag in help output, but didn't + accept the verbosity argument. Added -v and basic verbose output. + + * NEWS, plugins/check_fping.c: check_fping now supports passing target + timeout and interval to fping (#2347686 - Martin Foster) + + Added support for passing timeout and interval length to check_fping. + To protect compatibility, both options use fping's defaults if they + are not specified on the command line. + +2009-05-27 Thomas Guyot-Sionnest + + * NEWS, lib/utils_base.h, plugins/check_snmp.c, plugins/t/check_snmp.t: + check_snmp: Make use of standard threshold functions + + This patch makes use of standard threshold functions. This allows using + doubles as thresholds. + + Since SNMP supports only integers, double precision numbers are only + printed when parsed from a STRING type. + + In addition, support for printing properly Timeticks type has been added, + and the code has been thoroughly cleaned. + + * plugins/check_snmp.c: Fix whitespaces in check_snmp + +2009-05-26 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/Makefile.am, plugins/check_by_ssh.c: Fix + check_by_ssh interpretation of quotes in -C parameter (#1985246, + #2268675) + +2009-05-22 Matthias Eble + + * NEWS, plugins/check_mrtgtraf.c: Fixed wrong perfdata label for output + traffic in check_mrtgtraf + + check_mrtgtraf used the label "in" for both input and output traffic. + This fixed, now. + + * plugins/check_smtp.c: Removed -n option in check_smtp's help and usage + output (#2782784) + + Check_smtp's help showed the -n/--nocommand options to not send an + SMTP command. This usage is covered by check_tcp and is thus not needed + in check_smtp. + +2009-05-20 Thomas Guyot-Sionnest + + * plugins/sslutils.c: Whitespace changes only + + * NEWS, THANKS.in, plugins/check_http.c, plugins/netutils.h, + plugins/sslutils.c: check_http: Add SSL/TLS hostname extension support + (SNI) - (#1939022 - Joe Presbrey) + + * NEWS, THANKS.in, plugins-scripts/subst.in: Fix awk subst.in/subst + script path error (#2722832 - Martin Foster) + + * NEWS, THANKS.in, plugins/check_mysql.c, plugins/check_mysql_query.c: + Fix check_mysql* not using password set in my.cnf (#2531905 - Ben Timby) + +2009-05-20 Holger Weiss + + * gl/Makefile.am, gl/alignof.h, gl/arpa_inet.in.h, gl/c-strtod.c, + gl/c-strtod.h, gl/config.charset, gl/dup-safer.c, gl/fd-safer.c, + gl/fsusage.c, gl/gai_strerror.c, gl/getloadavg.c, gl/getopt1.c, + gl/gettext.h, gl/localcharset.c, gl/m4/00gnulib.m4, gl/m4/btowc.m4, + gl/m4/c-strtod.m4, gl/m4/errno_h.m4, gl/m4/extensions.m4, + gl/m4/fcntl_h.m4, gl/m4/floorf.m4, gl/m4/gnulib-common.m4, + gl/m4/gnulib-comp.m4, gl/m4/include_next.m4, gl/m4/inet_ntop.m4, + gl/m4/lib-link.m4, gl/m4/lib-prefix.m4, gl/m4/locale-fr.m4, + gl/m4/locale-ja.m4, gl/m4/locale-zh.m4, gl/m4/mbrtowc.m4, + gl/m4/mktime.m4, gl/m4/multiarch.m4, gl/m4/printf.m4, gl/m4/regex.m4, + gl/m4/stdint.m4, gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, gl/m4/strdup.m4, + gl/m4/sys_socket_h.m4, gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, + gl/m4/wchar.m4, gl/m4/wcrtomb.m4, gl/math.in.h, gl/mbrtowc.c, + gl/mountlist.c, gl/regex_internal.h, gl/stdint.in.h, gl/stdio.in.h, + gl/stdlib.in.h, gl/strdup.c, gl/strerror.c, gl/sys_socket.in.h, + gl/unistd.in.h, gl/vasnprintf.c, gl/wchar.in.h, gl/xmalloc.c: Sync with + the latest Gnulib code (cb75dc5) + + Signed-off-by: Holger Weiss + +2009-05-19 Chris Pepper + + * plugins/check_ups.c, plugins/urlize.c: Fix a few minor typos + + Signed-off-by: Holger Weiss + +2009-05-19 Holger Weiss + + * doc/developer-guidelines.sgml: Talk about Git instead of CVS + + Update the Developer Guidelines to reflect the fact that our development + is done using Git instead of CVS these days (as noted by Chris Pepper on + the "nagiosplug-devel" list). + + While at it, apply another few minor cleanups. + + Signed-off-by: Holger Weiss + + * doc/developer-guidelines.sgml: Remove comments regarding former + requirements + + Don't explain why Libtool and Gettext are no longer needed. Libtool + actually is a requirement, as (at least) the M4 macros provided by + Libtool are needed for our Autotools setup. And the fact that Gettext + is no longer needed probably isn't that interesting for new developers. + + Signed-off-by: Holger Weiss + +2009-05-07 Ton Voon + + * NEWS, THANKS.in, plugins/check_disk.c: Fixed typo in check_disk + +2009-05-01 Matthias Eble + + * NEWS, plugins/check_nt.c, plugins/tests/check_nt.t: Fixed crash from + check_nt when -H unspecified or given multiple times (sf.net #2731755, + debian #521097) + +2009-03-24 Thomas Guyot-Sionnest + + * NEWS, plugins/check_nt.c: check_nt: allow returning UNKNOWN on + timeouts (-u) + + * plugins/netutils.c, plugins/netutils.h: Make socket alarm handler + customisable (like c459ca07) + + * NEWS, THANKS.in, plugins/check_mysql.c: check_mysql: Fix segfault with + old slaves (#2696823 - Oskar Ahner) + + * plugins/check_nt.c: Whitespace and intend cleanup + +2009-03-21 Thomas Guyot-Sionnest + + * plugins/check_http.c: Update check_http short help with new stycky and + stickyport options. + + * plugins/check_http.c: check_http: die when an invalid --onredirect + option is specified + + * NEWS, plugins/check_http.c, plugins/tests/check_http.t: check_http: + add --onredirect=stickyport - also follow the same port + +2009-03-20 Thomas Guyot-Sionnest + + * .gitignore, gl/Makefile.am, gl/m4/gnulib-cache.m4, + gl/m4/gnulib-comp.m4, gl/m4/mktime.m4, gl/m4/time_h.m4, gl/m4/time_r.m4, + gl/m4/timegm.m4, gl/mktime.c, gl/time.in.h, gl/time_r.c, gl/timegm.c: + Add the timegm Gnulib module + + * NEWS, plugins/negate.c, plugins/t/negate.t: negate: make timeouts + configurable + + * plugins/utils.c, plugins/utils.h: Make alarm handler customisable + + * NEWS, plugins/negate.c: negate: Fix not printing the real timeout in + ALRM handler when timeout is left to default + + * plugins/tests/check_http.t: tests/check_http.t: Add various + timeout-related tests + +2009-03-19 Thomas Guyot-Sionnest thomas@aei.ca + + * NEWS, plugins/check_http.c: Fixed check_http not timing-out on + redirects + +2009-03-18 Thomas Guyot-Sionnest + + * plugins/sslutils.c, plugins/tests/check_http.t: Revert "Add timezone + support and fix checks around cert expiration" (keep the expiration fix) + + This reverts commit d41a33a434558189300113c28b26e2d3d681d390. + + * plugins/t/check_snmp.t: Add suggested multi-oid test (John A. Barbuto) + + * plugins/check_snmp.c: check_snmp: Fix potential buffer overflow - + enforce MAX_OIDS limit (John A. Barbuto) + + * tools/tinderbox_build: Fix logging of STDERR in tinderbox tests phase + +2009-03-17 Thomas Guyot-Sionnest + + * plugins/sslutils.c, plugins/tests/check_http.t: Add timezone support + and fix checks around cert expiration + +2009-03-17 Thomas Guyot-Sionnest + + * plugins/t/check_procs.t: Check for existence of pre-instaleld pst3 for + Solaris tests in t/check_procs.t + +2009-03-17 Thomas Guyot-Sionnest + + * NEWS, plugins/check_http.c: Fix check_http sending HTTP/1.0 with v1.1 + headers (#2638765) + +2009-03-16 Thomas Guyot-Sionnest + + * plugins/t/check_snmp.t: Fix check_snmp test on solaris + +2009-03-16 Thomas Guyot-Sionnest + + * plugins/tests/check_http.t: Update extended check_http tests for + 0d78171... + Also add some tests, and make debug mode loop infinitely. + + * plugins/check_http.c: check_http fixes: + - Fix broken printf on 500 errors + - Add bytes to normal output (accidentally removed in 0d78171) + + * plugins/check_snmp.c, plugins/t/check_snmp.t: check_snmp fixes: + - Fix broken compilation caused by typo in command ending + - Remove extra whitespaces at EOL + - Fix invalid host test on Ubuntu Hardy (and possibly others) + +2009-03-14 Ton Voon + + * plugins/check_snmp.c: Ignore stderr messages unless return code is + non-zero or there is no output + + * NEWS, THANKS.in, plugins/Makefile.am, plugins/check_snmp.c, + plugins/t/check_snmp.t: Fixed passing of quotes in OID for check_snmp + (#1985230 - Jan Wagner, patch by John Barbuto) + +2009-03-06 Ton Voon + + * plugins/tests/certs/expired-cert.pem, + plugins/tests/certs/expired-key.pem, plugins/tests/check_http.t: Create + expired cert for testing purposes. Updated tests to check + expired and unexpired certificates + +2009-03-05 Ton Voon + + * plugins/tests/certs/server-cert.pem, + plugins/tests/certs/server-key.pem, plugins/tests/check_http.t: Added + inline tests for HTTPS using HTTP::Daemon::SSL + +2009-02-24 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_snmp.c: check_snmp long help missing + retries entry (#2608223) + + Fix for check_snmp long help, reported by Richard Edward Horner + +2009-02-20 Ton Voon + + * po/fr.po: Updated string ids, due to typo fixes + + * plugins-scripts/check_mailq.pl, plugins/check_dns.c, + plugins/check_http.c, plugins/check_ldap.c, plugins/check_mysql.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_snmp.c, + plugins/check_tcp.c, plugins/check_ups.c: Typo fixes (Jan Wagner - SF + 1878971) + +2009-02-19 Ton Voon + + * NEWS, THANKS.in, plugins/check_nt.c, plugins/tests/check_nt.t: Fixed + coredump from check_nt when drive not found (Olli Hauer - SF 2179754) + +2009-02-06 Thomas Guyot-Sionnest + + * doc/RELEASING: Devel doc: NP-VERSION-GEN needs to be updated as well + + * NEWS: Small correction in NEWS entry + + * doc/LEAVERS, doc/NEW_STARTERS, doc/RELEASING: Update the devel notes + for Git + + * doc/LEAVERS, doc/NEW_STARTERS, doc/RELEASING: Revert "Moving project + administration documents to nagiosplugins.org site" + + This reverts commit f4a52594818e7c3634a397ac1f86ef87a68bd121. + +2009-02-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_http.c: check_http --onredirect=sticky follows + using the same IP address (sf.net #2550208). + +2009-02-03 Thomas Guyot-Sionnest + + * NEWS: Add NEWS entry for last commit + + * plugins/check_http.c: Fix aberrant behaviours in check_http: + + check_http used to ignore many parameters with check combinations - sometimes + even time thresholds(!!) + + With this commit as long as a response is received *all* checks are performed + on it. + + This fixes #1460312 plus a number of other issues I discovered over time. + +2009-01-26 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c, lib/utils_base.c, lib/utils_base.h, + plugins/check_ntp_peer.c: Make extract_value more generic: + + Add a separator argument passed using defines. + +2009-01-24 Thomas Guyot-Sionnest + + * lib/tests/test_ini1.c, lib/tests/test_opts1.c: Remove the commented + out blocks + + The die tests are implemented in the test_*3.t files + + * lib/tests/test_ini1.t, lib/tests/test_ini3.t: Fix paths in test_ini + tests + +2009-01-23 Thomas Guyot-Sionnest + + * .gitignore, configure.in, lib/tests/Makefile.am, + lib/tests/test_ini1.c, lib/tests/test_ini1.t, lib/tests/test_ini3.c, + lib/tests/test_ini3.t, lib/tests/test_opts3.t: Add die tests for + parse_ini + +2009-01-22 Thomas Guyot-Sionnest + + * lib/parse_ini.c, lib/tests/test_opts3.t: Return UNKNOWN if none of the + default files can be found. + + It makes no sense to return unknown if an implicit section is not found, but + go on if the file is missing + +2009-01-21 Thomas Guyot-Sionnest + + * .gitignore, configure.in, lib/tests/Makefile.am, + lib/tests/test_opts1.c, lib/tests/test_opts2.c, lib/tests/test_opts3.c, + lib/tests/test_opts3.t: Add die tests for extra-opts + +2009-01-19 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c, lib/utils_base.c, lib/utils_base.h, + plugins/check_ntp_peer.c: Move check_ntp's extract_value to + utils_base.c. + + This function can also be used to parse performance data strings which + could be useful in the future. + +2009-01-21 Thomas Guyot-Sionnest + + * .gitignore, lib/tests/test_opts1, lib/tests/test_opts2: Accidentally + included built executables - also updated .gitignore + +2009-01-20 Thomas Guyot-Sionnest + + * configure.in, lib/tests/Makefile.am, lib/tests/test_opts.t, + lib/tests/test_opts1, lib/tests/test_opts1.c, lib/tests/test_opts1.t, + lib/tests/test_opts2, lib/tests/test_opts2.c, lib/tests/test_opts2.t: + Some platform are missing setenv + + Instead of adding the gnulib module for solving tests only I split the test + in two, setting environment from Perl for the later. + + * lib/tests/Makefile.am: Fix (or try at least) for IRIX compile to tap + tests + + Gnulib says: "$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise" + Everywhere else we use LTLIBINTL so I assume the tests should use it as well. + + * plugins/t/check_users.t: Trick for check_users test without users + logged-in + +2009-01-19 Thomas Guyot-Sionnest + + * tools/tinderbox_build: Build extra-opts in tinderbox so they can be + tested + +2009-01-18 Thomas Guyot-Sionnest + + * lib/tests/Makefile.am: Re-apply "Cleanup; fix the way libraries are + linked; Make-It-Simple(tm)" + + This reverts commit 7449b16b1781c645751e2c05b93893e93630fb2a. + + * gl/wchar.in.h: Trying out new patch for IRIX 6.5 from Bruno Haible + + See: http://article.gmane.org/gmane.comp.lib.gnulib.bugs/16341 + + * gl/wchar.in.h: Revert "Trying out a patch for IRIX 11" + + This reverts commit d190c5d25865a7414eea4fe6409a94842fba220e. + +2009-01-16 Thomas Guyot-Sionnest + + * gl/wchar.in.h: Trying out a patch for IRIX 11 + + See: http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00098.html + +2009-01-15 Thomas Guyot-Sionnest + + * configure.in: Removing AC_FUNC_ALLOCA from configure.in (added in the + gnulib sync commit) + + I added AC_FUNC_ALLOCA because of a mistake on my part (which has been fixed + before the final commit). Removing it now. + + * lib/tests/test_disk.c: Typo + + * .gitignore, build-aux/config.rpath, configure.in, gl/Makefile.am, + gl/alloca.in.h, gl/arpa_inet.in.h, gl/base64.c, gl/base64.h, gl/btowc.c, + gl/config.charset, gl/errno.in.h, gl/fcntl.in.h, gl/float.in.h, + gl/gai_strerror.c, gl/getaddrinfo.c, gl/getaddrinfo.h, gl/gethostname.c, + gl/getloadavg.c, gl/getopt.c, gl/inet_ntop.c, gl/localcharset.c, + gl/m4/absolute-header.m4, gl/m4/alloca.m4, gl/m4/arpa_inet_h.m4, + gl/m4/btowc.m4, gl/m4/c-strtod.m4, gl/m4/codeset.m4, + gl/m4/double-slash-root.m4, gl/m4/eoverflow.m4, gl/m4/errno_h.m4, + gl/m4/extensions.m4, gl/m4/fcntl_h.m4, gl/m4/fsusage.m4, + gl/m4/getaddrinfo.m4, gl/m4/gethostname.m4, gl/m4/getloadavg.m4, + gl/m4/getopt.m4, gl/m4/gettext.m4, gl/m4/glibc2.m4, gl/m4/glibc21.m4, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, + gl/m4/gnulib-tool.m4, gl/m4/hostent.m4, gl/m4/iconv.m4, + gl/m4/include_next.m4, gl/m4/inet_ntop.m4, gl/m4/inline.m4, + gl/m4/intdiv0.m4, gl/m4/intldir.m4, gl/m4/intlmacosx.m4, + gl/m4/intmax.m4, gl/m4/intmax_t.m4, gl/m4/inttypes-pri.m4, + gl/m4/inttypes_h.m4, gl/m4/lcmessage.m4, gl/m4/lib-ld.m4, + gl/m4/lib-link.m4, gl/m4/lib-prefix.m4, gl/m4/localcharset.m4, + gl/m4/locale-fr.m4, gl/m4/locale-ja.m4, gl/m4/locale-zh.m4, + gl/m4/lock.m4, gl/m4/longlong.m4, gl/m4/ls-mntd-fs.m4, gl/m4/malloc.m4, + gl/m4/math_h.m4, gl/m4/mbrtowc.m4, gl/m4/mbsinit.m4, gl/m4/mbstate_t.m4, + gl/m4/mountlist.m4, gl/m4/multiarch.m4, gl/m4/netdb_h.m4, + gl/m4/netinet_in_h.m4, gl/m4/nls.m4, gl/m4/onceonly.m4, gl/m4/open.m4, + gl/m4/po.m4, gl/m4/printf-posix.m4, gl/m4/printf.m4, gl/m4/progtest.m4, + gl/m4/regex.m4, gl/m4/servent.m4, gl/m4/size_max.m4, gl/m4/snprintf.m4, + gl/m4/sockpfaf.m4, gl/m4/stdbool.m4, gl/m4/stdint.m4, gl/m4/stdint_h.m4, + gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, gl/m4/strdup.m4, gl/m4/strerror.m4, + gl/m4/string_h.m4, gl/m4/strndup.m4, gl/m4/strnlen.m4, + gl/m4/sys_socket_h.m4, gl/m4/threadlib.m4, gl/m4/uintmax_t.m4, + gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, gl/m4/visibility.m4, + gl/m4/vsnprintf.m4, gl/m4/wchar.m4, gl/m4/wchar_t.m4, gl/m4/wcrtomb.m4, + gl/m4/wctype.m4, gl/m4/wint_t.m4, gl/m4/write.m4, gl/m4/xsize.m4, + gl/math.in.h, gl/mbrtowc.c, gl/mbsinit.c, gl/netdb.in.h, + gl/netinet_in.in.h, gl/open-safer.c, gl/open.c, gl/regcomp.c, + gl/regex_internal.c, gl/regex_internal.h, gl/regexec.c, gl/snprintf.c, + gl/stdbool.in.h, gl/stdint.in.h, gl/stdio-write.c, gl/stdio.in.h, + gl/stdlib.in.h, gl/strdup.c, gl/streq.h, gl/strerror.c, gl/string.in.h, + gl/sys_socket.in.h, gl/unistd.in.h, gl/vasnprintf.c, gl/vasprintf.c, + gl/verify.h, gl/vsnprintf.c, gl/wchar.in.h, gl/wcrtomb.c, + gl/wctype.in.h, gl/write.c, gl/xalloc.h, gl/xmalloc.c, gl/xsize.h, + plugins/Makefile.am, plugins/netutils.h: Sync with gnulib + + * tap/tap.h: Clean up last commit - remove the __STDC_VERSION__ check in + tap.h + + HP-UX refuses to compile tap with the check for __STDC_VERSION__ >= 199901L + even though it can. + +2009-01-14 Thomas Guyot-Sionnest + + * tap/tap.h: Trying to see if HP-UX will compile without the + __STDC_VERSION__ check in tap.h + +2009-01-13 Thomas Guyot-Sionnest + + * lib/Makefile.am: Make /lib before /lib/tests to satisfy dependencies + (building tests fails on IRIX) + +2009-01-09 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c: Fix test from last commit + + * lib/tests/test_utils.c: basename check in test_utils.c was accidentaly + added again. + + In 538b97c I reverted a serie of libtap patch by Ton Voon; it included + the removal of the useless basename check. + + Relevant portion of the changelog from which it was removed (f31cd40): + + Removed basename test as we should use base_name from GNUlib which is + tested separately + + * lib/Makefile.am, lib/tests/Makefile.am: Revert "Cleanup; fix the way + libraries are linked; Make-It-Simple(tm)" + + Trying to see if this has any relation to the tinderbox failure. I doubt it + and will revert back as soon as it's tested. + + This reverts commit a97e5fbda21a05574b0e3c5a5118402ebfbbd13c. + +2009-01-08 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c: Try to make IRIX happy (this fixes a similar + warning in Solaris) + +2009-01-07 Thomas Guyot-Sionnest + + * lib/Makefile.am, lib/tests/Makefile.am: Cleanup; fix the way libraries + are linked; Make-It-Simple(tm) + + lib/Makefile.am | 2 +- + lib/tests/Makefile.am | 37 ++++--------------------------------- + 2 files changed, 5 insertions(+), 34 deletions(-) + +2009-01-06 Thomas Guyot-Sionnest + + * tools/git2svn.pl: git2svn: Use --add-author-from with "git set-tree" + + * tools/tinderbox_build: tinderbox_build: Add --enable-libtap configure + option + + * tools/tinderbox_build: tinderbox_build: Clarify comment + +2008-12-23 Ton Voon + + * plugins/check_snmp.c: Allow privproto to be passed through check_snmp + to snmpget. Defaults to DES + for compatibility + +2008-12-03 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_mrtg.c: check_mrtg: fix plugin + returning UNKNOWN instead of OK (bug #2378068) + +2008-12-02 Ton Voon + + * tools/sfsnapshot: Updated to latest due to SF policy changes + +2008-11-28 Thomas Guyot-Sionnest + + * .gitignore, Makefile.am, NEWS, configure.in, lib/tests/Makefile.am, + tap/Makefile.am, tap/README, tap/tap.3, tap/tap.c, tap/tap.h, + tap/tests/Makefile.am, tap/tests/README, tap/tests/diag/Makefile.am, + tap/tests/diag/test.c, tap/tests/diag/test.pl, tap/tests/diag/test.t, + tap/tests/fail/Makefile.am, tap/tests/fail/test.c, + tap/tests/fail/test.pl, tap/tests/fail/test.t, tap/tests/ok/Makefile.am, + tap/tests/ok/ok-hash/Makefile.am, tap/tests/ok/ok-hash/test.c, + tap/tests/ok/ok-hash/test.pl, tap/tests/ok/ok-hash/test.t, + tap/tests/ok/ok-numeric/Makefile.am, tap/tests/ok/ok-numeric/test.c, + tap/tests/ok/ok-numeric/test.pl, tap/tests/ok/ok-numeric/test.t, + tap/tests/ok/ok/Makefile.am, tap/tests/ok/ok/test.c, + tap/tests/ok/ok/test.pl, tap/tests/ok/ok/test.t, + tap/tests/pass/Makefile.am, tap/tests/pass/test.c, + tap/tests/pass/test.pl, tap/tests/pass/test.t, + tap/tests/plan/Makefile.am, tap/tests/plan/no-tests/Makefile.am, + tap/tests/plan/no-tests/test.c, tap/tests/plan/no-tests/test.pl, + tap/tests/plan/no-tests/test.t, tap/tests/plan/no_plan/Makefile.am, + tap/tests/plan/no_plan/test.c, tap/tests/plan/no_plan/test.pl, + tap/tests/plan/no_plan/test.t, + tap/tests/plan/not-enough-tests/Makefile.am, + tap/tests/plan/not-enough-tests/test.c, + tap/tests/plan/not-enough-tests/test.pl, + tap/tests/plan/not-enough-tests/test.t, tap/tests/plan/sane/Makefile.am, + tap/tests/plan/sane/test.c, tap/tests/plan/sane/test.pl, + tap/tests/plan/sane/test.t, tap/tests/plan/skip_all/Makefile.am, + tap/tests/plan/skip_all/test.c, tap/tests/plan/skip_all/test.pl, + tap/tests/plan/skip_all/test.t, + tap/tests/plan/too-many-plans/Makefile.am, + tap/tests/plan/too-many-plans/test.c, + tap/tests/plan/too-many-plans/test.pl, + tap/tests/plan/too-many-plans/test.t, + tap/tests/plan/too-many-tests/Makefile.am, + tap/tests/plan/too-many-tests/test.c, + tap/tests/plan/too-many-tests/test.pl, + tap/tests/plan/too-many-tests/test.t, tap/tests/skip/Makefile.am, + tap/tests/skip/test.c, tap/tests/skip/test.pl, tap/tests/skip/test.t, + tap/tests/todo/Makefile.am, tap/tests/todo/test.c, + tap/tests/todo/test.pl, tap/tests/todo/test.t: Add Libtap as a bundled + library (does not change any behaviour without --enable-libtap) + + Detects system library as pre-1.4.13 and does not install the built-in library anymore + + Tested on: + - Linux x86_64, with and without local libtap (System libtap installed) + - Linux x86, with and without local libtap (System libtap NOT installed) + - Solaris SPARC, with and without local libtap, with and without system libtap installed + + * Makefile.am, configure.in, external/README, + external/tap-1.01-nagios-plugins.tar.gz, lib/tests/Makefile.am, + lib/tests/test_all.t, lib/tests/test_base64.t, lib/tests/test_cmd.t, + lib/tests/test_disk.t, lib/tests/test_ini.t, lib/tests/test_opts.t, + lib/tests/test_tcp.t, lib/tests/test_utils.c, lib/tests/test_utils.t, + tools/setup: Revert inclusion of libtap into nagiosplugins + (except for the NEWS file) + + This reverts the following commits (latest first): f3e0909, 9f16b54, be8df51, f31cd40, 5270c7d, a25083f, f1bfe40, c503d85 and 6c476db + +2008-11-27 Thomas Guyot-Sionnest + + * tools/tinderbox_build: tinderbox: Don't alter SunOS path if we're + building off a repository tree + + SunOS make will work only out of snapshots and releases. + +2008-11-26 Thomas Guyot-Sionnest + + * plugins-root/Makefile.am, plugins-scripts/Makefile.am, + plugins/Makefile.am: Fixing build breakages (I totally forgot this rule + was there...) + + * NP-VERSION-GEN: Fix it for good now + + * NP-VERSION-GEN: Minor fix in NP-VERSION-GEN + + * Makefile.am, NP-VERSION-GEN, configure.in, plugins-root/Makefile.am, + plugins-scripts/Makefile.am, plugins/Makefile.am: Disable dynamic + versionning for releases, and allow generating version out of + subversion. + + This should be a definitive fix for systems with non-compilant make programs as the version will be taken from $(PACKAGE_VERSION) instead. + + At the same time I added code for generating svn-based version strings. + +2008-11-25 Thomas Guyot-Sionnest + + * plugins-root/Makefile.am, plugins-scripts/Makefile.am, + plugins/Makefile.am: Workaround to support more make programs + + Avoid the use of "-include". Since "include" is interpreted by Automake, we have to use a special macro instead. + + * plugins-scripts/Makefile.am: Exporting ENV vars from Makefile is + supported only with GNU Make. Use the shell instead. + +2008-11-24 Thomas Guyot-Sionnest + + * tools/distclean: No need to bailout on distclean failures + + * tools/tinderbox_build: Revert "tinderbox: Comment out additional PATH + conponent added for SunOS builds" + + This reverts commit 088452683cf881c6ed717cc559ca2eee3faa95ca. + +2008-11-23 Thomas Guyot-Sionnest + + * tools/tinderbox_build: tinderbox: Comment out additional PATH + conponent added for SunOS builds + + * plugins-root/Makefile.am, plugins-scripts/Makefile.am, + plugins/Makefile.am: Avoid the use of .PHONY (target s created twice and + I have no idea if it's right). + +2008-11-23 Thomas Guyot-Sionnest + + * .gitignore: Update .gitignore to include missing file/extention + + * .gitignore: Add .gitignore (Imported from svn:ignore) + +2008-11-23 Thomas Guyot-Sionnest + + * BRANCHES, Makefile.am, NP-VERSION-GEN, NPTest.pm, acinclude.m4, + autogen.sh, command.cfg.in, configure.in, contrib/check_adptraid.sh, + contrib/check_apc_ups.pl, contrib/check_appletalk.pl, + contrib/check_arping.pl, contrib/check_email_loop.pl, + contrib/check_fan_cpq_present, contrib/check_fan_fsc_present, + contrib/check_frontpage, contrib/check_http-with-client-certificate.c, + contrib/check_hw.sh, contrib/check_ica_master_browser.pl, + contrib/check_ica_metaframe_pub_apps.pl, + contrib/check_ica_program_neigbourhood.pl, + contrib/check_inodes-freebsd.pl, contrib/check_javaproc.pl, + contrib/check_joy.sh, contrib/check_log2.pl, contrib/check_lotus.pl, + contrib/check_mem.pl, contrib/check_ms_spooler.pl, + contrib/check_ora_table_space.pl, contrib/check_oracle_instance.pl, + contrib/check_oracle_tbs, contrib/check_pfstate, contrib/check_rbl.c, + contrib/check_smb.sh, contrib/check_snmp_disk_monitor.pl, + contrib/check_snmp_printer.pl, contrib/check_snmp_process_monitor.pl, + contrib/check_snmp_procs.pl, contrib/check_temp_cpq, + contrib/check_temp_fsc, contrib/check_traceroute.pl, + contrib/check_uptime.c, contrib/check_vcs.pl, contrib/check_wins.pl, + contrib/packet_utils.pm, contrib/utils.py, doc/BRANCHING, + doc/developer-guidelines.sgml, lib/extra_opts.c, lib/parse_ini.c, + lib/tests/test_base64.c, lib/tests/test_cmd.c, lib/tests/test_disk.c, + lib/tests/test_ini.c, lib/tests/test_opts.c, lib/tests/test_tcp.c, + lib/tests/test_utils.c, lib/utils_base.c, lib/utils_cmd.c, + lib/utils_disk.c, lib/utils_tcp.c, plugins-root/Makefile.am, + plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins-root/t/check_icmp.t, plugins-scripts/Makefile.am, + plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_file_age.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_log.sh, plugins-scripts/check_mailq.pl, + plugins-scripts/check_mssql.pl, plugins-scripts/check_netdns.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_oracle.sh, + plugins-scripts/check_rpc.pl, plugins-scripts/check_sensors.sh, + plugins-scripts/check_wave.pl, plugins-scripts/subst.in, + plugins-scripts/t/check_file_age.t, plugins-scripts/t/check_rpc.t, + plugins-scripts/t/utils.t, plugins-scripts/utils.pm.in, + plugins/Makefile.am, plugins/check_apt.c, plugins/check_by_ssh.c, + plugins/check_cluster.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide_smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/common.h, plugins/negate.c, plugins/netutils.c, + plugins/netutils.h, plugins/popen.c, plugins/popen.h, plugins/runcmd.c, + plugins/runcmd.h, plugins/sslutils.c, plugins/t/check_by_ssh.t, + plugins/t/check_cluster.t, plugins/t/check_dig.t, + plugins/t/check_disk.t, plugins/t/check_dns.t, plugins/t/check_dummy.t, + plugins/t/check_fping.t, plugins/t/check_ftp.t, plugins/t/check_hpjd.t, + plugins/t/check_http.t, plugins/t/check_imap.t, + plugins/t/check_jabber.t, plugins/t/check_load.t, + plugins/t/check_mysql.t, plugins/t/check_mysql_query.t, + plugins/t/check_nagios.t, plugins/t/check_ntp.t, plugins/t/check_ping.t, + plugins/t/check_pop.t, plugins/t/check_procs.t, plugins/t/check_smtp.t, + plugins/t/check_snmp.t, plugins/t/check_swap.t, plugins/t/check_tcp.t, + plugins/t/check_time.t, plugins/t/check_udp.t, plugins/t/check_users.t, + plugins/t/negate.t, plugins/urlize.c, plugins/utils.c, plugins/utils.h, + test.pl.in, tools/README, tools/git2svn.pl, tools/mini_epn.c, + tools/setup, tools/tinderbox_build: Removing CVS/SVN tags and replacing + with git-based versioning + For contrib/, full tags have been imported from subversion + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2091 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-20 Thomas Guyot-Sionnest + + * plugins/check_disk.c: Add comment to recent check_disk patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2088 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-19 Thomas Guyot-Sionnest + + * lib/parse_ini.c, lib/utils_base.c, lib/utils_disk.c, + plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins-root/pst3.c, plugins/check_apt.c, plugins/check_cluster.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ldap.c, plugins/check_mrtg.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_ntp.c, plugins/check_ntp_peer.c, + plugins/check_ntp_time.c, plugins/check_nwstat.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_radius.c, plugins/check_smtp.c, + plugins/check_snmp.c, plugins/check_ssh.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_ups.c, + plugins/netutils.c, plugins/popen.c, plugins/urlize.c: Bulk EOL cleanup + + $ git diff --ignore-space-change|diffstat + 0 files changed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2087 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_ntp.c, plugins/check_ntp_peer.c: Fixed buffer + overflow in check_ntp/check_ntp_peer (#1999319, Ubuntu #291265) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2086 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, lib/utils_disk.c, plugins/check_disk.c: check_disk: + rerpopulate the mount list after doing a stat() on paths specified with + -p for better automount support. + + NB: There's a memory leak here - properly freeing the mount list would invlove + much more work - there's many other places where leaks can happen so it + should be a project on its own. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2085 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-14 Ton Voon + + * tools/sfupload: Helper script to upload tarballs to SF and create + md5sum + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2081 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-11 Ton Voon + + * doc/developer-guidelines.sgml: Updated tinderbox link + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2080 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-08 Thomas Guyot-Sionnest + + * NEWS, plugins/check_nt.c: Add missing long options for check_nt (for + use with extra-opts) + + Extra-opts (ini files) requires long-options for setting up arguments. Added + the missing ones for check_nt so that it can be properly used with extra-opts. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2079 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_ide_smart.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql_query.c, + plugins/check_nt.c: Fix long options parsing in check_disk, check_dns, + check_mrtg and check_mrtgtraf (check_tcp was done in an earlier commit) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2078 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-08 Ton Voon + + * THANKS.in: Added Jan for check_http method patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2077 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_http.c, plugins/tests/check_http.t: + Fixed bug where extra headers and redirect caused segfault (Dieter Van + de Walle - 2089159) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2076 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_http.c, plugins/tests/check_http.t: check_http now + has options to specify the HTTP method (Jan - 2155152) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2075 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: Fix for tar on Solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2074 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-07 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins-root/check_icmp.c: check_icmp now reports min + and max round trip time perfdata (Steve Rader) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2073 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_tcp.c: Fix check_tcp longoptions handling + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2072 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-05 Ton Voon + + * lib/tests/Makefile.am: Need to add in the libgnu.la for Solaris and + other platforms + where missing functions have been replaced by GNUlib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2071 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-05 Thomas Guyot-Sionnest + + * NEWS: Missing NEWS item + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2070 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/extra_opts.c, lib/tests/test_opts.c: Fix calculation of extra-opts + parameters. + + By reading the current list instead of the additional one when counting parameters, extra-opts calculation was allocating insuficient space for the final array if later sections contained more arguments than the sum of all previously parsed sections. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2069 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-05 Ton Voon + + * Makefile.am, NEWS, configure.in: Fixed libtap dependency issue. + Warning: will install tap into lib directories + if ./configure --enable-libtap is used, but as development tool, will be okay + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2068 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-05 Thomas Guyot-Sionnest + + * plugins/t/check_http.t: Fix check_http test (altinity.com redirects + now). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2067 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-04 Thomas Guyot-Sionnest + + * lib/tests/test_ini.c, lib/tests/test_opts.c: Fixed the test (not the + bug yet) and added similar one to test_ini (that one works) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2066 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/test_opts.c: Corrected test_opts plan + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2065 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/plugins.ini, lib/tests/test_opts.c: Adding extra-opts check + that crash on my prod servers (*** glibc detected *** malloc(): memory + corruption: 0x0804e248 ***) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2064 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, lib/parse_ini.c, lib/tests/plugin.ini: Make extra-opts (C + plugins) behave more like N::P: + + N::P allows both '#' and ';' for comments. Extra-opts used to allow only '#', it now allows both (';' is the standard for ini files) + Extra-opts does not allow trailing comments anymore (like N::P) + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2063 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_ups.c: check_ups now sends a LOGOUT + string (debian bug #387001) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2062 f882894a-f735-0410-b71e-b25c423dba1c + +2008-10-22 Matthias Eble + + * BUGS, NEWS, plugins-scripts/check_ifoperstatus.pl: check_ifoperstatus + -n flag now works as expected (sf.net #1569488) + check_ifoperstatus now supports ifType based lookup for ifIndex + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2061 f882894a-f735-0410-b71e-b25c423dba1c + +2008-10-21 Ton Voon + + * NEWS, tools/tinderbox_build: Updated tinderbox server + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2060 f882894a-f735-0410-b71e-b25c423dba1c + +2008-10-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_users.c: check-users thresholds was >= rather than + > as documented. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2059 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-25 Ton Voon + + * BUGS, ChangeLog, NEWS, configure.in, package.def: Preparation for + 1.4.13 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2057 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/tests/check_http.t: Fix small test failure + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2056 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/LEAVERS, doc/NEW_STARTERS, doc/RELEASING: Moving project + administration documents to nagiosplugins.org site + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2055 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-02 Thomas Guyot-Sionnest + + * plugins/check_ntp_peer.c: Typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2054 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-02 Holger Weiss + + * THANKS.in, plugins/check_http.c: Some HTTP server + applications/configurations cause trouble if the port is + explicitly specified in our "Host:" header line. Therefore, we now specify the + port only if we're using a non-default port (Erik Wasser - 2082501). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2053 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-02 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp_peer.c: Fix possible segfault in + check_ntp_peer with deliberately invalid packets + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2052 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-01 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp_peer.c, plugins/check_ntp_time.c: + check_ntp_peer/check_ntp_time used to show port in --help but ignored + the argument - now implemented. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2051 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_http.c: Revert "Re-structure the HTTP + 1.1 headers to prevent 301s on servers with virtual hosts" + + This reverts commit 2030 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2050 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-01 Holger Weiss + + * plugins/check_http.c: Under some circumstances, the 'url' path of a + redirection target missed + a leading slash. While this was fixed later on, the incomplete 'url' + was used for redirection loop detection and error messages. This is now + fixed by adding the missing slash immediately. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2049 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-25 Ton Voon + + * plugins/tests/check_http.t: Fix HTTP::Daemon::VERSION to get a fixed + header size for tests + (Sven Nierlein) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2048 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/tests/check_http.t: Updated with more tests re: multiple + status codes (Sven Nierlein) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2047 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-25 Holger Weiss + + * NEWS, THANKS.in, plugins/check_http.c, plugins/tests/check_http.t: The + "-e" option now accepts a comma-delimited list of expected status + lines (Sven Nierlein - 1894496). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2046 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-22 Ton Voon + + * plugins/tests/check_http.t, plugins/tests/var/root: Added HTTP tests + for status codes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2045 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-21 Ton Voon + + * configure.in: Only include extra-opts tests if libtap is enabled + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2044 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: Note re: --enable-libtap + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2043 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/Makefile.am, lib/tests/test_all.t, lib/tests/test_base64.t, + lib/tests/test_cmd.t, lib/tests/test_disk.t, lib/tests/test_ini.t, + lib/tests/test_opts.t, lib/tests/test_tcp.t, lib/tests/test_utils.c, + lib/tests/test_utils.t: Correctly link to included libtap. Simplify + invoking test scripts. + Removed basename test as we should use base_name from GNUlib which is + tested separately + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2042 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/tinderbox_build: Fix regexp of version number of snapshot + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2041 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Remove .svn files in distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2040 f882894a-f735-0410-b71e-b25c423dba1c + + * external/tap-1.01-nagios-plugins.tar.gz, tools/setup: Renamed altered + tap file to nagios-plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2039 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-21 Thomas Guyot-Sionnest + + * plugins/check_ntp_peer.c: Nothing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2038 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp_peer.c: Misplaced comment + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2037 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp_peer.c: Complete rewrite of the extract_value + function + + The original one was flawed (easy to trigger segfaults) and did not allow some whitespaces as permitted by rfc1305. This one has been troughfully tested with tap (the testing code might get included later) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2036 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/parse_ini.h, lib/tests/test_opts.c: Typos in + comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2035 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-16 Thomas Guyot-Sionnest + + * plugins/check_mysql.c, plugins/check_mysql_query.c: Fix assignment + written as a comparison in validate_arguments() when db_pass is NULL + (Patch from http://blog.barfoo.org/projects/rpms-for-sles10) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2034 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_fping.c: Fix check_fping --help output (Patch from + http://blog.barfoo.org/projects/rpms-for-sles10) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2033 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_by_ssh.t: Typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2032 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-08 Ton Voon + + * plugins-root/pst3.c: Close on fd + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2031 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-08 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_http.c: Re-structure the HTTP 1.1 + headers to prevent 301s on servers with virtual hosts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2030 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Typo in --help output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2029 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-05 Thomas Guyot-Sionnest + + * tools/devmode: Set -D_FORTIFY_SOURCE=2, and added a comment with link + to explaination of this flag. + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2028 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-28 Matthias Eble + + * plugins-root/check_icmp.c: -b option now specifies ICMP data bytes + instead of packet size + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2027 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-17 Matthias Eble + + * NEWS, plugins-root/check_icmp.c: Add support for packet size + modification (-b) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2026 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-10 Thomas Guyot-Sionnest + + * plugins/check_disk.c: Verbose should not have to exceed 3 as per + developement guidelines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2025 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/devmode: Add -D_FORTIFY_SOURCE + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2024 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ups.c: Typo in check_ups + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2023 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-09 Matthias Eble + + * plugins/t/check_snmp.t: rewrote check_snmp.t to use Test::More + added perfdata checking for string values + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2022 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_snmp.c: check_snmp now only prints perfdata for + non numeric values (Joerg Linge #1867716) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2021 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-08 Ton Voon + + * Makefile.am, tools/tinderbox_build: Removed libtap configuration for + the moment, as tinderbox builds + are breaking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2020 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, lib/utils_cmd.c, lib/utils_cmd.h, plugins/Makefile.am, + plugins/check_procs.c: check_procs captures stderr and adds to plugin + output. This is + from a merge of branch nagiosplug/branches/new_threshold_syntax 1979:1982 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2019 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-06 Holger Weiss + + * plugins-root/check_dhcp.c: Don't try to set the "SO_BROADCAST" socket + option for unicast requests. + (Also, removed the unused "DHCP_UNICAST_FLAG" macro.) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2018 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-02 Ton Voon + + * lib/tests/Makefile.am: Use tap.h from the libtap directory + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2017 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/Makefile.am, plugins-root/pst3.c: Change pst3 again, this + time to remove use of kvm which is not + available in Solaris 10 non-global zones. Uses /proc, which is not + available in older versions of Solaris. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2016 f882894a-f735-0410-b71e-b25c423dba1c + +2008-06-30 Ton Voon + + * tools/setup: Fixed bug in tools/setup if docbook was run + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2015 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Have to list tap_dir manually to get into make dist + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2014 f882894a-f735-0410-b71e-b25c423dba1c + +2008-06-26 Ton Voon + + * Makefile.am, configure.in, external/README, + external/tap-1.01-altinity.tar.gz, lib/tests/Makefile.am, tools/setup, + tools/tinderbox_build: Adding libtap into distribution to help run C + based tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2013 f882894a-f735-0410-b71e-b25c423dba1c + +2008-06-17 Ton Voon + + * plugins-root/pst3.c: Fixed possible coredump. Removed one level of + subroutines (Duncan Ferguson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2012 f882894a-f735-0410-b71e-b25c423dba1c + +2008-06-09 Matthias Eble + + * NEWS, plugins/check_dig.c, plugins/t/check_dig.t: Added testcases for + check_dig + check_dig's -l option is mandatory now (#1986306) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2011 f882894a-f735-0410-b71e-b25c423dba1c + +2008-06-02 Ton Voon + + * NEWS, plugins-root/pst3.c: Optimised pst3 for systems with large + number of processes (Duncan Ferguson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2010 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, perlmods/Nagios-Plugin-0.22.tar.gz, + perlmods/Nagios-Plugin-0.27.tar.gz: Updated Nagios::Plugin perl modules + to 0.27 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2009 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-30 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_http.c: Fix Debian bug #460097: + check_http --max-age broken (Hilko Bengen) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2008 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-29 Thomas Guyot-Sionnest + + * BUGS: typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2007 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-27 Ton Voon + + * doc/RELEASING: Changed SF file release to use sftp instead of ftp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2006 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, NEWS, configure.in, package.def: Preparation for + 1.4.12 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2004 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, configure.in: Not picking up solaris systems correctly for + check_dhcp. Only + affected SunStudio compiles of check_dhcp (1890260 - Rob Windsor) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2003 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: Addition to help to state that -f will always + return OK if ssh command + is executed (Alain Dewit - 1852198) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2002 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/pst3.c: Add additional PID column heading + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2001 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-26 Thomas Guyot-Sionnest + + * NEWS: correct typo in NEWS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2000 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-23 Thomas Guyot-Sionnest + + * REQUIREMENTS: Add a note about radiusclient + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1999 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-22 Thomas Guyot-Sionnest + + * NEWS, configure.in: Fix linking against OpenSSL where libdl is + required + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1998 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-21 Thomas Guyot-Sionnest + + * NEWS, plugins/check_by_ssh.c, plugins/t/check_by_ssh.t: Fixed passive + option in check_by_ssh + Also: + - On non-skipped stderr, check_by_ssh now returns UNKNOWN or worse (result from command) instead of always UNKNOWN. + - Fixed passive tests and make is always run the specified number of tests (using fail if there's nothing to test). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1997 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-20 Thomas Guyot-Sionnest + + * plugins/t/check_by_ssh.t: Oops - forgot to remove the SKIP block + (which didn't seem to work fine) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1996 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_by_ssh.t: Add check_by_ssh tests (passive checks are + broken - should be fixed before next release!) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1995 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_radius.c: Clobber password in check_radius process + list aguments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1994 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-13 Thomas Guyot-Sionnest + + * plugins/check_dns.c: Typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1992 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-07 Thomas Guyot-Sionnest + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/utils.h: Added support for --extra-opts in all C plugins + (disabled by default, see configure --help) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1991 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_ping.c: Added performance data to + check_ping (Christian Schneemann) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1990 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-02 Thomas Guyot-Sionnest + + * NEWS, plugins/negate.c: negate now has the ability to replace the + status text as well (-s, --substitute) + Also changed: + - default timeout to 11 instead of 9 (since it's recommended to have a higher timeout, and many plugins default to 10 seconds) + - If there's no STDOUT lines returned, still returns the returned result if it's NON-ok instead of forcing it to UNKNOWN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1989 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-30 Thomas Guyot-Sionnest + + * NEWS, plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/t/check_mysql.t: Add socket support to check_mysql* + Also clears the password from check_mysql command-line options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1988 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-29 Holger Weiss + + * configure.in: Support "--without-pgsql" (reported by Alex Songe via + IRC). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1987 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-29 Thomas Guyot-Sionnest + + * plugins/check_ntp.c, plugins/check_ntp_peer.c, + plugins/check_ntp_time.c: Use UT_THRESHOLDS_NOTES in all plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1986 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c: --help output + cleanup (plus removal of spaces on blank lines) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1985 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-27 Thomas Guyot-Sionnest + + * plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_snmp.c, plugins/check_swap.c, plugins/check_ups.c, + plugins/utils.h: --help output cleanup (plus removal of spaces on blank + lines) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1984 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-23 Thomas Guyot-Sionnest + + * plugins/check_radius.c: Correct typo and make the --help notes a bit + simpler. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1983 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-17 Thomas Guyot-Sionnest + + * plugins/check_dns.c: Correct the help text + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1979 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_dns.c: Allow to repeat -a to set multiple possible + addresses + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1978 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp.c, plugins/check_ntp_peer.c: check_ntp and + check_ntp_peer now show proper jitter/stratum thresholds longopts in + --help + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1977 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-04 Thomas Guyot-Sionnest + + * lib/extra_opts.c, lib/parse_ini.c, lib/tests/test_ini.c, + lib/tests/test_opts.c: make parse_ini die like in N::P if section isn't + found + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1976 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-02 Thomas Guyot-Sionnest + + * lib/Makefile.config-opts, lib/tests/Makefile.config-opts: Delete + obsolete files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1974 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/Makefile.am, lib/parse_ini.c, lib/tests/Makefile.am, + lib/tests/test_ini.t, lib/tests/test_opts.t, po/de.po, po/fr.po, + po/nagios-plugins.pot: - Add --enable-extra-opts configure option for + compiling extra-opts support + - Auto-update po/pot files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1973 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-01 Thomas Guyot-Sionnest + + * lib/parse_ini.c: fix the obvious... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1972 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/extra_opts.c, lib/extra_opts.h: np_extra_opts now retain pointers + from argv so that plugins can still overwrite sensitive options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1971 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-31 Thomas Guyot-Sionnest + + * commit d043862c154070b2c58172289899dd14776e2d03, Author: Thomas + Guyot-Sionnest , Date: 2008-03-31: update + svn:ignore property (last gnulib update added many auto-generated files) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1970 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/extra_opts.c, lib/extra_opts.h, lib/parse_ini.c, lib/parse_ini.h, + lib/tests/test_ini.c, lib/tests/test_opts.c: Fix for last commit - I + accidentaly broke my local Makefile and tests weren't being re-compiled. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1968 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-30 Thomas Guyot-Sionnest + + * lib/extra_opts.c, lib/extra_opts.h, lib/tests/test_opts.c: - Remove + the last argument of np_extra_opts + - Code cleanups and comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1967 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-29 Thomas Guyot-Sionnest + + * commit af71e9fc0ef268b322c4f4677773273c07926a7a, Author: Thomas + Guyot-Sionnest , Date: 2008-03-26: Update + svn:ignore property + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1966 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-24 Thomas Guyot-Sionnest + + * lib/extra_opts.c, lib/extra_opts.h, lib/tests/config-opts.ini, + lib/tests/test_opts.c, lib/tests/test_opts.t: Add extra-opts argument + parsing with tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1961 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/parse_ini.h: Replace broken usage of + NAGIOS_CONFIG_PATH with a stub function (that will try to find a config + file in the future...) + Allow NULL locator (default file/section) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1960 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-20 Thomas Guyot-Sionnest + + * plugins/check_dig.c: - Fix bug #1920671 + - Make --help output looks nice + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1959 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-18 Ton Voon + + * plugins/tests/check_procs.t: Include test for check_procs, using input + file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1955 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c, plugins/tests/var/ps-axwo.darwin, + plugins/tests/var/ps_axwo.debian: Updated check_procs with a hidden + --input-file option. + Include some sample outputs for testing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1954 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-17 Ton Voon + + * plugins/t/check_nagios.t: Don't run check_nagios tests on Solaris, + because of pst3 requirement + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1953 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-16 Thomas Guyot-Sionnest + + * lib/tests/config-dos.ini, lib/tests/plugin.ini, lib/tests/test_ini.c: + Add tests: + - DOS-newline ini file + - section defined twice + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1951 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-15 Thomas Guyot-Sionnest + + * lib/parse_ini.c: parse_ini now reads the default section if the + request one can't be found. + All tests should return ok now. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1950 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c: Oops - this line shouldn't have been here (doesn't + even work anyways) ;) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1949 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/tests/plugin.ini, lib/tests/test_ini.c: - Make + equal-less parameters illegal + - parameters without argument after '=' are now assumed to be argument-less + - Add a testcase for space in stanza and various argument-less parameters + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1948 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c: Fix handling of leading and trailing spaces in stanza + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1947 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/tests/test_ini.c: Fix segfault in test_ini.c and + uncomment the affected tests + Fix bug in stanza parsing where full section could be skipped + Fix single-argument options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1946 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/parse_ini.h, lib/tests/test_ini.c, + lib/tests/test_ini.t: This commit consist of two changes: + 1. Make np_get_defaults return a linked list instead of a string. It will then be easy to convert the linked list back to an argument array. + 2. Fix tests 3-4 of test_ini.c. + + A test_ini.t was added too. parse_ini and test_ini aren't included yet in the build makefiles. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1945 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-15 Matthias Eble + + * plugins/check_http.c: Add port to Host Header to prevent problems with + non default ports (Christophe Dupre #1881898) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1944 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-14 Matthias Eble + + * NEWS, plugins/check_dig.c: Added -A/--dig-arguments to check_dig + (#1889453/#1874041) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1943 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Enhanced check_smtp to actually print invalid + response text (#1911239) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1942 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-14 Ton Voon + + * NEWS, plugins-root/Makefile.am, plugins/Makefile.am: Fixed 64 bit pst3 + when tries to link to gettext. Gettext linked + dynamically, if necessary + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1941 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-14 Thomas Guyot-Sionnest + + * gl/charset.alias, gl/configmake.h, gl/math.h, gl/ref-add.sed, + gl/ref-del.sed, gl/stdio.h, gl/stdlib.h, gl/string.h, gl/unistd.h: These + files are generated automatically during the make process, and removed + by make clean. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1940 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-11 Ton Voon + + * configure.in, gl/m4/mbstate_t.m4: Possible fix for HP-UX compile + problems of regex_internal.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1939 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/utils_base.c, plugins-root/Makefile.am, + plugins/check_http.c, plugins/check_smtp.c, plugins/common.h: Fixed link + -m64 problems on pst3 for solaris. Fixed _FILE_OFFSET_BITS + redefinition warnings. Fixed helper ar error in ./configure + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1938 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-28 Ton Voon + + * NEWS, configure.in, plugins-root/Makefile.am, plugins-root/pst3.c, + plugins/check_procs.c, plugins/t/check_procs.t: Reverted check_procs for + solaris back to using pst3 due to truncation + for argument fields using other methods + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1937 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/build_perl_modules: Fix where PERL5LIB is blank + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1936 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-18 Ton Voon + + * NEWS: Added CVE MITRE tracking number + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1935 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-13 Matthias Eble + + * NEWS, plugins/check_pgsql.c: check_pgsql now builds with postgres lib + v8.3 (Jan Wagner #1878972) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1934 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fix --local argument handling (Jan Wagner + #1878971) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1933 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-13 Thomas Guyot-Sionnest + + * plugins/check_disk.c: Fix broken intending (The whole file use spaces + only except my last patch and 1-3 other places). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1932 f882894a-f735-0410-b71e-b25c423dba1c + + * commit fe2e5f4aecab99a1c361994e4b678d6709d65f6c, Author: Thomas + Guyot-Sionnest , Date: 2008-02-13: Add + two files to svn:ignore + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1931 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: News, nothing else. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1929 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: This floorf workaround is Nnot needed anymore since + floorf is part of Gnulib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1928 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/test_base64.c: Reverting patch to test 8-bit data: Still + broken on Solaris (7-bit works as before) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1927 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-12 Thomas Guyot-Sionnest + + * gl/Makefile.am, gl/base64.c, gl/base64.h, gl/charset.alias, + gl/configmake.h, gl/floor.c, gl/floorf.c, gl/m4/base64.m4, + gl/m4/floorf.m4, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4, + gl/m4/math_h.m4, gl/math.h, gl/math.in.h, gl/ref-add.sed, + gl/ref-del.sed, gl/stdio.h, gl/stdlib.h, gl/string.h, gl/unistd.h, + lib/Makefile.am, lib/base64.c, lib/base64.h, lib/tests/Makefile.am, + lib/tests/test_base64.c, plugins/check_http.c, plugins/check_smtp.c: + Import Gnulib floorf and base64 and removed our old base64 library. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1926 f882894a-f735-0410-b71e-b25c423dba1c + + * build-aux/config.rpath, build-aux/link-warning.h, gl/Makefile.am, + gl/alloca.c, gl/alloca.in.h, gl/asnprintf.c, gl/asprintf.c, + gl/basename.c, gl/c-strtod.c, gl/cloexec.c, gl/config.charset, + gl/creat-safer.c, gl/dirname.c, gl/dirname.h, gl/dup-safer.c, + gl/error.c, gl/error.h, gl/exit.h, gl/exitfail.c, gl/exitfail.h, + gl/fcntl--.h, gl/fcntl-safer.h, gl/fd-safer.c, gl/float+.h, + gl/float.in.h, gl/fsusage.c, gl/fsusage.h, gl/full-read.c, + gl/full-read.h, gl/full-write.c, gl/full-write.h, gl/gai_strerror.c, + gl/getaddrinfo.c, gl/getaddrinfo.h, gl/gethostname.c, gl/getloadavg.c, + gl/getopt.c, gl/getopt.in.h, gl/getopt1.c, gl/getopt_int.h, + gl/gettext.h, gl/inet_ntop.c, gl/inet_ntop.h, gl/intprops.h, + gl/localcharset.c, gl/localcharset.h, gl/m4/absolute-header.m4, + gl/m4/alloca.m4, gl/m4/extensions.m4, gl/m4/float_h.m4, + gl/m4/fsusage.m4, gl/m4/getaddrinfo.m4, gl/m4/getloadavg.m4, + gl/m4/gettext.m4, gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4, + gl/m4/gnulib-comp.m4, gl/m4/iconv.m4, gl/m4/include_next.m4, + gl/m4/intdiv0.m4, gl/m4/intl.m4, gl/m4/intlmacosx.m4, gl/m4/intmax_t.m4, + gl/m4/lib-link.m4, gl/m4/localcharset.m4, gl/m4/lock.m4, + gl/m4/longdouble.m4, gl/m4/longlong.m4, gl/m4/malloc.m4, + gl/m4/mbchar.m4, gl/m4/mbiter.m4, gl/m4/mbrtowc.m4, gl/m4/memchr.m4, + gl/m4/minmax.m4, gl/m4/netinet_in_h.m4, gl/m4/po.m4, + gl/m4/printf-posix.m4, gl/m4/regex.m4, gl/m4/snprintf.m4, + gl/m4/socklen.m4, gl/m4/stdint.m4, gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, + gl/m4/strcase.m4, gl/m4/strdup.m4, gl/m4/strerror.m4, gl/m4/string_h.m4, + gl/m4/strndup.m4, gl/m4/strnlen.m4, gl/m4/sys_socket_h.m4, + gl/m4/uintmax_t.m4, gl/m4/ulonglong.m4, gl/m4/unistd_h.m4, + gl/m4/vasnprintf.m4, gl/m4/vasprintf.m4, gl/m4/vsnprintf.m4, + gl/m4/wchar.m4, gl/m4/wctype.m4, gl/m4/wcwidth.m4, gl/m4/wint_t.m4, + gl/malloc.c, gl/mbchar.c, gl/mbchar.h, gl/mbuiter.h, gl/memchr.c, + gl/minmax.h, gl/mountlist.c, gl/mountlist.h, gl/netinet_in.in.h, + gl/open-safer.c, gl/pipe-safer.c, gl/printf-args.c, gl/printf-args.h, + gl/printf-parse.c, gl/printf-parse.h, gl/ref-add.sin, gl/ref-del.sin, + gl/regcomp.c, gl/regex.c, gl/regex.h, gl/regex_internal.c, + gl/regex_internal.h, gl/regexec.c, gl/safe-read.c, gl/safe-read.h, + gl/safe-write.c, gl/safe-write.h, gl/size_max.h, gl/snprintf.c, + gl/snprintf.h, gl/stdbool.in.h, gl/stdint.in.h, gl/stdio.in.h, + gl/stdlib.in.h, gl/strcase.h, gl/strcasecmp.c, gl/strdup.c, gl/strdup.h, + gl/strerror.c, gl/string.in.h, gl/stripslash.c, gl/strncasecmp.c, + gl/strndup.c, gl/strndup.h, gl/strnlen.c, gl/strnlen.h, gl/strnlen1.c, + gl/sys_socket.in.h, gl/unistd--.h, gl/unistd-safer.h, gl/unistd.in.h, + gl/unistd_.h, gl/vasnprintf.c, gl/vasnprintf.h, gl/vasprintf.c, + gl/vasprintf.h, gl/vsnprintf.c, gl/vsnprintf.h, gl/wchar.in.h, + gl/wctype.in.h, gl/wcwidth.h, gl/xalloc-die.c, gl/xalloc.h, + gl/xmalloc.c, gl/xsize.h, gl/xstrndup.c, gl/xstrndup.h, + plugins/common.h, po/Makevars: Sync to latest Gnulib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1925 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-11 Ton Voon + + * REQUIREMENTS: Hints re: SSL features + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1924 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Added link to FAQ for redhat spopen problem + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1923 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-31 Thomas Guyot-Sionnest + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins-root/pst3.c: Bump plugins-root/ to GPLv3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1920 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h, plugins/netutils.h, plugins/popen.h, + plugins/runcmd.h: Bump plugins/ to GPLv3 (header files) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1919 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/negate.c, plugins/netutils.c, plugins/popen.c, + plugins/runcmd.c, plugins/sslutils.c, plugins/urlize.c, plugins/utils.c: + Bump plugins/ to GPLv3 (non-plugind files) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1918 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_ups.c, plugins/check_users.c: Bump plugin/ to GPLv3 + (check_overcr to check_users) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1917 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-30 Thomas Guyot-Sionnest + + * plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c: Bump plugins/ to GPLv3 (check_apt to + check_nwstat) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1916 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c, lib/utils_tcp.c: details... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1915 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/test_base64.c, lib/tests/test_cmd.c, lib/tests/test_disk.c, + lib/tests/test_ini.c, lib/tests/test_tcp.c, lib/tests/test_utils.c: Bump + lib/tests to GPLv3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1914 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/utils_base.c, lib/utils_cmd.c, lib/utils_disk.c, + lib/utils_tcp.c: Bump /lib to GPLv3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1913 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c: new standardized GPLv3 header (will be applied to all + C files) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1912 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-29 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp_peer.c: check_ntp_peer now checks for the + LI_ALARM flag + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1911 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1910 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_ntp.c, plugins/check_ntp_time.c: Fix bugs and + flaws in best offset server selection of check_ntp_time and (deprecated) + check_ntp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1909 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-26 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_ntp_peer.c, plugins/check_ntp_time.c: + Fix help text of check_ntp_* (Bug #1880095) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1908 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-15 Thomas Guyot-Sionnest + + * NEWS, plugins/check_disk.c: Fix check_disk disk usage calculation when + using --group=NAME (related to bug #1348746) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1907 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, configure.in: Add AC_SYS_LARGEFILE to configure.in (check_disk + should now work with large file systems (2TB+) on all archs that + supports it) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1906 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-10 Thomas Guyot-Sionnest + + * lib/tests/test_cmd.c: Add a return-code check (also test cmd_run + without out/err buffers) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1905 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-09 Thomas Guyot-Sionnest + + * tools/tinderbox_build: make test-debug generate lots of false errors + in tinderbox. Turning off until we find a solution (so al least we can + watch the tinderbox for breakages again) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1904 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-08 Matthias Eble + + * plugins/check_dns.c: Fixed reverse lookup damaged by previous commit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1903 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-08 Ton Voon + + * plugins/t/check_dns.t: Changed default test values for check_dns + (using nagios.com) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1902 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_ftp.t, plugins/t/check_imap.t, + plugins/t/check_jabber.t, plugins/t/check_pop.t, plugins/t/check_tcp.t: + Reverted commits 1898 and 1899 due to reversion of 1879 + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1901 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_tcp.c: Reverted commit 1879 where an invalid + hostname returns UNKNOWN - back to CRITICAL + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1900 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-08 Thomas Guyot-Sionnest + + * plugins/t/check_imap.t, plugins/t/check_jabber.t, + plugins/t/check_pop.t: more r1879 fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1899 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_ftp.t, plugins/t/check_tcp.t: Fix test breakages for + commit r1879: check_tcp now returns UNKNOWN with an invalid hostname on + command line + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1898 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-08 Holger Weiss + + * plugins-root/check_icmp.c: Hide some debug output which was printed + even without "-v" (under + certain circumstances). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1897 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Fix the handling of ICMP packets which are + not echo replies (such as + destination unreachable messages) or which are not directed at us. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1896 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Get rid of a cast which increases the + required alignment. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1895 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Mark some constant strings "const". + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1894 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-07 Holger Weiss + + * plugins/netutils.c: Support "[IPv6]" address syntax. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1893 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: My assumption that "-H example.com:80" didn't + work (see my previous + commit) was wrong, it worked if used together with "-I". So, here's + support for "-H [IPv6]:port", "-H [IPv6]", "-H IPv6", "-H IPv4:port", + "-H IPv4", and "-H host:port". + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1892 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-06 Holger Weiss + + * plugins/check_http.c: Remove support for specifying the port number + using "-H example.com:80". + Since this didn't work anyway (because ":80" wasn't stripped from the + "host_name" after extracting the "server_port"), nobody can be using + this syntax, and it prevents "-H" from accepting IPv6 addresses + (neufeind - 1865082). IMO, fixing it to recognize both ":80" and IPv6 + addresses isn't worth it, as the ":80" syntax doesn't seem very useful + for Nagios plugins (given the way how they are usually called in Nagios + command definitions). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1891 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-06 Thomas Guyot-Sionnest + + * lib/tests/test_base64.c: Fix base64 test (known string wasn't + null-terminated) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1890 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/test_cmd.c: Fix tinderbox breakage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1889 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-06 Matthias Eble + + * plugins/check_ldap.c: If unspecified set LDAP_OPT_SUCCESS to + LDAP_SUCCESS (Sergei Haramundanis - #1498923) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1888 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp.c, plugins/check_ntp_time.c: Fix Bug #1862300: + check_ntp_time segfault in 1.4.11 (Also apply to check_ntp) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1887 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-05 Matthias Eble + + * NEWS, THANKS.in, plugins/check_dns.c: check_dns now sorts addresses + for -a support with multiple address replies (Matthias Urlichs #1724052) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1886 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-04 Matthias Eble + + * plugins/check_procs.c: Cleaned check_procs usage output (Ferenc Wagner + #1862218) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1885 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-21 Holger Weiss + + * plugins-root/check_icmp.c: Fix INADDR_NONE value (for systems which + don't define it). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1884 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Include (if available) to + get SIOCGIFADDR defined on + Solaris. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1883 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins-root/check_icmp.c: New "-s" option to specify + the source IP address (thanks to Harald Jenny + for providing the patch and to Patrick Cervicek for looking into it!) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1882 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-21 Thomas Guyot-Sionnest + + * plugins/check_ldap.c: Remove c formating from translated strings + (makes translation easier) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1881 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-19 Holger Weiss + + * plugins/check_ldap.c: Fix the "--help" output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1880 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-19 Ton Voon + + * NEWS, plugins/check_tcp.c: check_tcp now returns UNKNOWN with an + invalid hostname on command line + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1879 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-17 Ton Voon + + * NEWS, THANKS.in, plugins/check_nt.c: Add check_nt -v INSTANCES + (Alessandro Ren) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1877 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-13 Ton Voon + + * plugins/check_nwstat.c: Fixed help output (Christian Mies) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1876 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: NEWS edited for consistent grammar + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1875 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, NEWS, configure.in, package.def: Preparation for + 1.4.11 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1873 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins-root/Makefile.am: Fixed VPATH problem in + plugins-root (Tom Payerle - 1789000) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1872 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, perlmods/Nagios-Plugin-0.21.tar.gz, + perlmods/Nagios-Plugin-0.22.tar.gz: Update to latest Nagios::Plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1871 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-12 Thomas Guyot-Sionnest + + * commit 151531173bd50d66548effa50ef7393a8c680513, Author: Ton Voon + , Date: 2007-12-12: Add build + files/binaries to the svn:ignore propt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1867 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-11 Thomas Guyot-Sionnest + + * plugins/t/check_ntp.t: D'oh! single escape will be handled by Perl.... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1865 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp_peer.c, plugins/t/check_ntp.t: - Fix check_ntp_peer + returning misleading information when an ICMP message came back + - Try to fix some servers apparently exanding the ~ in threshold ranges in t/check_ntp.t + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1864 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-11 Ton Voon + + * lib/tests/test_cmd.c: Fixed test so works on MacOSX (use /bin/sh + instead of /bin/grep). + Added extra test for missing command - should drop into STATE_UNKNOWN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1863 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/Makefile.am: Add verbose flag so each test result is seen, + rather than grouped by test + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1862 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-11 Thomas Guyot-Sionnest + + * plugins-root/check_icmp.c, plugins/check_cluster.c, + plugins/check_http.c, plugins/check_mrtgtraf.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c: Adding missing + function calls needed for i18n (only for plugins already in POTFILES.in) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1861 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-10 Thomas Guyot-Sionnest + + * po/fr.po: Some corrections + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1860 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_cluster.c, plugins/check_mysql.c, + plugins/check_radius.c, plugins/check_snmp.c, plugins/check_swap.c, + plugins/negate.c, po/de.po, po/fr.po, po/nagios-plugins.pot: Plenty of + french translations (and a few fixes BTW) + - No more fuzzy french translations + - Only (!) 355 strings to translate + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1859 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c, plugins/check_ntp_peer.c, + plugins/check_ntp_time.c: OOPS! Last commit should have included these + files. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1858 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po, po/nagios-plugins.pot: D'autres translations - + Err, I mean more translations :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1857 f882894a-f735-0410-b71e-b25c423dba1c + + * po/fr.po: More translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1856 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po, po/nagios-plugins.pot: re-update the po files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1855 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp_peer.c, po/fr.po: Some translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1854 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-10 Matthias Eble + + * po/de.po, po/fr.po, po/nagios-plugins.pot: Localization updates for + recent changes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1853 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Fix output when response time is critical. + Thanks to Nobuhiro Ban (patch #1817228) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1852 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_load.c, plugins/t/check_load.t: Fixed check_load + argument handling when passing non triplet thresholds. Thanks to + Jonathan Kamens (bug #1831890) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1851 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-09 Thomas Guyot-Sionnest + + * po/POTFILES.in, po/de.po, po/fr.po, po/nagios-plugins.pot: Gettin' + ready for some translation frenzy :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1850 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po, po/nagios-plugins.pot: update po files and fix a + few French translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1849 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-08 Thomas Guyot-Sionnest + + * NEWS, plugins/check_disk.c: Fix check_disk reporting OK if disk usage + grows over 100% (bug #1348746). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1848 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-04 Thomas Guyot-Sionnest + + * plugins/check_ntp_time.c: Interesting... For some reason it did not + take this (patch barfed on it and I thought I had fixed it already)... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1847 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/Makefile.am, plugins/check_ntp_peer.c, + plugins/check_ntp_time.c, plugins/t/check_ntp.t: Merge changes from + branches/dermoth_ntp_rework (check_ntp_peer/check_ntp_time) + + NEWS | 13 + plugins/Makefile.am | 8 + plugins/check_ntp_peer.c | 628 ++++++++++++++++------------------------------- + plugins/check_ntp_time.c | 323 ++---------------------- + plugins/t/check_ntp.t | 92 +++++- + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1846 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp_peer.c, plugins/check_ntp_time.c: Add the new checks + as check_ntp copies to keep full plug-in history + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1843 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: missing word in comment block. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1838 f882894a-f735-0410-b71e-b25c423dba1c + +2007-11-23 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp.c: - Use max_state_alt in check_ntp to fix + some issues with the latest commits. + - Roll back the stratum check as there were issues with it and a better one is already implemented in check_ntp_peer (about to be included) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1830 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: Add a max_state_alt function that + put UNKNOWN and DEPENDENT ahead of OK. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1829 f882894a-f735-0410-b71e-b25c423dba1c + +2007-11-11 Thomas Guyot-Sionnest + + * NEWS, plugins/check_cluster.c, plugins/check_snmp.c: Fix broken usage2 + in check_snmp and check_cluster + Fix check_cluster blocking some special characters for thresholds ("-", "@", "~") + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1827 f882894a-f735-0410-b71e-b25c423dba1c + +2007-11-10 Thomas Guyot-Sionnest + + * plugins/check_ntp.c: Fix newly added stratum check (has to be + decreased by one when using normal NTP packets versus control packets) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1822 f882894a-f735-0410-b71e-b25c423dba1c + +2007-11-09 Thomas Guyot-Sionnest + + * lib/tests/test_base64.c: Adding svn:keywords props + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1819 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/tests/Makefile.am, lib/tests/test_base64.c, + lib/tests/test_base64.t, tools/distclean: Adding test for base64 lib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1818 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/base64.c, lib/base64.h, plugins/check_http.c, + plugins/check_smtp.c: Moved base64 function to /lib. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1817 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_tcp.h: Nothing to see here... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1816 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in: Credits of check_snmp fix for bug #1815362 (CVE-2007-5623) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1815 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: Fix check_snmp buffer overflow (CVE-2007-5623) + + This patch comes from the Gentoo Portage tree but I couldn't find the author. I sent an email and will give credits when I get an answer. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1814 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ssh.c: Close the socket on all exits (not just the OK + one) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1813 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: Fix missing \n in --help output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1812 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-25 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp.c: check_ntp now return UNKNOWN instead of + WARNING if jitter is + unavailable. If no offset threshold is specified and + the offset is unavailable, will return UNKNOWN as well. + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1811 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-25 Ton Voon + + * plugins-root/check_dhcp.c, plugins/check_ping.c, plugins/check_ups.c, + tools/sync_website: Automatically update website with --help output. + Cosmetic + fixes for some help output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1810 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-24 Holger Weiss + + * THANKS.in, plugins/check_snmp.c: Hide the SNMP community string (and + v3 passwords) from error messages + (Bernhard Fischer on nagiosplug-devel@) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1809 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-15 Ton Voon + + * doc/RELEASING: Add reparagraph option to make ChangeLog output bit + prettier + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1808 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-14 Holger Weiss + + * plugins/check_http.c: Fix a possible segfault if using "-f follow" and + the server sends a + forged "LLLLocation" header prefixed with multiple "L"s (fabiodds - + 1813346) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1807 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-11 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp.c: Add stratum thresholds support for + check_ntp (feature request #1703823) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1806 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Use provided threshold functions (no functionnal + change apart the check for overlaping thresholds) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1805 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-02 Holger Weiss + + * NEWS, plugins/check_http.c: Fix regression in 1.4.10 where following + redirects to relative URLs on + virtual hosts failed if both "-H" and "-I" were specified (noted by + Rodrigo A. G. Schichaschwili on nagiosplug-devel@) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1804 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-29 Ton Voon + + * doc/RELEASING: Updated notes on releasing, mainly for svn + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1803 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, NEWS, configure.in, package.def: Prep for 1.4.10 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1801 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-26 Holger Weiss + + * NEWS, plugins/check_radius.c: Drop the weird and undocumented + behaviour of using positional argument + parsing instead of getopt(3) if 8 command line arguments were given (as + suggested by Matthias) and check whether all required arguments have + been specified in order to spit out proper error messages and to avoid a + possible segfault (as suggested by Thomas). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1800 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-26 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_ntp.c: Patch #1798774: check_ntp: honor + ntp flags + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1799 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-24 Ton Voon + + * perlmods/Nagios-Plugin-0.20.tar.gz, + perlmods/Nagios-Plugin-0.21.tar.gz: Update N::P with new version, + redirecting help, version and usage to + stdout + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1798 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: State that stderr should not have any + output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1796 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-24 Holger Weiss + + * NEWS, configure.in, plugins/netutils.c: Let ./configure --without-ipv6 + suppress non-IPv4 DNS lookups (noted by + Mark Frost on nagios-users@) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1794 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-23 Matthias Eble + + * plugins/check_disk.c, plugins/negate.c: Removed some c99 style + comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1793 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_by_ssh.c: Added multiline output capability to + check_by_ssh. Thanks to Matthias Flacke (#1769653) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1792 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS: removed solved issues + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1791 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: Added radiusclient-ng support to requirement notes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1790 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_disk.c: Fixed bug: stat was called on remote fs + even if -l was given + Added -L option to call stat on remote fs but without threshold comparison + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1789 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, configure.in, plugins/check_radius.c: Added + radiusclient-ng support for check_radius. Thanks to Sebastien Guay + (#1218438) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1788 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-22 Matthias Eble + + * lib/utils_disk.c, lib/utils_tcp.c, plugins/check_disk.c: substituted + bool/true/false with int/TRUE/FALSE (discussed on np-devel) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1787 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, lib/tests/test_disk.c, lib/utils_disk.c, lib/utils_disk.h, + plugins/check_disk.c, plugins/t/check_disk.t: Added -i/-I to ignore + pathes/partitions based on regular expressions + Added check_disk -A selecting all filesystems + -E option must now be passed before -p or -r/-R + Passing -E after -p or -r results in UNKNOWN state + Fixed bug when mixing case sensitive and insensitive regexes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1786 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-22 Thomas Guyot-Sionnest + + * NEWS, plugins/negate.c, plugins/t/negate.t: Rewrite the "map changes + to return codes" patch nearly from scratch. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1785 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-21 Ton Voon + + * NEWS, configure.in, lib/Makefile.am, lib/tests/Makefile.am, + lib/tests/test_cmd.c, lib/tests/test_cmd.t, lib/utils_cmd.c, + lib/utils_cmd.h, plugins/Makefile.am, plugins/negate.c, + plugins/t/negate.pl, plugins/t/negate.t: Stop double expansion of + parameters for negate - works like + time command now + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1784 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-21 Thomas Guyot-Sionnest + + * plugins/check_disk.c: My solaris box needs %llu to display 64bits + integers. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1783 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: - Added some variables at verbose==3 + - Removed support for verbose<0 (-q). -q was broken and tried to to the same as -e. + - -q in now an undocumented alias of -e (for backward-compatibility). + NB: Long help text for -d was already missing. + - Reordered the switches so that: +   a. less-important ones are in alphabetical order + b. short and long help orders match. + - Enclosed "-p | -x" inside braces instead of brackets as one or the other is required. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1782 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-17 Ton Voon + + * Makefile.am: Include directories and files required for perl modules + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1781 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-15 Holger Weiss + + * NEWS, plugins/check_smtp.c: Properly handle SMTP server responses + which are split into multiple + packets (noted by Chris Adams on nagiosplug-help@). TODO: The new + recvline()/recvlines() functions should buffer received data instead of + reading one byte at a time and they should be moved to netutils.c so + that other plugins can use them, too. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1780 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins-root/check_icmp.c: Correct all instances of misaligned + memory access. This fixes bus erros + on platforms which require alignment (such as SPARC and MIPS). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1779 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/devmode: Remove "-Wtraditional" from our development GCC flags. + We use ANSI C. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1778 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-13 Ton Voon + + * Makefile.am, configure.in, perlmods/Class-Accessor-0.31.tar.gz, + perlmods/Config-Tiny-2.10.tar.gz, perlmods/Makefile.am, + perlmods/Math-Calc-Units-1.06.tar.gz, + perlmods/Nagios-Plugin-0.20.tar.gz, + perlmods/Params-Validate-0.88.tar.gz, perlmods/Test-Simple-0.70.tar.gz, + perlmods/install_order, tools/build_perl_modules: Adding in optional + Nagios::Plugin perl module (and + dependencies) compilation and installation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1777 f882894a-f735-0410-b71e-b25c423dba1c + +2007-08-28 Thomas Guyot-Sionnest + + * contrib/check_apc_ups.pl, contrib/check_appletalk.pl, + contrib/check_linux_raid.pl, contrib/check_snmp_procs.pl: These plugins + assumed the "use lib util.pm;" would be substituted like standard Perl + plugins (in plugins-scripts) which isn't the case in contrib. I changed + the "use lib" line to use the default path. People using custom paths + will have to change it manually. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1771 f882894a-f735-0410-b71e-b25c423dba1c + +2007-08-09 Holger Weiss + + * plugins/check_disk.c: Don't use C++ style comments (noted by Johannes + Kingma on + nagiosplug-help@) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1770 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-31 Holger Weiss + + * plugins/check_smtp.c: Read the response to an SMTP QUIT command before + closing the socket + (noted by Dieter Hendricks on nagiosplug-help@) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1769 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-29 Holger Weiss + + * lib/utils_base.c: Don't use C++ style comments. + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1768 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-27 Holger Weiss + + * tools/tinderbox_build: If the TMPDIR environment variable is set, use + that instead of "/tmp" as + the installation directory. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1767 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-26 Holger Weiss + + * NEWS, plugins-root/check_dhcp.c: The "--serverip" and "--requestedip" + options now accept host names, too. + This doesn't quite fit the option names and so far I haven't changed the + "--help" output which currently only talks about IP addresses. However, + I don't see why resolving host names should not be supported. + + Also note that for the moment, I added a quick'n'dirty resolve_host() + function which should really go into netutils.c. I just wanted to think + about its interface a bit more before providing such a function globally. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1766 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins-root/check_dhcp.c: New "-m, --mac" option which allows + for specifying the MAC address to + use in the DHCP request. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1765 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c: Make sure strncpy(3)d buffers are + nul-terminated. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1764 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c: A few minor fixes/improvements which were + included with (but unrelated + to) the "--unicast" patch (Andreas Ericsson and Heiti Ernits - 1218235) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1763 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, configure.in, plugins-root/check_dhcp.c: New "-u, + --unicast" option which gives check_dhcp the ability to mimic a + DHCP relay server in order to check remote subnets (Heiti Ernits and + Andreas Ericsson - 1218235) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1762 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-24 Ton Voon + + * .cvsignore, build-aux/.cvsignore, doc/.cvsignore, gl/.cvsignore, + intl/.cvsignore, lib/.cvsignore, lib/tests/.cvsignore, m4/.cvsignore, + pkg/solaris/.cvsignore, plugins-root/.cvsignore, + plugins-scripts/.cvsignore, plugins/.cvsignore, plugins/t/.cvsignore, + po/.cvsignore: Removing all .cvsignore files + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1761 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot, tools/sfwebcron: Updated to use svn instead of cvs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1760 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-21 Holger Weiss + + * NEWS, plugins/check_http.c: Add "Connection: close" to the HTTP + request header, which tells HTTP/1.1 + servers to close the connection after completion of the response. This + should be compatible with HTTP/1.0, as HTTP/1.0 allows for custom header + fields which should be ignored if not recognized by the server. With + some server configurations, the server would keep the connection alive + without this header line (despite the plugin requesting HTTP/1.0), + resulting in the plugin running into either the server's or it's own + timeout (reported by Roman Schliessmeyer and Jesse Morgan via IRC). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1759 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-15 Matthias Eble + + * THANKS.in, plugins/check_procs.c: Make ps column count in zombie + detection less restrictive. Thanks to Andrew Elwell (#1280470) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1758 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-14 Matthias Eble + + * THANKS.in, plugins/check_smtp.c: Fixed segfault in argument + processing. Thanks to Christoph Schell (#1742066) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1757 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_ntp.c: check_ntp: Fixed typo in typo in + argument sanity check. Thanks to Aurelien Bompard (#1753506) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1756 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-10 Matthias Eble + + * NEWS, plugins/check_disk.c: Added examples for new features to + check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1755 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_disk.c, plugins/t/check_disk.t: Check_disk now + calls stat() for all filesystems to check. + Check_disk prints an strerror() message if the call of stat() fails. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1754 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-07 Matthias Eble + + * plugins/check_ldap.c: Added -v/--verbose argument to call + ldap_perror() for detailed messages on failure. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1753 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: Changed output order of print_revision + print_revision now uses clean_revstring + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1752 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/utils.pm.in: Changed print_revision output order in + utils.pm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1751 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_file_age.pl: substituted $ID$ through $Revision$ + in print_revision call + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1750 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh, plugins-scripts/check_oracle.sh, + plugins-scripts/utils.sh.in: Changed order in -V/--version output + Fixed -V output for check_log and check_oracle + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1749 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-06 Matthias Eble + + * doc/developer-guidelines.sgml: Added hint to avoid using the boolean + type in C as discussed on the devel list + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1748 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-20 Matthias Eble + + * plugins/check_ldap.c: Fixed default behaviour of check_ldaps + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1747 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_ldap.c: Clarified check_ldaps behaviour. New + arguments to explicitly select secure connect behaviour + (--starttls/--ssl). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1746 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_cluster.c: added -V/--version to check_cluster + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1745 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-18 Matthias Eble + + * REQUIREMENTS, configure.in, plugins/.cvsignore: Make Linux specific + plugin check_ide_smart build if appropriate headers are found + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1744 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-17 Holger Weiss + + * plugins/check_http.c: Minor fixes. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1743 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_http.c: Fix buffer overflow vulnerabilities when + parsing HTTP redirect + 'Location:' strings using sscanf(3) (Nobuhiro Ban - 1687867) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1742 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-15 Holger Weiss + + * plugins/check_http.c: When following redirects, the plugin supported + 'Location:' header fields + which spanned multiple lines. However, it was not checked whether extra + lines are preceeded with white space, which could lead to the following + header field name being interpreted as the value of the 'Location:' + field if the latter was empty for some reason. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1741 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: `host_name' is a NULL pointer if the "-I" flag + is used instead of "-H", + so use `server_address' instead. Fixes a possible segfault when + following redirects to relative URLs (reported by Ingo Lantschner). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1740 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-13 Matthias Eble + + * plugins/check_ide_smart.c: Fixed some syntax errors to make + check_ide_smart build + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1739 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-12 Holger Weiss + + * plugins/check_by_ssh.c: Add "-v" to help/usage output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1738 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-12 Matthias Eble + + * plugins/popen.c: Removed debug line + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1737 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-11 Matthias Eble + + * THANKS.in, plugins/popen.c: Fixed problem with popen.c not parsing + --longopt='foo bar' correctly (Daniel Bimschas #1291987) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1736 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-04 Ton Voon + + * THANKS.in: Removed duplicate names + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1735 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, NEWS, configure.in, package.def: For 1.4.9 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1733 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-03 Matthias Eble + + * lib/tests/test_tcp.c: Minor corrections to test_tcp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1732 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/Makefile.am: Makefile.am changes for test_tcp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1731 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/tests/.cvsignore, lib/tests/test_tcp.c, + lib/tests/test_tcp.t: Added test cases for utils_tcp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1730 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, lib/Makefile.am, lib/utils_tcp.c, lib/utils_tcp.h, + plugins/check_tcp.c: Moved check_tcp's expect string testing into + utils_tcp for testing purposes. + Added -A/--all flag to test for every expect string passed. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1729 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-01 Holger Weiss + + * BUGS, NEWS: Fix possible check_http segfaults when following HTTP + redirects. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1728 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Fix an off-by-one error where a realloc(3) call + doesn't allocate space + for nul-termination (Aravind Gottipati - 1729692) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1727 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/sslutils.c: Call the SSL library initialization functions only + once (not for every + SSL connection). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1726 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/sslutils.c: Save an entire CPU cycle if c points to NULL + already. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1725 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/sslutils.c: Set the pointers to the SSL and SSL_CTX objects + back to NULL after + freeing them in np_net_ssl_cleanup(). This fixes a check_http segfault + if an SSL site redirects to a non-SSL one (reported by Aravind Gottipati + via IRC). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1724 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-29 Matthias Eble + + * plugins/check_tcp.c: Fix segfault when -e is specified multiple times. + Thanks to John Rouillard and Ralph Roessner (#1475899) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1723 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: No more warn/crit values in performance data if + -w and -c are not specified. + Thanks to Simon Bellwood (#1181554) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1722 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-29 Thomas Guyot-Sionnest + + * NEWS, plugins/check_snmp.c: check_snmp don't warn anymore if something + is printed on stderr + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1721 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: change a bunch of whitespaces (no code was + harmed) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1720 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-27 Matthias Eble + + * THANKS.in, plugins-scripts/check_oracle.sh: check_oracle does not need + a valid ORACLE_HOME if called with --db. Thanks to Jason Martin + (#1505551) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1719 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-27 M. Sean Finney + + * lib/utils_base.c, lib/utils_base.h, plugins-root/check_dhcp.c, + plugins-root/check_icmp.c: added functions to utils_base: + np_check_if_root() - returns nonzero if geteuid()==0 + np_warn_if_not_root() - uses the above to print an informative warning + added uses of these functions to check_dhcp and check_icmp. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1718 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-24 Ton Voon + + * plugins/t/negate.pl: Test for new functionality in negate (not + automatically run in make test) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1717 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dummy.c, plugins/t/check_dummy.t: Tests for check_dummy + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1716 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-23 Thomas Guyot-Sionnest + + * NEWS, plugins/check_http.c, po/de.po, po/fr.po, po/nagios-plugins.pot: + Update many strings in check_http to get more consistent output + Update translation files; fix all check_http changes in French and most changes in German. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1715 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-18 Thomas Guyot-Sionnest + + * plugins/t/check_tcp.t: Make check_tcp.t compatible with picky web + servers. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1714 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-13 Holger Weiss + + * plugins/check_http.c: Add missing options to the usage output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1713 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-13 Matthias Eble + + * THANKS.in, plugins-root/check_dhcp.c: check_dhcp now adds mandatory + end option (Thanks to Enrico Scholz - #1675306) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1712 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-12 Matthias Eble + + * plugins/check_cluster.c: Fixed glibc error caused in utils_base.c due + to uninitialized thresholds struct (spotted on ubundu 6.06 LTS). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1711 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-12 Ton Voon + + * ABOUT-NLS, build-aux/mkinstalldirs, configure.in: Updating gettext + files from coreutils-6.9. mkinstalldirs needs to be in + build-aux for some systems without gettext natively. Also have at top level, + though gettext documentation says file not neceesary + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1710 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-09 Matthias Eble + + * plugins/check_ups.c: small typo in --help + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1709 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_ups.c: Fixed --help output (Ask Bjoern Hansen + - #1714823) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1708 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_disk.t: added testcase to verify that old positional + arguments only select one path + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1707 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-03 Matthias Eble + + * ChangeLog, THANKS.in, plugins/check_disk.c: fixed backward + incompatibility introduced in 1.4.8 where all partitions are selected, + if path is specified as last argument (without using -p). + Thanks to Emil Michles (Emilis) on #nagios + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1706 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-02 Thomas Guyot-Sionnest + + * tools/distclean: Making Solaris happy + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1705 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: /* Nothing */ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1704 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_time.c: Fix check_time returning wrong + OK when time is before the epoch on some arch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1703 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-28 Matthias Eble + + * plugins/t/check_cluster.t: added test cases for check_cluster + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1702 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-25 Ton Voon + + * tools/tinderbox_build: Test installs into temporary directories + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1701 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, configure.in, plugins/check_load.c, plugins/common.h, + plugins/t/check_load.t: check_load can optionally divide by number of + cpus + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1700 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-23 Holger Weiss + + * plugins/check_ping.c: #ifdef can only test a single macro, not an + expression. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1699 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-20 Holger Weiss + + * plugins-root/check_dhcp.c: Remove unused variables. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1698 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_cluster.c: Include "utils_base.h". + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1697 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_base.h: Declare print_thresholds(). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1696 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_cluster.c: Predeclare functions and remove unused + variables. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1695 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins-root/check_dhcp.c: Use the 'server identifier' + option instead of the 'siaddr' field as the + DHCP server address; see RFC 2131, 2. (Denis Knauf - 1667488) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1694 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-19 Thomas Guyot-Sionnest + + * NEWS, configure.in: Fix compilation of check_ldap, check_radius and + check_pgsql (*ding*) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1693 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-18 Holger Weiss + + * NEWS, plugins/check_by_ssh.c: Revert my previous change to "-S/--skip" + in favour of the two options + "-E/--skip-stderr" and "-S/--skip-stdout". Both of them support + omitting the number of lines to skip, in which case all output on the + respective file descriptor is skipped. "--skip" is kept as an alias for + "--skip-stdout" for backwards compatibility with recent releases. + + Also, print a message if no (non-skipped) stdout/stderr output is + available. This fixes a segfault if the remote command prints no + output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1692 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-15 Thomas Guyot-Sionnest + + * plugins/check_cluster.c: Localization and help fixes (Thanks Benoit + M.) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1691 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_cluster.c: Cosmetic change + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1690 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_cluster2.README: More details about the changes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1689 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/Makefile.am, plugins/check_cluster.c: Add thresholds + support for check_cluster + lots of standardization. + Add forgotten items to NEWS. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1688 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, plugins/check_snmp.c: Fix bug #1344584: Counter64 values not + handled correctly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1687 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-14 Thomas Guyot-Sionnest + + * BUGS: Works for me + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1686 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-14 Holger Weiss + + * BUGS, plugins/check_by_ssh.c: Up to revision 1.35, the "-S" option + skipped the specified number of + lines written to stderr. With revision 1.36 and newer, "-S" skipped the + specified number of lines written to stdout. Now, "-S" skips the + specified number of lines written to stderr; and if the number specified + via "-S" minus the number of lines written to stderr is larger than 0, + the difference is used as the number of lines written to stdout to skip. + Also, the "--help" output was fixed. (Hector - 1675286) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1685 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-13 Thomas Guyot-Sionnest + + * plugins/.cvsignore: ... Some CVS magic too + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1684 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_cluster2.README, plugins/Makefile.am, + plugins/check_cluster.c: automake magic for check_cluster + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1683 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-11 Ton Voon + + * doc/RELEASING: Add news item to nagiosplugins.org + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1682 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, BUGS, ChangeLog, NEWS, configure.in, package.def: 1.4.8 + release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1680 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-10 Thomas Guyot-Sionnest + + * po/POTFILES.in, po/de.po, po/fr.po, po/nagios-plugins.pot: Add some + check_ntp translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1679 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: - Fix possibility of printing scientific numbers + in perfdata + - Use fperfdata function for perfdata formatting + - Make the printing part a bit more flexible (similar to check_disk) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1678 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po, po/nagios-plugins.pot: Hopefully this is correct. + Need to make more changes so I'm commiting these. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1677 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-04 Thomas Guyot-Sionnest + + * plugins/check_ntp.c: Fix for getting dispersion instead of jitter on + older servers (like xntpd on Solaris). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1676 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-03 Holger Weiss + + * plugins/check_ntp.c: Fix the synchronization source selection on + big-endian systems. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1675 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-03 Thomas Guyot-Sionnest + + * plugins/check_ntp.c: Temporary fix for jitter calculation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1674 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-02 Holger Weiss + + * plugins/check_ntp.c: Don't rely on the assumption that the size of a + READSTAT response is a + multiple of sizeof(ntp_assoc_status_pair). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1673 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-02 Ton Voon + + * lib/tests/Makefile.am: Add libgnu.a as regex functions required + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1672 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-02 Thomas Guyot-Sionnest + + * plugins/check_ntp.c: Fix byte order in verbose logging + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1671 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Seems like we don't get any jitter sometimes. + While this needs to be fixed we should at least handle it gracefully. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1670 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-01 Matthias Eble + + * plugins/t/check_http.t: check_http.t: - added internet_access variable + to skip tests where internet access is required. + - added host_tcp_http2 variable for a webserver serving the string 'nagios' in index + - no tests are skipped if the new vars are not defined (existing installations) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1669 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c: utils_disk: fixed handling if check_disk -p is a + device (np_set_best_match()) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1668 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-31 Holger Weiss + + * NEWS: Various check_ntp fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1667 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Fix an out-of-bounds memcpy(3) and add a + realloc(3) error check in + jitter_request(). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1666 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Add a warning to the verbose output if + jitter_request() found no + synchronization source. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1665 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Avoid division by zero. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1664 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Remove the '-O' option, as it's ignored. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1663 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-30 Ton Voon + + * m4/np_mysqlclient.m4: Use AS_HELP_STRING instead of ACX_HELP_STRING + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1662 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, configure.in, m4/np_mysqlclient.m4: Fix AC_CHECK_LIB for + mysql_init - add dependent libraries. mysql detection + separated into external m4 file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1661 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-30 Matthias Eble + + * lib/tests/test_disk.c, plugins/t/check_disk.t: Test Cases for + check_disk's -r, -R, -C and -g + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1660 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: check_disk: minor fix for -C if bestmatch != -p + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1659 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: check_disk: + added regex functionality -r and -R. see np-devel mail (2007-02-10) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1658 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: check_disk: + added grouping functionality. see np-devel mail (2007-02-10) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1657 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: check_disk + -C is more flexible now. See np-devel post (2007-02-10) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1656 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-29 Holger Weiss + + * THANKS.in, plugins/check_mysql.c: Fix argument processing (Felix Frank + - 1690697) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1655 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/Makefile.am: Set the "read" and "execute" bits only for + "user" and "group" in order + to not overwrite "--without-world-permissions" for the root plugins. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1654 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-29 Ton Voon + + * BUGS, ChangeLog, NEWS, configure.in, package.def: 1.4.7 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1652 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Adding help text for jitter flags + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1651 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-27 Thomas Guyot-Sionnest + + * THANKS.in, plugins-root/check_icmp.c: Fix bug #1494629 - check_icmp + fails after some time on FreeBSD + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1650 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-25 Ton Voon + + * NEWS, configure.in: Reinstate --with-nagios-user/group and new + --without-group-permissions ./configure options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1649 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-22 Holger Weiss + + * THANKS.in, plugins/common.h: Increase MAX_INPUT_BUFFER from 1k to 8k + in order to increase I/O + performance (Stefan Meier) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1646 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-16 Gavin Carr + + * plugins-scripts/check_ifoperstatus.pl: Fix bogus 'eq ( || )' + constructions in check_ifoperstatus.pl. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1642 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-12 Ton Voon + + * NEWS, plugins/check_ping.c, plugins/t/check_ping.t: check_ping's + timeout interval is only +1 if ping command has a timeout value. + Tests updated to check for 100% packet loss (always if ping has timeout), otherwise + will check for "timed out" string + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1639 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-11 Thomas Guyot-Sionnest + + * plugins-root/t/check_icmp.t: Add tests for new check_icmp switch -m + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1638 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-11 Ton Voon + + * plugins-root/t/check_icmp.t, plugins/t/check_ping.t: Converted + check_ping.t to new-style testcases. Added test case for check_icmp - + requires sudo access + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1637 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Fixed some help display. Removed -L from usage + as deprecated option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1636 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-08 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins-root/check_icmp.c: New switch to check_icmp + to set the minimum required hosts for success. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1635 f882894a-f735-0410-b71e-b25c423dba1c + + * config_test/child_test.c: Ficing C++ style comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1634 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Fixed C++ style comments, but I don't get + why those lines were originally commented out. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1633 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-06 Ton Voon + + * plugins/check_http.c: Fix option handling (Nobuhiro Ban - 1657280) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1632 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Fixed compile errors in check_smtp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1631 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_smtp.c: Fixed broken HELO cmd (Enrico + Scholz - 1675279) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1630 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, configure.in, plugins/check_procs.c: Use /usr/ucb/ps on Solaris + in preference to pst3 (problems in 64bit mode) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1629 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_disk.t: Test failure if a filesystem which is a subset + of another fails the inode + check (Matthias Elbe - 1660953) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1628 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, configure.in: Detect if check_mysql compile will work at + ./configure time, due to some + Redhat systems distributing mysql_config, but not the include files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1627 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Clearer message when --with-nagios-user is used for + ./configure + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1626 f882894a-f735-0410-b71e-b25c423dba1c + + * FAQ, INSTALLING, NEWS, README, plugins-root/Makefile.am: Root plugins + installed with world executable permissions. Removed references + to --with-nagios-user and --with-nagios-group in README + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1625 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-02 Ethan Galstad + + * plugins/check_mrtgtraf.c: Fix for broken check_mrtgtraf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1624 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-24 Thomas Guyot-Sionnest + + * doc/makefile: Fix the makefile ('[[' is bash-specific, 'rm -f' don't + remove directories) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1623 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-14 Ton Voon + + * NEWS, contrib/check_sybase: check_sybase now maintained in + NagiosExchange + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1622 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fixed typo in help for -M + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1621 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, plugins/t/check_tcp.t: Documentation fix re: + --escape flag. Fix of ./check_tcp test to webservers + to make it more standards compliant + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1620 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-09 Ton Voon + + * NEWS, THANKS.in, po/.cvsignore, po/Makefile.in.in: Fixed MKINSTALLDIRS + problem on some systems - Lars Stavholm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1619 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-07 Ton Voon + + * lib/Makefile.config-opts, lib/parse_ini.c, + lib/tests/Makefile.config-opts, lib/tests/config-tiny.ini, + lib/tests/plugin.ini, lib/tests/test_ini.c: Added test files to test the + parse_ini.c routines. Requires libtap + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1614 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-07 Holger Weiss + + * plugins/check_swap.c: Include before in + order to fix compilation on + OpenBSD (nsturm - 1653934) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1613 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-06 Thomas Guyot-Sionnest + + * plugins/check_tcp.c: Correct vim typo in comment block :P + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1612 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-06 Benoit Mortier + + * plugins/check_disk.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_overcr.c, + plugins/check_smtp.c, plugins/check_tcp.c, po/de.po, po/fr.po, + po/nagios-plugins.pot: correcting some translation problems + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1611 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-06 M. Sean Finney + + * lib/parse_ini.c, lib/parse_ini.h: initial version of ini file parsing + routines in C + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1610 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-06 Benoit Mortier + + * po/Makevars: adding PACKAGE_BUGREPORT to fix Report-Msgid-Bugs-To: + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1609 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-05 Ton Voon + + * AUTHORS, doc/RELEASING: Update list of team members. More notes on new + releases + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1608 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, NEWS, configure.in, package.def: For 1.4.6 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1606 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-02 Thomas Guyot-Sionnest + + * plugins/check_snmp.c: Fix parsing of multiple OIDs sets needmibs = + TRUE + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1605 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-01 Thomas Guyot-Sionnest + + * plugins/check_tcp.c, plugins/t/check_jabber.t: Fix progname being + partly set to upper case + Change formating of invalid hostname output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1604 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: Adding NEWS entry for check_jabber + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1603 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh: Fix bug #1593073 Check_Log problem with + log rotation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1602 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-31 Ton Voon + + * plugins/t/check_jabber.t: Converted to new style object and Test::More + testing. Skipped jabber server + tests if not defined + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1601 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-31 Thomas Guyot-Sionnest + + * plugins/t/check_jabber.t: Add check_jabber test. Will ask for a jabber + host (default should be OK) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1600 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Fix Debian Bug #392610: check_jabber always + return warning + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1599 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-30 Thomas Guyot-Sionnest + + * plugins/check_tcp.c: Jail does not requires any arguments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1598 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-30 Ton Voon + + * config.rpath: make dist failing without config.rpath in top level. + File copied + from build-aux/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1597 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-30 Thomas Guyot-Sionnest + + * plugins/check_tcp.c, plugins/t/check_tcp.t: Fix reporting bug using + expect, affecting (not fixing) Debian bug #392610: check_jabber always + return warning + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1596 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-30 Holger Weiss + + * configure.in: grep(1) "-q" isn't portable (e.g., it won't work on + Solaris 8), redirect + output to /dev/null instead. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1595 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-29 Thomas Guyot-Sionnest + + * plugins/check_disk.c, plugins/t/check_disk.t: Revert 1643463 (reversed + disk thresholds) keeping the thresholds checks. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1594 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-29 Holger Weiss + + * configure.in: Automake 1.10 says: "compiling `test_disk.c' with + per-target flags + requires `AM_PROG_CC_C_O' in `configure.in'". + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1593 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-29 Ton Voon + + * build-aux/config.rpath: Move config.rpath into build-aux for automake + 1.10 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1592 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-28 Holger Weiss + + * INSTALLING: Remove description of deprecated ./configure + --with-nagios-{user,group} + options. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1591 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c, plugins/check_apt.c, + plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c, plugins/utils.c, plugins/utils.h: + Don't try to print `optarg' (which will be a NULL pointer) if an unknown + command line option was used, as this leads to a segfault on some + systems. The unknown option will be printed by getopt(3) anyway. So, + simply call print_usage() and exit UNKNOWN via the new usage5() instead. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1590 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-27 Thomas Guyot-Sionnest + + * plugins/check_disk.c, plugins/t/check_disk.t: Fix #1643463: + Miscalculating thresholds check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1589 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-27 Holger Weiss + + * lib/utils_base.c: Change the variable names `true' and `false' (which + are keywords in C99) + to `yes' and `no'. Fixes compilation when using SGI's MIPSpro c99(1). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1588 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: Include GNULib's "dirname.h" in order to pull in the + base_name() + prototype, fixes compilation of check_procs using SGI's MIPSpro C. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1587 f882894a-f735-0410-b71e-b25c423dba1c + + * ACKNOWLEDGEMENTS, NEWS: Fix typos. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1586 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: Added "-o,--ssh-option=OPTION" which hands "-o OPTION" over to + ssh(1) and + "-q,--quiet" which tells ssh(1) to suppress warnings (Gerhard Lausser - 1472491) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1585 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c: Include which is a + prerequisite for on + NetBSD and OpenBSD (at least). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1584 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-25 Ton Voon + + * Makefile.am, README, configure.in, doc/RELEASING: Update references to + NEWS instead of CHANGES. Fix compile of libtap + test programs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1583 f882894a-f735-0410-b71e-b25c423dba1c + + * build-aux/.cvsignore, build-aux/ltmain.sh, config.guess, config.sub, + configure.in: Use build-aux directory. Removed unnecessary checks in + configure.in. + Keeping libtool to link to libtap - can't find a suitable replacement method + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1582 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-24 Ton Voon + + * ACKNOWLEDGEMENTS, NEWS, config.rpath, configure.in, + doc/developer-guidelines.sgml, gl/.cvsignore, plugins/Makefile.am, + plugins/check_procs.c, po/POTFILES.in: Various cleanups in the syncing + with gnulib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1581 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, NEWS, config.rpath, configure.in, + doc/developer-guidelines.sgml, gl/Makefile.am, gl/alloca.c, + gl/alloca_.h, gl/asnprintf.c, gl/asprintf.c, gl/basename.c, + gl/c-strtod.c, gl/c-strtod.h, gl/cloexec.c, gl/cloexec.h, + gl/creat-safer.c, gl/dirname.c, gl/dirname.h, gl/dup-safer.c, + gl/error.c, gl/error.h, gl/exit.h, gl/exitfail.c, gl/exitfail.h, + gl/fcntl--.h, gl/fcntl-safer.h, gl/fd-safer.c, gl/fsusage.c, + gl/fsusage.h, gl/full-read.c, gl/full-read.h, gl/full-write.c, + gl/full-write.h, gl/gai_strerror.c, gl/getaddrinfo.c, gl/getaddrinfo.h, + gl/gethostname.c, gl/getloadavg.c, gl/getopt.c, gl/getopt1.c, + gl/getopt_.h, gl/getopt_int.h, gl/gettext.h, gl/inet_ntop.c, + gl/inet_ntop.h, gl/intprops.h, gl/m4/absolute-header.m4, + gl/m4/alloca.m4, gl/m4/arpa_inet_h.m4, gl/m4/c-strtod.m4, + gl/m4/cloexec.m4, gl/m4/codeset.m4, gl/m4/dirname.m4, gl/m4/dos.m4, + gl/m4/double-slash-root.m4, gl/m4/eoverflow.m4, gl/m4/error.m4, + gl/m4/exitfail.m4, gl/m4/extensions.m4, gl/m4/fcntl-safer.m4, + gl/m4/fstypename.m4, gl/m4/fsusage.m4, gl/m4/getaddrinfo.m4, + gl/m4/gethostname.m4, gl/m4/getloadavg.m4, gl/m4/getopt.m4, + gl/m4/gettext.m4, gl/m4/glibc2.m4, gl/m4/glibc21.m4, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, + gl/m4/gnulib-tool.m4, gl/m4/iconv.m4, gl/m4/inet_ntop.m4, + gl/m4/inline.m4, gl/m4/intdiv0.m4, gl/m4/intl.m4, gl/m4/intldir.m4, + gl/m4/intmax.m4, gl/m4/intmax_t.m4, gl/m4/inttypes-pri.m4, + gl/m4/inttypes_h.m4, gl/m4/lcmessage.m4, gl/m4/lib-ld.m4, + gl/m4/lib-link.m4, gl/m4/lib-prefix.m4, gl/m4/lock.m4, + gl/m4/longdouble.m4, gl/m4/longlong.m4, gl/m4/ls-mntd-fs.m4, + gl/m4/mbchar.m4, gl/m4/mbiter.m4, gl/m4/mbrtowc.m4, gl/m4/memchr.m4, + gl/m4/minmax.m4, gl/m4/mountlist.m4, gl/m4/netinet_in_h.m4, + gl/m4/nls.m4, gl/m4/onceonly_2_57.m4, gl/m4/po.m4, + gl/m4/printf-posix.m4, gl/m4/progtest.m4, gl/m4/regex.m4, + gl/m4/safe-read.m4, gl/m4/safe-write.m4, gl/m4/size_max.m4, + gl/m4/snprintf.m4, gl/m4/socklen.m4, gl/m4/sockpfaf.m4, + gl/m4/ssize_t.m4, gl/m4/stdbool.m4, gl/m4/stdint.m4, gl/m4/stdint_h.m4, + gl/m4/strcase.m4, gl/m4/strdup.m4, gl/m4/strndup.m4, gl/m4/strnlen.m4, + gl/m4/sys_socket_h.m4, gl/m4/uintmax_t.m4, gl/m4/ulonglong.m4, + gl/m4/unistd-safer.m4, gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, + gl/m4/vasprintf.m4, gl/m4/visibility.m4, gl/m4/vsnprintf.m4, + gl/m4/wchar.m4, gl/m4/wchar_t.m4, gl/m4/wctype.m4, gl/m4/wcwidth.m4, + gl/m4/wint_t.m4, gl/m4/xalloc.m4, gl/m4/xsize.m4, gl/m4/xstrndup.m4, + gl/malloc.c, gl/mbchar.c, gl/mbchar.h, gl/mbuiter.h, gl/memchr.c, + gl/minmax.h, gl/mountlist.c, gl/mountlist.h, gl/open-safer.c, + gl/pipe-safer.c, gl/printf-args.c, gl/printf-args.h, gl/printf-parse.c, + gl/printf-parse.h, gl/regcomp.c, gl/regex.c, gl/regex.h, + gl/regex_internal.c, gl/regex_internal.h, gl/regexec.c, gl/safe-read.c, + gl/safe-read.h, gl/safe-write.c, gl/safe-write.h, gl/size_max.h, + gl/snprintf.c, gl/snprintf.h, gl/socket_.h, gl/stdbool_.h, gl/stdint_.h, + gl/strcase.h, gl/strcasecmp.c, gl/strdup.c, gl/strdup.h, + gl/stripslash.c, gl/strncasecmp.c, gl/strndup.c, gl/strndup.h, + gl/strnlen.c, gl/strnlen.h, gl/strnlen1.c, gl/strnlen1.h, gl/unistd--.h, + gl/unistd-safer.h, gl/unistd_.h, gl/vasnprintf.c, gl/vasnprintf.h, + gl/vasprintf.c, gl/vasprintf.h, gl/vsnprintf.c, gl/vsnprintf.h, + gl/wchar_.h, gl/wctype_.h, gl/wcwidth.h, gl/xalloc-die.c, gl/xalloc.h, + gl/xmalloc.c, gl/xsize.h, gl/xstrndup.c, gl/xstrndup.h, lib/Makefile.am, + lib/basename.c, lib/c-strtold.c, lib/gettext.h, lib/realloc.c, + lib/snprintf.c, lib/strtod.c, lib/tests/Makefile.am, lib/unlocked-io.h, + lib/xalloc.h, lib/xmalloc.c, m4/Makefile.am.in, m4/afs.m4, + m4/basename.m4, m4/extensions.m4, m4/fstypename.m4, m4/inttypes.m4, + m4/longlong.m4, m4/np_coreutils.m4, m4/np_curl.m4, m4/restrict.m4, + m4/signed.m4, m4/ulonglong.m4, m4/unlocked-io.m4, + plugins-root/Makefile.am, plugins/Makefile.am, plugins/check_smtp.c, + plugins/common.h, plugins/getaddrinfo.c, plugins/getaddrinfo.h, + plugins/gethostbyname.c, plugins/gethostbyname.h, plugins/netutils.h, + tools/setup, tools/update_coreutils: Sync with gnulib - lots of + extraneous code removed in preference to GNU code + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1580 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-23 Holger Weiss + + * THANKS.in, plugins/check_ssh.c: Support `check_ssh --hostname=ADDRESS' + (but keep `--host=ADDRESS' for backward + compatibility) (Ville Mattila - 1642780) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1579 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: Location updates + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1578 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Add missing `break' to the switch-case block that + handles the `-m' option + (Nobuhiro Ban - 1642682) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1577 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_radius.c: Initialize `data' to zero, fixes + potential segfault (Nobuhiro Ban - 1642658) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1576 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/mountlist.c: Add support for statvfs(2) which is needed in order + to compile the plugins on + NetBSD 3.0 and newer. The current coreutils release supports statvfs(2), so + this patch won't be needed anymore when updating the coreutils files. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1575 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-22 Holger Weiss + + * plugins/check_by_ssh.c: Added "-o,--ssh-option=OPTION" which hands "-o + OPTION" over to ssh(1) and + "-q,--quiet" which tells ssh(1) to suppress warnings (Gerhard Lausser - 1472491) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1574 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-20 Ton Voon + + * doc/developer-guidelines.sgml: Updated policy on contributed plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1573 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/LEAVERS, doc/NEW_STARTERS, doc/RELEASING: Administrative notes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1572 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-20 M. Sean Finney + + * plugins/check_ntp.c: compilation fixes for check_ntp.c: + - check_ntp.c:290: warning: overflow in implicit constant conversion + fixed with an explicit cast to int8_t. + - check_ntp.c:544: warning: pointer of type ‘void *’ used in arithmetic + fixed by casting to ptrdiff_t before arithmetic and (void*) afterwards + - in TVtoNTP64, cast arithmetic result passed to R32 as uint64_t. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1571 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-20 Thomas Guyot-Sionnest + + * plugins/check_http.c, plugins/check_ldap.c: Fix bug #1632091: printf + format string typos. Add some more cosmetic changes. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1570 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Fix bug #1632078: critical threshold % + incorrectly displayed by check_icmp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1569 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES, THANKS.in, plugins/netutils.c: Fix bug #1632072 pointer error + in plugins/netutils.c. Add changelog entry for previous commit. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1568 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-17 Thomas Guyot-Sionnest + + * THANKS.in, plugins/check_procs.c: Fix bug #1630970 Fix for buffer + overflow of check_procs procprog string + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1566 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-08 Ton Voon + + * CHANGES, THANKS.in, plugins/t/check_disk.t: Added notes about + check_disk perf data fix. Added test to check perf data is + same when mount points reversed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1565 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-07 Thomas Guyot-Sionnest + + * plugins/check_disk.c: Fix bug #1627970: check_disk performance output + for more then one partition + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1564 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-06 Thomas Guyot-Sionnest + + * plugins/check_ping.c: Fix bug #1629008: check_ping fails to handle + Packet filtered error + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1563 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Revert last patch: it works but not really for + the reason I though. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1562 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Fix the way check_ping calculate the maximum run + time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1561 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-04 Thomas Guyot-Sionnest + + * plugins/check_real.c: Fix bug #1574863: check_real does not accept the + '-v' option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1560 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Fix bug #1592605: check_ping times out + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1559 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/README, tools/distclean: Adding my distclean script + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1558 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-23 Thomas Guyot-Sionnest + + * plugins/t/check_snmp.t: Regexps in check_snmp tests fails where they + shouldn't. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1557 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-21 Thomas Guyot-Sionnest + + * NPTest.pm: - Fixing small error (wrong file name) in NPTest.pm + documentation. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1556 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-20 Ton Voon + + * CHANGES, THANKS.in, plugins/check_http.c, plugins/t/check_http.t: + Removed unused timestamp variable (Matthias Eble) + Fixed redirection test. Added extra tests for funny syntax when checking + certificates, updated help for more common syntax + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1555 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c, + plugins/t/check_disk.t: Fixed inode thresholds, regressed from previous + release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1554 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-20 Benoit Mortier + + * po/de.po, po/fr.po, po/nagios-plugins.pot: updated the + nagios-pulgins.pot files now that localization is clean + first pass at updating the french locale + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1553 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-12 Ton Voon + + * plugins-scripts/t/utils.t: Enhanced test for single letters in fqdn + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1549 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/utils.pm.in: Allow single characters in fqdn (Dave + Alden) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1548 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-07 Ton Voon + + * CHANGES, THANKS.in, configure.in: Fixed HP/UX's swapinfo command for + check_procs (Dick van den Burg - 1573700) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1547 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_disk.c, plugins/check_swap.c, + plugins/common.h, plugins/netutils.h: Fix coredump on 64bit Solaris. + Also adds more error conditions and moves + swap specific includes out of common.h (Duncan Ferguson - 1588031) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1546 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-06 Ton Voon + + * plugins/Makefile.am: Move SSL libs to correct order per plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1545 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Only include -lssl for plugins that require it + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1544 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Flag common compile error because of no ar on Solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1543 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Remove CVS files from distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1542 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Add libtool requirement for development + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1541 f882894a-f735-0410-b71e-b25c423dba1c + +2006-11-09 Ton Voon + + * CHANGES, THANKS.in, plugins/check_ping.c, plugins/netutils.c: Reduced + DNS lookups in check_ping and netutils.c in IPv6 configurations + (Pawel Malachowski) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1535 f882894a-f735-0410-b71e-b25c423dba1c + +2006-11-03 Ton Voon + + * lib/Makefile.am, lib/alloca.c, lib/alloca_.h: Add alloca files, + required for *BSD + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1534 f882894a-f735-0410-b71e-b25c423dba1c + +2006-11-01 Ton Voon + + * ChangeLog, configure.in, package.def: For 1.4.5 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1532 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-27 Ton Voon + + * plugins-scripts/t/utils.t, plugins-scripts/utils.pm.in: More edge + testcases. Allow anything if ends with a . as long as correct + characters + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1531 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-26 Ton Voon + + * NPTest.pm: New test variables default to "none", so no changes + required to tinderbox satelites + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1530 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins-scripts/check_oracle.sh: Fixed error if + dba_free_space has no free segments (Florian Gleixner) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1529 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/Makefile.am, plugins-scripts/t/utils.t, + plugins-scripts/utils.pm.in: Fixed regression where hostnames with + hyphens were rejected (1581402 - Holger Weiss) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1528 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/tarballs/check_traffic-0.90b.tar.gz: Removing unnecessary + tarball + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1527 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_disk.c, plugins/check_http.c: Remove C style + comments (1583467 - Markus Baertschi) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1526 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-24 Benoit Mortier + + * plugins-root/check_icmp.c: more fixes and removal of certain sentences + not needed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1525 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c, plugins/check_nt.c: last localization fixes + for core plugins in c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1524 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: next round of localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1523 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-24 Ton Voon + + * plugins-root/Makefile.am, plugins-root/check_icmp.c: Fixed compile on + non-glibc platforms + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1522 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Restored accidently regressed fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1521 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-23 Benoit Mortier + + * plugins/check_http.c: localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1520 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: first pass a making check icmp respecting + nagiosplugins rules + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1519 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-22 Benoit Mortier + + * plugins/check_nt.c: latest localization fixes for tonight ;-) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1518 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c: localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1517 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: putting default template for copyright and + explanations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1516 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: revert mistake when commiting fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1515 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c, plugins/check_apt.c, plugins/check_procs.c: + more localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1514 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-20 Ton Voon + + * plugins/check_snmp.c: Reverting back accidently regressed code + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1513 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-20 Benoit Mortier + + * plugins/check_mrtg.c: more localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1512 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c, plugins/check_apt.c: localization updates + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1511 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-19 Benoit Mortier + + * plugins/check_snmp.c: adding missing check_snmp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1510 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c: another round of localization + cleaning + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1509 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-19 Ton Voon + + * BUGS, ChangeLog, configure.in, package.def: For 1.4.4 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1507 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Added info re: 1.4.4 in prep for release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1506 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_snmp.c: Initialise strings for Fedora Core 5 + (Henning Schmiedehausen) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1505 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_snmp.c: Removed asprintf for perf data (Craig + Orsinger, Robby Giffin - 1310495) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1504 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_snmp.c: type variable not cleared in Sol 10 + (Kyle Tucker) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1503 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_http.c, plugins/t/check_http.t: Redirection + error if other headers beginning with L (Aravind Gottipati - 1562572) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1502 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins-scripts/utils.pm.in: Allow hostnames beginning with + digits (O'Shaughnessy Evans - 1567390) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1501 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_smtp.t: Added tests for SMTP servers without TLS and + with TLS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1500 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-19 Benoit Mortier + + * plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide_smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_procs.c: + first pass at cleaning localization for new release + first pass at making all the headre be the same licence, plugin, etc... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1499 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-18 Ton Voon + + * plugins/check_disk.c, plugins/t/check_disk.t: Re-added perf data to + check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1498 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/test_disk.c, lib/utils_disk.h: Fix tests for exact matches + when searching filesystems + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1497 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_base.c, lib/utils_base.h: Cater for different errors when + setting thresholds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1496 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-12 Ton Voon + + * plugins/check_smtp.c, plugins/t/check_smtp.t: Resend EHLO after TLS + negotiation as per RFC3207 (Holger Weiss - 1482832) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1493 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Removed extraneous comma in perf data output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1492 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/t/check_disk.t: Remove the "- free + space" if status is OK + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1491 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm, THANKS.in, plugins/check_disk.c, plugins/t/check_disk.t: + Fixed output from -e in check_disk (Andreas Behal) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1490 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-02 Ton Voon + + * plugins/t/check_load.t: Fix test failure on poseidon + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1487 f882894a-f735-0410-b71e-b25c423dba1c + +2006-09-21 Ton Voon + + * THANKS.in, plugins/check_nwstat.c: Added perfdata for most variables + and new parameters: VMU, VMF, + VMP, NRMH, NRMP, NRMM, NRMS, NSS1 to NSS7 (Christian Mies) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1480 f882894a-f735-0410-b71e-b25c423dba1c + +2006-09-02 M. Sean Finney + + * lib/utils_base.h, plugins/utils.h: - explicitly include utils_base.h + from utils.h + - put utils.h inside of an #ifndef/#endif + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1474 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: - fix for warning/critical timeouts in + check_tcp.c, in which the plugin + would exit with a usage error if non-int timeouts were passed. + - change --warning-time/--critical-time to just --warning/--critical, + as it's what --help says. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1473 f882894a-f735-0410-b71e-b25c423dba1c + +2006-08-14 Ton Voon + + * THANKS.in, plugins/check_disk.c: Fixed inode percent free output (Mike + Emigh - 1531899) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1469 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_ntp.t: Fixed skip of no ntp test + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1468 f882894a-f735-0410-b71e-b25c423dba1c + +2006-08-11 Ton Voon + + * plugins/check_ntp.c, plugins/t/check_ntp.t: Catch no responses from + any server (1538341 - nmdias) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1467 f882894a-f735-0410-b71e-b25c423dba1c + +2006-08-03 Ton Voon + + * tools/tinderbox_build: Interpret the snapshot datestamp as GMT + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1465 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-31 Harper Mann + + * plugins/check_nt.c: Bug: 694259 fix. After consulting with the target + service authors, we + decided to keep the default port as 1248 and add a note about other services + sometimes using this port and suggesting to change the port. Closing bug. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1464 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-31 Ton Voon + + * doc/developer-guidelines.sgml: M4 requirement for developer platform + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1463 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-29 Ton Voon + + * plugins-root/check_dhcp.c, plugins/common.h: Fix two Solaris compile + problems + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1462 f882894a-f735-0410-b71e-b25c423dba1c + + * po/POTFILES.in: Remove reference to check_udp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1461 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-28 Ton Voon + + * configure.in, plugins-scripts/Makefile.am, plugins/Makefile.am: + Cleanup references to old check_udp and INSTALL_OPTS. Error if + --with-nagios-user or --with-nagios-group specified for configure + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1460 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES, plugins/Makefile.am, plugins/check_udp.c, + plugins/t/check_udp.t: check_udp.c deprecated and check_udp now linked + to check_tcp. check_udp2 removed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1459 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-27 Ton Voon + + * doc/developer-guidelines.sgml: Example ranges (Nathan Vonnahme) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1458 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-19 Ton Voon + + * THANKS.in, configure.in: Stricter autoconf 2.60 rules (Lance Albertson + - 1522900) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1457 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: Fix to add uintmax_t, for check_disk.c compile + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1456 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: Fix for CHAR_MAX on Solaris 9 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1455 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-14 Ton Voon + + * lib/Makefile.am, lib/utils_base.c: Missing header files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1454 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fix inode percents using coreutils' percentage + calculation technique + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1453 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-13 Ton Voon + + * CHANGES, lib/tests/test_utils.c, lib/utils_base.c, lib/utils_base.h, + lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c, + plugins/t/check_disk.t: Major fixes to check_disk. Now should return + same data as df + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1452 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, configure.in, lib/Makefile.am, lib/tests/.cvsignore, + lib/tests/Makefile.am, lib/tests/README, lib/tests/test_disk.c, + lib/tests/test_disk.t, lib/tests/test_utils.c, lib/tests/test_utils.t, + plugins/Makefile.am, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, plugins/utils.c, + plugins/utils.h, plugins/utils_disk.c, plugins/utils_disk.h: Move new + util_* functions to lib/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1451 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/basename.c, lib/dirname.h, m4/basename.m4, + m4/dos.m4, m4/np_coreutils.m4, plugins/check_procs.c, plugins/utils.c, + plugins/utils.h: Using coreutils' base_name function because of + portability issues with + Tru64 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1450 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-12 Ton Voon + + * plugins/check_disk.c, plugins/t/check_disk.t, plugins/utils_disk.c, + plugins/utils_disk.h: Added -E option for exact match of filesystem. + Restructured main filesystem + loop. Added extra tests for possible duplicate filesystems. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1449 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/tests/.cvsignore, + plugins/tests/test_disk.c, plugins/utils_disk.c, plugins/utils_disk.h: + Moving parameter_list into utils_disk.h. Given list of mount points, can + now work out best match or exact match. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1448 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_disk.c, plugins/tests/Makefile.am, + plugins/tests/test_disk.c, plugins/tests/test_disk.t, + plugins/utils_disk.c, plugins/utils_disk.h: Moving check_disk functions + into utils_disk.c and testing them + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1447 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-11 Ton Voon + + * lib/creat-safer.c, lib/dup-safer.c, lib/fcntl--.h, lib/fcntl-safer.h, + lib/fd-safer.c, lib/open-safer.c, lib/pipe-safer.c, lib/unistd--.h, + lib/unistd-safer.h, m4/fcntl-safer.m4, m4/np_coreutils.m4, + m4/unistd-safer.m4: Extra files from coreutils required for getloadavg.c + to compile + on Tru64 (Ciro Iriarte - 1520331) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1446 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-10 Ton Voon + + * lib/Makefile.am: Didn't add intprops.h into distribution correctly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1445 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-07 Harper Mann + + * plugins/urlize.c: Added check for two arguments. Was segfaulting if no + or one arg. Now returns + help. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1444 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-05 Ton Voon + + * plugins-scripts/check_mailq.pl: Fixed checking of return codes from + external mailq programs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1443 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/tinderbox_build: Add instructions for manually sending Tinderbox + build logs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1442 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/intprops.h: Missing intprops.h for Tru64 (Ciro + Iriarte - 1517379) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1441 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-04 Ton Voon + + * THANKS.in, m4/alloca.m4, m4/np_coreutils.m4: Added alloca.h check and + fixed locale.h, wchar.h (Ari Pollak - 1516578) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1440 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-03 Ton Voon + + * plugins/check_dig.c: Fixed -p getopt call (Allan Bennett - 1511650) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1439 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, lib/c-strtod.c, lib/c-strtod.h, lib/c-strtold.c, + m4/c-strtod.m4, m4/np_coreutils.m4, plugins/Makefile.am: Fixed compile + on Tru64 5.1b (Ciro Iriarte - 1515435) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1438 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-21 Benoit Mortier + + * plugins/check_snmp.c, plugins/check_ssh.c: cleaning help and usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1437 f882894a-f735-0410-b71e-b25c423dba1c + + * po/LINGUAS: fixing bug id #1509699 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1436 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-20 Benoit Mortier + + * plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c: + cleaning help and usage + license + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1435 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-18 Benoit Mortier + + * plugins/check_disk.c, plugins/check_time.c, plugins/check_udp.c, + plugins/check_ups.c, plugins/check_users.c, plugins/gethostbyname.c, + plugins/gethostbyname.h, plugins/negate.c, plugins/netutils.c, + plugins/popen.c, plugins/runcmd.c, plugins/sslutils.c, plugins/urlize.c, + plugins/utils.c: updating help and usage and license + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1434 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-17 Benoit Mortier + + * plugins/check_hpjd.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c: cleaning up help and usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1433 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-15 Benoit Mortier + + * plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c: cleaning help and usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1432 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ide_smart.c: cleaning help and usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1430 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-14 Benoit Mortier + + * plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c: updating the help and usage for localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1427 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-14 Ton Voon + + * INSTALLING, doc/developer-guidelines.sgml: Updated requirements for + development platform + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1426 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-14 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c: + starting the BIG locale update ;-) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1425 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-07 M. Sean Finney + + * contrib/check_linux_raid.pl: some gratuitous whitespace changes, and a + fix to the "recovery =" detection + logic in check_linux_raid.pl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1418 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/utils.pm.in: removed stale references to + PATH_TO_NTPFOO, as it's no longer used. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1417 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-07 Ton Voon + + * plugins-root/Makefile.am: Do not install setuid programs unless run as + root + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1416 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/Makefile.am, tools/setup: Fixed two build problems re: + libtool and pst3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1415 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-06 M. Sean Finney + + * plugins/check_pgsql.c: modify the is_pg_dbname() function to allow + databases with '-' in their name. + reference: sf tracker #1500752 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1414 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-03 M. Sean Finney + + * configure.in: removed the -R for openssl, as it should be figured out + automatically by + libtool and also controlled via the --enable-rpath/--disable-rpath configure + options. furthermore keeping it in forces the rpath option on in spite of + what's passed on the configure line. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1413 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-01 M. Sean Finney + + * contrib/check_linux_raid.pl: gave some TLC to check_linux_raid + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1412 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-30 Ton Voon + + * configure.in: Default to search path for mysql_config + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1411 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in: For reporting check_radius compile problem + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1410 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, config.guess, config.sub, doc/developer-guidelines.sgml, + ltmain.sh: Added libtool files, at version 1.5.22, into CVS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1409 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-25 Ethan Galstad + + * plugins-root/check_dhcp.c: Applied patch for responses from + helpers/relays, cleaned up different coding styles for consistency + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1408 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-25 Ton Voon + + * lib/regex.o: Removed unnecessary file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1407 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/Makefile.am, plugins/common.h: Gettext fixes to sync + with coreutils + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1406 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-25 Ethan Galstad + + * plugins-root/check_dhcp.c: Fixed short interface name length, UNKNOWN + return code (patches from tracker) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1405 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-25 Ton Voon + + * plugins/check_http.c, plugins/t/check_http.t: Option to invert results + from a regexp pattern match + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1404 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/.cvsignore, lib/regcomp.c, lib/regex.c, lib/regex.h, + lib/regex.o, lib/regex_internal.c, lib/regex_internal.h, lib/regexec.c, + lib/strcase.h, m4/.cvsignore, m4/np_coreutils.m4, m4/regex.m4, + m4/restrict.m4, plugins/check_apt.c, plugins/check_http.c, + plugins/check_smtp.c, plugins/check_snmp.c: Use coreutils' regexp + libraries, so regexp always available now + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1403 f882894a-f735-0410-b71e-b25c423dba1c + + * m4/ls-mntd-fs.m4: Sync with coreutils 5.96 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1402 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-24 Ton Voon + + * THANKS.in, configure.in: Fix for mysql 3.x (Jeremy Reed, Michael + Tiernan - 1491936) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1401 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Reminder of no inline variable + declarations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1400 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: Variables need to be declared at top of code for + better portability + (Gerhard Lausser) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1399 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-19 Ton Voon + + * configure.in, doc/developer-guidelines.sgml: Requirement of automake + 1.8.3, as coreutils needs it + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1398 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, config.rpath, mkinstalldirs, po/.cvsignore, + po/remove-potcdate.sin: Adding more required files from gettext + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1397 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-18 Ton Voon + + * tools/setup: Bug in Makefile.am creation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1396 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, ABOUT-NLS, m4/Makefile.am, m4/Makefile.am.in, + po/.cvsignore, po/Makefile.in.in, tools/setup: Fixes from coreutils + sync: some files now required and removed generateable files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1395 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, Makefile.am, configure.in, doc/developer-guidelines.sgml, + lib/Makefile.am, lib/cloexec.c, lib/cloexec.h, lib/error.c, lib/error.h, + lib/exit.h, lib/exitfail.c, lib/exitfail.h, lib/fsusage.c, + lib/fsusage.h, lib/full-read.c, lib/full-read.h, lib/full-write.c, + lib/full-write.h, lib/getloadavg.c, lib/getopt.c, lib/getopt1.c, + lib/getopt_.h, lib/getopt_int.h, lib/gettext.h, lib/malloc.c, + lib/mountlist.c, lib/mountlist.h, lib/realloc.c, lib/safe-read.c, + lib/safe-read.h, lib/safe-write.c, lib/safe-write.h, lib/stdbool_.h, + lib/strtod.c, lib/unlocked-io.h, lib/xalloc-die.c, lib/xalloc.h, + lib/xmalloc.c, m4/.cvsignore, m4/Makefile.am, m4/afs.m4, m4/codeset.m4, + m4/error.m4, m4/exitfail.m4, m4/extensions.m4, m4/fstypename.m4, + m4/fsusage.m4, m4/getopt.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, + m4/intdiv0.m4, m4/inttypes-pri.m4, m4/inttypes.m4, m4/inttypes_h.m4, + m4/isc-posix.m4, m4/lcmessage.m4, m4/lib-ld.m4, m4/lib-link.m4, + m4/lib-prefix.m4, m4/longdouble.m4, m4/longlong.m4, m4/ls-mntd-fs.m4, + m4/malloc.m4, m4/mountlist.m4, m4/nls.m4, m4/np_coreutils.m4, + m4/onceonly_2_57.m4, m4/po.m4, m4/progtest.m4, m4/realloc.m4, + m4/signed.m4, m4/stdbool.m4, m4/stdint_h.m4, m4/uintmax_t.m4, + m4/ulonglong.m4, m4/unlocked-io.m4, m4/wchar_t.m4, m4/wint_t.m4, + m4/xalloc.m4, plugins-root/.cvsignore, plugins-root/check_dhcp.c, + plugins/.cvsignore, plugins/check_disk.c, plugins/common.h, + plugins/tests/.cvsignore, po/.cvsignore, tools/setup: Synchronise with + coreutils 2.95. Gettext now synced with coreutils, + so no longer development platform requirement + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1394 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-17 Ton Voon + + * configure.in: Fix for loading SSL libraries at runtime + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1393 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-root/Makefile.am: Fix compile problems on + Solaris for pst3 and ssl libs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1392 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-15 Ton Voon + + * CHANGES, contrib/check_disk_snmp.pl: check_disk_snmp.pl removed. + Notice added to CHANGES + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1391 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Changed snapshot generator due to cvs changes on SF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1390 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-03 Ton Voon + + * doc/LEAVERS: Leavers process documented + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1389 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-02 Ton Voon + + * plugins/check_disk.c: Inode thresholds not always being initialised + (James Fidell - 1476457) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1388 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: New check_ntp and check_apt plugins by Sean + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1387 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-01 M. Sean Finney + + * configure.in, plugins-scripts/Makefile.am, plugins/Makefile.am, + plugins/check_ntp.c, plugins/common.h, plugins/runcmd.c: - check_ntp: + - now roughly feature-complete. + - various bugfixes, esp. offset calculation. + - enhanced the asynchronous offset polling to set requests that + haven't recieved a response in >= 1 second to stale and retransmit them, + which results in much better performance on unreliable networks. + - we only spend timeout/2 seconds polling offsets, and if we don't get + everything by that point we work with what we have and set status to + warning/critical depending on how much data we have. + - set the same defaults as the perl script. + - commit changes to configure.in to support automatic building of check_apt + (if apt-get is installed and regex libraries available) and check_ntp + (unconditionally), now defaulting to check_ntp.c instead of the perl script. + if this is an issue we can back out the commit of course. an eye + should be kept on check_ntp building and running correctly in different + environments, esp. 64-bit and big-endian platforms, and those with more + "esoteric" API's (do any of the platforms not have poll()?). + - similar changes to Makefile.am's. + - common.h: add statement to include sys/poll.h + - runcmd.c: exit STATE_UNKNOWN if execve() fails. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1386 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-28 Ton Voon + + * configure.in: Remove stupid error where pst3 was always compiled + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1385 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-root/Makefile.am: Added pst3 into distribution + (Jason Kau - 1476451) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1384 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-27 Ton Voon + + * configure.in, plugins/check_procs.c, plugins/tests/test_utils.c, + plugins/utils.c, plugins/utils.h: Internal version of basename if one + not found in system + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1383 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-19 Ton Voon + + * plugins/t/check_nagios.t: Fix check_nagios tests on MacOSX 10.4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1382 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-19 Subhendu Ghosh + + * ChangeLog: ChangeLog update - release pending + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1380 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, package.def: version update - release pending + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1379 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-17 Benoit Mortier + + * po/fr.po: Final commit of fr.po + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1378 f882894a-f735-0410-b71e-b25c423dba1c + + * po/fr.po: another big chunk of fr.po + + Still 20 to go ;) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1377 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-16 Benoit Mortier + + * po/fr.po: big revision of po file for 1.4.3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1376 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-15 Benoit Mortier + + * po/fr.po: second part of fr.po updating + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1375 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-14 Benoit Mortier + + * po/de.po, po/fr.po, po/nagios-plugins.pot: updated pot file + sarted updating fr.po for nagios 1.4.3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1374 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-12 M. Sean Finney + + * plugins/check_ntp.c: the offset_requests are now parallelized. still + stuff needs to be + done (conveniently marked with XXX), but on well behaving networks + the plugin should behave more or less identical to check_ntp.pl now. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1373 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: added a currently unused but "good for reference" + version of offset_request + which attempts to behave more like ntpdate, but this doesn't yet and + the code isn't actually used yet. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1372 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-11 M. Sean Finney + + * plugins/check_ntp.c: another big code-commit to check_ntp. jitter + calculations now work, and + the program is becoming much closer on the packet-for-packet level to + how check_ntp.pl behaves. i'll send an email in the morning :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1371 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-06 Ton Voon + + * THANKS.in, plugins/utils.c: Stop coredump on Solaris if arg not + specified (Jason Kau - 1465288) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1370 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-05 Ton Voon + + * CHANGES: Notice added re: check_udp in next release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1369 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: Use pid_t for pids (1463853) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1368 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/t/check_http.t: Allow multiple -k + parameters (Gerd Mueller - 1457726) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1367 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-05 M. Sean Finney + + * plugins/check_apt.c: finally??? cvs works again???? let me dig up my + week-old cvs + commit message..... + + i'm becoming very happy with check_apt now :) + - now has support for an externally (configure.in) path to apt-get, + though i still have that in #ifdefs for the time being. + - support for defining what packages are "critical updates", via + the already-existing security regexp or overridable on the cmdline + - allow overriding of apt-get cmdline options + - introduce a "no upgrade" in case someone just wants to check that + they can download the package lists with -u but not check for upgrades. + might need to change the name of this option to prevent confusion. + - improved -h documentation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1366 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-29 Ton Voon + + * THANKS.in, plugins/check_tcp.c, plugins/tests/test_utils.c, + plugins/utils.c, plugins/utils.h: New function to for escaped strings + from command line for send/quit. + Adapted from Sebastian Wiesinger's patch (1292404) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1365 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm: Will die if signal received from a testCmd + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1364 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_udp.t: Allow 1 second delay in check_udp timeout + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1363 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_http.t: Fix possible timeout issue on hostname_invalid + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1362 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_dns.t: Fix test if response time is one second + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1361 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-29 M. Sean Finney + + * plugins/check_apt.c: now support for detecting critical/security + updates, which sets + the return code to STATE_CRITICAL instead of just STATE_WARNING + as it was previously doing. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1360 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-27 Ton Voon + + * plugins/t/check_udp.t: Set timeout within nc, rather than the test + script + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1359 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fixed bug with malloc of wrong size + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1358 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-24 Ton Voon + + * plugins/t/check_dns.t: Fixing defaults to work + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1357 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Reintroduced --with-mysql configure option. Note about SSL + cleanup + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1356 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: -C now implies -S/--ssl as well + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1355 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_hpjd.t, plugins/t/check_http.t: Tests converted to new + style + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1354 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, plugins/t/check_udp.t: udp checks require and + send and receive option. Tests updated so if + nc is available, will check send and receive working correctly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1353 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-23 M. Sean Finney + + * plugins/check_apt.c: - addition of include/exclude option for package + names in check_apt, + using POSIX regexp support. + - various commenting and tidying of code/logic/output. + - still haven't committed the Makefile.am/configure.in stuff. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1352 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-23 Ton Voon + + * NPTest.pm, plugins/check_disk.c, plugins/t/check_disk.t: check_disk + now errors if a specified directory does not exist (cf df /foo) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1351 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_disk.t: Some versions of Test::More do not like the + m#foo# syntax + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1350 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm, plugins/check_disk.c, plugins/t/check_disk.t: Incorrect + output when checking non-existent disk (John Rouillard - 1326050) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1349 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-23 M. Sean Finney + + * plugins/check_apt.c: more work on check_apt. more graceful error + handling and information + reporting, a couple new cmdline options. still not quite ready + for prime-time, maybe tomorrow :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1348 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-22 Ton Voon + + * REQUIREMENTS, configure.in: Reinstated --with-mysql option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1347 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c, plugins/t/check_dns.t: Added warning and critical + response times (John Rouillard - 1343159) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1346 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_pop.t: Convert to new style tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1345 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_tcp.c: Options to change line ends for -s and + -q (John Rouillard - 1346104) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1344 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh: Remove PATH restriction + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1343 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c, plugins/t/check_dns.t: New style tests. Cleanup + of presentation of help. Added '' around -a checks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1342 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: Typo (Thomas Guettler - 1433447) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1341 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh, plugins-scripts/utils.sh.in: Remove + hardlink to /bin/sed. Leave to PATH (Abs - 1391483) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1340 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-22 M. Sean Finney + + * plugins/check_apt.c: initial version of a check_apt plugin... not + editing configure/Makefile.am's + until i'm happier with it (better output, better ways to define warning + vs. critical thresholds... etc). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1339 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-21 Ton Voon + + * THANKS.in, configure.in: Stop check_dns from compiling if nslookup + does not exist (Sakari Lehtonen - + 1412721) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1338 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_load.t: Updated to new Test::More method for testing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1337 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fix for mysql 3.x + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1336 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Return CRITICAL if hostname invalid, as per + guidelines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1335 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: Patch to workaround SFnot having libtool installed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1334 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES, REQUIREMENTS, THANKS.in, configure.in, plugins/Makefile.am, + plugins/tests/Makefile.am: mysql discovery based on mysql_config (Johan + Fischer - 1359414) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1333 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-20 M. Sean Finney + + * plugins/check_ntp.c: - shuffling some code around to keep things tidy. + - now average the result of 4 queries just as ntpdate does + - put things in place for jitter calculation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1332 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: ipv6 support for c-version of check_ntp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1331 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-18 M. Sean Finney + + * plugins/check_ntp.c: initial version of the pure-c check_ntp + implementation. jitter not yet + implemented, and a couple other misc things to do, so i haven't + yet patched Makefile.am + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1330 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: return-logic related fix for cert checking, + thanks to emmet hogan. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1329 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-17 Ton Voon + + * plugins/tests/test_utils.t: Better error message re: tap library + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1328 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS, configure.in, plugins/Makefile.am, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/t/check_mysql.t: mysql detection cleanup: fixes runtime linking, + autodetection of main + locations, detection of lib64 and different layouts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1327 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Added requirement for developer system + to have gnu libtool + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1326 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-16 Ton Voon + + * configure.in, plugins/tests/Makefile.am, tools/setup: Using libtool to + get runpath for tap library + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1325 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-15 Ton Voon + + * THANKS.in, plugins/check_mysql.c, plugins/t/check_mysql.t: Alert on + amount of time a slave is behind (Steven Kreuzer) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1324 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-13 M. Sean Finney + + * plugins/check_swap.c: fix for (tracker id 1420741) + "check_swap: incorrect totals for multiple partitions (BSD)" + thanks to scott thompson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1323 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-13 Ton Voon + + * plugins/check_ping.c: Change warning message if there is stderr + output. This catches a problem + where time was shifting backwards on a linux VMware guest during the ping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1322 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-07 Ton Voon + + * plugins/t/check_http.t: Added tests for two external websites with + certificates + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1321 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_http.t: Tests re-written in new object format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1320 f882894a-f735-0410-b71e-b25c423dba1c + +2006-02-24 Ton Voon + + * doc/developer-guidelines.sgml: Updated doc as tap library is now + automatically discovered + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1319 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/tests/Makefile.am: Use the installed tap library + instead of requesting a compiled object + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1318 f882894a-f735-0410-b71e-b25c423dba1c + +2006-02-17 Ton Voon + + * THANKS.in, plugins/popen.c: SIGALRM could be received before + child_process is created (Jason Crawford) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1317 f882894a-f735-0410-b71e-b25c423dba1c + +2006-02-17 M. Sean Finney + + * plugins/check_procs.c: set LC_NUMERIC to POSIX in check_procs.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1316 f882894a-f735-0410-b71e-b25c423dba1c + +2006-02-01 Ton Voon + + * plugins/t/check_mysql_query.t: If a mysql server has anonymous login, + tests will always fail + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1315 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/tests/Makefile.am: Need to distribute perl test file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1314 f882894a-f735-0410-b71e-b25c423dba1c + +2006-01-31 Ton Voon + + * CHANGES: check_mysql_query included + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1313 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: Note on MacOSX difference in mysql package + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1312 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/Makefile.am: Clean compile of check_mysql_query + on MacOSX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1311 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm: Sort ordering of tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1310 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/.cvsignore, plugins/Makefile.am, + plugins/check_mysql_query.c, plugins/t/check_mysql_query.t, + plugins/utils.h: Adding check_mysql_query, using new ranges and + threshold checking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1309 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_mysql.t: Extra explanation in tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1308 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/tests/test_utils.c: Fixed invalid free + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1307 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Updated instructions on using libtap as + configure option changed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1306 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Changed configure option to --with-libtap-srcdir because + requires + tap.h as well as tap.o + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1305 f882894a-f735-0410-b71e-b25c423dba1c + +2006-01-30 Ton Voon + + * doc/developer-guidelines.sgml, plugins/tests/test_utils.c, + plugins/utils.c, plugins/utils.h: Clearly defined thresholds & ranges in + docs. Added get_status routine. Added + set_thresholds routine. Tests enhanced to check new routines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1304 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, doc/developer-guidelines.sgml, plugins/Makefile.am, + plugins/tests/.cvsignore, plugins/tests/Makefile.am, + plugins/tests/README, plugins/tests/check_disk, plugins/tests/check_dns, + plugins/tests/check_ftp, plugins/tests/check_hpjd, + plugins/tests/check_http, plugins/tests/check_load, + plugins/tests/check_ping, plugins/tests/check_procs, + plugins/tests/check_swap, plugins/tests/check_users, + plugins/tests/check_vsz, plugins/tests/test_utils.c, + plugins/tests/test_utils.t, plugins/utils.c, plugins/utils.h: Added + libtap tests for utils.c library functions. Removed redundant + test files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1303 f882894a-f735-0410-b71e-b25c423dba1c + +2006-01-21 Ton Voon + + * tools/sfsnapshot: Have to use own id for cvs checkout. Change compile + server because + old one not working consistently + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1302 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-19 Ton Voon + + * NPTest.pm: Break out of testing if a new parameter is required + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1301 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-16 Harper Mann + + * contrib/check_log2.pl: Added ability to output critical on error. + Fixed open so it properly fails if the log file open throws an error, + turned on -w in the perl call, fixed warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1300 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-15 Ton Voon + + * NPTest.pm, plugins/check_mysql.c, plugins/t/check_mysql.t: Display + errors with slave queries correctly. Added extra tests for slaves + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1299 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm, doc/developer-guidelines.sgml, plugins/t/check_disk.t: New + 3 parameter version of getTestParameters. Updated check_disk.t to + reflect. + Added notes re: testing in developer guidelines. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1298 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_file_age.pl, plugins-scripts/t/check_file_age.t: + Allow directories and links to be tested by check_file_age. Sanitise + output. + Added tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1297 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-07 Harper Mann + + * plugins/urlize.c: Nagiosplug bug 1266977. Added code to insert the + closing after the plugin output but before the performance output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1296 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-07 Ton Voon + + * THANKS.in, plugins/common.h: No floorf on Solaris 9 (Jon Vandegrift - + 1374705) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1295 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-02 Ton Voon + + * THANKS.in, doc/developer-guidelines.sgml, plugins/check_nagios.c, + plugins/t/check_nagios.nagios1.status.log, + plugins/t/check_nagios.nagios2.status.dat, plugins/t/check_nagios.t: + Support for Nagios 1 and Nagios 2 status files (Gerhard Lausser - + 1296242) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1294 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/.cvsignore: Ignore temporary files created for tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1293 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-01 Ton Voon + + * config_test/Makefile, config_test/run_tests, configure.in: Run longer + test on redhat for spopen/pthread problem. Allow enable/disable of + pthread fix via configure option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1292 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-30 Harper Mann + + * plugins-scripts/check_ntp.pl: Nagiosplug bug # 1251096 + check_ntp wasn't properly handing a bad exit status from the external programs it calls (ntpdate and ntpq), so jitter wasn't set. Added check of $? on close and proper error output if status from the sub program call completion is non-zero. This includes "host not found". + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1291 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-29 Harper Mann + + * contrib/check_email_loop.pl: UNKNOWN exit status was returning status + of "-1", changed to "3" + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1290 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_email_loop.pl: Bug: 1355304 Added patch for ePN and perl + warnings. Fixed some text and + a warning about type comparison. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1289 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-18 Ton Voon + + * tools/sfsnapshot: Create a permanent link to HEAD snapshot + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1288 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Updated with more detailed description + of UNKNOWN states + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1287 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-16 Ton Voon + + * plugins/check_disk.c: Fixed some compile errors with new translations. + Also reintroduced formatting + after discussion with Benoit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1286 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-15 Ton Voon + + * plugins/t/check_disk.t: Updated tests to minimise false positives. + Breaking down so more obvious + what the tests are doing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1285 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-14 Ton Voon + + * doc/developer-guidelines.sgml: Added section re: translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1284 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-14 Benoit Mortier + + * plugins/check_http.c: localization cleaning ... + last commit before sleeping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1283 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c: + start of the cleaning of the localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1282 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-12 Ton Voon + + * THANKS.in, plugins/t/check_disk.t: Updated check_disk tests to use + Test::More (Serhan Kiymaz) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1281 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-09 Ton Voon + + * plugins/t/check_mysql.t: Using Test::More + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1280 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm, plugins/t/check_imap.t, plugins/t/check_swap.t: Added new + NPTest->testCmd which returns objects back for testing + at the test script level. Updated check_swap and check_imap to this + new format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1279 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Problem where absolute thresholds not working on + /proc/meminfo + systems. Suffixed all variables with the unit of measurement + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1278 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Typo with predetermined values + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1277 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Added copyright/license info required + in submissions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1276 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/NEW_STARTERS, doc/developer-guidelines.sgml: Updated dev + guidelines to link to NagiosExchange. Removed project admin + notes from guidelines into separate file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1275 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-07 M. Sean Finney + + * configure.in: incorporated patch from Elan Ruusamäe (ahmake) to + override + program autodetection (see Feature Requests-1341528). i would + not call this quite complete just yet (i'll explain more in the + tracker), but should be functional and useful enough to commit + now, in any case. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1274 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-04 Ton Voon + + * THANKS.in, plugins/check_tcp.c, plugins/t/check_imap.t: Fixed + --mismatch option for check_tcp. Added tests into check_imap + (Rick Fey - 1339134) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1273 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-03 Ton Voon + + * Makefile.am, tools/tinderbox_build: Adding new tinderbox build script + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1272 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_disk.t, plugins/t/check_procs.t: Invalid mount point + doesn't make sense because most df implementations + would work out the actual mount point. And fixed typo in check_procs.t + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1271 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm, plugins/t/check_http.t, plugins/t/check_time.t: Fixing some + test failures + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1270 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-02 M. Sean Finney + + * plugins/check_disk.c: #995761: patch from ben o'hara to include inode + calculations in + check_disk.c. + + previous commit also had a patch for smtp auth support, but i accidentally + sent a blank commit message. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1269 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: check_smtp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1268 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-31 M. Sean Finney + + * configure.in, plugins/check_game.c, plugins/check_http.c, + plugins/check_nagios.c, plugins/check_snmp.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/common.h, plugins/netutils.c, + plugins/netutils.h, plugins/sslutils.c: code cleanups, largely resulting + from turning on -Wall. mostly + unused variables and explicit casting issues, but there were a + couple gotchas in there too. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1267 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-30 M. Sean Finney + + * plugins/Makefile.am: turned on -Wall in plugins/Makefile.am via + AM_CFLAGS. shouldn't keep + our heads in the sand for potential errors, after all :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1266 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: another fix from alex: check for '/' in the + server_address before + trying to resolve it via is_host(). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1265 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: fixes for some bugs found in my merging of the + tcp socket patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1264 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-29 M. Sean Finney + + * plugins-scripts/check_log.sh: check_log fixes from Ade Rixon + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1263 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: patch from nsturm: Makefile.am should have been + checking for check_ldap + instead of check_ldaps. the result was that check_ldaps was not being + created during the build process. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1262 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-25 M. Sean Finney + + * COPYING, configure.in, plugins/Makefile.am, plugins/check_tcp.c, + plugins/netutils.c, plugins/netutils.h, plugins/utils.h, po/de.po, + po/fr.po: - added code to allow check_tcp (via np_net_connect) work with + local + unix sockets. some testing would be welcome. based on idea from + Alex Samorukov. + - also introduced a check_clamd behavior in check_tcp. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1261 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-24 M. Sean Finney + + * plugins/Makefile.am, plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_dns.c, plugins/check_game.c, plugins/check_nagios.c, + plugins/netutils.c, plugins/runcmd.c, plugins/utils.c, plugins/utils.h: + initial merging of ae's np_runcmd code into selected plugins. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1260 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-23 M. Sean Finney + + * configure.in: whoops, missed this one, same as last commit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1259 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/netutils.c, plugins/sslutils.c: - + compartmentalized ssl code into seperate sslutils.c + - ssl-related cleanups in configure.in, and now openssl/gnutls options + automatically disable each other. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1258 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-19 M. Sean Finney + + * plugins/check_http.c, plugins/check_smtp.c, plugins/check_tcp.c, + plugins/netutils.c, plugins/netutils.h: all plugins now using + centralized ssl functions in netutils.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1257 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: endif was a few lines off of where it should be + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1256 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-root/Makefile.am, plugins/Makefile.am, + plugins/check_http.c, plugins/check_smtp.c, plugins/check_tcp.c, + plugins/common.h, plugins/netutils.c, plugins/netutils.h: - initial + attempt at consolidating ssl-related code into netutils.{c,h} + - added some #ifdefs to common.h and netutils.h to prevent multiple + inclusions (as netlibs now includes common.h) + - all ssl plugins (tcp/http/smtp) compile cleanly against gnutls, though + certificate checking still needs to be done. + - modified configure script so you can also explicitly say "without-gnutls" + too (otherwise if you disable openssl you have no way of disabling + gnutls too) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1255 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-18 M. Sean Finney + + * configure.in, plugins/check_tcp.c: initial "experimental" support for + gnutls. by default openssl is still + used if available, and gnutls is only used if openssl is not available + or explicitly disabled (--without-openssl). currently the only plugin + i've verified to work is check_tcp, but i had to disable cert checking. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1254 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-18 Ton Voon + + * README: Added license information to README with exemption for use of + OpenSSL + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1253 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-13 Ton Voon + + * configure.in: Run spopen tests for Redhat ES SMP (Hans Engelen) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1252 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-13 M. Sean Finney + + * po/de.po: debian bts #313960: + - grammatical german fixes. i'm taking the reporter's word for it :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1251 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: debian bts #268044: + - use a "less beastly" regex for parsing ntpq output. probably need + some more widespread testing on this one. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1250 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: debian bts #296278: + - it seems that when check_disk uses the "df" routines and is told to + check a non-mountpoint, it would check the filesystem on which the + directory was mounted (i.e. /var/log -> /var if no /var/log mount). + the system-call routines now do this too. might need a bit more + widespread testing, but looks good for me and i did it without + modifying any of the system-call-specific codeblocks. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1249 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_game.c: debian bts #307905: + - someone changed the cmdline syntax of check game without also + updating the usage/help function ;p + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1248 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_disk_smb.pl: debian bts #300701: + - check_smb fix for freespace threshold parsing from the cmdline options. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1247 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: multiple fixes in check_smtp from debian (bts + #285554): + - fix for double free via SSL_CTX_free. looks like the previous author + knew this was a problem but didn't care enough to fix it ;p. + - use defines instead of const chars for SMTP strings. + - default to send our fqdn (via gethostbyname lookup on gethostname) + in the HELO string, as this is an RFC/SMTP requirement. overridable + via cmdline. + - use EHLO instead of HELO if using STARTTLS, as it is not SMTP but + ESMTP. + - verify the server supports STARTTLS before initializing it. + - always send QUIT before disconnecting when possible. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1246 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mrtg.c: was this plugin even working? i don't think the + if/else logic + was doing what was intended. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1245 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mysql.c: check mysql now reads [client] defaults from + my.cnf (debian bug #278817) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1244 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-06 M. Sean Finney + + * plugins/check_ups.c: fix for misreporting temperature in perfdata + output for check_ups + (debian bts id: #316534) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1243 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-root/Makefile.am: whoops. now using automake + conditionals to prevent attempted compiles + of pst3 on non solaris systems. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1242 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-25 M. Sean Finney + + * plugins-root/Makefile.am: added rules to Makefile.am for pst3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1241 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-24 M. Sean Finney + + * configure.in: a final change to hardcode the path for where plugins + are installed. + it's a very, very ugly hack... if anyone can think of a better way + to do it, i'm all ears. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1240 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-22 M. Sean Finney + + * configure.in: use test instead of '[ ... ]' in configure.in. the + check_procs/pst3 + situation is still not quite fixed. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1239 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, configure.in, plugins-root/pst3.c: first version of bob + ingraham's pst3 to allow checking for longer + cmdline names than otherwise possible, by querying solaris kmem + directly (ps forcibly truncates). added requisite configure.in voodoo + and updated THANKS.in. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1238 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-22 Ton Voon + + * po/POTFILES.in: Mark moving of check_dhcp and check_icmp for + translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1237 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-21 Ton Voon + + * AUTHORS, THANKS.in: Updated with contributors and new team member + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1236 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nwstat.c: Reopen connections for each query (1296296 - + David Sullivan) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1235 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dhcp.c, plugins/check_icmp.c: Moved into plugins-root/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1234 f882894a-f735-0410-b71e-b25c423dba1c + + * ACKNOWLEDGEMENTS, CHANGES, Makefile.am, README, configure.in, + plugins-root/.cvsignore, plugins-root/Makefile.am, + plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/Makefile.am: Separation of root setuid plugins into + plugins-root/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1233 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-20 Ton Voon + + * configure.in: Incorrect assignment of procppid in configure.in + (1296497 - Pascal Larisch) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1232 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/t/check_procs.t: Support for Tru64 for + check_procs + additional test cases + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1231 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-19 Ton Voon + + * doc/RELEASING: Note to update version number before creating ChangeLog + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1230 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, package.def: For 1.4.2 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1228 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: Updated for 1.4.2 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1227 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/RELEASING: Reminders for news item and tag format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1226 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS: Updated BUGS for 1.4.2 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1225 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1224 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-15 Ton Voon + + * plugins/t/check_ping.t: Added test to make sure hostname has to be + specified + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1223 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c, plugins/check_swap.c: - Cleanup minor compile + errors on Irix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1222 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-14 Ton Voon + + * plugins/check_ping.c: Using common message + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1221 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Required hostname not flagging as an error + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1220 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Some makes do not like blank lines after "\". + Fixed check_ldaps to only + generate if check_ldap was created (Chester Hosey) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1219 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: Fix to parsing of uptime (Ronald Tin - 1254656) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1218 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: - Removing typos + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1217 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-13 Ton Voon + + * plugins/check_ping.c: More diagnostic messages from check_ping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1216 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-12 M. Sean Finney + + * plugins/check_ping.c: re-add a call to setlocale(LC_ALL, "") in + check_ping.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1215 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-12 Ton Voon + + * THANKS.in: For help in fixing Red Hat problem with ECHILD and waitpid + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1214 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, config_test/Makefile, config_test/child_test.c, + config_test/run_tests, configure.in, plugins/popen.c: ECHILD error at + waitpid on Red Hat systems (Peter Pramberger and + Sascha Runschke - 1250191) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1213 f882894a-f735-0410-b71e-b25c423dba1c + +2005-08-30 Ton Voon + + * plugins-scripts/subst.in: Better comments for what the substitutions + are doing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1212 f882894a-f735-0410-b71e-b25c423dba1c + +2005-08-01 Ton Voon + + * doc/BRANCHING: Move notes on branching away from RELEASING + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1210 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, REQUIREMENTS, configure.in, package.def: For 1.4.1 + release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1209 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-25 Peter Bray + + * NPTest.pm: Change the environment variable NPTESTCACHE to NPTEST_CACHE + for consistancy + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1208 f882894a-f735-0410-b71e-b25c423dba1c + + * Helper.pm, Makefile.am, NPTest.pm, configure.in, + plugins-scripts/t/check_rpc.t, plugins/t/check_disk.t, + plugins/t/check_dns.t, plugins/t/check_fping.t, plugins/t/check_ftp.t, + plugins/t/check_hpjd.t, plugins/t/check_http.t, plugins/t/check_imap.t, + plugins/t/check_load.t, plugins/t/check_mysql.t, plugins/t/check_ping.t, + plugins/t/check_pop.t, plugins/t/check_procs.t, plugins/t/check_smtp.t, + plugins/t/check_snmp.t, plugins/t/check_swap.t, plugins/t/check_tcp.t, + plugins/t/check_time.t, plugins/t/check_udp.t, plugins/t/check_users.t, + plugins/t/check_vsz.t, test.pl.in: [1185704] New Testing Infrastructure. + Complete rewrite of the original testing infrastructure and + all test cases (to use the new infrastructure) + See NPTest.pm and issue 1185704 for more details. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1207 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-20 Ton Voon + + * THANKS.in: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1206 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Fix parsing for netkit-ping and iputils-ping + (Christian G Warden) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1205 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-11 Ton Voon + + * plugins/check_nwstat.c: Miscelleneous bug fixes (Gerd Mueller - + 1235879) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1204 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-09 Ton Voon + + * BRANCHES: Changed format (already!) for awk simplicity + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1203 f882894a-f735-0410-b71e-b25c423dba1c + + * BRANCHES: Master file to describe the current branches in CVS. Will be + used by + sfsnapshot to create the snapshot tarballs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1202 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-06 Ton Voon + + * configure.in: Removed ",", causing problems with MacOSX compile + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1201 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Updated help file to remove swap -s reference + (Sivakumar Nellurandi) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1200 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, THANKS.in: Sean Finney moved to main list of plugin + developers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1199 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-04 Benoit Mortier + + * contrib/tarballs/check_traffic-0.90b.tar.gz: replace the version of + check_traffic who was missing the plugin + by a good one + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1198 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-29 M. Sean Finney + + * plugins/runcmd.c, plugins/runcmd.h: initial versions of the runcmd + framework by andreas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1197 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: divide by 0 fix for check_swap + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1196 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-28 M. Sean Finney + + * plugins/check_load.c: set LC_NUMERIC to POSIX in check_load (1164325) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1195 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/Makefile.am, plugins/check_swap.c: scanf parsing + fix for check_swap from tracker id 1123292. now use floor(3) + to round down floating point numbers. requires -lm on many systems, + so support for testing for this was added to the configure.in and + automake template + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1194 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-27 M. Sean Finney + + * plugins/check_hpjd.c: fixes from richard brodie (tracker id 1216576) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1193 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-26 M. Sean Finney + + * contrib/check_dl_size.pl, contrib/check_ftpget.pl, + contrib/check_logins.c, contrib/check_mysql.c, contrib/check_mysql.pl, + contrib/check_mysqlslave.pl, contrib/check_nwstat.pl, + contrib/check_pop3.pl, contrib/check_procl.sh, contrib/check_procr.sh: + spring cleaning of contrib directory from andreas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1192 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/tarballs/berger-ping.tar.gz, + contrib/tarballs/check_memory.tgz, contrib/tarballs/check_spread.tar, + contrib/tarballs/radius.tar.gz: removal of obsolete tarballs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1191 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: "asprintf madness" fix from andreas' patch to + np-d, minus the comments. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1190 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-05 M. Sean Finney + + * plugins/check_tcp.c: check_tcp code cleanup from andreas plus fix to + andreas' patch from sean + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1189 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-03 M. Sean Finney + + * plugins/check_procs.c: gcc 2.x fixes from edward + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1188 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-01 Subhendu Ghosh + + * plugins/check_snmp.c: only load mibs if needed or specified - patch + 1212395 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1187 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-28 M. Sean Finney + + * plugins/check_load.c: bugfixes to check_load thanks to andreas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1186 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-26 M. Sean Finney + + * plugins/check_mysql.c: fix for check_msyql so that it doesn't use + column numbers but the + names instead for determining slave status. thanks to james kingston. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1185 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-25 Subhendu Ghosh + + * plugins/check_time.c: 64bit sys support - 1185713 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1183 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: support for getnext - 1106430 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1182 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: RH9 pattern + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1181 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: perfdata patch - 1172539 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1180 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: new option for zero offset - 1159317 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1179 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: v2c support - 1155754 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1178 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-25 M. Sean Finney + + * configure.in, plugins/check_nagios.c, plugins/check_procs.c: fixes for + check_procs: + - added support for printing the pid in all the ps outputs + - don't use the proc name to ignore self, use the pid vs getpid(). + - initialize procetime to null string otherwise -vvv can have funny results + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1177 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, plugins/netutils.c, plugins/netutils.h: bah, + my_connect is taken by mysql. now calling it np_net_connect. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1176 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-24 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: patched bug id 1200030 - regex update + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1175 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: patched bug id 1204636 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1174 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-24 M. Sean Finney + + * plugins/check_tcp.c, plugins/netutils.c, plugins/netutils.h: + optimizations and cleanup from andreas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1173 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-23 M. Sean Finney + + * nagios-plugins.spec.in: build fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1172 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-03 M. Sean Finney + + * plugins/check_ping.c: setlocale(LC_ALL, "") should be + setlocale(LC_NUMERIC, "C") to properly parse the output of ping. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1171 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: if check_tcp was called with -e but not -s, it + would hang in a call to my_recv. the + fix committed here adds on more piece of logic to the check to see if more data needs + to be read, avoiding the deadlock call. a better fix would be to not use these "voodoo" + heuristics and instead use poll() or select(), but that's quite a bit more complicated. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1170 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-01 M. Sean Finney + + * plugins/popen.c, plugins/popen.h: better error checking in spopen + signal handler (see 1107524) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1169 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: provide a --with-perl option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1168 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-29 Stanley Hopcroft + + * contrib/check_sybase: check_sybase 0.7 from Simon Bellman. Thx + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1167 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-19 M. Sean Finney + + * plugins-scripts/check_ntp.pl: regexp fix for check_ntp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1166 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: check for the -w flag for ping6 as well as ping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1165 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-17 M. Sean Finney + + * plugins-scripts/check_disk_smb.pl: also change the --help output to + reflect that check_disk_smb defaults to empty passwords + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1164 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-16 M. Sean Finney + + * plugins-scripts/check_disk_smb.pl: patch to check_disk_smb to allow + empty passwords + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1163 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-14 M. Sean Finney + + * plugins-scripts/check_mailq.pl: check_mailq fix, don't be case + sensitive matching /^\s+Total\sRequests:\s(\d+)$/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1162 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: typographical fix in check_ntp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1161 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-11 M. Sean Finney + + * plugins/check_ssh.c: properly call close() on the ssh connection + before exiting. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1160 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_tcp.c: this should add support for + check_ssmtp, based on the 1.3.x patch in 1155562, + but fixed to follow how things are done in 1.4 (using strdup instead of + asprintf) and patching configure.in instead of configure. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1159 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-07 M. Sean Finney + + * plugins/check_smtp.c: in honor of joining up, my first bugfix. this + should resolve 1174070. + + note i don't have an exchange server to test this against, but it + does what the requester mentioned (slightly cleaner than the patch + attached in the tracker). + + it does, however, still work against my own postfix server :) + + sean + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1158 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-05 Harper Mann + + * plugins/check_snmp.c: This is a first cut at adding performance data + to check_snmp. I wasn't sure + how to handle UOM so only values that return SNMP type Counter32: are labled + with "c". All other values have a blank UOM. I also left off warn, crit, + max and min values in the performance data until we come up with a way to + handle them. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1157 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-04 Ton Voon + + * THANKS.in: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1156 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Fix static buffer (Nikolay Sturm) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1155 f882894a-f735-0410-b71e-b25c423dba1c + +2005-03-18 Matthew Kent + + * plugins/check_mysql.c: Replication check support for 4.1.x from Gerrit + Beine + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1154 f882894a-f735-0410-b71e-b25c423dba1c + +2005-03-08 Ton Voon + + * plugins-scripts/check_ntp.pl: Added OS info for offset issue + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1149 f882894a-f735-0410-b71e-b25c423dba1c + +2005-03-04 Ton Voon + + * plugins-scripts/check_ntp.pl: Ignore extra check on offset 0.00000 + (John Warburton - 1150777) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1148 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/check_smtp.c, plugins/check_ups.c: Fixed + // comments (Steve Greenland - 1143836) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1146 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: Support for IPv6 (Merijn Evertse - + 1119917) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1145 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, package.def: Changed to next version number + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1144 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/RELEASING: Notes on branching + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1143 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Missed check_disk addition to 1.4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1141 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-11 Stanley Hopcroft + + * plugins/Makefile.am: Fix for check_icmp build on Solaris from Andreas + Ericsson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1140 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-04 Ton Voon + + * configure.in: For 1.4 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1138 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: Updated for 1.4 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1137 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS: New file to note known bugs for major releases + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1136 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Reordering of items with most important announcements first + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1135 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-04 Stanley Hopcroft + + * contrib/check_oracle_tbs: New version (1.1) from John Koyle + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1134 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-04 Ton Voon + + * Makefile.am: BUGS file addition to release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1133 f882894a-f735-0410-b71e-b25c423dba1c + + * README: Cleanup and addition of reference to BUGS file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1132 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/RELEASING: Updated with corrections. Added note to update BUGS + file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1131 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-03 Ton Voon + + * THANKS.in: Patch against check_log + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1130 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh: Check for log file readability + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1129 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-02 Stanley Hopcroft + + * contrib/check_email_loop.pl: Add debug option from John Rouillard + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1128 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ide_smart.c: try again to stop looping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1127 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ide_smart.c: restructure main() to stop looping on -n + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1126 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-01 Stanley Hopcroft + + * contrib/check_traceroute-pure_perl.pl: Thank you to Myke Place for + check_traceroute-pure_perl.pl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1125 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in: Thank you for contributed plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1124 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: check_icmp added to libexec_PROGRAMS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1123 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: check_icmp no longer regarded as volatile; built by default + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1122 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/linux.h: plugins/linux.h, vestigeal header required for prior + versions of check_icmp, no longer required. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1121 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Amendments for check_icmp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1120 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: hacks to partly support check_icmp.c (1.0). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1119 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_icmp.c: Revised check_icmp (1.0) from A Ericsson. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1118 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_asterisk.pl, contrib/check_email_loop.pl, + contrib/check_http-with-client-certificate.c, + contrib/tarballs/check_traffic-0.91b.tar.gz: New or revised plugin in + /contrib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1117 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-28 Stanley Hopcroft + + * contrib/check_sybase: New version of Simon Bellwoods check_sybase + (0.4). Thank you. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1116 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-27 Stanley Hopcroft + + * contrib/check_traceroute.pl: Jon Meek's check_traceroute for Mon + hacked by YT for Nagios. Prob pretty weak + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1115 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_smart.pl: Candidate successor to + /plugins/check_ide_smart.c. Now in /contrib. NB there is another new + plugin with sim function + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1114 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_fan_cpq_present, contrib/check_fan_fsc_present, + contrib/check_mysqlslave.pl, contrib/check_temp_cpq, + contrib/check_temp_fsc: New /contrib plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1113 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_arping.pl, contrib/check_cpqarray.c, + contrib/check_frontpage, contrib/check_logins.c, + contrib/check_oracle_tbs, contrib/check_pcpmetric.py, + contrib/check_pfstate: New /contrib plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1112 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES, THANKS.in, contrib/README.TXT, po/de.po, po/fr.po: 1 New + /contrib plugins + 2 Revised check_dhcp.c status in CHANGES + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1111 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-27 Harper Mann + + * plugins/Makefile.am: Added check_dhcp bask into libexec_PROGRAMS after + talking with Stanley. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1110 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-26 Ton Voon + + * THANKS.in: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1109 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: Convert tabs to spaces from dig's answer section + (Randy O'Meara - 1107651) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1108 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: Add recommendation for check_procs on Mandrake systems + (Paulo Fessel - 1106849) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1107 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-25 Stanley Hopcroft + + * plugins/check_ide_smart.c: Display usage if no argv (Reuben Farrelly) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1106 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-25 Harper Mann + + * plugins/check_dhcp.c: Tracker:1109261 This was an alignment problem on + Solaris. Linux kernel fixes alignment so this was not seen there. Memcpy + takes care of proper alignment. Tested on RHEL V3 U3, RHEL V4, FreeBSD + 4.10 (Thanks Stanley!) and Solaris 9 with the GNU env. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1105 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-25 Stanley Hopcroft + + * plugins/check_ide_smart.c: Trivial text changes (print_help, + commentary & -n option) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1104 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_dhcp.c, contrib/tarballs/check_icmp-0.8.tar.gz: moved to + /plugins (core plugin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1103 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/tarballs/check_cit.tgz: replaced by contrib/check_ica* (esp + check_ica_metaframe_pub_apps) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1102 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_citrix: Replaced by the check_ica* pair of plugins + (mainly check_ica_metaframe_pub_apps) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1101 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/packet_utils.pm: packet creation and dumping hacks used by + check_ica* and check_lotus + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1100 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_ica_master_browser.pl: New plugin - checks that ICA + master browser is what it should be (important for firewalled dialup) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1099 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_ica_metaframe_pub_apps.pl: Replacement (structured name + mainly) for check_citrix: check of ICA browse service + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1098 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_ica_program_neigbourhood.pl: New plugin to check Citrix + Metaframe XP "Program Neighbourhood" + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1097 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_lotus.pl: New plugin to check responsiveness of Louts + Notes (v5 at least) servers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1096 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-24 Stanley Hopcroft + + * plugins/Makefile.am: Removed check_dhcp and check_icmp from + libexec_PROGRAMS (ie dont build by defaut) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1095 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Notes about check_dhcp and check_icmp (no longer built by + default, use at own peril, volatile) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1094 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-21 Stanley Hopcroft + + * configure.in: Set arch specifc preprocessor symbols in config.h. + TEMPORARY hack for check_dhcp.c [on FreeBSD 4: /check_dhcp -i fxp0 -> + DHCP ok: Received 1 DHCPOFFER(s), max lease time = 259200 sec. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1093 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-21 Harper Mann + + * plugins/check_snmp.c: Tracker 1106378 fixed - The -t (timeout) arg was + not handled correctly when passed to the snmpget command. Added -e + --retries for the correct retries value to snmpcmd. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1092 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-21 Ton Voon + + * doc/developer-guidelines.sgml: Changing copyright to the Nagios + Plugins Development Team, rather than + individual names. Also, clarified use of ACKNOWLEDGEMENTS, THANKS.in and + AUTHORS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1091 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-20 Harper Mann + + * plugins/check_http.c: Changed long argument --minmax to --pagesize and + updated help and usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1090 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-20 Ton Voon + + * AUTHORS, Makefile.am, THANKS.in: The AUTHORS file now used for the + plugin team, with THANKS.in as the + contributors list. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1089 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-20 Harper Mann + + * CHANGES: Added comment about check_http --pagesize and added max value + to page size check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1088 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-20 Ton Voon + + * AUTHORS: Added Sean for bug reports + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1087 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-20 Harper Mann + + * plugins/check_http.c: Tracker 1099682 fix. Now getting the page size + from Content-Length in the header. Added max value to the -m switch so + can do "-m min:max". Retained "-m min" convention. Renamed long arg name + to --minmax + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1086 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-19 Harper Mann + + * plugins/check_nt.c: In the CHECK_COUNTER block, there were several + strcats writing to unallocated + memory. Changed to asprintf. We're not freeing since plugin run is short. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1085 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-19 Ton Voon + + * plugins/check_swap.c: Fixed parsing of AIX lsps command (1093522) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1084 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-14 Ton Voon + + * AUTHORS: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1083 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fixed ssl configure problems on Solaris (Bug 1096091) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1081 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-13 Ton Voon + + * configure.in, plugins/check_swap.c: Use floats for holding memory + values to avoid different types on different + OSes. Seems to have a problem with the perf data for check_swap on Sol 2.6, + but not critical + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1080 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-05 Ton Voon + + * configure.in, package.def: Update version number to next release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1079 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-04 Benoit Mortier + + * plugins/check_ide_smart.c: still trying to fix #1094326 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1078 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-03 Benoit Mortier + + * plugins/check_ide_smart.c: more fixes for #1094326 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1077 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_mailq.pl: fixes for #1094324 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1076 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-02 Benoit Mortier + + * plugins/check_ide_smart.c: fixing bug #1094326 + + still need to check the makefile for check_ide_smart.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1075 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-01 Ton Voon + + * plugins/check_smtp.c: Removed old terminate function (Bug 1093491) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1074 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-30 Ton Voon + + * ChangeLog: Updated with r1_4-beta1 details + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1072 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Note some syntax changes to check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1071 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/RELEASING: Update package files for version + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1070 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: For help with ps on FreeBSD 4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1069 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Get ps command for FreeBSD 4 (Tomasz Pilat) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1068 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-30 Benoit Mortier + + * plugins/check_dhcp.c, plugins/check_dns.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_swap.c, plugins/check_tcp.c, po/de.po, po/fr.po, + po/nagios-plugins.pot: more internationalization fixes + internationalization freeze for beta1 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1067 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-28 Benoit Mortier + + * AUTHORS, po/fr.po: more internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1066 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_smtp.c, po/fr.po: starttls support + for check_smtp #1041576 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1065 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins/check_ping.c: String match in check_ping for Solaris + 10 #1091043 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1064 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-28 Ton Voon + + * configure.in: sys/param.h needed for sys/swap.h on openbsd 3.6 (Julien + Touche) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1063 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-27 Benoit Mortier + + * po/fr.po: more internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1062 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-25 Benoit Mortier + + * plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_icmp.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_procs.c, + plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, + plugins/check_snmp.c, plugins/check_ssh.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_udp.c, + plugins/check_ups.c, plugins/check_users.c, plugins/negate.c, + plugins/netutils.c, plugins/popen.c, plugins/popen.h, plugins/urlize.c, + plugins/utils.c, po/de.po, po/fr.po, po/nagios-plugins.pot: various + fixes for localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1061 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po, po/nagios-plugins.pot: new version of po files and + pot file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1060 f882894a-f735-0410-b71e-b25c423dba1c + + * package.def, po/POTFILES.in: change realase name on package.def + adding check_dhcp.c to potfiles.in + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1059 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dhcp.c: internationalization of + check_dhcp + internationalization fixes of check_ssh + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1058 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-24 Benoit Mortier + + * plugins/check_icmp.c, po/POTFILES.in, po/fr.po: first pass at adapting + to plugin guidelines + and start of localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1057 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-23 Benoit Mortier + + * plugins/check_http.c, po/fr.po: internationalization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1056 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-23 Michael Wirtgen + + * po/de.po: german translations 391 to go + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1055 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-23 Ton Voon + + * ACKNOWLEDGEMENTS, configure.in, m4/np_curl.m4, plugins/Makefile.am: + Another attempt at fixing check_http compile on Redhat EL3. Fixed + check_icmp + compile (Lynne Lawrence - 1087171) - still some code changes to check_icmp + outstanding. Fixed compile of check_dhcp (complaining about socklen_t). + Added acknowledgements for Coreutils and curl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1054 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-22 Harper Mann + + * plugins/check_nt.c: Added check for "%" in COUNTER . If + it exists, is used as an arg to asprintf. If it doesn't + exist, is used as a label. If the formatting is wrong, the + program will segv. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1053 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-22 Ton Voon + + * lib/Makefile.am, lib/stdbool_.h: File required from coreutils + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1052 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-21 Ton Voon + + * configure.in, plugins/Makefile.am: Revert back to previous openssl + checks (the ones from curl kept having + problems with later Redhat versions) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1051 f882894a-f735-0410-b71e-b25c423dba1c + + * m4/stdbool.m4: Another m4 from coreutils + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1050 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: For their bug reports + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1049 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, m4/Makefile.am, m4/np_coreutils.m4: Fixed compile + problem on Sol2.6 with stdbool.h + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1047 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-21 Stanley Hopcroft + + * plugins/check_dhcp.c: Commentary changes only: cite origin of copied + code with reference to ACK file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1046 f882894a-f735-0410-b71e-b25c423dba1c + + * ACKNOWLEDGEMENTS: ACK file contains the details of the authors of code + copied by the plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1045 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-21 Matthew Kent + + * plugins/check_dns.c: Add another error string match from Pasi + Tiittanen + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1044 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-20 Ton Voon + + * plugins/check_nagios.c: Corrected help for expiry units. Restored + functionality of searching for + process arguments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1043 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nagios.c: Updating help text to reflect using shortname + instead of full path for command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1042 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: - stupid typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1041 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fix compile errors when looking for openssl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1040 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-20 Stanley Hopcroft + + * COPYING, plugins/check_dhcp.c, po/de.po, po/fr.po: Compilation fixes + for check_dhcp.c HP-UX 11. Still fails on HP-UX 10. Unknown if + check_dhcp works on UX. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1039 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-18 Michael Wirtgen + + * po/de.po: Initial commit on german translation - 428 to go + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1038 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-17 Ton Voon + + * configure.in: Support for FreeBSD 5.2.1 and 5.3 in check_procs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1037 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-15 Ton Voon + + * configure.in: Bump version to next release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1036 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Mistake in automake version - back to + 1.8 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1035 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/RELEASING: Clarified notes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1034 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: Updated for r1_4_0-alpha3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1032 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Updated requirements for GNU tools + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1031 f882894a-f735-0410-b71e-b25c423dba1c + + * m4/Makefile.am: Makefile for m4 files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1030 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, configure.in, plugins/Makefile.am, tools/setup: Support + for coreutils lib. Configure tests via m4 scripts from coreutils + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1029 f882894a-f735-0410-b71e-b25c423dba1c + + * m4/Makefile.am.in, m4/afs.m4, m4/codeset.m4, m4/error.m4, + m4/exitfail.m4, m4/extensions.m4, m4/fstypename.m4, m4/fsusage.m4, + m4/getopt.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, m4/intdiv0.m4, + m4/inttypes-pri.m4, m4/inttypes.m4, m4/inttypes_h.m4, m4/isc-posix.m4, + m4/lcmessage.m4, m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4, + m4/ls-mntd-fs.m4, m4/malloc.m4, m4/mountlist.m4, m4/np_coreutils.m4, + m4/onceonly.m4, m4/progtest.m4, m4/realloc.m4, m4/stdint_h.m4, + m4/uintmax_t.m4, m4/ulonglong.m4, m4/unlocked-io.m4, m4/xalloc.m4: + Moving m4 files from lib/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1028 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/afs.m4, lib/error.m4, lib/exitfail.m4, + lib/fstypename.m4, lib/fsusage.m4, lib/full-read.c, lib/full-write.c, + lib/full-write.h, lib/getopt.m4, lib/ls-mntd-fs.m4, lib/onceonly.m4, + lib/safe-read.c, lib/safe-read.h, lib/safe-write.c, lib/safe-write.h, + lib/unlocked-io.m4, lib/xalloc.m4: Moving m4 files into m4/. Added extra + coreutils files required from + autoconf tests. Updated Makefile.am to have nagiosplug lib and a separate + coreutils lib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1027 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-15 Benoit Mortier + + * po/de.po, po/fr.po: fr.po work in progress still 88 to translate ;-) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1026 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-11 Matthew Kent + + * plugins/check_tcp.c: Patch from Ollie Cook to define return code when + expected value not received (#1082275). + Also included another change from Ollie Cook to do stricter matching of expected values from the beginning of the line. When a user defines an expected string this is changed to the old style strstr matching. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1025 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-10 Ton Voon + + * plugins/check_ldap.c: Fixed compile warning + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1024 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-10 Matthew Kent + + * plugins/Makefile.am: Compile broken - fixing link flags. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1023 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: Error catching improvements from Ollie Cook + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1022 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_pgsql.c: Fixing broken compile + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1021 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: More contributers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1020 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-10 Stanley Hopcroft + + * plugins/Makefile.am: Changes to link flags for check_dhcp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1019 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dhcp.c: Extensive changes to get MAC address from + Solaris via DLPI + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1018 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-10 Ton Voon + + * plugins/check_dns.c, plugins/check_procs.c: Reverting back ngettext + calls + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1017 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: Fix includes for gettext + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1016 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-09 Ton Voon + + * configure.in: Include $libsuff for systems that define this (based on + advice from + Daniel Stenberg) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1015 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-08 Ton Voon + + * configure.in: Removed redundant check and make export LD_LIBRARY_PATH + more sh friendly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1014 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-08 Benoit Mortier + + * configure.in, plugins/Makefile.am, plugins/check_by_ssh.c, + plugins/check_game.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_snmp.c, plugins/check_tcp.c: patch + 1028033 + + minor internationalization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1013 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-08 Ton Voon + + * configure.in: Fixed output info for openssl and LD_LIBRARY_PATH for + subsequent compiles + (otherwise get ld.so.1: ./conftest: fatal: libssl.so.0.9.7: open failed) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1012 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-07 Ton Voon + + * configure.in, plugins/Makefile.am: Better SSL checking (inspired by + curl 7.12.2's configure.ac) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1011 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-07 Matthew Kent + + * plugins-scripts/check_ifoperstatus.pl: Option to check for admin down + (#1012191) from Raúl Pedroche. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1010 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-07 Stanley Hopcroft + + * plugins/Makefile.am: Correct dependencies for check_dhcp.c. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1009 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_dhcp.c: New plugin: check_dhcp.c. + Attempt to port to non Linux platform. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1008 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-06 Benoit Mortier + + * po/fr.po: new version of fr.po + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1007 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-05 Matthew Kent + + * plugins/check_snmp.c: Fix for -s string matching (#756567, Tony + Missana) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1006 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-05 Benoit Mortier + + * plugins/check_nt.c, po/fr.po, po/nagios-plugins.pot: cleaned fr.po + nagios-plugins.pot + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1005 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/check_icmp.c, plugins/check_nwstat.c, + plugins/check_ping.c, plugins/check_smtp.c, plugins/check_swap.c, + plugins/utils.h: fix patch 998291 + fix patch 1078934 expect check_ssh fix and check_nt perfdata should stay + on one word like in nagios + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1004 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-04 Benoit Mortier + + * po/nagios-plugins.pot: new version of pot file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1003 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dns.c, po/POTFILES.in: various + internationalization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1002 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_mrtg.c, + plugins/check_nt.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_udp.c, + po/POTFILES.in: internationalization fixes + bugfixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1001 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c, plugins/check_hpjd.c: check_dns needs a space + between 'time' and the hostname + check_hpjd needs a parenthesis removed in print_usage() + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1000 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Bug Fix [ 1024735 ] check_swap providing + inaccurate swap information on Sol6 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@999 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-03 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c: reverting my changes from + !=TRUE to == ERROR, that's not good ;-( sorry + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@998 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, po/de.po, po/fr.po, po/nagios-plugins.pot: + check_tcp parenthesis bug, header fix for po files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@997 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide-smart.c, + plugins/check_ldap.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_procs.c, + plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, + plugins/check_snmp.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c: + print_help and print_usage() cleanup + + other misc cleanups + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@996 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-03 Stanley Hopcroft + + * plugins/check_tcp.c: 1041571: -D option processing corrected (Eric + Chen). Changed process_arguments() to return TRUE. Dont know why this + was necessary. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@995 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-03 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c: remove UT_HLP_VRS from print_usage + this was not a good idea ;-) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@994 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: removing support fonction + removing warranty from print_revision + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@993 f882894a-f735-0410-b71e-b25c423dba1c + + * ROADMAP, package.def, plugins/negate.c, plugins/utils.h: some minor + fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@992 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c, plugins/check_ssh.c: correcting parenthesis + error + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@991 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins/check_load.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/urlize.c: fixes for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@990 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_nwstat.c: + internationalization fixes and help fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@989 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_http.c, + plugins/check_nwstat.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_udp.c, po/.cvsignore: Localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@988 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ide-smart.c, plugins/check_pgsql.c: correcting copyright + and remaning int result = STATE_UNKNOWN; + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@987 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-03 Matthew Kent + + * plugins/check_nagios.c: Affected by elapsed time patch. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@986 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Another contributer. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@985 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_procs.c: Patch from Russell Miller which + adds elapsed time as a metric. Only for linux so far. (991359) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@984 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c: Fix typo breaking compile. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@983 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-03 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_ide-smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c, plugins/urlize.c: bump + copyright year + initialize result to STATE_UNKNOW in place of STATE_OK + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@982 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Benoit Mortier + + * plugins/check_dns.c, plugins/check_ldap.c, plugins/check_procs.c: + --disable-nls throws an error on check_dns, check_procs and + check_ldap without this patch. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@981 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Stanley Hopcroft + + * plugins/check_tcp.c: Tracker 1041571: appended :D to getopt_long() + args (for cert expiry check). Eric Chen. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@980 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c, plugins/popen.c, + plugins/utils.c: More internationalization work + new usage4 function to permit localisation of think like check_ssh: xxxxx + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@979 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c: return of process_arguments() is TRUE not OK ! + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@978 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: return of process_arguments() is TRUE not OK ! + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@977 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Stanley Hopcroft + + * plugins/Makefile.am: Add check_icmp plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@976 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_icmp.c: check_icmp plugin from A Ericsson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@975 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/linux.h: For check_icmp plugin from A Ericsson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@974 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Matthew Kent + + * command.cfg.in: Fix typo. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@973 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, REQUIREMENTS, command.cfg.in, plugins/check_ups.c: Patch from + Arnaud Quette to bring support to NUT 2.0 plus couple improvements and + fixes (1038413 which includes 1032009, 815785). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@972 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Benoit Mortier + + * plugins/check_dns.c, plugins/check_game.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_load.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_procs.c, + plugins/check_radius.c, plugins/check_real.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/negate.c, + plugins/popen.c: changed Error: by CRITICAL - + more localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@971 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_rbl.c: adapted for localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@970 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-01 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, + plugins/common.h, plugins/getaddrinfo.c, plugins/getaddrinfo.h, + plugins/gethostbyname.c, plugins/gethostbyname.h, plugins/negate.c, + plugins/netutils.c, plugins/netutils.h, plugins/popen.c, + plugins/urlize.c, plugins/utils.c, plugins/utils.h: standardize + localization string + standardize unknow arguments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@969 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-01 Ton Voon + + * doc/RELEASING: Notes on releasing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@968 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Next version number + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@967 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: Updated for r1_4_0-alpha2 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@965 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/devmode: eval not working - instructions now in comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@964 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Fixed pmon process checking from a + change I made earlier + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@963 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-01 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_ssh.c: first + pass at standardization of messages for the localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@962 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-01 Stanley Hopcroft + + * configure.in: Bryan Loniewski contributed check_jabber plugin + (SSL/check_tcp); Eric Chen check_nntps plugin + SSL certficate expiry + check [added -D option to check_tcp] + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@961 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/netutils.c: 1075725: patch to my_connect() to deal with SEGV + if connect fails + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@960 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: 1041571 & 664615: check_tcp with cert check + + nntps, simap, jabber + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@959 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-01 Matthew Kent + + * contrib/check_nmap.py: Small fix from David Rippel (996800) for newer + versions of nmap + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@958 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Perf data and other improvements by + Florian Gleixner (1027787) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@957 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-30 Benoit Mortier + + * po/fr.po: more french translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@956 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-30 Ton Voon + + * plugins/check_ide-smart.c: Capitalized some error messages + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@955 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/urlize.c: Updated output to UNKNOWN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@954 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-30 Benoit Mortier + + * po/fr.po: translating fr.po new part + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@953 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-29 Ton Voon + + * lib/Makefile.am, lib/exitfail.m4, lib/getopt.m4: Extra files required + from coreutils + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@952 f882894a-f735-0410-b71e-b25c423dba1c + + * SUPPORT: Cleanup and statement re: contrib plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@951 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Patches for configure on *BSD (Julien Touche) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@950 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-29 Stanley Hopcroft + + * contrib/README.TXT, contrib/rblcheck-dns, contrib/rblcheck-web, + contrib/tarballs/check_icmp-0.8.tar.gz: *** empty log message *** + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@949 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-29 Matthew Kent + + * contrib/check_linux_raid.pl: Better error checking (820806) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@948 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-29 Benoit Mortier + + * po/fr.po: second version of french .po still 300 ;-) to translate + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@947 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-28 Benoit Mortier + + * po/fr.po: first new translation of fr.po + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@946 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-27 Matthew Kent + + * plugins/check_ssh.c: Add remote version check (1030269, Daniel Gullin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@945 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-26 Stanley Hopcroft + + * AUTHORS: New plugin/bugfix: tracker 1070929. check_hpjdres + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@944 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-25 Matthew Kent + + * plugins/check_disk.c: From old test harness code, make ./check_disk -w + 0 -c 0 / valid parameters again + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@943 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_dns.t, plugins/t/check_http.t, plugins/t/check_load.t, + plugins/t/check_mysql.t, test.pl.in: Updating test harness + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@942 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-25 Stanley Hopcroft + + * contrib/README.TXT: Removed reference to non existent tar balls + (Hopcroft plugins) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@941 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_wins.pl: Non functional tidy ups to check_wins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@940 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_hw.sh: Added /contrib/check_hw.sh by Rok Debevc + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@939 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_sybase: Added /contrib/check_sybase by Simon Bellwood + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@938 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_hprsc.pl: update check_hprsc.pl for Net-SNMP versions + >=4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@937 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-24 Ton Voon + + * tools/sfsnapshot: Removing build directory after creating distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@936 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/makefile: Added clean + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@935 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-24 Stanley Hopcroft + + * plugins/check_hpjd.c: add -OQa to command_line in check_hpjd.c. + Correct nagiosplug-Bugs-889948, 846329 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@933 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-24 Matthew Kent + + * plugins/check_nwstat.c: Attempting to fix a reported segfault + (1055054) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@932 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Added support for sending port in host header + (913633) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@931 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-24 Ton Voon + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_udp.c, + plugins/check_ups.c, plugins/check_users.c, plugins/negate.c, + plugins/urlize.c: Making messages more consistent + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@930 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-23 Ton Voon + + * plugins/check_by_ssh.c, plugins/check_dns.c, plugins/check_hpjd.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_swap.c, + plugins/check_time.c: Standardising translation texts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@929 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Guidelines on translated text (Yves + Mettier, Simon Bellwood, Andreas Ericsson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@928 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Adding notes on developer and + translator access in SF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@927 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-23 Matthew Kent + + * AUTHORS: More contributers. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@926 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fix integer warning and critical options. Take + values from current unit instead of always KB. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@925 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-23 Stanley Hopcroft + + * doc/developer-guidelines.sgml: trivial changes to Perl plugin section. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@924 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-22 Ton Voon + + * AUTHORS: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@923 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Fixed some messages that should not be translated + (Benoit Mortier) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@922 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-21 Matthew Kent + + * plugins/check_mysql.c: Patch from Nathan Shafer to add replication + slave check (1006777) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@920 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-20 Matthew Kent + + * AUTHORS: Oops, forgot one. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@919 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: More contributers. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@918 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_linux_raid.pl: Fix always reading status from the last + line (1045506) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@917 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: New output format reported by pumuckel1980 + (946857) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@916 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Bit of cleanup, fix verbose output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@915 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-20 Ton Voon + + * configure.in: Fixed va_copy problem on AIX by copying samba's + configure.in + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@914 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-19 Ton Voon + + * CODING: Added perl coding guidelines, from Programming Perl book + (Andreas Ericsson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@913 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/getloadavg.m4: I think getloadavg.m4 is no longer required (as + autoconf has built-in function) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@912 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am: Removed getloadavg.m4 (built-in function in autoconf) + and added cloexec.[hc] + for getloadavg.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@911 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/cloexec.c, lib/cloexec.h: Files required for getloadavg.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@910 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-19 Matthew Kent + + * plugins-scripts/check_ntp.pl: Fix incorrectly labelled units in output + (1025905, Jason Martin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@909 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: Enabling timeout flag (1010097, Jason Martin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@908 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Make -L notice ssl use to output a proper href + (1035234, Abid Rasheed) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@907 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Change unit from 'us' to 's' to match other core + plugins for simplicity. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@906 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-19 Ton Voon + + * AUTHORS: - More great contributors... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@905 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Options for User Agent string and extra headers + (Ibere Tizio) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@904 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-18 Ton Voon + + * configure.in: Remove unnecessary CPPFLAGS for openssl (Lutz Behnke - + 686476) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@903 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Enhance SSL initialization problems (Phil + Dibowitz - 1055120) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@902 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-18 Matthew Kent + + * plugins/check_smtp.c: Go critical on no route to host instead of + warning (934025) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@901 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-18 Ton Voon + + * tools/setup: Use copy of tools for consistency if building on + different platforms from + shared source + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@900 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-17 Ton Voon + + * plugins/check_tcp.c: Ignore output from tcp port (949070 - Jan-Piet + Mens) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@899 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: --no-body and --max-age options (949521 - Jamie + Zawinski) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@898 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Added section on using Sourceforge, + mainly for administrators + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@897 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-12 Ton Voon + + * tools/update_coreutils: Tool to pull newer coreutil libs into + nagiosplug's lib directory + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@896 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/error.c, lib/error.h, lib/error.m4, lib/exit.h, + lib/exitfail.c, lib/exitfail.h, lib/fsusage.c, lib/fsusage.h, + lib/fsusage.m4, lib/full-read.h, lib/getloadavg.c, lib/getopt.c, + lib/getopt.h, lib/getopt1.c, lib/gettext.h, lib/ls-mntd-fs.m4, + lib/malloc.c, lib/mountlist.c, lib/mountlist.h, lib/onceonly.m4, + lib/realloc.c, lib/snprintf.c, lib/strtod.c, lib/unlocked-io.h, + lib/unlocked-io.m4, lib/xalloc.h, lib/xalloc.m4, lib/xmalloc.c, + lib/xstrdup.c, plugins/check_disk.c, po/de.po, po/fr.po: Update to using + coreutils 5.2.1 libraries and snprintf.c from samba 3.0.8 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@895 f882894a-f735-0410-b71e-b25c423dba1c + +2004-09-07 Ton Voon + + * doc/developer-guidelines.sgml: Clarity based on comments by Ben + Clewett + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@894 f882894a-f735-0410-b71e-b25c423dba1c + +2004-08-23 Ton Voon + + * AUTHORS: For patch to check_nt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@893 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Restore divisor for memory size reported by + Windows. Also, implements warning + and critical levels for performance counters. (Paulo Afonso Graner Fessel) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@892 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_swap.c, plugins/common.h: Using swapctl + for Solaris, Tru64 and *BSD (Sean Finney) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@891 f882894a-f735-0410-b71e-b25c423dba1c + +2004-08-19 Ton Voon + + * configure.in, plugins/check_swap.c, plugins/common.h: Patch for tru64 + using swapctl calls (Sean Finney) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@890 f882894a-f735-0410-b71e-b25c423dba1c + +2004-08-18 Ton Voon + + * AUTHORS: Another day's work... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@889 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: Checks different record types and checks against + an expected address (Bill Kunkel) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@888 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Support for check_swap on NetBSD/OpenBSD (Sean Finney) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@887 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: More specific test for sid (Paul + Allen) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@886 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fixed perfdata so that shows amount used (Garry + Cook) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@885 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: Perfdata corrected (Garry Cook) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@884 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Fix for similar dataabase sids + (Carole Verdon) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@883 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Gary Cook for perfdata for check_nt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@882 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Perfdata added (Gary Cook) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@881 f882894a-f735-0410-b71e-b25c423dba1c + +2004-06-26 Ton Voon + + * tools/sfsnapshot: Change of compile server and cleanups + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@880 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Remove need to alter configure.in. Using different + compile farms for + SF to do the compiling + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@879 f882894a-f735-0410-b71e-b25c423dba1c + +2004-05-24 Ton Voon + + * AUTHORS: Ben Clewett + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@878 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am: Missed getloadavg.c (Ben Clewett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@877 f882894a-f735-0410-b71e-b25c423dba1c + +2004-05-20 Ethan Galstad + + * contrib/check_dhcp.c: DHCP bug fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@876 f882894a-f735-0410-b71e-b25c423dba1c + +2004-05-10 Ton Voon + + * configure.in: Set EXTRAS with check_swap if ac_cv_have_swap is set + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@875 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-30 Ton Voon + + * configure.in: ps -el for HP-UX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@874 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-29 Ton Voon + + * configure.in: Bug in ps -el for AIX 4.1 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@873 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Sven for HP-UX requirements + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@872 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: HP-UX requirements (Sven Schaffranneck) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@871 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-19 Subhendu Ghosh + + * AUTHORS, contrib/check_nagios_db_pg.pl: Postgres backend monitor + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@870 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins-scripts/check_mssql.pl: check_mssql.pl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@869 f882894a-f735-0410-b71e-b25c423dba1c + + * README: Win32 plugin repository + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@868 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-08 Ton Voon + + * AUTHORS: Torsten Werner for check_racle patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@867 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Cleaner calls to awk and support if + Oracle has different national + language settings (Torsten Werner) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@866 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-06 Ton Voon + + * configure.in, plugins/check_procs.c: Fixed weird scanf bug on Solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@864 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-02 Karl DeBisschop + + * plugins/check_by_ssh.c: add example invocation to help + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@863 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-31 Ton Voon + + * AUTHORS: Howard Wilkinson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@862 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Command line argument bug (Howard Wilkinson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@861 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/netutils.c: Set default state (Howard Wilkinson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@860 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Update author list + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@859 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-23 Karl DeBisschop + + * plugins/check_fping.c: check was supposed to be agains ms - got munged + wfixeg the perfdata output to be in seconds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@858 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-22 Ton Voon + + * AUTHORS: Joe Rhett for getopt bug + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@856 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Option --url not mapped (Joe Rhett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@855 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-18 Ton Voon + + * AUTHORS: More help for patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@854 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Typo in check_disk units (Matthew Kent - 909281) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@853 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Mysql include path not added correctly (Arnold Cavazos - + 912974) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@852 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_radius.c: Option to fill in NAS-identifier to Emulate + pam_radius behaviour (Alexander Kulak) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@851 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-17 Ton Voon + + * doc/developer-guidelines.sgml: Copyright information for patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@850 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-14 Karl DeBisschop + + * plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtgtraf.c, + plugins/check_pgsql.c, plugins/check_smtp.c, plugins/check_tcp.c, + plugins/check_ups.c: use fperfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@849 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_fping.c: use fperfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@848 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-12 Ethan Galstad + + * contrib/check_cluster2.c: New cluster plugin for Nagios 2.x + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@847 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-11 Ton Voon + + * CHANGES: check_procs difference + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@846 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nagios.c: Incorporate check_proc changes into + check_nagios. ps handling probably should + be moved into utils.c in future + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@845 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-08 Ton Voon + + * configure.in: Require ngettext + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@844 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Information on plugin output format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@843 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-04 Karl DeBisschop + + * plugins/check_dig.c, plugins/check_dns.c, plugins/check_game.c: use + float for time in perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@842 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-03 Karl DeBisschop + + * plugins/check_http.c, plugins/utils.c: begin writing some perfdata as + float + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@841 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_pop3.pl: fix loop and \r\n (Jason Burnett - + http://sourceforge.net/tracker/index.php?func=detail&aid=895677&group_id + =29880&atid=397599) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@840 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: check_disk was getting blocks instead of bytes + (Michael Musikhin - + http://sourceforge.net/tracker/index.php?func=detail&aid=900215&group_id + =29880&atid=397599) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@839 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-02 Karl DeBisschop + + * pkg/fedora/requires, pkg/redhat/requires: attempt to prune requires + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@838 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, nagios-plugins.spec.in, pkg/fedora/requires: make + specfile into a template which can generate a generic spec plus specs + suitable for various repositories + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@837 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: prpare for alpha2 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@836 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: relax check for -w/-c to accept floats (bug + report from Warrick FitzGerald) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@835 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins/check_swap.c: fix div by zero error when swaptotal is + zero (Flo Gleixner) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@834 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-01 Karl DeBisschop + + * plugins/check_tcp.c, plugins/netutils.c: check_tcp was returning + uninitialized string with user-defined refused outcome + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@833 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: allow regex for ecpect checks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@832 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-29 Karl DeBisschop + + * plugins/check_nwstat.c, plugins/netutils.c, plugins/netutils.h: was + making up to 34 separate tcp connections - now we open one and reuse + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@831 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-28 Karl DeBisschop + + * plugins/check_snmp.c: checks for warn in check_num() mistakenly + referred to crit limits + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@830 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: minor doco update to reflect handling of + repeated caoomand strings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@829 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: work in progress to accept multiple + command/expect pairs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@828 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: update to work with Linux 2.6 /proc/meminfo + format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@827 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-25 Karl DeBisschop + + * AUTHORS, plugins/check_dns.c: check server for authoritative status + (from Jon Hallet) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@826 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: change some datatypes to llu for very large + swaps + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@825 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_ping.c: pass timeout to ping if supported + with -w parameter (linux) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@824 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-21 Karl DeBisschop + + * plugins/check_by_ssh.c: add option to ignore a specified number of + lines on stderr + (to suppress a login banner) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@823 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Add Jason Martin for report of missing $opt_C for 'use vars' + in check_breeze + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@821 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_breeze.pl: add opt_C to 'usr vars' + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@820 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-20 Ton Voon + + * plugins/check_http.c: - Missed out getopt for -T + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@819 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-20 Karl DeBisschop + + * contrib/check_dhcp.c, plugins/check_snmp.c, plugins/negate.c, + plugins/netutils.c, plugins/urlize.c: spell fix "received" + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@818 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: add perfdata function for floats to + complement ints, also spell fix "received" + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@817 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: add Ralph Rye for report of check_procs segfault on + AIX/WebSphere and proof-of-concept patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@816 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: handle case where line from ps output exceed + MAX_INPUT_BUFFER + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@815 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-20 Ton Voon + + * AUTHORS: Shaun Wills for patch to check_http + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@814 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Added Content-type when POSTing (Shawn Wills) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@813 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: - compiler warning removed (but usage2 messages + badly broken) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@812 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Matt Pounsett for bug report + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@811 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: Different text to scan for if multiple addresses + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@810 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Corrected usage message (Matt Pounsett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@809 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-19 Ton Voon + + * AUTHORS: Michael Musikhin for check_disk patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@808 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Uninitialised variables for -X (Bug 900091 - + Michael Musikhin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@807 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-18 Karl DeBisschop + + * configure.in: version bump (old) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@806 f882894a-f735-0410-b71e-b25c423dba1c + + * acinclude.m4, lib/afs.m4, lib/fstypename.m4, lib/fsusage.m4: + underquoted defines cause warning on FC2 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@805 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-18 Ton Voon + + * AUTHORS: Johannes Herlitz for patch to check_dns + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@804 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: Output message includes the query_address, as + inspired by Johannes Herlitz. + Also cleanup of comments and handles multi-line nslookup output (MacOSX 10.3) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@803 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-17 Ton Voon + + * AUTHORS: David Alden for check_snmp_procs.pl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@802 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_snmp_procs.pl: Checks remote processes via SNMP (David + Alden) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@801 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-09 Ton Voon + + * AUTHORS: Patrick McCormick + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@800 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Fix for check_ping old-style argument handling + (Patrick McCormick - 892211) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@799 f882894a-f735-0410-b71e-b25c423dba1c + +2004-01-28 Ton Voon + + * plugins/check_dummy.c: Print optional text + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@798 f882894a-f735-0410-b71e-b25c423dba1c + +2004-01-21 Karl DeBisschop + + * AUTHORS: credit David Croft (patch check_tcp formultibyte malloc bug + in server_expect) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@797 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: =fix segfault on malloc of server_expect for + multibyte chars (David Croft) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@796 f882894a-f735-0410-b71e-b25c423dba1c + +2004-01-18 Subhendu Ghosh + + * contrib/check_snmp_printer.pl: plugin to check printer status via + snmp, includes page count as perfdata; perl plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@795 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-24 Ton Voon + + * AUTHORS: Bug reporter + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@794 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Fixed help doc on use of % (854817 - Gunnar + Hellekson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@793 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-18 Ton Voon + + * README: Reference to CHANGES file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@792 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Add CHANGES file to distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@791 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: List major changes between releases + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@790 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-11 Ton Voon + + * AUTHORS: For patch to check_http + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@789 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Relative redirects not followed correctly + (854131 - John Sivak) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@788 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-05 Ton Voon + + * AUTHORS: Ben Whaley for reported Solaris 8 /usr/ucb/ps problem in + configure.in + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@787 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Not correctly working out ps command if /usr/ucb before + /usr/bin in PATH for + Solaris (reported by Ben Whaley) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@786 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Patch to my_connect + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@785 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/netutils.c, plugins/netutils.h: Fix clash of namespace for + my_connect with mysql (854339 - Ian Holsman) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@784 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-02 Ton Voon + + * plugins/check_disk.c: Default thresholds not defined for lists in -x + parameter (raised by Matt Garrett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@783 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-01 Karl DeBisschop + + * po/de.po, po/fr.po: commit changes caused by upstream code mods + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@782 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: use usage2 function + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@781 f882894a-f735-0410-b71e-b25c423dba1c + + * nagios-plugins.spec.in: add THANKS to %doc + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@780 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-28 Ton Voon + + * plugins/check_procs.c: Fixed listing of failed processes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@779 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-24 Ton Voon + + * AUTHORS: For patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@778 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: Bug from code-clean (Antony Simmonds - 846311) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@777 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-21 Karl DeBisschop + + * README: update auotmake/autoconf versions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@776 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: update developer names + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@775 f882894a-f735-0410-b71e-b25c423dba1c + + * INSTALLING: our policy now is to use most recent versions of GNU tool + chain + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@774 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-19 Karl DeBisschop + + * plugins/check_time.c: add perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@773 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: use perfdata() to return perfoamnace data in + stanadrd format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@772 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-17 Karl DeBisschop + + * plugins/check_ups.c: bugfix - each supported option was overwriting + the previous perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@771 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ups.c: add perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@770 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_pgsql.c: add perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@769 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-12 Karl DeBisschop + + * plugins/check_snmp.c: clean up compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@768 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mrtg.c, plugins/check_nt.c: clean up compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@767 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mrtgtraf.c, plugins/check_swap.c: clean up compiler + warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@766 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mrtgtraf.c: add perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@765 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: remove overflow checks of strtod - HUGE_VALF + requires C99; also remove equality checks on warn/crit interval which + are no doubles + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@764 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-11 Ton Voon + + * plugins/check_tcp.c: Added perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@763 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_users.c: Added perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@762 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Added perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@761 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Fixed if only absolute warn/crit set + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@760 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-10 Ton Voon + + * plugins/utils.h: - typo fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@759 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-05 Subhendu Ghosh + + * plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl: added plugin timeout options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@758 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-31 Karl DeBisschop + + * plugins/check_nt.c: provide an error message + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@757 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: line indentation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@756 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: add perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@755 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mrtg.c: add perf data + fix bug where stale data message would get overwritten + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@754 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-24 Ton Voon + + * plugins/common.h: Ignore __attribute__ for non-GNU compilers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@753 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Moved config.h to toplevel + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@752 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-23 Ton Voon + + * lib/Makefile.am: Need to include intl/ for systems without libintl.h + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@751 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-21 Ton Voon + + * AUTHORS: Matt Garrett for bug reports + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@750 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_file_age.pl: - Fixed file name (Matt Garrett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@749 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-20 Ton Voon + + * configure.in, lib/fsusage.c, lib/mountlist.c: Fix for config.h at top + level. Required for intl/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@748 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-15 Ton Voon + + * tools/mail_error: Need to export PATH for sfsnapshot to get correct + GNU toolchain + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@747 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-14 Subhendu Ghosh + + * plugins-scripts/check_ifoperstatus.pl: snmpv3 patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@746 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: more snmpv3 patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@745 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: Bug 773588: added check to warn on + matching # candidates only + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@744 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: Added -M for maxmsgsize (v1/v2c) + Added v3 support + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@743 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-30 Ton Voon + + * plugins/check_swap.c: Fixed logic problem if HAVE_SWAP, but not on AIX + or Solaris. Removed + unnecessary ifdefs for help page. Better indentation for ifdefs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@742 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-29 Ton Voon + + * lib/Makefile.am: Missed GNU files for AIX 5.1 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@741 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-17 Ton Voon + + * AUTHORS: Added authors of obsolete contrib plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@740 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/maser-oracle.pl: Obsolete from main check_oracle + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@739 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/aix/check_crit_dsk, contrib/aix/check_dsk, + contrib/aix/check_ping: Plugins obsolete from main check_disk and + check_ping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@738 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/strtod.c: Required if strtod not GNU compilant + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@737 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/Makefile.am, lib/error.c, lib/error.h, lib/error.m4, + lib/malloc.c, lib/realloc.c, lib/unlocked-io.h, lib/xalloc.h, + lib/xmalloc.c: Support to compile on AIX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@736 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: - typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@735 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_swap.c: Support for check_swap in AIX + (tested on 5.1) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@734 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: Hide error message if docbook not available + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@733 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-16 Ton Voon + + * doc/developer-guidelines.sgml: Added in threshold range format and + updated autoconf to 2.54 for a problem + on Darwin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@732 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/Makefile.am, plugins/check_procs.c: Support for + AIX ps command and cleanup of configure's ps checks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@731 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins/common.h: AIX problem with enum TRUE and FALSE (Ludse + Verhoeven) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@730 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-16 Karl DeBisschop + + * tools/sfsnapshot: here-doc format was not correct + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@729 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c: milisecond timing and perfdata, fix NULL pointer + error in validate_arguments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@728 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-15 Ton Voon + + * AUTHORS: Contributors to the perfdata discussion + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@727 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins-scripts/check_mailq.pl: Added Exim support (768445 - + Eric Bollengier) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@726 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins/check_nt.c: Option to verify check_nt version (799098 + - Steve Hanselman) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@725 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Jason Burnett for check_disk_smb patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@724 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_disk_smb.pl: Optionally specify port for + smbclient to use (781227 - Jason Burnett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@723 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-15 Karl DeBisschop + + * plugins/check_http.c: make status code extensible (thanks to Chris + Wilson ) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@722 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-12 Karl DeBisschop + + * AUTHORS: two new additions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@721 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: new output format reported by Patrick Allen + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@719 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-11 Karl DeBisschop + + * plugins/check_http.c: use prefdata function for size too + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@718 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: use prefdata function + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@717 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_swap.c: last changes to configure broke + check_swap on RHLinux. Restore /proc/meminfo check and make check_swap + ifdefs safer + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@716 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-04 Karl DeBisschop + + * Makefile.am: change so make-dist works in subdirs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@715 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-03 Ton Voon + + * configure.in: Remove df checks and ignore swap checks if no swap + commands found + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@714 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: No named credits in source code + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@713 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fixed substitution for Tru64's ps format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@712 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-03 Karl DeBisschop + + * plugins/check_dig.c: allow warn/crit times to be floating point + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@711 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/common.h: include math.h if needed for HUGE_VAL + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@710 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-02 Ton Voon + + * plugins/check_procs.c: Solaris requires asprintf checks for null + variables + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@709 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-01 Ton Voon + + * Makefile.am: Report duplicates in AUTHORS file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@708 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Add contributor's name into CVS + comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@707 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-31 Ton Voon + + * .cvsignore, AUTHORS, Makefile.am, THANKS.in: Updated AUTHORS to + include all contributors listed in comments in code and + CVS for plugins and plugins-scripts. Still need to do SF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@706 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Updated perf data standard for warn + before crit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@705 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-28 Karl DeBisschop + + * plugins/check_game.c: add perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@704 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: add perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@703 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: use single quotes per guideline, also quote when SPC + or = are found + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@702 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: add perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@701 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: suppress quotes in perf data when not needed (some + plugins need the space to keep below line length limit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@700 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.h: add min() macro to complement max() + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@699 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-26 Karl DeBisschop + + * plugins/check_dig.c: print perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@698 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_fping.c: print perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@697 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: function to make perfdata output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@696 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-23 Karl DeBisschop + + * plugins/check_http.c: - found and fixed memory allocation error in + rewritten redir() function + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@695 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: - hacked interim fix to segfault on redirect - + for tesing only + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@694 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: - fix various format errors with newly added perf + data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@693 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-22 Karl DeBisschop + + * plugins/check_dig.c: - forgot to declare struct timeval tv for hires + timing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@692 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: - add perf data for time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@691 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mysql.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_procs.c, + plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, + plugins/check_snmp.c, plugins/check_ssh.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_udp.c, + plugins/check_ups.c, plugins/check_users.c, plugins/negate.c, + plugins/urlize.c: - bindtextdomain for gettext, a few other smale + cleanups here and there + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@690 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: * bugfix: snprintf of timestamp truncated '\0' + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@689 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-21 Karl DeBisschop + + * plugins/check_http.c: * Check redirections for infinte loops and limit + depth of recursion + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@688 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-20 Ton Voon + + * plugins/check_time.c: Optionally use udp instead of tcp (Bradley Baetz + - 751646) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@687 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_wins.pl: Changed netsaint to nagios in use lib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@686 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-19 Karl DeBisschop + + * plugins/check_http.c: *BUGFIX: LWS is not required betwwen "Location:" + header field name and field value + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@685 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: *add missing status numbers from RFC 2616 + (HTTP1.1) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@684 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-18 Karl DeBisschop + + * plugins/check_ping.c: move error scans to a new separate routine and + scan both stderr and stdio + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@683 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-11 Ton Voon + + * doc/developer-guidelines.sgml: Performance data guidelines added + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@682 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Fixed building snapshots - cvs update ignores new + directories. + Also do not need to run make + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@681 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-10 Karl DeBisschop + + * plugins/utils.c: config.h is redundant (common.h includes it) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@680 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c, plugins/check_smtp.c: perf data in integer + microseconds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@679 f882894a-f735-0410-b71e-b25c423dba1c + + * po/POTFILES.in, po/de.po, po/fr.po: first pass at NLS markup done + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@678 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_rpc.pl: proposed fix for LANG issue + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@677 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c, plugins/popen.c, + plugins/urlize.c: the last round of pedantic compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@676 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-09 Karl DeBisschop + + * tools/devmode: a little shell script to make it a little easier to + produce pedantic compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@675 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c, plugins/check_ssh.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c: more pedantic compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@674 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-09 Jeremy T. Bouse + + * plugins/common.h, po/de.po, po/fr.po: Code clean-up + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@673 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-09 Karl DeBisschop + + * plugins/check_dig.c, plugins/check_http.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_ping.c, plugins/check_procs.c, + plugins/check_real.c, plugins/utils.c, plugins/utils.h: more pedantic + compiler warns + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@672 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: more pedantic compiler warns, change to + microsecond output for perf data, add size to perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@671 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: add function for elapsed tim ein + microseconds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@670 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: more pedantic compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@669 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/check_dummy.c, plugins/popen.c, + plugins/utils.c, plugins/utils.h: more pedantic compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@668 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-08 Karl DeBisschop + + * lib/Makefile.am: include getloadvag.m4 in distrib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@667 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/netutils.c, plugins/netutils.h: cleanups + from pedantic complier warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@666 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: change if/elseif block to case, general streamline + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@665 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: fix a variety of compiler warnings about + qualifier discards and other pedantic stuff + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@664 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_snmp.c, plugins/utils.c, plugins/utils.h: fix a variety of + compiler warnings about qualifier discards and other pedantic stuff + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@663 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_disk.c, plugins/check_nt.c, + plugins/netutils.c, plugins/netutils.h, plugins/popen.h, + plugins/utils.h: fix a variety of compiler warnings about qualifier + discards and other pedantic stuff + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@662 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c, plugins/check_smtp.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@661 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-07 Karl DeBisschop + + * plugins/check_real.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@660 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@659 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: reorder for consistency, restore prototypes for + print_foo, nest #ifdef to avoid pedantic traditional c warn + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@658 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: reorder for consistency (no code changes) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@657 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_http.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_radius.c, plugins/check_real.c, plugins/check_snmp.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/negate.c, plugins/netutils.c, plugins/popen.c, plugins/utils.c, + plugins/utils.h: replace "terminate" with "die" for shorter name and + better readability + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@656 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: cleanup for better readability + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@655 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@654 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: make must be run before make dist to creat language + files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@653 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-06 Ton Voon + + * doc/developer-guidelines.sgml: Added in that Nagios plugins are + written to GNU standards + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@652 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-06 Karl DeBisschop + + * lib/.cvsignore: ignore ulonglong.m4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@651 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_overcr.c: markup for translation, move send_buffer + assignment to process_args so process_tcp_request can be moved outside + the conditional, replace if/esleif with switch, replace #defines with + enum + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@650 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nwstat.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@649 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-05 Ton Voon + + * doc/developer-guidelines.sgml: Added dev platform requirements + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@648 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-05 Karl DeBisschop + + * plugins/check_ssh.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@647 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-05 Stanley Hopcroft + + * contrib/check_mssql.sh: Version 2.0 of MS SQL server plugin + (contrib/check_mssql.sh) from T De Blende. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@646 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-04 Karl DeBisschop + + * plugins/check_users.c, plugins/urlize.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@645 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_time.c, plugins/check_udp.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@644 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c, plugins/check_nagios.c, plugins/check_radius.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/negate.c: markup for + translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@643 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-03 Karl DeBisschop + + * plugins/check_ldap.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c: + markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@642 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@641 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@640 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/check_ldap.c, plugins/check_tcp.c: + markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@639 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_ide-smart.c: markup for + translation, use common.h, fix problems compiling + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@638 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@637 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-02 Karl DeBisschop + + * plugins/check_hpjd.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@636 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mysql.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@635 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_fping.c, plugins/check_game.c, plugins/check_mysql.c, + plugins/check_snmp.c, plugins/utils.h: markupf for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@634 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: ifdef so utils.h can be header for + utils.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@633 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_fping.c, plugins/check_snmp.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@632 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_pgsql.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/utils.h: establish + "UT_" namespace for usage text in #defines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@631 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@630 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-01 Karl DeBisschop + + * plugins/check_dns.c: terminate in error_scan() so meaningfull errors + can be sent + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@628 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dummy.c: mark for transaltion + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@627 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: do not translate the strings that will be + compared to utility output - LC_ALL is set to C so those strings should + be untranslated regardless of the system settings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@626 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/popen.c: set LC_ALL to C in execve environemnt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@625 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: 'ln -f -s ...' is not reliable/portable. Use 'rm + -f ...; ln -s ...' + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@624 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-31 Karl DeBisschop + + * plugins/check_dns.c: mark for translation (note problem here - it + relies on tranalation in underlying utility, which has a high chance of + failing) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@623 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/utils.h: mark for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@622 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-30 Karl DeBisschop + + * plugins/check_by_ssh.c: mark up for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@621 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_pgsql.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/utils.h: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@620 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-29 Karl DeBisschop + + * plugins/check_pgsql.c, plugins/check_swap.c, plugins/check_tcp.c: mark + for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@619 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.h: some shared text for internationalized help text + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@618 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: clean up warnings about ill-formed comment and string + concatenation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@617 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, ChangeLog, README, configure.in, lib/Makefile.am: bump to + gettext 0.11.5 and cleanup GNU toolchain + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@616 f882894a-f735-0410-b71e-b25c423dba1c + + * ABOUT-NLS, INSTALL: get from GNU files instead of storing in CVS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@615 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: move autopoint to start of gnu toolchain setup + use --force-missing instead on manually copying files + (manual process was broken on RedHat, and we should expect automake to do its job right anyway) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@614 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: look for getloadavg.c in $topdir/lib, not $srcdir/lib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@613 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: patch attempt to reference undefined optarg + (credit Paul Farrall) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@612 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-28 Ton Voon + + * configure.in: - Specify srcdir so no confusion + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@611 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/getloadavg.m4: Readded getloadavg.m4 as using + autoconf 2.50+. This fixes redhat 6.2 compiles + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@608 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-26 Karl DeBisschop + + * plugins/check_pgsql.c: mark for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@607 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: add S_ macor to mark message for both translation + and inclusion into docbook SGML + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@606 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po: updated check_tcp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@605 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, po/ChangeLog: internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@604 f882894a-f735-0410-b71e-b25c423dba1c + + * intl/.cvsignore, lib/.cvsignore, po/.cvsignore: skip gettext files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@603 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am: checkins for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@602 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am: checkins for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@601 f882894a-f735-0410-b71e-b25c423dba1c + + * po/Makevars: checkins for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@600 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, tools/setup: checkins for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@599 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, ABOUT-NLS, ChangeLog, Makefile.am, configure.in, + lib/Makefile.am, lib/gettext.h, nagios-plugins.spec.in, + plugins/Makefile.am, plugins/check_tcp.c, plugins/common.h, + plugins/utils.c, po/LINGUAS, po/POTFILES.in, po/de.po, po/fr.po, + tools/setup: checkins for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@598 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-21 Karl DeBisschop + + * plugins/common.h: add stubs to allow markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@597 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/common.h: test GNU_SOURCE and include features.h + if present to clear warning about asprintf definition + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@596 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-20 Karl DeBisschop + + * doc/developer-guidelines.sgml: must use '&' in attribute values + instead of '&' + id tokens (attibute values) must not have embedded spaces + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@595 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-17 Ton Voon + + * plugins-scripts/check_oracle.sh: - Cleanup comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@593 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Guidelines updated to use Sourceforge + tracker system + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@592 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-11 Ton Voon + + * doc/developer-guidelines.sgml: - Fixed CVS commit comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@591 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Added in practice of prefixing comments + in CVS commits + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@590 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-04 Karl DeBisschop + + * configure.in, plugins/Makefile.am: only make links for check_spop and + check_simap when SSL is built into check_tcp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@586 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-03 Ton Voon + + * plugins/check_procs.c: Fixed seg fault on some Sol 7/8 servers (Patch + 764745 - Alexander Matey) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@585 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: Changing $() to `` to be compatible with Solaris' sh + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@584 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-03 Karl DeBisschop + + * autogen.sh, tools/setup: mv GNU toolchain check into tools/setup + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@583 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: remove LABELLEN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@582 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-02 Ton Voon + + * plugins-scripts/check_oracle.sh: Check for ORA- errors for tablespace + and cache (patch 755456 - Sven Meyer) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@581 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_disk_smb.pl: Update error message from smbclient + v2.2.7 (Patch 740132 - Cove Schneider) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@580 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/.cvsignore, plugins-scripts/Makefile.am, + plugins-scripts/check_file_age.pl, plugins-scripts/subst.in: Moving + check_file_age into core + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@578 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fixed SUPPORT message + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@577 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-30 Jeremy T. Bouse + + * plugins/check_http.c, plugins/check_ldap.c, plugins/check_smtp.c: + Added -4 and -6 command line options into check_http, check_ldap and + check_smtp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@575 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c, plugins/check_ssh.c, plugins/check_tcp.c, + plugins/netutils.c: Corrections to get code to compile on systems + without IPv6 support + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@574 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Added check_simap & check_spop to + check_tcp_programs + If someone knows how to make this conditional in the Makefile only if + being compiled with SSL I think this is the only way to make it better + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@573 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-30 Ton Voon + + * plugins/check_disk.c: Fixed support for "check_disk warn crit [path]" + with thresholds at used levels + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@572 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-29 Jeremy T. Bouse + + * configure.in, plugins/check_ldap.c: Included patch for check_ldap from + Patch #753621 by Ziya Suzen + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@571 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c, plugins/check_tcp.c: Changed usage output to + show -4 and -6 are mutually exclusive. You can only + use one or the other but not both. The last one used will win out. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@570 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c, plugins/netutils.c: check_ping is now coded with + -4 & -6 options to call PING or PING6 command + netutils modified to verify hosts based on address_family setting when used + with -4 or -6 options. is_inet_addr() will not be tested if -6 is + used and is_inet6_addr() will not be tested if -4 is used. Also the + is_hostname() will use the address_family value to resolve hostnames + only if IPv6 support is available otherwise defaults to AF_INET. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@569 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ssh.c, plugins/check_tcp.c, plugins/netutils.c, + plugins/netutils.h: Added address_family extern int variable to netutils + to allow for -4 & -6 + options for explicit connection protocol + Added support for -4 & -6 options to check_ssh and check_tcp for testing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@568 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-29 Ton Voon + + * plugins/check_nwstat.c: Added NLM test (Phil Randal) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@567 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Corrected reported size for PROC_MEMINFO systems + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@566 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfwebcron: Fixed so goes to correct web area + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@565 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfwebcron: New tool to run on shell.sf.net to update the dev + guidelines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@564 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/makefile: Fixed makefile + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@563 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-27 Jeremy T. Bouse + + * plugins/netutils.c: Modified my_connect to include ai_socktype in the + hints to be compliant with + RFC3493 as pointed out by Janos Mohacsi. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@562 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-27 Ton Voon + + * configure.in, plugins/check_swap.c: Support for swap -s for solaris. + Also changes size of swap to MBs through + a conversion amount in configure. Possible breakage on other OSes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@561 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/makefile: Remove if which check - done in tools/setup instead + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@560 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: Fiddling as Solaris' which command is broken + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@559 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-26 Ton Voon + + * plugins/check_disk.c: Fixed different thresholds if using exclude + lists + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@558 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-25 Ton Voon + + * plugins/check_disk.c: Support for different thresholds for different + filesystems + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@557 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Removed -d option and just check against -p + parameter + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@556 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Report errors if path specified not found + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@555 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Problems compiling on SunOS 5.6 with gcc 2.8.1. + Fixed by specifying + floating variables, rather than letting asprintf work it out + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@554 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-21 Karl DeBisschop + + * plugins/Makefile.am: soalris 8 needs 'ln -s -f' instead of 'ln -sf' + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@552 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: add remaining URI_PATH chars per RFC 2396 + remove '-' from URI_PORT + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@549 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-12 Jeremy T. Bouse + + * command.cfg.in: Renamed duplicate check_snmp command definitions to be + unique + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@548 f882894a-f735-0410-b71e-b25c423dba1c + + * command.cfg.in, configure.in: Made the two check_ifoperstatus commands + unique to remove conflicts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@547 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-11 Karl DeBisschop + + * plugins/check_http.c: fix URI_PATH to allow ?&#: (more still should be + allowed) + fix class to be POSIX compliant + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@546 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-10 Karl DeBisschop + + * contrib/urlize.pl: add comment about shell quote removal to address + https://sourceforge.net/tracker/index.php?func=detail&aid=661916&group_i + d=29880&atid=397597 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@544 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/urlize.c: add note about shell quote removal to address + https://sourceforge.net/tracker/index.php?func=detail&aid=661916&group_i + d=29880&atid=397597 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@543 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-08 Ton Voon + + * configure.in: Fixed quoting on SWAP_FORMAT + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@540 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Support for OpenBSD 3.2 & 3.3 ps (Julien Touche) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@539 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-07 Subhendu Ghosh + + * plugins/check_real.c: \r\n patch from Mathias + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@537 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-04 Ton Voon + + * plugins/check_disk.c: Argument to asprintf in wrong order + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@533 f882894a-f735-0410-b71e-b25c423dba1c + + * pkg/solaris/solpkg: Remove /usr as well. Maybe this is best done by + changing BASEDIR to + configure's prefix? + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@532 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-02 Karl DeBisschop + + * plugins/check_tcp.c: finish recv() loop when stream GT or EQ maxbytes + (was GT) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@531 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-01 Karl DeBisschop + + * plugins/check_tcp.c: allow user to limit number of bytes fetched + fix some doco (wait is now delay, server_quit was not shown) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@529 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-31 Karl DeBisschop + + * plugins/check_dns.c: first revised patch failed to trap the "break" in + while() + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@526 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-27 Stanley Hopcroft + + * contrib/check_sap.sh: check_sap.sh plugin to check SAP /R3 servers + from Karel Salavec and Tom De Blende. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@523 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-26 Stanley Hopcroft + + * contrib/check_axis.sh, contrib/check_mssql.sh: Revisions to Tom De + Blende contributed plugins: check_axis.sh and check_mssql.sh + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@522 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-17 Ton Voon + + * plugins/t/check_ftp.t: Fixed test (Mathew Ericson - 738609) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@521 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_load.t: Fixed tests (Mathew Ericson - 738607) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@520 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_procs.t: Fixed test commands (Mathew Ericson - 738605) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@519 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_http.t: Fixed tests (Mathew Ericson - 738608) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@518 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_tcp.t: Fixed tests (Mathew Ericson - 738604) + CV: ---------------------------------------------------------------------- + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@517 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-16 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: bug fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@515 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-14 Ton Voon + + * plugins/negate.c: Added examples + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@514 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_mailq.pl: Added postfix support (Thomas Nilsen - + 735218) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@513 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nwstat.c: Added DSVER and UPTIME checks (Phil Randal - + 737617) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@512 f882894a-f735-0410-b71e-b25c423dba1c + + * pkg/solaris/solpkg: Typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@511 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/.cvsignore: Ignore developer-guidelines.html as generated from + docbook + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@510 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, pkg/solaris/pkginfo.in, pkg/solaris/solpkg: Remove + dependency on gnu make + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@509 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-13 Ton Voon + + * doc/developer-guidelines.sgml: Updated docs to include comments, + contrib->main, getopts_long and + verbose output levels + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@508 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Calls tools/setup and creates a README for the + snapshot directory + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@507 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.html, doc/makefile, tools/setup: The + developer-guidelines.html file is now generated from the sgml file + by docbook2html at tools/setup time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@506 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-13 Stanley Hopcroft + + * contrib/tarballs/hopcroft-plugins.tar.gz: Removed + contrib/tarballs/hopcroft-plugins.tar.gz. This is archaic, + anachronistic, unmaintained and humblingly embarrassing. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@505 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_mssql.sh: check_mssql.sh. A new plugin from Mr T DE + BLENDE to check MS SQLServer databases. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@504 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-09 Karl DeBisschop + + * plugins/check_http.c: fix error when server closes connection + immediately + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@503 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: cause snmpget try try for 1 second less than the + timeout (allowing plugin to force close if needed) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@501 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-07 Jeremy T. Bouse + + * plugins/check_ping.c: Modified check_ping to handle IPv6 as well as + IPv4 ICMP checks using the + PING6_COMMAND determined during the configure script execution. As + USE_IPV6 may be defined and PING6_COMMAND is not defined if there is not + IPv6 TCP stack available when configure is run I condition it off + PING6_COMMAND existing to remove build errors for being undefined. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@500 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-25 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: corrected output units + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@499 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-23 Karl DeBisschop + + * plugins/check_http.c: update to RFC1123 hostname specs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@498 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-17 Karl DeBisschop + + * nagios-plugins.spec.in: add check_nt, drop check_vsz + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@497 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_tcp.c, plugins/check_users.c: code + cleanup to clear strict compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@496 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_tcp.c, plugins/netutils.c: code + cleanup to clear strict compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@495 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-16 Subhendu Ghosh + + * plugins/check_real.c: reset to old behavior of not checking stream by + default + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@493 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-13 Subhendu Ghosh + + * plugins/check_hpjd.c: reduce compiler warning between gcc3 and gcc2.96 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@492 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-scripts/utils.pm.in: update for check_mailq - + qmail support + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@491 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_mailq.pl: Added sendmail multi-queue support + (Canau), merged qmail support (Schmid) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@490 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-11 Ton Voon + + * plugins/check_procs.c: Match -a STRING anywhere in ps args (Laurent + Vaslin - 719783) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@488 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-11 Subhendu Ghosh + + * plugins-scripts/check_ifstatus.pl: added feature -u (list of unused + ifIndex) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@487 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: bug 691412, added feature -x (list + of excluded ifTypes) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@486 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: patch 698384 - order of args to snmpget + print + a bit of stderr + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@485 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-09 Karl DeBisschop + + * plugins/check_hpjd.c, plugins/check_http.c, plugins/check_nt.c: + cleanup to suppress various strict compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@483 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: rewrite #elif to be compatible with traditional C + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@482 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: check_game needs popen.c now + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@481 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-08 Ton Voon + + * command.cfg.in: Updated command for new check_procs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@479 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c, plugins/check_nt.c: Changed // to /* */ comments + as some compilers do not like them + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@478 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-08 Stanley Hopcroft + + * contrib/check_axis.sh: check_axis.sh (Axis 5xx print servers) from Tom + De Blende + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@477 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-07 Ton Voon + + * plugins/check_procs.c: Fixed zombie processes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@476 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Missed some PS_FORMAT strings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@475 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/Makefile.am, plugins/check_nagios.c, + plugins/check_procs.c, plugins/check_vsz.c: Souped up check_procs with + different metrics + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@474 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: Removed unnecessary regex array + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@472 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-07 Karl DeBisschop + + * plugins/check_http.c: ste timeout one second greater than critical + time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@471 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_game.c: had been grandfathered ibto core, finally use + normal getopts, add options for player, max-player array positions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@470 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-03 Ton Voon + + * plugins-scripts/check_oracle.sh: Cleaned up cache output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@469 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-01 Ton Voon + + * plugins-scripts/check_oracle.sh: Fixed sqlplus calls and rearranged + parameters for --tablespace & --cache + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@468 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-01 Karl DeBisschop + + * configure.in: remove PATH_PROG call for autoconf/automake components + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@467 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-31 Karl DeBisschop + + * plugins/check_disk.c: checkpoint + supresses iso9660 + adds option for checking only local + adds choice of scale factor + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@466 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-27 Ton Voon + + * plugins/check_nwstat.c: Extra Netware checks (Patch 710247 - Dietmar + Ruzicka) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@465 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-26 Ton Voon + + * configure.in: ipv6 check requires unistd.h for Darwin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@464 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_procs.c: Removal of ps_raw and ps_vars + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@463 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nagios.c: Uses same ps command as check_procs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@462 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-25 Karl DeBisschop + + * .cvsignore: subst is no longer used + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@461 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-24 Jeremy T. Bouse + + * .cvsignore, Makefile.am: Better stripping of prefix for Solaris + package install needs to remove + /usr/local as package installs there by default + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@460 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, pkg/solaris/.cvsignore, pkg/solaris/pkginfo.in, + plugins/check_disk.c: Minor changes to build for Solaris packages + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@459 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-24 Ton Voon + + * plugins/check_procs.c: Use max_state + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@458 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/mail_error, tools/sfsnapshot: PATH set in correct place and + extra comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@457 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/mail_error, tools/sfsnapshot: Bug fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@456 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/mail_error: Sends email if non-zero return code from command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@455 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Error code depending on number of files generated + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@454 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/ls-mntd-fs.m4: Using coreutils 4.5.11 version to fix Darwin + problem + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@453 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: Add NSClient requirement for check_nt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@452 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Reference to web site to get NSClient + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@450 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-23 Jeremy T. Bouse + + * Makefile.am, autogen.sh, configure.in, lib/Makefile.am, + pkg/solaris/pkginfo.in, pkg/solaris/solpkg: Solaris package build system + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@449 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-23 Karl DeBisschop + + * plugins/check_disk.c: can once again exclude indiviual path/partitions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@448 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: add -X to exclude FS type, now works with more + than one path/dev specified + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@447 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-22 Karl DeBisschop + + * plugins/utils.c: declaration must precede printf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@446 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-21 Karl DeBisschop + + * plugins/check_disk.c: checkpoint, allows selecting devices and paths + now + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@444 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: instructions for posting plugin version number + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@443 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-19 Karl DeBisschop + + * plugins/check_by_ssh.c: allow to specify -1 and -2 for protocol + version + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@442 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: make state_text a function + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@440 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/mountlist.c, plugins/check_disk.c: check_disk working with + mountlist.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@439 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, configure.in: subst.* was replaced by dist-hook + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@438 f882894a-f735-0410-b71e-b25c423dba1c + + * subst.in, subst.sh: these were replaced by dist-hook + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@437 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-18 Karl DeBisschop + + * configure.in: running the AFS macro causes newer AC/AM to barf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@436 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: afs checking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@435 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/afs.m4, lib/ls-mntd-fs.m4: use AC_DEFINE_UNQOUTED + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@434 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/ls-mntd-fs.m4: stop warning on autoheader 2.13 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@433 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/netutils.c, plugins/netutils.h: common.h was doubly included + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@432 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: use enum instead of define, remove some cruft from + old snprintf implementation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@431 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/Makefile.am, plugins/check_disk.c: use GNU fileutils + for check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@430 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/afs.m4, lib/fstypename.m4, lib/fsusage.c, lib/fsusage.h, + lib/fsusage.m4, lib/ls-mntd-fs.m4, lib/mountlist.c, lib/mountlist.h: + from GNU fileutils for check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@429 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-17 Ton Voon + + * plugins-scripts/check_oracle.sh: Allow default Oracle home from oratab + (reported by Walbert Oberngruber) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@428 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-16 Jeremy T. Bouse + + * configure.in: Modified to automatically enable getaddrinfo emulation + if lwres is not used and + getaddrinfo is not found in the system. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@427 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, plugins/netutils.c, plugins/netutils.h: Applied + patch #660973 for tcp refusals + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@426 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-15 Jeremy T. Bouse + + * configure.in: Left over debug define + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@425 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/Makefile.am, plugins/Makefile.am, + plugins/getaddrinfo.c, plugins/getaddrinfo.h, plugins/gethostbyname.c, + plugins/gethostbyname.h, plugins/netutils.c, plugins/netutils.h, + plugins/utils.c, plugins/utils.h: Spent the day working on backwards + compatability using getaddrinfo() + Moved getaddrinfo.? and gethostbyname.? from lib/ to plugins/ due to + problems with compiling into the libnagiosplug.a as it required linking + against socket libraries which are unneeded except for network based + plugins. + This code should hopefully happily work for all systems and has been tested + prior to commit on Debian GNU/Linux, SPARC Solaris 7 and SPARC Solaris 9. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@424 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-14 Karl DeBisschop + + * plugins-scripts/check_ntp.pl: add timeout, fix taint chacking diom + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@423 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-13 Jeremy T. Bouse + + * .cvsignore, configure.in, lib/Makefile.am: Working out issues with + getaddrinfo emulation build environment + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@422 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-13 Ton Voon + + * plugins/check_dns.c, plugins/check_http.c, plugins/check_tcp.c: Strip + leading spaces in perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@421 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Perf data without leading spaces and fix ANSI C + complaint about \n + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@420 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Fix compiler warnings re progname + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@419 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-13 Jeremy T. Bouse + + * depcomp: Removed auto-tools script that automake adds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@418 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, configure.in, install-sh, missing, mkinstalldirs, + plugins/.cvsignore, plugins/Makefile.am, plugins/common.h, + plugins/netutils.h, plugins/popen.h, plugins/utils.c, plugins/utils.h, + plugins/version.h.in: Updated cvs ignore files to reflect changes + Moved header files from being ran through configure to standard + Removed auto-tools scripts that get added by automake + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@417 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-13 Karl DeBisschop + + * plugins/negate.c: negate must be POSIXly correct in handling options, + else wrapped options get passed to it + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@416 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-13 Jeremy T. Bouse + + * configure.in: Removed --with-ipv6 configure option so it determines + IPv6 availablity + completely on it's own per suggestion by Karl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@415 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-12 Jeremy T. Bouse + + * plugins/check_tcp.c: doco standarization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@413 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-scripts/subst.in: Just a lil namespace clean-up + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@412 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Minor fix to --with-ipv6 behavior + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@411 f882894a-f735-0410-b71e-b25c423dba1c + + * autogen.sh, configure.in, plugins/utils.c, plugins/utils.h.in: Added + autogen.sh script that rebuilds using autotools and runs configure + Modified configure.in to include some debug build option info at the end + of the scripts execution. Can be removed by release time. + Modified configure.in to include a --with-ipv6 option + Default build is without IPv6 support now to enable you need to use the + --with-ipv6 command line option to configure. + Modified plugins/utils.* to use USE_IPV6 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@410 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-12 Karl DeBisschop + + * plugins/check_disk.c: doco standarization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@409 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: errors for statfs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@408 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: comment/doco cleanup for embeeded doc work, + control STMP command via options instead of defines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@407 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: version increase, statfs work + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@406 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-12 Jeremy T. Bouse + + * plugins/.cvsignore: Add some more extra plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@405 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Clean up of output from plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@404 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_udp.c: Code clean-up + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@403 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Code cleanup + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@402 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-12 Ton Voon + + * plugins/check_dns.c: Removed is_host checks to speed up code. Fixed + timings so no spaces + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@401 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: Timings in milliseconds and nicer output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@400 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-11 Ton Voon + + * plugins-scripts/.cvsignore: Add script ignores + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@399 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/negate.c: Remove getopt_long checks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@398 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/negate.c: Fixed reading too many argv parameters and changed + to asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@397 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide-smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/check_vsz.c: Remove getopt_long checks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@396 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-11 Jeremy T. Bouse + + * configure.in: Fixed some ping6 variables + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@395 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Minor change to Karl's statfs check + Inclusion of ICMPv6 ping tests to define PING6_COMMAND + Minor fix to ps syntax checking to fix bug I introduced last nite + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@394 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, configure.in: Removed acconfig.h from EXTRA_DIST + Fixed problem with test in SWAP_FORMAT and SWAP_COMMAND + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@393 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-11 Karl DeBisschop + + * configure.in, plugins/check_disk.c: use statfs for check_disk (still + needs fs scan) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@392 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-11 Jeremy T. Bouse + + * acconfig.h, configure.in: Finishing clean-up of configure.in + Removing acconfig.h as it's no longer needed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@391 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-10 Jeremy T. Bouse + + * acconfig.h, configure.in: Cleaned up configure for PS and PING to + produce cleaner config.h + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@390 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-09 Jeremy T. Bouse + + * plugins/common.h.in: Make sure sys/socket.h is explicitly included if + HAVE_SYS_SOCKET_H is defined + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@389 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-09 Ton Voon + + * plugins/check_disk.c: Implement error-only option for check_disk (Ian + Duggan) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@388 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-08 Ton Voon + + * plugins/check_disk.c: Fix AIX /proc filesystem (Ian Duggan) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@387 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: snprintf checks in configure.in like samba + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@386 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-08 Jeremy T. Bouse + + * plugins/check_dns.c: Modified code to call is_addr() rather than + is_dotted_quad() with the + new AF indepdent function routines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@385 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/netutils.c, plugins/netutils.h.in, plugins/utils.c, + plugins/utils.h.in: AF indepedent routines introduced. + Modifed process_request() & my_connect() parameters to make 'proto' type + 'int' rather than 'char *' and use IPPROTO_* POSIX values. + Removed is_dotted_quad() & my_inet_aton() functions + Added is_addr(), is_inet_addr(), is_inet6_addr() and resolve_host_or_addr() + functions to check whether it is a valid IP address + Modified is_host() to call is_addr() and is_hostname() + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@384 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-08 Ton Voon + + * tools/sfsnapshot: Need to remove configure.in + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@383 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/snprintf.c, plugins/Makefile.am: Move snprintf + into lib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@382 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Have to run through whole automake procedure as + datestamp in RELEASE variable + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@381 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Added automake parameters for config.sub and + config.guess + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@380 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Fixed production OUT variable + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@379 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Adds MD5SUM file, creates multiple branch snapshots + and doesn't + rerun configure/automake/autoconf unnecessarily + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@378 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Use Makefile's variables (to support a shortcut in + sfsnapshot) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@377 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-07 Jeremy T. Bouse + + * configure.in, lib/Makefile.am, lib/getaddrinfo.c, lib/getaddrinfo.h, + lib/gethostbyname.c, lib/gethostbyname.h, plugins/check_pgsql.c, + plugins/common.h.in, plugins/netutils.c, plugins/netutils.h.in, + tools/setup: Added getaddrinfo.[ch] & gethostbyname.[ch] to provide + RFC2553 functions + if missing in system libs and lwres not present + Moved all references to netdb.h and sys/socket.h into common.h.in + Modified automake call in tools/setup to include adding missing files + so config.sub and config.guess will be available + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@376 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-07 Karl DeBisschop + + * plugins/check_smtp.c: millisecond timing and perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@374 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: whole timer loop was on the wrong side of + connection close code + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@373 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_udp.c: fix for -H invocation of hostname + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@372 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-06 Jeremy T. Bouse + + * acinclude.m4, configure.in: Adds --with-lwres and + --enable-emulate-getaddrinfo but are not used in any of + the code at this time. Has a check for IPv6 support but only runs if using the + emulate-getaddrinfo routines, this needs to be modified. + !!! I need input from results of this run on various platforms to see what + results are seen in plugins/config.h so please help test !!! + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@371 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-05 Karl DeBisschop + + * plugins-scripts/check_ntp.pl: add "m" to regex for minutes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@370 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-05 Ton Voon + + * plugins/check_http.c: check_http min size option (680467 - Dave Viner) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@365 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-04 Ton Voon + + * plugins/check_nt.c: Make output message for CPU Load a bit nicer + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@364 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: To create nagiosplug daily snapshots on SF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@363 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-03 Karl DeBisschop + + * plugins/check_ping.c: accept comma-delimted list of hosts for checking + if a multihomed host is alive + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@362 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-02 Karl DeBisschop + + * plugins/check_ping.c: add logic to check multiple servers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@361 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: update from CVS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@360 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, nagios-plugins.spec.in: adjustments to remove beta + tagging + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@359 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: update from CVS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@358 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-01 Karl DeBisschop + + * nagios-plugins.spec.in: we were missing some docs in the RPM + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@357 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-23 Subhendu Ghosh + + * REQUIREMENTS: Novell requirements + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@356 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_bgpstate.pl: removed community string in CRIT message + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@355 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-22 Ton Voon + + * configure.in: Solaris and Unixware labels round the wrong way for swap + command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@354 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-22 Karl DeBisschop + + * Makefile.am: provide target for nagios-plugins.spec + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@353 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: add CODING FAQ LEGAL to distribution tarball + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@352 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-21 Ton Voon + + * plugins/check_http.c: Fixed coredump with unallocated string + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@351 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: Strip leading spaces on dns return value (689563 + - Simon L Nielsen) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@350 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-20 Karl DeBisschop + + * plugins-scripts/check_disk_smb.pl: option regexs need to include ^ and + $ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@348 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-19 Ton Voon + + * lib/Makefile.am: Removing getloadavg.m4 from dist + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@347 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-19 Karl DeBisschop + + * INSTALL, configure.in, lib/getloadavg.m4, tools/setup: remove + getloadavg.m4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@346 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-19 Ton Voon + + * Makefile.am, configure.in, lib/Makefile.am, lib/getloadavg.c, + lib/getloadavg.m4, plugins/Makefile.am: Move getloadavg to lib + directory. Must run "aclocal -I lib" + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@345 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-18 Karl DeBisschop + + * plugins/check_pgsql.c: spurious backslash escape + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@344 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: set tag for beta3, fix pgsql detection + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@343 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_udp.c: never exited getopt loop + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@342 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: failed if header was more than 1023 bytes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@341 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-18 Ton Voon + + * plugins/check_load.c: Fixed the output messages (Bug 688729 - Jayjay) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@340 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Add SUPPORT file to distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@339 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Fixed compiler warning and increased the SSL + random key for a Solaris PRNG problem + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@338 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-18 Karl DeBisschop + + * configure.in: remainder of ps fix for UnixWare, and move [] in if/elif + to indicate m4 quoting instead of test invocation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@337 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-18 Subhendu Ghosh + + * contrib/check_appletalk.pl: Appletalk ping plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@336 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: OID type prefix patch [Patches-679403] + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@335 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: support for Large swap sizes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@334 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: regex fix to catch *BSD swapinfo and not HP-UX error and + memory/file swap in addition to device for HP-UX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@333 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-17 Karl DeBisschop + + * configure.in: typo in testing uname output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@332 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: ping and swap for unixware + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@331 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: library search dirs are part of LDFLAGS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@330 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-17 Subhendu Ghosh + + * REQUIREMENTS: location updates + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@329 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-16 Ton Voon + + * plugins/Makefile.am: Fixed dependencies for check_nt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@328 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Coredump if no variable set (reported by Marc C. + Poulin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@327 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-16 Ethan Galstad + + * contrib/check_dhcp.c: Interface patch byor Clemens Resen + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@326 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-16 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: all alphanumeric accepted for refid on + ntpq + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@325 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-12 Ton Voon + + * plugins/.cvsignore: Added extra plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@324 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/.cvsignore: Add ignore files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@323 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/negate.c: Remove unnecessary \ and fix coredump with no + parameters specified + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@322 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Remove unnecessary \ - complaints from Tru64's + cc compiler + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@321 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Inadequate quoting for PS_FORMAT & removal of grep "*** + for Tru64 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@320 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-12 Subhendu Ghosh + + * command.cfg.in: forced ntpq jitter check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@319 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifoperstatus.pl: added timeout alarm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@318 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: fixed regex for stratum1 peer, added + logic for failed ntpq call(e.g. sntp host) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@317 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-11 Ton Voon + + * plugins/check_mysql.c: Patch by Dave Viner for seg fault on RH 7.3 + (655903) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@316 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-10 Ton Voon + + * configure.in: Update with references to REQUIREMENTS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@315 f882894a-f735-0410-b71e-b25c423dba1c + + * Requirements: Remove file, superceded by REQUIREMENTS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@314 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/getopt.c, plugins/getopt.h, plugins/getopt1.c: Removing getopt + files - now in new lib directory + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@313 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/getopt.c, lib/getopt.h, lib/getopt1.c: New + directory for common library files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@312 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h.in: Added in a define for HAVE_GETOPT_H for backwards + compatibility + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@311 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Remove unnecessary getopt references and link in + lib directory + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@310 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Removing checks for getopt.h - now always available. + Also support lib dir + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@309 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Adding lib directory for getopts change + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@308 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fixed Tru64 ps command (Bug 669585 - Paula Arnold) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@307 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-10 Jeremy T. Bouse + + * plugins/check_ssh.c: Added argc checks before attempting to access + argv[] + + Corrected return codes and output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@306 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ssh.c: Revised code to use resolving and connection code + in utils.c and + netutils.c rather than its own functions. + Corrected code to properly handle input of server hostname and port on + commandline without option flags. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@305 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-10 Karl DeBisschop + + * contrib/check_fping_in.c: this plugin is in core as check_fping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@304 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-09 Jeremy T. Bouse + + * tools/setup: Reordered program calls so autoheader was called before + automake thus + getting rid of errors for header files not being present when automake + was called. Also puts it inline with documentation in + INSTALL & INSTALLING + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@303 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-09 Subhendu Ghosh + + * contrib/check_adptraid.sh, contrib/check_compaq_insight.pl, + contrib/check_file_age.pl: new plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@302 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/README.TXT: file rename + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@301 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_remote_nagios_status.pl, contrib/check_wins.pl, + contrib/sched_downtime.pl: more contribs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@300 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/tarballs/fetchlog-0.92.tar.gz, + contrib/tarballs/fetchlog-0.94.tar.gz: new version + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@299 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-09 Karl DeBisschop + + * CODING, README: spell check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@298 f882894a-f735-0410-b71e-b25c423dba1c + + * FAQ: spell check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@297 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-09 Subhendu Ghosh + + * SUPPORT: ispell + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@296 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-08 Karl DeBisschop + + * plugins/check_pgsql.c: use enum instead of define + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@295 f882894a-f735-0410-b71e-b25c423dba1c + + * FAQ: add item on submitting new plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@294 f882894a-f735-0410-b71e-b25c423dba1c + + * SUPPORT: suggest minimum standards for support requests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@293 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: submit request with one send + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@292 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-05 Karl DeBisschop + + * configure.in: fix for SSL build on RedHat rawhide + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@291 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: allow check to proceed using servers from + resolv.conf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@290 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: fix segfault due to bad asprintf invocation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@289 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-04 Subhendu Ghosh + + * plugins-scripts/Makefile.am: install user:grp perms [patch 679703 + -Detlef Boehm] + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@288 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_flexlm.pl: lmstat output update + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@287 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: corrected ntpdate offset to seconds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@286 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-03 Ton Voon + + * plugins/check_snmp.c: Avoid core dump with null or invalid data + (679400 - Mathieu Masseboeuf) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@285 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Patch for Mac OS X compile (652080 - Ton Voon) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@284 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-03 Subhendu Ghosh + + * contrib/tarballs/check_cit.tgz: Citrix plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@283 f882894a-f735-0410-b71e-b25c423dba1c + + * command.cfg.in: more sample command configurations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@282 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-scripts/check_ntp.pl, + plugins-scripts/utils.pm.in: change ntpdc to ntpq (Jonathan Rozes,Thomas + Schimpke, bug-656237 ) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@281 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: patch for desync peer and ntpdate (James + Fidell) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@280 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: bugfix [bug 651021 mperry2] + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@279 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: added default community [bug-patch #600349 + jbaumgartner] + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@278 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-31 Ton Voon + + * plugins/check_procs.c: Fix for zombie processes on Solaris (Bug 677803 + - Matthew Brown) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@277 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Reapply all asprintf calls. Fix for %% problem + with -l flag. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@276 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Removed all unnecessary asprintf calls. Replaced + with original check_nt.c + to minimise amount of changes (reported by Reuben Farrelly) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@275 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-30 Ton Voon + + * plugins/check_nt.c: Added reference to the official NSClient web site + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@274 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Fixed long --allswap option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@273 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: Fixed progname + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@272 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-29 Ton Voon + + * plugins/check_mrtgtraf.c: Fixed error and success codes (638656 - Paul + Dlug) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@271 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Added cache and tablespace check + (621567 - John Marquart) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@270 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_nt.c: Added in check_nt for bug + 646516 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@269 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-29 Karl DeBisschop + + * plugins/check_mysql.c: remove incorrect check_disk() declaration + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@268 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c: fix segfault when argc>=2 and the -H or -b + options are not supplied + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@267 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: 1.8 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@266 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-29 Ton Voon + + * plugins/check_http.c: Better error if server requests client based + certificate (609382 - Olaf Greis) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@265 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_dns_random.pl: Exit code added (604837 - Lachlan + Cameron-Smith) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@264 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Added dummy login test (650970 - Ton + Voon) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@263 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_vsz.c: Error when no params passed, better invalid + params message (652086 - Ton Voon) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@262 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: Fixed NULL status in Solaris (644783 - Fabian + Pehla) + Fixed -p options (652082 - Ton Voon) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@261 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-28 Karl DeBisschop + + * contrib/checkciscotemp.pl: typo: had commented use Net::SNMP for + testing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@260 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_real.c: make sure host_name is set and remove NULL + string inits that can lead to segfaults + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@259 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mysql.c: missed argc check on port parameter + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@258 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/checkciscotemp.pl: split and validate input more robustly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@257 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: remove NULL string inits that can lead to + segfaults + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@256 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-28 Ton Voon + + * configure.in: ps support for Darwin / MacOSX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@255 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-27 Karl DeBisschop + + * plugins/check_http.c: do not pass host if none is provided + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@254 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: we were sending extra CRLF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@253 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-19 Karl DeBisschop + + * plugins-scripts/check_rpc.pl: indicate new default state in + get_rpcinfo, also fix a bunch of indents for consistent format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@252 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-17 Subhendu Ghosh + + * plugins-scripts/check_rpc.pl: bug fix for state and opt_c + initialization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@251 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: Counter32 tag parsing added + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@250 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-16 Karl DeBisschop + + * plugins/check_mysql.c, plugins/check_pgsql.c: semicolon needed where + progname define was replaced + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@249 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: add option to let regex span newlines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@248 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_game.c: progname and print_usage need to be defined + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@247 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_radius.c: semicolon needed where praogname define was + replced + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@246 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: semicolon needed where praogname define was + replced + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@245 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: find kerberos libs in latest Red Hat beta + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@244 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: restore max() macro + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@243 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: cleanup progname assignment + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@242 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_disk_smb.pl: accept $ for share and \\ for users + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@241 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: avoid segfault when host is not given + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@240 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-13 Karl DeBisschop + + * contrib/check_dhcp.c, contrib/check_fping_in.c, contrib/check_rbl.c: + convert PROGANE from a define to a const char + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@239 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, + plugins/check_vsz.c, plugins/negate.c, plugins/urlize.c, + plugins/utils.c, plugins/utils.h.in: convert PROGANE from a define to a + const char + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@238 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/popen.c: change exit status to be POSIX compliant + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@237 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nagios.c: check for a few null strings, change PROGNAME + from #define to const *char + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@236 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: add options for excluding devices and for + skipping OK devices in summary + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@235 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-03 Karl DeBisschop + + * plugins/utils.c: protect against some null strings, make formats more + uniform + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@234 f882894a-f735-0410-b71e-b25c423dba1c + +2002-12-19 Karl DeBisschop + + * plugins/check_tcp.c: expect is +OK for SPOP too + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@233 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: server expect not getting set, expect is +OK for + POP + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@232 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: remove spurious CRLF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@231 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-29 Stanley Hopcroft + + * contrib/check_citrix: New plugin to check the ICA browse service (used + by Citrix Metaframe servers) from + Ed Rolison and Tom De Blende. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@230 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-25 Karl DeBisschop + + * plugins/check_tcp.c: was segfaulting if no dtat was returned + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@228 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-24 Karl DeBisschop + + * tools/snapshot: some fixes needed to move off old devel box + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@227 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/snapshot: make routine snapshots of nagios and plugin CVS to + expand testing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@226 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-22 Karl DeBisschop + + * plugins/check_ups.c: add replace battery condition, replace unchecked + strcat calls with asprintf (I do not think buffer overflow was possible + here, but lets be consistent) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@225 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: get long args output to work on check_procs by putting + incantations with -w ahead of others + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@224 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: get long args output to work on linux check_procs, + actually works this time (needs OpenBSD testing) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@223 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: add a few comments, trap a few place where a + NULL string might have been handled + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@222 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: get long args output to work on linux check_procs (needs + OpenBSD testing) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@221 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-21 Karl DeBisschop + + * plugins/check_dig.c: fix empty output on errors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@220 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-20 Karl DeBisschop + + * plugins/check_swap.c: add switch to evaluate each swap individually + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@219 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: fix solaris SEGV, still need to print meaningful + error text + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@218 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: in short options, t no no argument + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@217 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: replace some strcpy with strscpy + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@216 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-19 Karl DeBisschop + + * plugins/Makefile.am: another try at portable symlinking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@215 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: another try at portable symlinking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@214 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_time.c: explicitly cast recv() arg2 for SunOS5.6 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@213 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: rewrite of install-exec-hook for solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@212 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-18 Subhendu Ghosh + + * contrib/check_javaproc.pl, contrib/nagios_sendim.pl: javaproc, sendim + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@211 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib-reporting/process_perfdata.pl: New directory to for perfdata + and reporting scripts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@210 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-18 Karl DeBisschop + + * plugins/check_swap.c: test total swap instead of individual disks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@209 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: failed to handle multple disks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@208 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: more readable max_state() code + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@207 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-16 Karl DeBisschop + + * plugins/Makefile.am: fix too many sources problem for programs tha are + symlinks to check_tcp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@206 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: my take on Subhendu's patches, plus a few + comments for clarity + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@205 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-15 Subhendu Ghosh + + * plugins/check_snmp.c: memory bounds in options, no output comparison + case + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@204 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-15 Karl DeBisschop + + * nagios-plugins.spec.in: make spec work again, now that release is in + source name again + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@203 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: release numbering fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@202 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: fix label handling, replace accidentally deleted + elseif l.310 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@201 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-14 Karl DeBisschop + + * Makefile.am, acconfig.h, configure.in, nagios-plugins.spec.in, + plugins/utils.c: fix bug with gettimeofday test, improve version/release + handling, update rpm spec + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@200 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: fix typo in snprintf build + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@199 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: can't drop these sources -- neded for dist + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@198 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: fix build rule for snprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@197 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: pagesize count off by one + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@196 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: clean up NULL from status on Solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@195 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: typo in AC_DEFINE of PS_FORMAT for solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@194 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: remove check_nt again + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@193 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: back out last change -- it was only work in + progress + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@192 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_dns.c, plugins/check_ldap.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_nwstat.c, + plugins/check_radius.c, plugins/utils.c, plugins/version.h.in: remove + call_getopt and ssprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@191 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-13 Karl DeBisschop + + * plugins/check_disk.c, plugins/check_dns.c, plugins/check_fping.c, + plugins/check_hpjd.c, plugins/check_mrtg.c, plugins/check_nwstat.c, + plugins/check_ping.c, plugins/check_vsz.c, plugins/urlize.c, + plugins/utils.c: remove call_getopt and asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@190 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-12 Karl DeBisschop + + * plugins/check_dig.c: cleanup asprintf, old function decls + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@189 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mysql.c, plugins/check_real.c, plugins/check_ups.c: + remove call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@188 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-11 Subhendu Ghosh + + * plugins/check_snmp.c: should use asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@187 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: more snmpv3 patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@186 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: long opt for miblist, snmpv3 support (rosenauer) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@185 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: option to specify a miblist - llow + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@184 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: misc doc fix, missing verbose option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@183 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-09 Karl DeBisschop + + * plugins/check_ups.c, plugins/check_users.c: remove call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@182 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_ping.c, + plugins/check_time.c: remove call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@181 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: cleaner handling of DEFAULT_PORT + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@180 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: add HPUX swap, try to cleanup getopt processing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@179 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_snmp.c, + plugins/negate.c, plugins/utils.h.in: define and use usage3 where second + part of message is a an int/char + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@178 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/snprintf.c: HAVE_C99_SNPRINTF is not tested, so remove from + ifdef + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@177 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-08 Karl DeBisschop + + * plugins/check_snmp.c: user reports NULL still getting into asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@176 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_vsz.c: remove call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@175 f882894a-f735-0410-b71e-b25c423dba1c + + * acconfig.h, configure.in, plugins/common.h.in, plugins/utils.c, + plugins/utils.h.in: patches required to build on solaris with asprintf + and gettimeofday + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@174 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/check_load.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_smtp.c, plugins/check_tcp.c: remove + unused variables + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@173 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/oneliners: some useful onliners + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@172 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-07 Karl DeBisschop + + * plugins/check_snmp.c: bugfixes to command format and (null) text + created by asprintf switch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@171 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: remove call_getopt, add [] arougn time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@170 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: test snprintf function family for ifdefs in snprintf.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@169 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-30 Karl DeBisschop + + * plugins/check_tcp.c: replace fixed-lentgh buffer with asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@168 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_udp.c: forgot to remove call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@167 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ssh.c, plugins/check_swap.c: forgot to remove + call_getopt declaration + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@166 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: remove call_getopt, fix several buffer overruns + possible due to use of fixed size buffers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@165 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: debian builds not actively maintained, so suppress error + in setup script + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@164 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-30 Subhendu Ghosh + + * acconfig.h, configure.in, plugins-scripts/Makefile.am, + plugins-scripts/check_mailq.pl, plugins-scripts/utils.pm.in: monitor + mailq + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@163 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-28 Karl DeBisschop + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_log.sh, + plugins-scripts/check_ntp.pl, plugins-scripts/check_rpc.pl, + plugins-scripts/check_sensors.sh, plugins-scripts/check_wave.pl: remove + pspace in shebang since no sequent users replied + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@162 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-26 Karl DeBisschop + + * nagios-plugins.spec.in: release should not be in tarball name + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@161 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-25 Karl DeBisschop + + * nagios-plugins.spec.in: tweak source macro + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@160 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: remove check_nt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@159 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, plugins/Makefile.am: include getloadavg sources, add some + Solaris pkg build support + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@158 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-22 Karl DeBisschop + + * plugins/check_ssh.c: remove call_getopt, replace ssprintf with + asprintf,better server version reporting + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@157 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: add check_spop + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@156 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: remove call_getopt, replace ssprintf with + asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@155 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-22 Subhendu Ghosh + + * contrib/check_procr.sh: From: Jerome Tytgat - checks to see if named + process is running + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@154 f882894a-f735-0410-b71e-b25c423dba1c + + * README, plugins/check_nt.c: check_nt is downloadable from + nsclient.ready2run.nl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@153 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-21 Karl DeBisschop + + * plugins/check_swap.c: use asprintf instead of ssprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@152 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: need to define SOURCES for check_tcp to also + build as check_ftp,check_imap,check_nntp,check_pop + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@151 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: use asprintf to do strscpy + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@150 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: roll check_ftp, check_imap, check_pop, and + check_nntp into check_tcp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@149 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ftp.c, plugins/check_imap.c, plugins/check_nntp.c, + plugins/check_pop.c: these are all combined into check_tcp now + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@148 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: remove broken call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@147 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: cleanup process_arguments, print_help, and + print_usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@146 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_pgsql.c: now we provide long opts if they do not exist + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@145 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-20 Karl DeBisschop + + * plugins/check_snmp.c: fixed scanning for multiple OIDs, which was not + working + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@144 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: change ssprintf to asprintf + back out change at line 225 in r1.4 + (values were mismatched to format string, so output was nonsense) + (I left a comment showing a construct that should work, but it fails for PHBs: + if my disk gets nearly full, they want 'CRITICAL - 99%' not 'CRITICAL - Gauge32: 99') + (If someine has a rationale for the change, maybe it could be done as an option? - it seems + fairly clear that the Web display should be sensible to PHBs so long as there's no real loss) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@143 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-18 Karl DeBisschop + + * plugins/check_swap.c: remove old call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@142 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: remove old call_getopt code, fix bug taking + single float, allow colon as separators in additin to commas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@141 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: handle null src in strscat + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@140 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: millisecond timing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@139 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.h.in: refine STD_LONG_OPTS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@138 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: provide on more decimal point printing time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@137 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: remove broken call_getopt stuff + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@136 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-17 Karl DeBisschop + + * plugins/check_tcp.c: using asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@135 f882894a-f735-0410-b71e-b25c423dba1c + + * INSTALL, INSTALLING, tools/setup: revise now that aclocal is remved + from CVS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@134 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-16 Karl DeBisschop + + * configure.in: need some quoting on ifdef + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@133 f882894a-f735-0410-b71e-b25c423dba1c + + * acinclude.m4, configure.in: finally a working fix for + AM/AC_FUNC_STRTOD nightmare + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@132 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: mismatched quote + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@131 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: mismatched quote + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@130 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: missing commas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@129 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: complains on paren in comment + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@128 f882894a-f735-0410-b71e-b25c423dba1c + + * acinclude.m4: lost a paren + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@127 f882894a-f735-0410-b71e-b25c423dba1c + + * acinclude.m4: old auto???? has AM_FUNC_STRTOD, now renamed + AC_FUNC_STRTOD + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@126 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/utils.c, plugins/utils.h.in: millisecond + timimg where supported + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@125 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, missing: build cleanly on RedHat 8.0 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@124 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore: ignore aclocal.m4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@123 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: AM_STRTOD was a typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@122 f882894a-f735-0410-b71e-b25c423dba1c + + * aclocal.m4: automake invokes acloacl on each run - it cannot be right + to include this + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@121 f882894a-f735-0410-b71e-b25c423dba1c + + * acconfig.h: better checks for vsnprintf stuff + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@120 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_http.c: use asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@119 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: use asprintf to construct strscat + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@118 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/popen.h.in: timeout interval is extern + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@117 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h.in: start support for gettimeofday + and tv_usec + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@116 f882894a-f735-0410-b71e-b25c423dba1c + + * aclocal.m4: generated with automake 1.6 / autoconf 2.53 (maybe should + not be in CVS, however) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@115 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/snprintf.c: newer snprintf from samba.org + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@114 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, depcomp: needed for automake 1.6 / autoconf 2.53 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@113 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: cosmetic line wrap before 80 chars + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@112 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: work with newer automake, begin swithc to asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@111 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-15 Subhendu Ghosh + + * plugins-scripts/check_ifoperstatus.pl: new exit states, more + conditional checking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@110 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-07 Subhendu Ghosh + + * plugins/check_dns.c: patch for expected IP address + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@109 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-07 Karl DeBisschop + + * plugins/popen.c: make sure we do not run past the end of an + unterminated string + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@108 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/negate.c: use asprintf, inhibit splint warning + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@107 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-05 Karl DeBisschop + + * getloadavg.m4, plugins/getloadavg.c: lets use library instead od + inconsistent command line interfaces + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@106 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-26 Karl DeBisschop + + * plugins/urlize.c: use ssprintf instead of sprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@105 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-25 Karl DeBisschop + + * plugins/check_http.c: incorporate comment on my_recv from Russell + Scibetti + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@104 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: incorporate comments from Russell Scibetti + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@103 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-24 Karl DeBisschop + + * plugins/check_http.c: replace remaining occurences of sprintf with + snprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@102 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-16 Karl DeBisschop + + * INSTALL: needed for latest autoconf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@101 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, aclocal.m4, configure.in, nagios-plugins.spec.in: finish + ckleanup of rpm spec porcessing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@100 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-14 Karl DeBisschop + + * nagios-plugins.spec.in: complete spec based on confugure.in + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@99 f882894a-f735-0410-b71e-b25c423dba1c + + * make-tarball, rpm: automake makes the dist tarball, rpmbuild -ta makes + the rpm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@98 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/check_tcp.c: time data in performance + string + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@97 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh: patch from Matthew Peters + , plus turned up a few bugs on my own + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@96 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-12 Karl DeBisschop + + * plugins/Makefile.am: negate wrapper + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@95 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-08 Karl DeBisschop + + * plugins/negate.c: wrapper to invert return status + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@94 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: clears up warnings in splint + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@93 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-06 Karl DeBisschop + + * plugins-scripts/check_rpc.pl: case on key to ERRORS hash + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@92 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-04 Subhendu Ghosh + + * configure.in: more Mysql patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@91 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: dispersion check now controlled by warn + and crit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@90 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Mysql dir fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@89 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_ifoperstatus.pl, contrib/check_ifstatus.pl: moved to + supported plugins-scripts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@88 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-02 Subhendu Ghosh + + * plugins/check_smtp.c: new -f option for adding a FROM address for RFC + correctness + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@87 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-01 Subhendu Ghosh + + * INSTALLING: file rename for MacOS X + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@86 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Valid MAIL command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@85 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-22 Subhendu Ghosh + + * contrib/check_snmp_process_monitor.pl: updates + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@84 f882894a-f735-0410-b71e-b25c423dba1c + + * command.cfg.in: smsclient config + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@83 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_snmp_disk_monitor.pl, + contrib/check_snmp_process_monitor.pl: new plugins contrib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@82 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-18 Karl DeBisschop + + * plugins/check_by_ssh.c: typo in options passed to ssh for ipv6. + fix by setting a generic hook for 1-char pasthhru options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@81 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-14 Subhendu Ghosh + + * plugins-scripts/check_disk_smb.pl: patch for admin shares + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@80 f882894a-f735-0410-b71e-b25c423dba1c + + * command.cfg.in: qpage definitions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@79 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: skip PPP interfaces + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@78 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: added HELO command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@77 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: ipv4/ipv6 switch added + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@76 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: net-snmp v5x fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@75 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_apc_ups.pl: fix for ePN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@74 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_linux_raid.pl, contrib/check_nagios_db.pl: new plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@73 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_inodes-freebsd.pl: check inodes - freebsd - candidate + for merge with check_inodes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@72 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_smb.sh: new smb check - users + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@71 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-13 Ethan Galstad + + * plugins/check_game.c: Mod to display current/max number of players in + a game (Frank Kannemann) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@70 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-12 Ethan Galstad + + * contrib/check_disk_snmp.pl: Updated to use getopt (Christoph Maser) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@69 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-01 Subhendu Ghosh + + * plugins/check_snmp.c: re-patched exit state comparison + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@68 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: port option added, -c support net-snmpv5, + complete response string output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@67 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-01 Ethan Galstad + + * contrib/check_digitemp.pl: Add Brian Lane's Digitemp (1-wire temp + sensor) plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@66 f882894a-f735-0410-b71e-b25c423dba1c + +2002-07-16 Ethan Galstad + + * contrib/check_disk_snmp.pl: Christoph Maser's plugin to check disk + usage via SNMP3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@65 f882894a-f735-0410-b71e-b25c423dba1c + +2002-07-16 Stanley Hopcroft + + * contrib/check_ms_spooler.pl: Primitive and in need of refinement test + of MS spooler (with smbclient) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@64 f882894a-f735-0410-b71e-b25c423dba1c + +2002-07-04 Subhendu Ghosh + + * contrib/check_procl.sh: Jerome Tytgat - accumulated/percentage CPU/MEM + per process - bash plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@63 f882894a-f735-0410-b71e-b25c423dba1c + + * INSTALL: doc update + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@62 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-28 Subhendu Ghosh + + * INSTALL: note about autoconf/automake version + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@61 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-25 Subhendu Ghosh + + * contrib/check_rbl.c: Check if IP address is specified on RBL - Tim + Bell + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@60 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_lmmon.pl: check motherboard/cpu temp via lmmon + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@59 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-24 Subhendu Ghosh + + * plugins/check_http.c: ignore return status codes if user specified + status line check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@58 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: printf bug for large numbers - Jeff Murray + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@57 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-20 Subhendu Ghosh + + * plugins-scripts/check_disk_smb.pl: logic fix for disk space thresholds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@56 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-19 Subhendu Ghosh + + * plugins/check_dig.c, plugins/check_dns.c, plugins/check_fping.c, + plugins/check_hpjd.c, plugins/check_nagios.c, plugins/check_ping.c, + plugins/check_snmp.c, plugins/check_vsz.c, plugins/urlize.c, + plugins/utils.c, plugins/utils.h.in: more POSIX return value comparison + related code fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@55 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/check_ping.c, plugins/check_procs.c: + fixes for using POSIX return codes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@54 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-18 Subhendu Ghosh + + * plugins/common.h.in: updated to POSIX return codes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@53 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_cluster.c: Ethan's check_cluster + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@52 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-13 Subhendu Ghosh + + * plugins/check_smtp.c: conformance to RFC 821 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@51 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: use xntpdc on Solaris for check_ntp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@50 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-10 Subhendu Ghosh + + * plugins/check_smtp.c: patch to stop NOQUEUE syslog messages - Karl + Ewald + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@49 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-08 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: xntpdc/ntpdc patch - John Koyle + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@48 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-06 Subhendu Ghosh + + * plugins-scripts/subst.in, plugins-scripts/utils.sh.in: corrected + result codes - for sh; corrected substition for libexec - Tom Bertelson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@47 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: added option for mount point - Tom Bertelson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@46 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Add test for Oracle name server, can + dynamicall determine ORACLE_HOME - tom Bertelson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@45 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_flexlm.pl: conditional on lmstat + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@44 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: conditional on ntpdc + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@43 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-29 Subhendu Ghosh + + * command.cfg.in: notes added + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@42 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-28 Subhendu Ghosh + + * command.cfg.in: option updates, more examples + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@41 f882894a-f735-0410-b71e-b25c423dba1c + + * command.cfg.in: option updates, more examples + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@40 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-27 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: checked in too quickly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@39 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/README, doc/developer-guidelines.html, + doc/developer-guidelines.sgml: added developer guidelines. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@38 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: typo, AIX 4.3 ps, smbclient, Net::SNMP fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@37 f882894a-f735-0410-b71e-b25c423dba1c + + * acconfig.h, plugins-scripts/utils.pm.in: new var - smbclient + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@36 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: logic reorg, ePN fix and support for + utils.pm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@35 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_disk_smb.pl: ePN fix and support for utils.pm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@34 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-23 Subhendu Ghosh + + * contrib/check_log2.pl, contrib/check_vcs.pl: New plugins from Aaron + Bostick - Veritas Cluster, logfile + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@33 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-10 Subhendu Ghosh + + * plugins-scripts/check_rpc.pl: updates for ePN, patch for multiple + version check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@32 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-scripts/utils.pm.in: added programs to autoconf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@31 f882894a-f735-0410-b71e-b25c423dba1c + + * acconfig.h: This commit was generated by cvs2svn to compensate for + changes in r29, + which included commits to RCS files with non-trunk default branches. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@30 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-09 Subhendu Ghosh + + * plugins-scripts/Makefile.am, plugins-scripts/check_ifoperstatus.pl: + migrated check_ifoperstatus to standard plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@28 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-08 Subhendu Ghosh + + * plugins/check_ping.c: patch for Suse 8.0 loss output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@27 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/utils.pm.in: is_hostname added, update CODES to POSIX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@26 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c, plugins/check_ups.c: updated notes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@25 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: updated messages and check for host command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@24 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/Makefile.am, plugins-scripts/check_ifstatus.pl: moved + updated check_ifstatus to standard plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@23 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-07 Subhendu Ghosh + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ircd.pl, plugins-scripts/check_netdns.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_wave.pl: 2nd fix for + ePN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@22 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-02 Subhendu Ghosh + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_netdns.pl, plugins-scripts/check_ntp.pl, + plugins-scripts/check_rpc.pl, plugins-scripts/check_wave.pl: fix for + embedded perl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@21 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/README, tools/mini_epn.c, tools/p1.pl: updated mini_epn and + p1.pl added to plugins distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@20 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-01 Subhendu Ghosh + + * contrib/tarballs/fetchlog-0.92.tar.gz: remote log check (via snmp + possible) by Alexander Haderer + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@19 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-29 Karl DeBisschop + + * plugins/getopt.h: failed to carry over from old plugins, listed in + EXTRA_DIST, needed for build + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@18 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-23 Subhendu Ghosh + + * plugins/check_ping.c: corrected program name and added rtt patch for + RH7.2+beta + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@17 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-18 Ethan Galstad + + * contrib/check_inodes.pl: add check_inodes contrib plugin by John Jolet + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@16 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: configure script patch for ping syntax + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@15 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-07 Subhendu Ghosh + + * contrib/check_backup.pl, contrib/check_dl_size.pl: plugins from + Patrick Greenwell + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@14 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-05 Subhendu Ghosh + + * acconfig.h: This commit was generated by cvs2svn to compensate for + changes in r12, + which included commits to RCS files with non-trunk default branches. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@13 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/tarballs/check_spread.tar: plugin to check spread messaging + toolkit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@11 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-03 Subhendu Ghosh + + * contrib/check_oracle_instance.pl: from Sven Dolderer - check oracle + instance + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@10 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_nfs.pl: check_nfs functionality exists in + check_rpc + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@9 f882894a-f735-0410-b71e-b25c423dba1c + +2002-03-18 Subhendu Ghosh + + * plugins-scripts/subst.in: function to update perl plugin scripts to + find utils.pm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@8 f882894a-f735-0410-b71e-b25c423dba1c + +2002-03-01 Ethan Galstad + + * plugins/.cvsignore, plugins/config.h.in: Fix for stupid me + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@7 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_breeze.pl, contrib/check_dhcp.c, + contrib/check_flexlm.pl, contrib/check_hltherm.c, + contrib/check_hprsc.pl, contrib/check_ipxping.c, contrib/check_mysql.c, + contrib/check_uptime.c, contrib/check_wave.pl, contrib/readme.txt, + contrib/tarballs/berger-ping.tar.gz, + contrib/tarballs/bowen-langley_plugins.tar.gz, + contrib/tarballs/check_bgp-1.0.tar.gz, + contrib/tarballs/check_breeze.tar.gz, + contrib/tarballs/check_flexlm.tar.gz, + contrib/tarballs/check_hltherm.tar.gz, + contrib/tarballs/check_hprsc.tar.gz, contrib/tarballs/check_memory.tgz, + contrib/tarballs/check_radius.tar.gz, + contrib/tarballs/check_wave.tar.gz, + contrib/tarballs/hopcroft-plugins.tar.gz, + contrib/tarballs/radius.tar.gz, plugins/.cvsignore, plugins/config.h.in: + Contrib plugin cleanup + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@6 f882894a-f735-0410-b71e-b25c423dba1c + +2002-02-28 Ethan Galstad + + * .cvsignore, AUTHORS, CODING, COPYING, ChangeLog, FAQ, Helper.pm, + INSTALL, LEGAL, Makefile.am, NEWS, README, REQUIREMENTS, ROADMAP, + Requirements, acconfig.h, aclocal.m4, command.cfg.in, configure.in, + contrib/aix/check_crit_dsk, contrib/aix/check_dsk, + contrib/aix/check_failed, contrib/aix/check_io, + contrib/aix/check_kerberos, contrib/aix/check_ping, + contrib/aix/check_queue, contrib/aix/pg_stat, contrib/check_apache.pl, + contrib/check_apc_ups.pl, contrib/check_bgpstate.pl, + contrib/check_dhcp.c, contrib/check_dlswcircuit.pl, + contrib/check_dns_random.pl, contrib/check_email_loop.pl, + contrib/check_fping_in.c, contrib/check_ftpget.pl, + contrib/check_ifoperstatus.pl, contrib/check_ifstatus.pl, + contrib/check_ipxping.c, contrib/check_joy.sh, + contrib/check_maxchannels.pl, contrib/check_maxwanstate.pl, + contrib/check_mem.pl, contrib/check_memory.tgz, contrib/check_mysql.c, + contrib/check_mysql.pl, contrib/check_nagios.pl, + contrib/check_netapp.pl, contrib/check_nmap.py, contrib/check_nwstat.pl, + contrib/check_ora_table_space.pl, contrib/check_pop3.pl, + contrib/check_qmailq.pl, contrib/check_rrd_data.pl, + contrib/check_sap.sh, contrib/check_sockets.pl, contrib/check_timeout.c, + contrib/check_uptime.c, contrib/checkciscotemp.pl, + contrib/maser-oracle.pl, contrib/mrtgext.pl, contrib/readme.txt, + contrib/restrict.pl, contrib/tarballs/berger-ping.tar.gz, + contrib/tarballs/bowen-langley_plugins.tar.gz, + contrib/tarballs/check_bgp-1.0.tar.gz, + contrib/tarballs/check_breeze.tar.gz, + contrib/tarballs/check_flexlm.tar.gz, + contrib/tarballs/check_hltherm.tar.gz, + contrib/tarballs/check_hprsc.tar.gz, + contrib/tarballs/check_radius.tar.gz, + contrib/tarballs/check_wave.tar.gz, + contrib/tarballs/hopcroft-plugins.tar.gz, + contrib/tarballs/radius.tar.gz, contrib/urlize.pl, contrib/utils.py, + install-sh, make-tarball, missing, mkinstalldirs, nagios-plugins.spec, + opttest.pl, package.def, plugins-scripts/.cvsignore, + plugins-scripts/Makefile.am, plugins-scripts/check_breeze.pl, + plugins-scripts/check_disk_smb.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ircd.pl, plugins-scripts/check_log.sh, + plugins-scripts/check_netdns.pl, plugins-scripts/check_nfs.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_oracle.sh, + plugins-scripts/check_rpc.pl, plugins-scripts/check_sensors.sh, + plugins-scripts/check_wave.pl, plugins-scripts/subst.in, + plugins-scripts/t/check_rpc.t, plugins-scripts/utils.pm.in, + plugins-scripts/utils.sh.in, plugins/.cvsignore, plugins/Makefile.am, + plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_ftp.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide-smart.c, plugins/check_imap.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, plugins/check_nagios.c, + plugins/check_nntp.c, plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_pop.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/check_vsz.c, plugins/common.h.in, + plugins/getopt.c, plugins/getopt1.c, plugins/netutils.c, + plugins/netutils.h.in, plugins/popen.c, plugins/popen.h.in, + plugins/snprintf.c, plugins/t/check_disk.t, plugins/t/check_dns.t, + plugins/t/check_fping.t, plugins/t/check_ftp.t, plugins/t/check_hpjd.t, + plugins/t/check_http.t, plugins/t/check_imap.t, plugins/t/check_load.t, + plugins/t/check_mysql.t, plugins/t/check_ping.t, plugins/t/check_pop.t, + plugins/t/check_procs.t, plugins/t/check_smtp.t, plugins/t/check_snmp.t, + plugins/t/check_swap.t, plugins/t/check_tcp.t, plugins/t/check_time.t, + plugins/t/check_udp.t, plugins/t/check_users.t, plugins/t/check_vsz.t, + plugins/tests/check_disk, plugins/tests/check_dns, + plugins/tests/check_ftp, plugins/tests/check_hpjd, + plugins/tests/check_http, plugins/tests/check_load, + plugins/tests/check_ping, plugins/tests/check_procs, + plugins/tests/check_swap, plugins/tests/check_users, + plugins/tests/check_vsz, plugins/urlize.c, plugins/utils.c, + plugins/utils.h.in, plugins/version.h.in, rpm, subst.in, subst.sh, + test.pl.in, tools/setup, tools/tango: Initial revision + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2 f882894a-f735-0410-b71e-b25c423dba1c + 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 this project include detailed version information. When executed with the '-V' option, a version string will be printed: - check_radius v1.4.16 (nagios-plugins 1.4.16) + check_radius v1.4.16 (monitoring-plugins 1.4.16) All bug reports and help requests should reference this information. @@ -32,7 +32,7 @@ A: At a minimum, the output from 'uname -a' and the version string Q: I'm using Redhat Linux (or some other RPM-based distribution). Which packages should I install? -A: The package nagios-plugins-..rpm contains only +A: The package monitoring-plugins-..rpm contains only those plugins that should work on any POSIX compliant system. In other words, you should be able to install this package on your system, no matter what else is or in not installed. @@ -42,7 +42,7 @@ A: The package nagios-plugins-..rpm contains only each dependency could be installed cleanly, but many people found that this resulted in too many packages. So in the end, all the non-POSIX plugins were folded into one RPM - (nagios-plugins-..rpm). Most people will need to + (monitoring-plugins-..rpm). Most people will need to use RPM's '--nodeps' option to install this package. @@ -59,10 +59,10 @@ Q: I prefer to build my own RPMs. Do I need to install all of the A: Beginning with the 1.2.9-1 release, you may run - rpm --define 'custom 1' -ta nagios-plugins-.tar.gz + rpm --define 'custom 1' -ta monitoring-plugins-.tar.gz In prior releases, you must unpack the tarball and build the - RPM using nagios-custom.spec with 'rpm -ba'. + RPM using monitoring-custom.spec with 'rpm -ba'. Q: I get an error like @@ -84,8 +84,8 @@ A: Commonly, system administrators will make security as tight as Q: I have a plugin to offer. What can I do? -A: You can make it available on NagiosExchange (http://nagiosexchange.org) +A: You can make it available on MonitoringExchange (http://monitoringexchange.org) where other people can find it for use. You can also get feedback on improving the plugin via the - nagiosplug-devel@lists.sourceforge.net mailing list. + devel@monitoring-plugins.org mailing list. diff --git a/Makefile.am b/Makefile.am index de23d35..3309977 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@ EXTRA_DIST = config.rpath \ ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ LEGAL NEWS \ NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \ - NPTest.pm pkg nagios-plugins.spec \ + NPTest.pm pkg monitoring-plugins.spec \ config_test/Makefile config_test/run_tests config_test/child_test.c \ tools/build_perl_modules \ tools/tinderbox_build @@ -51,7 +51,7 @@ solpkg: cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR) THANKS: THANKS.in - @echo "This software is brought to you by the Nagios Plugins Development Team. However," > $@ + @echo "This software is brought to you by the Monitoring Plugins Development Team. However," > $@ @echo "there have been many contributors to this project. Everyone below has helped in " >> $@ @echo "raising bug reports, creating patches or contributing new plugins." >> $@ @echo "" >> $@ diff --git a/Makefile.in b/Makefile.in index 724cd2e..c9f674f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,7 +52,7 @@ host_triplet = @host@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/nagios-plugins.spec.in $(srcdir)/test.pl.in \ + $(srcdir)/monitoring-plugins.spec.in $(srcdir)/test.pl.in \ $(top_srcdir)/configure $(top_srcdir)/pkg/solaris/pkginfo.in \ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS THANKS \ build-aux/compile build-aux/config.guess \ @@ -85,6 +85,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/gnulib-common.m4 \ $(top_srcdir)/gl/m4/gnulib-comp.m4 \ $(top_srcdir)/gl/m4/hostent.m4 $(top_srcdir)/gl/m4/iconv.m4 \ + $(top_srcdir)/gl/m4/idpriv.m4 \ $(top_srcdir)/gl/m4/include_next.m4 \ $(top_srcdir)/gl/m4/inet_ntop.m4 \ $(top_srcdir)/gl/m4/intlmacosx.m4 \ @@ -134,11 +135,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdbool.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ - $(top_srcdir)/gl/m4/stdlib_h.m4 \ + $(top_srcdir)/gl/m4/stdlib_h.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ - $(top_srcdir)/gl/m4/string_h.m4 $(top_srcdir)/gl/m4/strndup.m4 \ - $(top_srcdir)/gl/m4/strnlen.m4 $(top_srcdir)/gl/m4/strsep.m4 \ - $(top_srcdir)/gl/m4/strstr.m4 \ + $(top_srcdir)/gl/m4/string_h.m4 \ + $(top_srcdir)/gl/m4/strings_h.m4 \ + $(top_srcdir)/gl/m4/strndup.m4 $(top_srcdir)/gl/m4/strnlen.m4 \ + $(top_srcdir)/gl/m4/strsep.m4 $(top_srcdir)/gl/m4/strstr.m4 \ $(top_srcdir)/gl/m4/sys_socket_h.m4 \ $(top_srcdir)/gl/m4/sys_types_h.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ @@ -153,14 +155,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \ $(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/xalloc.m4 \ $(top_srcdir)/gl/m4/xsize.m4 $(top_srcdir)/gl/m4/xstrndup.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = nagios-plugins.spec test.pl pkg/solaris/pkginfo +CONFIG_CLEAN_FILES = monitoring-plugins.spec test.pl \ + pkg/solaris/pkginfo CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -336,6 +339,7 @@ GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ +GNULIB_FFS = @GNULIB_FFS@ GNULIB_FFSL = @GNULIB_FFSL@ GNULIB_FFSLL = @GNULIB_FFSLL@ GNULIB_FGETC = @GNULIB_FGETC@ @@ -701,6 +705,7 @@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ +HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ @@ -730,6 +735,7 @@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FEATURES_H = @HAVE_FEATURES_H@ +HAVE_FFS = @HAVE_FFS@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FMA = @HAVE_FMA@ @@ -841,8 +847,10 @@ HAVE_SQRTL = @HAVE_SQRTL@ HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ +HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRINGS_H = @HAVE_STRINGS_H@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -933,7 +941,6 @@ LD = @LD@ LDAPINCLUDE = @LDAPINCLUDE@ LDAPLIBS = @LDAPLIBS@ LDFLAGS = @LDFLAGS@ -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ LIBICONV = @LIBICONV@ @@ -959,6 +966,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MATHLIBS = @MATHLIBS@ @@ -984,6 +992,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ +NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ @@ -1004,6 +1013,7 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_STDINT_H = @NEXT_STDINT_H@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ +NEXT_STRINGS_H = @NEXT_STRINGS_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ @@ -1063,7 +1073,6 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PST3CFLAGS = @PST3CFLAGS@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -PYTHON = @PYTHON@ RADIUSLIBS = @RADIUSLIBS@ RANLIB = @RANLIB@ RELEASE = @RELEASE@ @@ -1255,7 +1264,6 @@ SCRIPT_TEST = @SCRIPT_TEST@ SED = @SED@ SERVENT_LIB = @SERVENT_LIB@ SET_MAKE = @SET_MAKE@ -SH = @SH@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ @@ -1279,6 +1287,7 @@ WARRANTY = @WARRANTY@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ +WTSAPI32LIBS = @WTSAPI32LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -1347,7 +1356,7 @@ SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@ EXTRA_DIST = config.rpath \ ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ LEGAL NEWS \ NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \ - NPTest.pm pkg nagios-plugins.spec \ + NPTest.pm pkg monitoring-plugins.spec \ config_test/Makefile config_test/run_tests config_test/child_test.c \ tools/build_perl_modules \ tools/tinderbox_build @@ -1364,7 +1373,7 @@ all: config.h .SUFFIXES: am--refresh: Makefile @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1391,9 +1400,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): @@ -1404,14 +1413,14 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ distclean-hdr: -rm -f config.h stamp-h1 -nagios-plugins.spec: $(top_builddir)/config.status $(srcdir)/nagios-plugins.spec.in +monitoring-plugins.spec: $(top_builddir)/config.status $(srcdir)/monitoring-plugins.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ test.pl: $(top_builddir)/config.status $(srcdir)/test.pl.in cd $(top_builddir) && $(SHELL) ./config.status $@ @@ -1909,7 +1918,7 @@ solpkg: cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR) THANKS: THANKS.in - @echo "This software is brought to you by the Nagios Plugins Development Team. However," > $@ + @echo "This software is brought to you by the Monitoring Plugins Development Team. However," > $@ @echo "there have been many contributors to this project. Everyone below has helped in " >> $@ @echo "raising bug reports, creating patches or contributing new plugins." >> $@ @echo "" >> $@ diff --git a/NEWS b/NEWS index 55174a8..f2898ab 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,55 @@ This file documents the major additions and syntax changes between releases. +2.0 11th July 2014 + ENHANCEMENTS + check_mailq now supports auto detection of qmail, postfix, exim and nullmailer with + fallback to sendmail + check_ide_smart now defaults to plugin output, original output appended with -v + Extra-Opts are now enabled by default, see: + https://www.monitoring-plugins.org/doc/extra-opts.html + check_swap now supports a configurable state when there is no swap + check_radius now supports the FreeRADIUS Client library + New check_mysql_query -f option to specify a client options file + New check_mysql_query -g option to specify a client options group + Add performance data to check_mysql_query + New check_file_age -i/--ignore-missing option to return OK on nonexistent files + Make check_ping, check_users, and check_disk work on Windows + New check_ssh -P option to specify the expected SSH protocol version + check_dns now emits the warning and critical thresholds with the performance data + + FIXES + Don't let e.g. check_http's -C option reset SSL version if e.g. -S 1 -C 5 is specified + Don't have check_http's -N option expect an argument + check_ide_smart could disable offline auto tests but could not re-enable them. + For this reason all SMART command modes have been disabled. + check_dig: fix wrong IPv6 arguments order (Stéphane Bortzmeyer) + check_dig: make sure not to give up too early when a timeout is specified with -t + check_log: don't stumble over log lines that include a "%" character + check_nt: add UPTIME to perfdata + Handle SNMPv3 noAuthNoPriv properly with check_snmp + Fix compilation with GnuTLS + + WARNINGS + New default installation prefix: /usr/local instead of /usr/local/nagios + check_snmp now evaluates negative values properly, which means it might return CRITICAL + in cases where it used to return OK. If this is undesired, the warning/critical + threshold(s) must be fixed by specifying e.g. ~:100 instead of 100 + check_procs now ignores its parent process to avoid unexpected results when invoked via + certain shells + utils.sh no longer defines ECH + check_ide_smart -q/--quiet and -n/--nagios (Nagios-compatible output) are now deprecated + but accepted for backward-compatibility + check_ide_smart -0/--auto-off, -1/--auto-on and -i/--immediate: options have + been disabled because they were broken + State retention: the NAGIOS_PLUGIN_STATE_DIRECTORY environment variable has been + renamed MP_STATE_PATH. The old variable will continue to work in v2.0.x + Add the UID of the invoking user to the state retention file path. This helps solving + permission issues when different users run the same plugin + check_swap used to allow returning OK on a system without swap when only percent thresholds + were used. This is no longer the case and one must now use -n/--no-swap= + The Perl and Shell plugins now use the PATH specified via ./configure's --trusted-path + option, or "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" by default + 1.5 2nd October 2013 ENHANCEMENTS New check_dbi plugin for checking an (SQL) database using DBI @@ -46,6 +96,7 @@ This file documents the major additions and syntax changes between releases. WARNINGS check_http behaviour of -k/--header changed since it does not seperate multiple headers by semicolons anymore. Use multiple -k switches instead. check_http's --proxy_authorization option is now called --proxy-authorization (it was always documented this way) + The contrib directory has been removed from this distribution 1.4.16 27th June 2012 ENHANCEMENTS @@ -287,7 +338,7 @@ This file documents the major additions and syntax changes between releases. check_icmp fix for *BSD when running for long time check_ping times out 1 second quicker if host is unreachable Root plugins installed with world executable - check_sybase from contrib now maintained in NagiosExchange + check_sybase from contrib now maintained in MonitoringExchange --with-nagios-user/group reinstated ./configure option New --without-world-permissions ./configure option @@ -311,7 +362,7 @@ This file documents the major additions and syntax changes between releases. New C based check_ntp. The perl version is now deprecated. New check_apt plugin Notice: plugins in contrib/ will start to be removed from this distribution. - Please check at http://www.nagiosexchange.org for contributed plugins + Please check at http://www.monitoringexchange.org for contributed plugins Major bug fixes to check_disk where values were incorrectly calculated and alerted on. check_udp2 removed. check_udp is now linked to check_tcp.c check_mailq now errors if the sub-program run returns non-zero return code. This would appear diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN index ae507e4..26f94e7 100755 --- a/NP-VERSION-GEN +++ b/NP-VERSION-GEN @@ -6,7 +6,7 @@ SRC_ROOT=`dirname $0` NPVF=NP-VERSION-FILE -DEF_VER=1.5.git +DEF_VER=2.0.git LF=' ' diff --git a/NPTest.pm b/NPTest.pm index 9b85617..f72ed2d 100644 --- a/NPTest.pm +++ b/NPTest.pm @@ -1,12 +1,12 @@ package NPTest; # -# Helper Functions for testing Nagios Plugins +# Helper Functions for testing Monitoring Plugins # require Exporter; @ISA = qw(Exporter); -@EXPORT = qw(getTestParameter checkCmd skipMissingCmd); +@EXPORT = qw(getTestParameter checkCmd skipMissingCmd skipMsg); @EXPORT_OK = qw(DetermineTestHarnessDirectory TestsFrom SetCacheFilename); use strict; @@ -25,21 +25,21 @@ $VERSION = "1556."; # must be all one line, for MakeMaker =head1 NAME -NPTest - Simplify the testing of Nagios Plugins +NPTest - Simplify the testing of Monitoring Plugins =head1 DESCRIPTION This modules provides convenience functions to assist in the testing -of Nagios Plugins, making the testing code easier to read and write; +of Monitoring Plugins, making the testing code easier to read and write; hopefully encouraging the development of a more complete test suite for -the Nagios Plugins. It is based on the patterns of testing seen in the +the Monitoring Plugins. It is based on the patterns of testing seen in the 1.4.0 release, and continues to use the L module as the basis of testing. =head1 FUNCTIONS -This module defines three public functions, C, -C and C. These are exported by +This module defines four public functions, C, +C, C and C. These are exported by default via the C statement. =over @@ -92,7 +92,7 @@ Testing of results would be done in your test script, not in this module. This function is obsolete. Use C instead. This function attempts to encompass the majority of test styles used -in testing Nagios Plugins. As each plug-in is a separate command, the +in testing Monitoring Plugins. As each plug-in is a separate command, the typical tests we wish to perform are against the exit status of the command and the output (if any) it generated. Simplifying these tests into a single function call, makes the test harness easier to read and @@ -132,7 +132,7 @@ of either C or C, so remember this when counting the number of tests to place in the C call. -Many Nagios Plugins test network services, some of which may not be +Many Monitoring Plugins test network services, some of which may not be present on all systems. To cater for this, C allows the tester to define exceptions based on the command's exit status. These exceptions are provided to skip tests if the test case developer @@ -185,6 +185,15 @@ of times. =back +=item C + +If for any reason the test harness must C some +or all of the tests in a given test harness this function provides a +simple iterator to issue an appropriate message the requested number +of times. + +=back + =head1 SEE ALSO L @@ -199,7 +208,7 @@ Copyright (c) 2005 Peter Bray. All rights reserved. This package is free software and is provided "as is" without express or implied warranty. It may be used, redistributed and/or modified -under the same terms as the Nagios Plugins release. +under the same terms as the Monitoring Plugins release. =cut @@ -304,6 +313,20 @@ sub skipMissingCmd return $testStatus; } +sub skipMsg +{ + my( $msg, $count ) = @_; + + my $testStatus; + + for ( 1 .. $count ) + { + $testStatus += skip( $msg, 1 ); + } + + return $testStatus; +} + sub getTestParameter { my( $param, $envvar, $default, $brief, $scoped ); @@ -347,7 +370,7 @@ sub getTestParameter } # Set "none" if no terminal attached (eg, tinderbox build servers when new variables set) - return "" unless (-t STDERR); + return "" unless (-t STDIN); my $userResponse = ""; @@ -438,7 +461,7 @@ sub LoadCache chomp($fileContents); my( $contentsRef ) = eval $fileContents; - %CACHE = %{$contentsRef}; + %CACHE = %{$contentsRef} if (defined($contentsRef)); } @@ -494,26 +517,35 @@ sub SetCacheFilename sub DetermineTestHarnessDirectory { - my( $userSupplied ) = @_; + my( @userSupplied ) = @_; + my @dirs; # User Supplied - if ( defined( $userSupplied ) && $userSupplied ) + if ( @userSupplied > 0 ) { - if ( -d $userSupplied ) + for my $u ( @userSupplied ) { - return $userSupplied; - } - else - { - return undef; # userSupplied is invalid -> FAIL + if ( -d $u ) + { + push ( @dirs, $u ); + } } } - # Simple Case : "t" is a subdirectory of the current directory + # Simple Cases: "t" and tests are subdirectories of the current directory if ( -d "./t" ) { - return "./t"; + push ( @dirs, "./t"); } + if ( -d "./tests" ) + { + push ( @dirs, "./tests"); + } + + if ( @dirs > 0 ) + { + return @dirs; + } # To be honest I don't understand which case satisfies the # original code in test.pl : when $tstdir == `pwd` w.r.t. @@ -526,7 +558,7 @@ sub DetermineTestHarnessDirectory if ( $pwd =~ m|/t$| ) { - return $pwd; + push ( @dirs, $pwd ); # The alternate that might work better is # chdir( ".." ); @@ -535,7 +567,7 @@ sub DetermineTestHarnessDirectory # to be tested is in the current directory (ie "./check_disk ....") } - return undef; + return @dirs; } sub TestsFrom @@ -618,12 +650,13 @@ sub only_output { } sub testCmd { - my $class = shift; + my $class = shift; my $command = shift or die "No command passed to testCmd"; + my $timeout = shift || 120; my $object = $class->new; local $SIG{'ALRM'} = sub { die("timeout in command: $command"); }; - alarm(120); # no test should take longer than 120 seconds + alarm($timeout); # no test should take longer than 120 seconds my $output = `$command`; $object->return_code($? >> 8); diff --git a/README b/README index b3d65de..beb7769 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ -Nagios Plugins -============== +Monitoring Plugins +================== -* For instructions on installing these plugins for use with Nagios, - see below. In addition, generic instructions for the GNU toolchain can be - found in the `INSTALL` file. +* For instructions on installing these plugins for use with your monitoring + system, see below. In addition, generic instructions for the GNU + toolchain can be found in the `INSTALL` file. * For major changes between releases, read the `NEWS` file. @@ -21,19 +21,20 @@ Nagios Plugins You can check for the latest plugins at: -* +* -Send an email to for assistance. -Please include the OS type and version that you are using. Also, run the -plugin with the `-vvv` option and provide the resulting version information. -Of course, there may be additional diagnostic information required as well. +Send an email to for assistance. Please +include the OS type and version that you are using. Also, run the plugin +with the `-vvv` option and provide the resulting version information. Of +course, there may be additional diagnostic information required as well. Use good judgment. -Send an email to for developer -discussions. +Send an email to for developer discussions. For patch submissions and bug reports, please use the appropriate resources -at . +at: + +* Installation Instructions @@ -45,17 +46,17 @@ Installation Instructions ./tools/setup For more detail, see the developer guidelines at - . + . 2. Run the configure script to initialize variables and create a Makefile, etc. ./configure --prefix=BASEDIRECTORY --with-cgiurl=SOMEURL - Replace `BASEDIRECTORY` with the path of the directory under which Nagios - is installed (default is `/usr/local/nagios`), and replace `SOMEURL` with - the path used to access the Nagios CGIs with a web browser (default is - `/nagios/cgi-bin`). + Replace `BASEDIRECTORY` with the path of the directory under which your + monitoring system is installed (default is `/usr/local`), and replace + `SOMEURL` with the path used to access the monitoring system CGIs with a + web browser (default is `/nagios/cgi-bin`). 3. Compile the plugins with the following command: @@ -77,14 +78,21 @@ Installation Instructions make install-root That's it! If you have any problems or questions, feel free to send an -email to . +email to . -License Stuff -------------- +License Notice +-------------- -This software is released under the GNU General Public License, Version 3, -with the additional exemption that compiling, linking and/or using OpenSSL -is allowed. +You can redistribute and/or modify this software under the terms of the GNU +General Public License as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later version; with the +additional exemption that compiling, linking, and/or using OpenSSL is +allowed. -See the `COPYING` file for the complete GPLv3 text. +This software is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. + +See the `COPYING` file for the complete text of the GNU General Public +License, version 3. diff --git a/REQUIREMENTS b/REQUIREMENTS index 1f673e9..303fd62 100644 --- a/REQUIREMENTS +++ b/REQUIREMENTS @@ -1,4 +1,4 @@ -Nagios Plugin Requirements +Monitoring Plugins Requirements -------------------------- Some plugins require that you have additional programs and/or @@ -50,14 +50,16 @@ check_dbi: http://libdbi.sourceforge.net/ check_radius: - - Requires the radiusclient-ng library available from: - http://developer.berlios.de/projects/radiusclient-ng/ + - Requires the FreeRADIUS Client library available from: + http://freeradius.org/freeradius-client/ + - As an alternative, the radiusclient-ng library may be used: + http://sourceforge.net/projects/radiusclient-ng.berlios/ - This plugin also works with the original radiusclient library from ftp://ftp.cityline.net/pub/radiusclient/ RPM (rpmfind): radiusclient 0.3.2, radiusclient-devel-0.3.2 - Unless you're using a distro-maintained version of this library you - probably want to use radiusclient-ng. The original radiusclient library is - unmaintained and has many known issues, particularly with 64bit systems. + However, you probably want to use the FreeRADIUS Client library, as + both radiusclient and radiusclient-ng are unmaintained and have known + issues. check_snmp: - Requires the NET-SNMP package available from diff --git a/SUPPORT b/SUPPORT index f1705aa..d2a2b7d 100644 --- a/SUPPORT +++ b/SUPPORT @@ -1,14 +1,14 @@ SUPPORT -Using the mailing lists and tracker databases at SourceForge are the -best ways to obtain direct support for the Nagios Plugins. There may +Using the mailing lists and issue tracker at GitHub are the +best ways to obtain direct support for the Monitoring Plugins. There may also be commercial support options available to you -- check http://www.nagios.org/ to track the current status of commercial support offerings. -There are two mailing lists associated with Nagios Plugin development: -'help' (mailto:nagiosplug-help@lists.sourceforge.net), and 'devel' -(mailto:nagiosplug-devel@lists.sourceforge.net). Unless you are fairly +There are two mailing lists associated with Monitoring Plugins development: +'help' (mailto:help@monitoring-plugins.org), and 'devel' +(mailto:help@monitoring-plugins.org). Unless you are fairly certain you have found a bug or that you are requesting a new feature, please direct support requests to 'help'. @@ -18,8 +18,8 @@ their time to fix bug and provide feature requests, it is generally in you interest to do a modest amount of legwork before posting to either of these lists. -Plugins that are in the contrib directories are provided as-is. We will -try to help, but sometimes the plugins have dependencies that the nagios-plugin +Plugins that are in the contrib directories are provided as-is. We will +try to help, but sometimes the plugins have dependencies that the monitoring-plugin developers do not have access to. You may be able to try the authors directly. @@ -34,7 +34,7 @@ Requests to 'help' require posting the version number of the plugin. The best place to include the version information is in the subject. A good post would have a subject like: - Can I use SSL with check_imap (nagios-plugins 1.3.0-beta2) 1.12 + Can I use SSL with check_imap (monitoring-plugins 1.3.0-beta2) 1.12 If you do not include the version of the plugin, you risk having your post silently ignored. @@ -48,17 +48,17 @@ REPORTING BUGS AND SUBMITTING PATCHES Bug reports, investigations of possible bugs, feature requests, and patch submissions should be submitted to the development list at -mailto:nagiosplug-devel@lists.sourceforge.net. Please raise an issue first +mailto:devel@monitoring-plugins.org. Please raise an issue first in GitHub, otherwise your email is likely to be missed over time. -You should identify the version, preferably in the subject line. -However, to best use developer resources, it is suggested that you +You should identify the version, preferably in the subject line. +However, to best use developer resources, it is suggested that you reference your report to one of the following sources: 1) The most recent release, including beta's 2) The current snapshots (there's a link provided on - https://www.nagios-plugins.org/download.html) + https://www.monitoring-plugins.org/download.html) 3) The current Git code from GitHub diff --git a/THANKS b/THANKS index 89be5de..44b606f 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ -This software is brought to you by the Nagios Plugins Development Team. However, +This software is brought to you by the Monitoring Plugins Development Team. However, there have been many contributors to this project. Everyone below has helped in raising bug reports, creating patches or contributing new plugins. @@ -36,20 +36,25 @@ Guy Van Den Bergh Jimmy Bergman Jochen Bern Tom Bertelston +Gunnar Beutner Daniel Bimschas Jeffery Blank Tom De Blende Eric Bollengier Aurelien Bompard +Stéphane Bortzmeyer Alex Bradley +Andy Brist Richard Brodie Dominique Broeglin Matthew Brown Tobias Brox +Tilmann Bubeck Dick van den Burg Jason Burnett Grant Byers Carlos Canau +Jethro Carr Jim Carroll Ian Cass Arnold Cavazos @@ -58,10 +63,12 @@ Stephane Chazelas Eric Chen Alwyn Cherrington Ben Clewett +Jean-Claude Computing Lionel Cons Garry Cook Charlie Cook Ollie Cook +Luca Corti Jason Crawford David Croft Robert Dale @@ -87,6 +94,7 @@ Ragnar Hojland Espinosa O'Shaughnessy Evans Merijn Evertse Karl Ewald +Mikael Falkvidd Paul Farrall Reuben Farrelly Mark Favas @@ -107,6 +115,8 @@ Matt Garrett Robby Giffin Flo Gleixner Florian Gleixner +Evgeni Golov +Joseph Gooch Aravind Gottipati Kev Green Steve Greenland @@ -155,6 +165,7 @@ Marcel Kuiper Alexander Kulak Bill Kunkel Brian Landers +Stephane Lapie Pascal Larisch Charles-Henri Larose Tim Laszlo @@ -165,13 +176,17 @@ William Leibzon Pedro Leite Richard Leitner Craig Leres +Oskar Liljeblad Joerg Linge Jan Lipphaus +Anton Lofgren Larry Low Jacob Lundqvist Jason Lunn +Davide Madrisan Guenther Mair Pawel Malachowski +Ricardo Maraschini Michael Markstaller John Marquart Ernst-Dieter Martin @@ -190,15 +205,18 @@ Emil Michles Christian Mies Jonathan Milby Russell Miller +Eric J. Mislivec Janos Mohacsi Gerd Mueller Michael Musikhin +Damian Myerscough Jan-Frode Myklebust Sivakumar Nellurandi Truongchinh Nguyen Simon L Nielsen Thomas Nilsen Sebastian Nohn +Geoff Oakham Walbert Oberngruber Craig Orsinger Vaclav Ovsik @@ -224,6 +242,7 @@ Olivier 'Babar' Raginel Phil Randal Abid Rasheed Jeremy Reed +Spenser Reinhardt Marc Remy Alessandro Ren Joe Rhett @@ -287,6 +306,7 @@ Carole Verdon Ludse Verhoeven Robert August Vincent Dave Viner +Lars Vogdt Jan Wagner Dieter Van de Walle John Warburton @@ -297,6 +317,7 @@ Steve Weinreich Erik Welch Torsten Werner Ben Whaley +Andrew Widdersheim Adrian Wieczorek Sebastian Wiesinger Paul Wiggins diff --git a/aclocal.m4 b/aclocal.m4 index c292f9a..0d38bda 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -416,18 +416,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -612,6 +600,46 @@ fi rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 5 + +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. @@ -1048,6 +1076,7 @@ m4_include([gl/m4/gnulib-common.m4]) m4_include([gl/m4/gnulib-comp.m4]) m4_include([gl/m4/hostent.m4]) m4_include([gl/m4/iconv.m4]) +m4_include([gl/m4/idpriv.m4]) m4_include([gl/m4/include_next.m4]) m4_include([gl/m4/inet_ntop.m4]) m4_include([gl/m4/intlmacosx.m4]) @@ -1116,8 +1145,10 @@ m4_include([gl/m4/stdint.m4]) m4_include([gl/m4/stdint_h.m4]) m4_include([gl/m4/stdio_h.m4]) m4_include([gl/m4/stdlib_h.m4]) +m4_include([gl/m4/strcase.m4]) m4_include([gl/m4/strerror.m4]) m4_include([gl/m4/string_h.m4]) +m4_include([gl/m4/strings_h.m4]) m4_include([gl/m4/strndup.m4]) m4_include([gl/m4/strnlen.m4]) m4_include([gl/m4/strsep.m4]) diff --git a/config.h.in b/config.h.in index ece9d78..c15000c 100644 --- a/config.h.in +++ b/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD @@ -273,6 +273,10 @@ don't. */ #undef HAVE_DECL_STRERROR_R +/* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you + don't. */ +#undef HAVE_DECL_STRNCASECMP + /* Define to 1 if you have the declaration of `strndup', and to 0 if you don't. */ #undef HAVE_DECL_STRNDUP @@ -336,6 +340,15 @@ /* Define to 1 if you have the `fs_stat_dev' function. */ #undef HAVE_FS_STAT_DEV +/* Define to 1 if you have the 'getegid' function. */ +#undef HAVE_GETEGID + +/* Define to 1 if you have the 'geteuid' function. */ +#undef HAVE_GETEUID + +/* Define to 1 if you have the 'getgid' function. */ +#undef HAVE_GETGID + /* Define to 1 if you have the `gethostbyname' function. */ #undef HAVE_GETHOSTBYNAME @@ -354,6 +367,12 @@ /* Define to 1 if you have the `getopt_long_only' function. */ #undef HAVE_GETOPT_LONG_ONLY +/* Define to 1 if you have the 'getresgid' function. */ +#undef HAVE_GETRESGID + +/* Define to 1 if you have the 'getresuid' function. */ +#undef HAVE_GETRESUID + /* Define to 1 if you have the `getservbyname' function. */ #undef HAVE_GETSERVBYNAME @@ -363,6 +382,9 @@ /* Define if gettimeofday is found */ #undef HAVE_GETTIMEOFDAY +/* Define to 1 if you have the 'getuid' function. */ +#undef HAVE_GETUID + /* Define to 1 if you have the header file. */ #undef HAVE_GNUTLS_OPENSSL_H @@ -436,6 +458,10 @@ /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL +/* Define to 1 if you have the `freeradius-client' library + (-lfreeradius-client). */ +#undef HAVE_LIBFREERADIUS_CLIENT + /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H @@ -723,6 +749,9 @@ /* Define to 1 if fdatasync is declared even after undefining macros. */ #undef HAVE_RAW_DECL_FDATASYNC +/* Define to 1 if ffs is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_FFS + /* Define to 1 if ffsl is declared even after undefining macros. */ #undef HAVE_RAW_DECL_FFSL @@ -1152,6 +1181,9 @@ /* Define to 1 if stpncpy is declared even after undefining macros. */ #undef HAVE_RAW_DECL_STPNCPY +/* Define to 1 if strcasecmp is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_STRCASECMP + /* Define to 1 if strcasestr is declared even after undefining macros. */ #undef HAVE_RAW_DECL_STRCASESTR @@ -1164,6 +1196,9 @@ /* Define to 1 if strerror_r is declared even after undefining macros. */ #undef HAVE_RAW_DECL_STRERROR_R +/* Define to 1 if strncasecmp is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_STRNCASECMP + /* Define to 1 if strncat is declared even after undefining macros. */ #undef HAVE_RAW_DECL_STRNCAT @@ -1371,9 +1406,27 @@ /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT +/* Define to 1 if you have the 'setegid' function. */ +#undef HAVE_SETEGID + /* Define to 1 if you have the 'setenv' function. */ #undef HAVE_SETENV +/* Define to 1 if you have the 'seteuid' function. */ +#undef HAVE_SETEUID + +/* Define to 1 if you have the 'setregid' function. */ +#undef HAVE_SETREGID + +/* Define to 1 if you have the 'setresgid' function. */ +#undef HAVE_SETRESGID + +/* Define to 1 if you have the 'setresuid' function. */ +#undef HAVE_SETRESUID + +/* Define to 1 if you have the 'setreuid' function. */ +#undef HAVE_SETREUID + /* Define to 1 if you have the `shutdown' function. */ #undef HAVE_SHUTDOWN @@ -1422,6 +1475,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP @@ -1434,6 +1490,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + /* Define to 1 if you have the 'strndup' function. */ #undef HAVE_STRNDUP @@ -1653,6 +1712,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_WS2TCPIP_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WTSAPI32_H + /* Define to 1 if you have the header file. */ #undef HAVE_X509_H diff --git a/configure b/configure index 675c407..b224c23 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for nagios-plugins 1.5. +# Generated by GNU Autoconf 2.69 for monitoring-plugins 2.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -585,15 +585,14 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='nagios-plugins' -PACKAGE_TARNAME='nagios-plugins' -PACKAGE_VERSION='1.5' -PACKAGE_STRING='nagios-plugins 1.5' +PACKAGE_NAME='monitoring-plugins' +PACKAGE_TARNAME='monitoring-plugins' +PACKAGE_VERSION='2.0' +PACKAGE_STRING='monitoring-plugins 2.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' ac_unique_file="NPTest.pm" -ac_default_prefix=/usr/local/nagios # Factoring default headers for most tests. ac_includes_default="\ #include @@ -679,8 +678,15 @@ NEXT_SYS_UIO_H WINDOWS_64_BIT_OFF_T NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H NEXT_SYS_TYPES_H +HAVE_STRINGS_H +NEXT_AS_FIRST_DIRECTIVE_STRINGS_H +NEXT_STRINGS_H NEXT_AS_FIRST_DIRECTIVE_STRING_H NEXT_STRING_H +HAVE_DECL_STRNCASECMP +HAVE_STRCASECMP +HAVE_FFS +GNULIB_FFS NEXT_AS_FIRST_DIRECTIVE_STDLIB_H NEXT_STDLIB_H NEXT_AS_FIRST_DIRECTIVE_STDIO_H @@ -1633,6 +1639,9 @@ check_tcp_ssl SSLINCLUDE KRBINCLUDE PATH_TO_WHO +WTSAPI32LIBS +HAVE_WTS32API_FALSE +HAVE_WTS32API_TRUE HAVE_UTMPX_FALSE HAVE_UTMPX_TRUE MYSQLCFLAGS @@ -1654,10 +1663,7 @@ MATHLIBS SOCKETLIBS BASENAME HOSTNAME -LIBGNUTLS_CONFIG PERL -SH -PYTHON NP_RELEASE RELEASE_PRESENT_FALSE RELEASE_PRESENT_TRUE @@ -1721,6 +1727,9 @@ build_os build_vendor build_cpu build +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -1785,6 +1794,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_maintainer_mode with_nagios_user with_nagios_group with_world_permissions @@ -2389,7 +2399,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nagios-plugins 1.5 to adapt to many kinds of systems. +\`configure' configures monitoring-plugins 2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2437,7 +2447,8 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/nagios-plugins] + --docdir=DIR documentation root + [DATAROOTDIR/doc/monitoring-plugins] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -2459,7 +2470,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nagios-plugins 1.5:";; + short | recursive ) echo "Configuration of monitoring-plugins 2.0:";; esac cat <<\_ACEOF @@ -2467,6 +2478,8 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-maintainer-mode disable make rules and dependencies not useful + (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-largefile omit support for large files @@ -2487,7 +2500,7 @@ Optional Features: --enable-redhat-pthread-workaround force Redhat patch to be applied (default: test system) - --enable-perl-modules Enables installation of Nagios::Plugin and its + --enable-perl-modules Enables installation of Monitoring::Plugin and its dependencies (default: no) Optional Packages: @@ -2502,7 +2515,7 @@ Optional Packages: --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). --with-cgiurl=DIR sets URL for cgi programs - --with-trusted-path=PATH sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin) + --with-trusted-path=PATH sets trusted path for executables called by scripts --with-perl=PATH sets path to perl executable --with-openssl=DIR path to openssl installation --with-gnutls=PATH path to gnutls installation root @@ -2622,7 +2635,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nagios-plugins configure 1.5 +monitoring-plugins configure 2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3327,7 +3340,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nagios-plugins $as_me 1.5, which was +It was created by monitoring-plugins $as_me 2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3620,6 +3633,18 @@ gl_header_list="$gl_header_list netdb.h" gl_header_list="$gl_header_list netinet/in.h" gl_getopt_required=GNU gl_header_list="$gl_header_list getopt.h" +gl_func_list="$gl_func_list getuid" +gl_func_list="$gl_func_list geteuid" +gl_func_list="$gl_func_list getresuid" +gl_func_list="$gl_func_list getgid" +gl_func_list="$gl_func_list getegid" +gl_func_list="$gl_func_list getresgid" +gl_func_list="$gl_func_list setresuid" +gl_func_list="$gl_func_list setreuid" +gl_func_list="$gl_func_list seteuid" +gl_func_list="$gl_func_list setresgid" +gl_func_list="$gl_func_list setregid" +gl_func_list="$gl_func_list setegid" gl_header_list="$gl_header_list langinfo.h" gl_func_list="$gl_func_list symlink" gl_header_list="$gl_header_list xlocale.h" @@ -3638,6 +3663,7 @@ gl_func_list="$gl_func_list setenv" gl_func_list="$gl_func_list snprintf" gl_header_list="$gl_header_list wchar.h" gl_header_list="$gl_header_list stdint.h" +gl_header_list="$gl_header_list strings.h" gl_func_list="$gl_func_list strndup" gl_header_list="$gl_header_list sys/uio.h" gl_header_list="$gl_header_list sys/time.h" @@ -3716,7 +3742,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files gl/Makefile nagios-plugins.spec" +ac_config_files="$ac_config_files gl/Makefile monitoring-plugins.spec" ac_aux_dir= for ac_dir in build-aux "$srcdir"/build-aux; do @@ -4184,8 +4210,8 @@ fi # Define the identity of the package. - PACKAGE='nagios-plugins' - VERSION='1.5' + PACKAGE='monitoring-plugins' + VERSION='2.0' cat >>confdefs.h <<_ACEOF @@ -4225,6 +4251,29 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + ac_config_headers="$ac_config_headers config.h" # Make sure we can run config.sub. @@ -4299,13 +4348,12 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +DEFAULT_PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" RELEASE=1 - - extra_install_args="" # Check whether --with-nagios_user was given. @@ -6480,6 +6528,7 @@ fi # Code from module gettext-h: # Code from module havelib: # Code from module hostent: + # Code from module idpriv-droptemp: # Code from module include_next: # Code from module inet_ntop: # Code from module intprops: @@ -6529,10 +6578,12 @@ fi # Code from module stdint: # Code from module stdio: # Code from module stdlib: + # Code from module strcase: # Code from module streq: # Code from module strerror: # Code from module strerror-override: # Code from module string: + # Code from module strings: # Code from module strndup: # Code from module strnlen: # Code from module strsep: @@ -14091,10 +14142,10 @@ PLUGIN_TEST=`echo $srcdir/plugins/t/*.t|sed -e 's,\.*/plugins/,,g'` SCRIPT_TEST=`echo $srcdir/plugins-scripts/t/*.t|sed -e 's,\.*/plugins-scripts/,,g'` -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" +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" -SUPPORT="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" +SUPPORT="Send email to help@monitoring-plugins.org if you have questions regarding use\nof this software. To submit patches or suggest improvements, send email to\ndevel@monitoring-plugins.org. Please include version information with all\ncorrespondence (when possible, use output from the --version option of the\nplugin itself).\n" @@ -14117,7 +14168,7 @@ _ACEOF if test "${with_trusted_path+set}" = set; then : withval=$with_trusted_path; with_trusted_path=$withval else - with_trusted_path=/bin:/sbin:/usr/bin:/usr/sbin + with_trusted_path=$DEFAULT_PATH fi @@ -14131,6 +14182,7 @@ ac_cv_uname_m=`uname -m` ac_cv_uname_s=`uname -s` ac_cv_uname_r=`uname -r` ac_cv_uname_v=`uname -v` +ac_cv_uname_o=`uname -o` PKG_ARCH=`uname -p` REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'` @@ -14157,86 +14209,6 @@ else fi -# Extract the first word of "python", so it can be a program name with args. -set dummy python; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PYTHON in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PYTHON=$ac_cv_path_PYTHON -if test -n "$PYTHON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -$as_echo "$PYTHON" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "sh", so it can be a program name with args. -set dummy sh; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_SH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $SH in - [\\/]* | ?:[\\/]*) - ac_cv_path_SH="$SH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -SH=$ac_cv_path_SH -if test -n "$SH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SH" >&5 -$as_echo "$SH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -14277,46 +14249,6 @@ $as_echo "no" >&6; } fi -# Extract the first word of "libgnutls-config", so it can be a program name with args. -set dummy libgnutls-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LIBGNUTLS_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $LIBGNUTLS_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_LIBGNUTLS_CONFIG="$LIBGNUTLS_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG -if test -n "$LIBGNUTLS_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_CONFIG" >&5 -$as_echo "$LIBGNUTLS_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - # Extract the first word of "hostname", so it can be a program name with args. set dummy hostname; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -14756,7 +14688,7 @@ fi if test "${enable_extra_opts+set}" = set; then : enableval=$enable_extra_opts; enable_extra_opts=$enableval else - enable_extra_opts=no + enable_extra_opts=yes fi if test "$enable_extra_opts" = "yes"; then @@ -14932,7 +14864,7 @@ $as_echo "$as_me: WARNING: install PostgreSQL headers to compile this plugin (se else - EXTRAS="$EXTRAS check_pgsql" + EXTRAS="$EXTRAS check_pgsql\$(EXEEXT)" fi else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&5 @@ -15006,7 +14938,7 @@ _ACEOF fi if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then - EXTRAS="$EXTRAS check_dbi" + EXTRAS="$EXTRAS check_dbi\$(EXEEXT)" DBILIBS="-ldbi" else @@ -15029,13 +14961,13 @@ fi if test "x$with_radius" != "xno"; then : _SAVEDLIBS="$LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradiusclient" >&5 -$as_echo_n "checking for rc_read_config in -lradiusclient... " >&6; } -if ${ac_cv_lib_radiusclient_rc_read_config+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lfreeradius-client" >&5 +$as_echo_n "checking for rc_read_config in -lfreeradius-client... " >&6; } +if ${ac_cv_lib_freeradius_client_rc_read_config+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lradiusclient $LIBS" +LIBS="-lfreeradius-client $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -15055,28 +14987,28 @@ return rc_read_config (); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_radiusclient_rc_read_config=yes + ac_cv_lib_freeradius_client_rc_read_config=yes else - ac_cv_lib_radiusclient_rc_read_config=no + ac_cv_lib_freeradius_client_rc_read_config=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radiusclient_rc_read_config" >&5 -$as_echo "$ac_cv_lib_radiusclient_rc_read_config" >&6; } -if test "x$ac_cv_lib_radiusclient_rc_read_config" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freeradius_client_rc_read_config" >&5 +$as_echo "$ac_cv_lib_freeradius_client_rc_read_config" >&6; } +if test "x$ac_cv_lib_freeradius_client_rc_read_config" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRADIUSCLIENT 1 +#define HAVE_LIBFREERADIUS_CLIENT 1 _ACEOF - LIBS="-lradiusclient $LIBS" + LIBS="-lfreeradius-client $LIBS" fi - if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then - EXTRAS="$EXTRAS check_radius" - RADIUSLIBS="-lradiusclient" + if test "$ac_cv_lib_freeradius_client_rc_read_config" = "yes"; then + EXTRAS="$EXTRAS check_radius\$(EXEEXT)" + RADIUSLIBS="-lfreeradius-client" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradiusclient-ng" >&5 @@ -15125,14 +15057,65 @@ _ACEOF fi if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then - EXTRAS="$EXTRAS check_radius" - RADIUSLIBS="-lradiusclient-ng" + EXTRAS="$EXTRAS check_radius\$(EXEEXT)" + RADIUSLIBS="-lradiusclient-ng" else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping radius plugin" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradiusclient" >&5 +$as_echo_n "checking for rc_read_config in -lradiusclient... " >&6; } +if ${ac_cv_lib_radiusclient_rc_read_config+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lradiusclient $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char rc_read_config (); +int +main () +{ +return rc_read_config (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_radiusclient_rc_read_config=yes +else + ac_cv_lib_radiusclient_rc_read_config=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radiusclient_rc_read_config" >&5 +$as_echo "$ac_cv_lib_radiusclient_rc_read_config" >&6; } +if test "x$ac_cv_lib_radiusclient_rc_read_config" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRADIUSCLIENT 1 +_ACEOF + + LIBS="-lradiusclient $LIBS" + +fi + + if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then + EXTRAS="$EXTRAS check_radius\$(EXEEXT)" + RADIUSLIBS="-lradiusclient" + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping radius plugin" >&5 $as_echo "$as_me: WARNING: Skipping radius plugin" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&5 $as_echo "$as_me: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&2;} + fi fi fi LIBS="$_SAVEDLIBS" @@ -15204,7 +15187,7 @@ _ACEOF fi done - EXTRAS="$EXTRAS check_ldap" + EXTRAS="$EXTRAS check_ldap\$(EXEEXT)" for ac_func in ldap_init ldap_set_option ldap_get_option ldap_start_tls_s do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -15288,7 +15271,7 @@ $as_echo "$as_me: WARNING: check_ide_smart works only on Linux and NetBSD" >&2;} esac if test "$FOUNDINCLUDE" = "yes" ; then - EXTRAS="$EXTRAS check_ide_smart" + EXTRAS="$EXTRAS check_ide_smart\$(EXEEXT)" fi @@ -15426,7 +15409,7 @@ $as_echo "$as_me: WARNING: Skipping mysql plugin" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install mysql client libs to compile this plugin (see REQUIREMENTS)." >&5 $as_echo "$as_me: WARNING: install mysql client libs to compile this plugin (see REQUIREMENTS)." >&2;} else - EXTRAS="$EXTRAS check_mysql check_mysql_query" + EXTRAS="$EXTRAS check_mysql\$(EXEEXT) check_mysql_query\$(EXEEXT)" MYSQLINCLUDE="$np_mysql_include" MYSQLLIBS="$np_mysql_libs" MYSQLCFLAGS="$np_mysql_cflags" @@ -15456,7 +15439,34 @@ else fi -if test "$ac_cv_header_utmpx_h" = "no" +for ac_header in wtsapi32.h +do : + ac_fn_c_check_header_compile "$LINENO" "wtsapi32.h" "ac_cv_header_wtsapi32_h" "#include +" +if test "x$ac_cv_header_wtsapi32_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WTSAPI32_H 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_wtsapi32_h" = "yes"; then + HAVE_WTS32API_TRUE= + HAVE_WTS32API_FALSE='#' +else + HAVE_WTS32API_TRUE='#' + HAVE_WTS32API_FALSE= +fi + + +if test "$ac_cv_header_wtsapi32_h" = "yes"; then + WTSAPI32LIBS="-lwtsapi32" + +fi + +if test "$ac_cv_header_utmpx_h" = "no" -a "$ac_cv_header_wtsapi32_h" = "no" then # Extract the first word of "who", so it can be a program name with args. set dummy who; ac_word=$2 @@ -15859,8 +15869,6 @@ fi if test ! "$FOUNDOPENSSL" = "yes" && test ! "$with_gnutls" = "no"; then if test ! "$with_gnutls" = ""; then CPPFLAGS="$CPPFLAGS -I${with_gnutls}/include" - elif test ! "$LIBGNUTLS_CONFIG" = ""; then - CPPFLAGS="$CPPFLAGS -I`$LIBGNUTLS_CONFIG --prefix`" fi for ac_header in gnutls/openssl.h do : @@ -16480,8 +16488,8 @@ elif test "$ac_cv_uname_s" = "SunOS"; then ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_cols=9 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using nagios-plugins internal ps command (pst3) for solaris" >&5 -$as_echo "using nagios-plugins internal ps command (pst3) for solaris" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using monitoring-plugins internal ps command (pst3) for solaris" >&5 +$as_echo "using monitoring-plugins internal ps command (pst3) for solaris" >&6; } if test `isainfo -b` = 64 ; then pst3_use_64bit=1 { $as_echo "$as_me:${as_lineno-$LINENO}: using 64bit pst3" >&5 @@ -16490,7 +16498,7 @@ $as_echo "$as_me: using 64bit pst3" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: using 32bit pst3" >&5 $as_echo "$as_me: using 32bit pst3" >&6;} fi - EXTRAS_ROOT="$EXTRAS_ROOT pst3" + EXTRAS_ROOT="$EXTRAS_ROOT pst3\$(EXEEXT)" if test "$pst3_use_64bit" = 1; then old_cflags=$CFLAGS @@ -16878,7 +16886,7 @@ cat >>confdefs.h <<_ACEOF #define PS_COLS $ac_cv_ps_cols _ACEOF - EXTRAS="$EXTRAS check_procs check_nagios" + EXTRAS="$EXTRAS check_procs check_nagios\$(EXEEXT)" if echo "$ac_cv_ps_varlist" | grep "procetime" >/dev/null; then $as_echo "#define PS_USES_PROCETIME \"yes\"" >>confdefs.h @@ -16995,6 +17003,14 @@ $as_echo "(command-line) $with_ping_command" >&6; } ac_cv_ping_packets_first=yes fi +elif [ "z$ac_cv_uname_o" = "zCygwin" ] +then + with_ping_command="$PATH_TO_PING -n %d -w %d000 %s" + ac_cv_ping_packets_first=yes + ac_cv_ping_has_timeout=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } + elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \ $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ egrep -i "^round-trip|^rtt" >/dev/null @@ -17009,7 +17025,7 @@ elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ then with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" ac_cv_ping_packets_first=yes - ac_cv_ping_has_timeout=yes + ac_cv_ping_has_timeout=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 $as_echo "$with_ping_command" >&6; } @@ -17125,7 +17141,12 @@ $as_echo "(command-line) $with_ping6_command" >&6; } then ac_cv_ping6_packets_first=yes fi - +elif [ "z$ac_cv_uname_o" = "zCygwin" -a "x$PATH_TO_PING" != "x" ]; then + with_ping6_command="$PATH_TO_PING -6 -n %d -w %d000 %s" + ac_cv_ping6_packets_first=yes + ac_cv_ping_has_timeout=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif test "x$PATH_TO_PING6" != "x"; then if [ "z$ac_cv_uname_s" = "zUnixWare" ] && \ $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ @@ -17373,7 +17394,7 @@ $as_echo "$as_me: WARNING: nslookup command not found" >&2;} fi if test -n "$ac_cv_nslookup_command"; then - EXTRAS="$EXTRAS check_dns" + EXTRAS="$EXTRAS check_dns\$(EXEEXT)" cat >>confdefs.h <<_ACEOF #define NSLOOKUP_COMMAND "$ac_cv_nslookup_command" @@ -17700,7 +17721,7 @@ cat >>confdefs.h <<_ACEOF #define PATH_TO_SNMPGET "$PATH_TO_SNMPGET" _ACEOF - EXTRAS="$EXTRAS check_hpjd check_snmp" + EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)" else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&5 $as_echo "$as_me: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&2;} @@ -17862,12 +17883,12 @@ fi if test -x "$PATH_TO_QUAKESTAT" then ac_cv_path_to_qstat="$PATH_TO_QUAKESTAT" - EXTRAS="$EXTRAS check_game" + EXTRAS="$EXTRAS check_game\$(EXEEXT)" elif test -n "$PATH_TO_QSTAT" then ac_cv_path_to_qstat="$PATH_TO_QSTAT" - EXTRAS="$EXTRAS check_game" + EXTRAS="$EXTRAS check_game\$(EXEEXT)" else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin" >&5 $as_echo "$as_me: WARNING: Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin" >&2;} @@ -17983,7 +18004,7 @@ cat >>confdefs.h <<_ACEOF #define PATH_TO_FPING "$PATH_TO_FPING" _ACEOF - EXTRAS="$EXTRAS check_fping" + EXTRAS="$EXTRAS check_fping\$(EXEEXT)" if test x"$with_ipv6" != xno && test -n "$PATH_TO_FPING6"; then cat >>confdefs.h <<_ACEOF @@ -18049,7 +18070,7 @@ cat >>confdefs.h <<_ACEOF #define SSH_COMMAND "$PATH_TO_SSH" _ACEOF - EXTRAS="$EXTRAS check_by_ssh" + EXTRAS="$EXTRAS check_by_ssh\$(EXEEXT)" else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Get ssh in order to make check_by_ssh plugin" >&5 $as_echo "$as_me: WARNING: Get ssh in order to make check_by_ssh plugin" >&2;} @@ -18459,7 +18480,7 @@ fi if test "$ac_cv_have_decl_swapctl" = "yes"; then - EXTRAS="$EXTRAS check_swap" + EXTRAS="$EXTRAS check_swap\$(EXEEXT)" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 2-arg (SVR4) swapctl" >&5 $as_echo_n "checking for 2-arg (SVR4) swapctl... " >&6; } if test "$ac_cv_type_swaptbl_t" = "yes" -a \ @@ -18535,7 +18556,7 @@ then $as_echo "#define HAVE_SWAP 1" >>confdefs.h - EXTRAS="$EXTRAS check_swap" + EXTRAS="$EXTRAS check_swap\$(EXEEXT)" fi if test "x$ac_cv_swap_command" != "x" then @@ -18585,7 +18606,7 @@ cat >>confdefs.h <<_ACEOF #define PROC_MEMINFO "$ac_cv_proc_meminfo" _ACEOF - EXTRAS="$EXTRAS check_swap" + EXTRAS="$EXTRAS check_swap\$(EXEEXT)" fi # Extract the first word of "dig", so it can be a program name with args. @@ -18635,7 +18656,7 @@ if test "${with_dig_command+set}" = set; then : fi if test -n "$PATH_TO_DIG"; then - EXTRAS="$EXTRAS check_dig" + EXTRAS="$EXTRAS check_dig\$(EXEEXT)" cat >>confdefs.h <<_ACEOF #define PATH_TO_DIG "$PATH_TO_DIG" @@ -18697,12 +18718,12 @@ cat >>confdefs.h <<_ACEOF _ACEOF if test -n "$PATH_TO_APTGET" ; then - EXTRAS="$EXTRAS check_apt" + EXTRAS="$EXTRAS check_apt\$(EXEEXT)" fi if test -f $srcdir/plugins/check_nt.c ; then - EXTRAS="$EXTRAS check_nt" + EXTRAS="$EXTRAS check_nt\$(EXEEXT)" fi @@ -20821,8 +20842,8 @@ fi if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then if echo $ac_cv_uname_r | egrep "\.EL(smp)?$" >/dev/null 2>&1 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: See http://nagiosplugins.org/faq/compile/configure_appears_to_hang if this next part takes a long time" >&5 -$as_echo "$as_me: See http://nagiosplugins.org/faq/compile/configure_appears_to_hang if this next part takes a long time" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time" >&5 +$as_echo "$as_me: See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for redhat spopen problem" >&5 $as_echo_n "checking for redhat spopen problem... " >&6; } ( cd config_test && make && make test ) > /dev/null 2>&1 @@ -24617,6 +24638,66 @@ _ACEOF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GNULIB_NL_LANGINFO=0; HAVE_NL_LANGINFO=1; REPLACE_NL_LANGINFO=0; @@ -28193,6 +28274,12 @@ fi + GNULIB_FFS=0; + HAVE_FFS=1; + HAVE_STRCASECMP=1; + HAVE_DECL_STRNCASECMP=1; + + REPLACE_STRERROR_0=0 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5 $as_echo_n "checking whether strerror(0) succeeds... " >&6; } @@ -28365,6 +28452,146 @@ fi + + + + + + + + + + + + + + : + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_strings_h='<'strings.h'>' + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_strings_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + + if test $ac_cv_header_strings_h = yes; then + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + + gl_header_literal_regex=`echo 'strings.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + gl_cv_next_strings_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"`'"' + else + gl_cv_next_strings_h='<'strings.h'>' + fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_strings_h" >&5 +$as_echo "$gl_cv_next_strings_h" >&6; } + fi + NEXT_STRINGS_H=$gl_cv_next_strings_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'strings.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_strings_h + fi + NEXT_AS_FIRST_DIRECTIVE_STRINGS_H=$gl_next_as_first_directive + + + + + if test $ac_cv_header_strings_h = yes; then + HAVE_STRINGS_H=1 + else + HAVE_STRINGS_H=0 + fi + + + + for gl_func in ffs strcasecmp strncasecmp; do + as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 +$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } +if eval \${$as_gl_Symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + /* Minix 3.1.8 has a bug: must be included before + . */ + #include + #include + +int +main () +{ +#undef $gl_func + (void) $gl_func; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_gl_Symbol=yes" +else + eval "$as_gl_Symbol=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$as_gl_Symbol + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1 +_ACEOF + + eval ac_cv_have_decl_$gl_func=yes +fi + done + + + ac_fn_c_check_decl "$LINENO" "strndup" "ac_cv_have_decl_strndup" "$ac_includes_default" if test "x$ac_cv_have_decl_strndup" = xyes; then : ac_have_decl=1 @@ -32148,6 +32375,54 @@ done fi + + + + + + : + + + + + + + + + + + + + + + + + + + + + + : + + + + + + + + + + + + + + + + + + + + @@ -37301,6 +37576,88 @@ fi + for ac_func in strcasecmp +do : + ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" +if test "x$ac_cv_func_strcasecmp" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRCASECMP 1 +_ACEOF + +fi +done + + if test $ac_cv_func_strcasecmp = no; then + HAVE_STRCASECMP=0 + fi + + + + for ac_func in strncasecmp +do : + ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" +if test "x$ac_cv_func_strncasecmp" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRNCASECMP 1 +_ACEOF + +fi +done + + if test $ac_cv_func_strncasecmp = yes; then + HAVE_STRNCASECMP=1 + else + HAVE_STRNCASECMP=0 + fi + ac_fn_c_check_decl "$LINENO" "strncasecmp" "ac_cv_have_decl_strncasecmp" "$ac_includes_default" +if test "x$ac_cv_have_decl_strncasecmp" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRNCASECMP $ac_have_decl +_ACEOF + + if test $ac_cv_have_decl_strncasecmp = no; then + HAVE_DECL_STRNCASECMP=0 + fi + + + if test $HAVE_STRCASECMP = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS strcasecmp.$ac_objext" + + + : + + fi + if test $HAVE_STRNCASECMP = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS strncasecmp.$ac_objext" + + + : + + fi + + + if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then @@ -37443,6 +37800,9 @@ done + + + : @@ -39947,7 +40307,7 @@ if test "$ac_cv_uname_s" = 'SunOS' -a \( "x$ac_cv_prog_ac_ct_AR" = "x" -o "$ac_c as_fn_error $? "No ar found for Solaris - is /usr/ccs/bin in PATH?" "$LINENO" 5 fi -ac_config_files="$ac_config_files Makefile tap/Makefile lib/Makefile plugins/Makefile lib/tests/Makefile plugins-root/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh test.pl pkg/solaris/pkginfo po/Makefile.in" +ac_config_files="$ac_config_files Makefile tap/Makefile lib/Makefile plugins/Makefile lib/tests/Makefile plugins-root/Makefile plugins-scripts/Makefile plugins-scripts/utils.pm plugins-scripts/utils.sh test.pl pkg/solaris/pkginfo po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -40066,6 +40426,10 @@ else am__EXEEXT_FALSE= fi +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -40090,6 +40454,10 @@ if test -z "${HAVE_UTMPX_TRUE}" && test -z "${HAVE_UTMPX_FALSE}"; then as_fn_error $? "conditional \"HAVE_UTMPX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_WTS32API_TRUE}" && test -z "${HAVE_WTS32API_FALSE}"; then + as_fn_error $? "conditional \"HAVE_WTS32API\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -40561,7 +40929,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nagios-plugins $as_me 1.5, which was +This file was extended by monitoring-plugins $as_me 2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -40627,7 +40995,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nagios-plugins config.status 1.5 +monitoring-plugins config.status 2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -41041,7 +41409,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "gl/Makefile") CONFIG_FILES="$CONFIG_FILES gl/Makefile" ;; - "nagios-plugins.spec") CONFIG_FILES="$CONFIG_FILES nagios-plugins.spec" ;; + "monitoring-plugins.spec") CONFIG_FILES="$CONFIG_FILES monitoring-plugins.spec" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; @@ -41053,7 +41421,6 @@ do "lib/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/tests/Makefile" ;; "plugins-root/Makefile") CONFIG_FILES="$CONFIG_FILES plugins-root/Makefile" ;; "plugins-scripts/Makefile") CONFIG_FILES="$CONFIG_FILES plugins-scripts/Makefile" ;; - "plugins-scripts/subst") CONFIG_FILES="$CONFIG_FILES plugins-scripts/subst" ;; "plugins-scripts/utils.pm") CONFIG_FILES="$CONFIG_FILES plugins-scripts/utils.pm" ;; "plugins-scripts/utils.sh") CONFIG_FILES="$CONFIG_FILES plugins-scripts/utils.sh" ;; "test.pl") CONFIG_FILES="$CONFIG_FILES test.pl" ;; diff --git a/configure.in b/configure.ac similarity index 94% rename from configure.in rename to configure.ac index 7e8c810..9de36d3 100644 --- a/configure.in +++ b/configure.ac @@ -1,19 +1,19 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(nagios-plugins,1.5) +AC_INIT(monitoring-plugins,2.0) AC_CONFIG_SRCDIR(NPTest.pm) AC_CONFIG_FILES([gl/Makefile - nagios-plugins.spec]) + monitoring-plugins.spec]) AC_CONFIG_AUX_DIR(build-aux) AM_INIT_AUTOMAKE([1.8.3]) -AM_CONFIG_HEADER(config.h) +AM_MAINTAINER_MODE([enable]) +AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST +DEFAULT_PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" RELEASE=1 AC_SUBST(RELEASE) -AC_PREFIX_DEFAULT(/usr/local/nagios) - dnl Deprecated configure options @@ -58,10 +58,10 @@ AC_SUBST(PLUGIN_TEST)dnl SCRIPT_TEST=`echo $srcdir/plugins-scripts/t/*.t|sed -e 's,\.*/plugins-scripts/,,g'` AC_SUBST(SCRIPT_TEST)dnl -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" +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" AC_SUBST(WARRANTY) -SUPPORT="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" +SUPPORT="Send email to help@monitoring-plugins.org if you have questions regarding use\nof this software. To submit patches or suggest improvements, send email to\ndevel@monitoring-plugins.org. Please include version information with all\ncorrespondence (when possible, use output from the --version option of the\nplugin itself).\n" AC_SUBST(SUPPORT) dnl CGIURL has changed for Nagios with 1.0 beta @@ -75,9 +75,9 @@ AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs]) AC_ARG_WITH(trusted_path, ACX_HELP_STRING([--with-trusted-path=PATH], - [sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]), + [sets trusted path for executables called by scripts]), with_trusted_path=$withval, - with_trusted_path=/bin:/sbin:/usr/bin:/usr/sbin) + with_trusted_path=$DEFAULT_PATH) AC_SUBST(with_trusted_path) EXTRAS= @@ -90,6 +90,7 @@ ac_cv_uname_m=`uname -m` ac_cv_uname_s=`uname -s` ac_cv_uname_r=`uname -r` ac_cv_uname_v=`uname -v` +ac_cv_uname_o=`uname -o` PKG_ARCH=`uname -p` REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'` @@ -111,10 +112,7 @@ fi AC_SUBST(NP_RELEASE) dnl Checks for programs. -AC_PATH_PROG(PYTHON,python) -AC_PATH_PROG(SH,sh) AC_PATH_PROG(PERL,perl) -AC_PATH_PROG(LIBGNUTLS_CONFIG,libgnutls-config) AC_PATH_PROG(HOSTNAME,hostname) AC_PATH_PROG(BASENAME,basename) @@ -194,7 +192,7 @@ AC_ARG_ENABLE(extra-opts, AC_HELP_STRING([--enable-extra-opts], [Enables parsing of plugins ini config files for extra options (default: no)]), [enable_extra_opts=$enableval], - [enable_extra_opts=no]) + [enable_extra_opts=yes]) AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"]) if test "$enable_extra_opts" = "yes" ; then AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.]) @@ -241,7 +239,7 @@ if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then else AC_SUBST(PGLIBS) AC_SUBST(PGINCLUDE) - EXTRAS="$EXTRAS check_pgsql" + EXTRAS="$EXTRAS check_pgsql\$(EXEEXT)" fi else AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)]) @@ -261,7 +259,7 @@ AS_IF([test "x$with_dbi" != "xno"], [ _SAVEDLIBS="$LIBS" AC_CHECK_LIB(dbi,dbi_initialize) if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then - EXTRAS="$EXTRAS check_dbi" + EXTRAS="$EXTRAS check_dbi\$(EXEEXT)" DBILIBS="-ldbi" AC_SUBST(DBILIBS) else @@ -276,20 +274,27 @@ AC_ARG_WITH([radius], [AS_HELP_STRING([--without-radius], [Skips the radius plug dnl Check for radius libraries AS_IF([test "x$with_radius" != "xno"], [ _SAVEDLIBS="$LIBS" - AC_CHECK_LIB(radiusclient,rc_read_config) - if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then - EXTRAS="$EXTRAS check_radius" - RADIUSLIBS="-lradiusclient" + AC_CHECK_LIB(freeradius-client,rc_read_config) + if test "$ac_cv_lib_freeradius_client_rc_read_config" = "yes"; then + EXTRAS="$EXTRAS check_radius\$(EXEEXT)" + RADIUSLIBS="-lfreeradius-client" AC_SUBST(RADIUSLIBS) else AC_CHECK_LIB(radiusclient-ng,rc_read_config) if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then - EXTRAS="$EXTRAS check_radius" - RADIUSLIBS="-lradiusclient-ng" + EXTRAS="$EXTRAS check_radius\$(EXEEXT)" + RADIUSLIBS="-lradiusclient-ng" AC_SUBST(RADIUSLIBS) else - AC_MSG_WARN([Skipping radius plugin]) - AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).]) + AC_CHECK_LIB(radiusclient,rc_read_config) + if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then + EXTRAS="$EXTRAS check_radius\$(EXEEXT)" + RADIUSLIBS="-lradiusclient" + AC_SUBST(RADIUSLIBS) + else + AC_MSG_WARN([Skipping radius plugin]) + AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).]) + fi fi fi LIBS="$_SAVEDLIBS" @@ -307,7 +312,7 @@ AS_IF([test "x$with_ldap" != "xno"], [ AC_SUBST(LDAPLIBS) AC_SUBST(LDAPINCLUDE) AC_CHECK_FUNCS(ldap_set_option) - EXTRAS="$EXTRAS check_ldap" + EXTRAS="$EXTRAS check_ldap\$(EXEEXT)" AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s) else AC_MSG_WARN([Skipping LDAP plugin]) @@ -344,7 +349,7 @@ case $host in esac if test "$FOUNDINCLUDE" = "yes" ; then - EXTRAS="$EXTRAS check_ide_smart" + EXTRAS="$EXTRAS check_ide_smart\$(EXEEXT)" fi dnl Check for mysql libraries @@ -353,7 +358,7 @@ if test $with_mysql = "no" ; then AC_MSG_WARN([Skipping mysql plugin]) AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).]) else - EXTRAS="$EXTRAS check_mysql check_mysql_query" + EXTRAS="$EXTRAS check_mysql\$(EXEEXT) check_mysql_query\$(EXEEXT)" MYSQLINCLUDE="$np_mysql_include" MYSQLLIBS="$np_mysql_libs" MYSQLCFLAGS="$np_mysql_cflags" @@ -366,8 +371,16 @@ dnl Check for headers used by check_users AC_CHECK_HEADERS(utmpx.h) AM_CONDITIONAL([HAVE_UTMPX], [test "$ac_cv_header_utmpx_h" = "yes"]) +AC_CHECK_HEADERS(wtsapi32.h, [], [], [#include ]) +AM_CONDITIONAL([HAVE_WTS32API], [test "$ac_cv_header_wtsapi32_h" = "yes"]) + +if test "$ac_cv_header_wtsapi32_h" = "yes"; then + WTSAPI32LIBS="-lwtsapi32" + AC_SUBST(WTSAPI32LIBS) +fi + dnl Fallback to who(1) if the system doesn't provide an utmpx(5) interface -if test "$ac_cv_header_utmpx_h" = "no" +if test "$ac_cv_header_utmpx_h" = "no" -a "$ac_cv_header_wtsapi32_h" = "no" then AC_PATH_PROG(PATH_TO_WHO,who) @@ -503,8 +516,6 @@ dnl check for gnutls if openssl isn't found (or is disabled) if test ! "$FOUNDOPENSSL" = "yes" && test ! "$with_gnutls" = "no"; then if test ! "$with_gnutls" = ""; then CPPFLAGS="$CPPFLAGS -I${with_gnutls}/include" - elif test ! "$LIBGNUTLS_CONFIG" = ""; then - CPPFLAGS="$CPPFLAGS -I`$LIBGNUTLS_CONFIG --prefix`" fi AC_CHECK_HEADERS([gnutls/openssl.h],FOUNDGNUTLS="yes",) if test "$FOUNDGNUTLS" = "yes"; then @@ -648,14 +659,14 @@ elif test "$ac_cv_uname_s" = "SunOS"; then ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_cols=9 - AC_MSG_RESULT([using nagios-plugins internal ps command (pst3) for solaris]) + AC_MSG_RESULT([using monitoring-plugins internal ps command (pst3) for solaris]) if test `isainfo -b` = 64 ; then pst3_use_64bit=1 AC_MSG_NOTICE([using 64bit pst3]) else AC_MSG_NOTICE([using 32bit pst3]) fi - EXTRAS_ROOT="$EXTRAS_ROOT pst3" + EXTRAS_ROOT="$EXTRAS_ROOT pst3\$(EXEEXT)" if test "$pst3_use_64bit" = 1; then dnl Test if we can actually compile code in 64bit @@ -980,7 +991,7 @@ if test -n "$ac_cv_ps_varlist" ; then [Format string for scanning ps output in check_procs]) AC_DEFINE_UNQUOTED(PS_COLS,$ac_cv_ps_cols, [Number of columns in ps command]) - EXTRAS="$EXTRAS check_procs check_nagios" + EXTRAS="$EXTRAS check_procs check_nagios\$(EXEEXT)" if echo "$ac_cv_ps_varlist" | grep "procetime" >/dev/null; then AC_DEFINE(PS_USES_PROCETIME,"yes", [Whether the ps utility uses the "procetime" field]) @@ -1014,6 +1025,13 @@ then ac_cv_ping_packets_first=yes fi +elif [[ "z$ac_cv_uname_o" = "zCygwin" ]] +then + with_ping_command="$PATH_TO_PING -n %d -w %d000 %s" + ac_cv_ping_packets_first=yes + ac_cv_ping_has_timeout=yes + AC_MSG_RESULT([$with_ping_command]) + elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ egrep -i "^round-trip|^rtt" >/dev/null @@ -1027,7 +1045,7 @@ elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ then with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" ac_cv_ping_packets_first=yes - ac_cv_ping_has_timeout=yes + ac_cv_ping_has_timeout=yes AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \ @@ -1124,7 +1142,11 @@ then then ac_cv_ping6_packets_first=yes fi - +elif [[ "z$ac_cv_uname_o" = "zCygwin" -a "x$PATH_TO_PING" != "x" ]]; then + with_ping6_command="$PATH_TO_PING -6 -n %d -w %d000 %s" + ac_cv_ping6_packets_first=yes + ac_cv_ping_has_timeout=yes + AC_MSG_RESULT([$with_ping6_command]) elif test "x$PATH_TO_PING6" != "x"; then if [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ @@ -1302,7 +1324,7 @@ else fi if test -n "$ac_cv_nslookup_command"; then - EXTRAS="$EXTRAS check_dns" + EXTRAS="$EXTRAS check_dns\$(EXEEXT)" AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$ac_cv_nslookup_command", [path and args for nslookup]) fi @@ -1362,7 +1384,7 @@ AC_ARG_WITH(snmpget_command, if test -n "$PATH_TO_SNMPGET" then AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary]) - EXTRAS="$EXTRAS check_hpjd check_snmp" + EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)" else AC_MSG_WARN([Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins]) fi @@ -1394,12 +1416,12 @@ AC_ARG_WITH(qstat_command, if test -x "$PATH_TO_QUAKESTAT" then ac_cv_path_to_qstat="$PATH_TO_QUAKESTAT" - EXTRAS="$EXTRAS check_game" + EXTRAS="$EXTRAS check_game\$(EXEEXT)" elif test -n "$PATH_TO_QSTAT" then ac_cv_path_to_qstat="$PATH_TO_QSTAT" - EXTRAS="$EXTRAS check_game" + EXTRAS="$EXTRAS check_game\$(EXEEXT)" else AC_MSG_WARN([Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin]) fi @@ -1423,7 +1445,7 @@ AC_ARG_WITH(fping6_command, if test -n "$PATH_TO_FPING" then AC_DEFINE_UNQUOTED(PATH_TO_FPING,"$PATH_TO_FPING",[path to fping]) - EXTRAS="$EXTRAS check_fping" + EXTRAS="$EXTRAS check_fping\$(EXEEXT)" if test x"$with_ipv6" != xno && test -n "$PATH_TO_FPING6"; then AC_DEFINE_UNQUOTED(PATH_TO_FPING6,"$PATH_TO_FPING6",[path to fping6]) fi @@ -1438,7 +1460,7 @@ AC_ARG_WITH(ssh_command, if test -n "$PATH_TO_SSH" then AC_DEFINE_UNQUOTED(SSH_COMMAND,"$PATH_TO_SSH",[path to ssh binary]) - EXTRAS="$EXTRAS check_by_ssh" + EXTRAS="$EXTRAS check_by_ssh\$(EXEEXT)" else AC_MSG_WARN([Get ssh in order to make check_by_ssh plugin]) fi @@ -1574,7 +1596,7 @@ AC_CHECK_MEMBERS([struct swapent.se_nblks],,,[ if test "$ac_cv_have_decl_swapctl" = "yes"; then - EXTRAS="$EXTRAS check_swap" + EXTRAS="$EXTRAS check_swap\$(EXEEXT)" AC_MSG_CHECKING([for 2-arg (SVR4) swapctl]) if test "$ac_cv_type_swaptbl_t" = "yes" -a \ "$ac_cv_type_swapent_t" = "yes"; @@ -1630,7 +1652,7 @@ dnl if test "x$ac_cv_have_swap" != "x" then AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found]) - EXTRAS="$EXTRAS check_swap" + EXTRAS="$EXTRAS check_swap\$(EXEEXT)" fi if test "x$ac_cv_swap_command" != "x" then @@ -1662,7 +1684,7 @@ fi if test -n "$ac_cv_proc_meminfo"; then AC_DEFINE(HAVE_PROC_MEMINFO,1,[Define if we have /proc/meminfo]) AC_DEFINE_UNQUOTED(PROC_MEMINFO,"$ac_cv_proc_meminfo",[path to /proc/meminfo if name changes]) - EXTRAS="$EXTRAS check_swap" + EXTRAS="$EXTRAS check_swap\$(EXEEXT)" fi AC_PATH_PROG(PATH_TO_DIG,dig) @@ -1670,7 +1692,7 @@ AC_ARG_WITH(dig_command, ACX_HELP_STRING([--with-dig-command=PATH], [Path to dig command]), PATH_TO_DIG=$withval) if test -n "$PATH_TO_DIG"; then - EXTRAS="$EXTRAS check_dig" + EXTRAS="$EXTRAS check_dig\$(EXEEXT)" AC_DEFINE_UNQUOTED(PATH_TO_DIG,"$PATH_TO_DIG",[Path to dig command, if present]) fi @@ -1682,12 +1704,12 @@ AC_ARG_WITH(apt-get_command, with_apt_get_command=$PATH_TO_APTGET) AC_DEFINE_UNQUOTED(PATH_TO_APTGET,"$PATH_TO_APTGET",[Path to apt-get command, if present]) if test -n "$PATH_TO_APTGET" ; then - EXTRAS="$EXTRAS check_apt" + EXTRAS="$EXTRAS check_apt\$(EXEEXT)" fi if test -f $srcdir/plugins/check_nt.c ; then - EXTRAS="$EXTRAS check_nt" + EXTRAS="$EXTRAS check_nt\$(EXEEXT)" fi @@ -1731,7 +1753,7 @@ AC_ARG_ENABLE(redhat-pthread-workaround, [ac_cv_enable_redhat_pthread_workaround=test]) if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then if echo $ac_cv_uname_r | egrep "\.EL(smp)?$" >/dev/null 2>&1 ; then - AC_MSG_NOTICE([See http://nagiosplugins.org/faq/compile/configure_appears_to_hang if this next part takes a long time]) + AC_MSG_NOTICE([See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time]) AC_MSG_CHECKING(for redhat spopen problem) ( cd config_test && make && make test ) > /dev/null 2>&1 if test $? -eq 0 ; then @@ -1748,7 +1770,7 @@ fi dnl Perl modules AC_ARG_ENABLE(perl-modules, AC_HELP_STRING([--enable-perl-modules], - [Enables installation of Nagios::Plugin and its dependencies (default: no)]), + [Enables installation of Monitoring::Plugin and its dependencies (default: no)]), [enable_perl_modules=$enableval], [enable_perl_modules=no]) if test "$enable_perl_modules" = "yes" ; then @@ -1783,10 +1805,8 @@ AC_OUTPUT( lib/tests/Makefile plugins-root/Makefile plugins-scripts/Makefile - plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh - perlmods/Makefile test.pl pkg/solaris/pkginfo po/Makefile.in diff --git a/gl/Makefile.am b/gl/Makefile.am index c2e8e5a..54abb4c 100644 --- a/gl/Makefile.am +++ b/gl/Makefile.am @@ -21,7 +21,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname environ floorf fsusage getaddrinfo gethostname getloadavg getopt-gnu gettext mountlist regex setenv strsep timegm unsetenv vasprintf vsnprintf +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname environ floorf fsusage getaddrinfo gethostname getloadavg getopt-gnu gettext idpriv-droptemp mountlist regex setenv strcase strsep timegm unsetenv vasprintf vsnprintf AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects @@ -402,6 +402,14 @@ EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath ## end gnulib module havelib +## begin gnulib module idpriv-droptemp + +libgnu_a_SOURCES += idpriv-droptemp.c + +EXTRA_DIST += idpriv.h + +## end gnulib module idpriv-droptemp + ## begin gnulib module inet_ntop @@ -1536,6 +1544,15 @@ EXTRA_DIST += stdlib.in.h ## end gnulib module stdlib +## begin gnulib module strcase + + +EXTRA_DIST += strcasecmp.c strncasecmp.c + +EXTRA_libgnu_a_SOURCES += strcasecmp.c strncasecmp.c + +## end gnulib module strcase + ## begin gnulib module streq @@ -1661,6 +1678,37 @@ EXTRA_DIST += string.in.h ## end gnulib module string +## begin gnulib module strings + +BUILT_SOURCES += strings.h + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_H)|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \ + -e 's|@''GNULIB_FFS''@|$(GNULIB_FFS)|g' \ + -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \ + -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \ + -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(srcdir)/strings.in.h; \ + } > $@-t && \ + mv $@-t $@ +MOSTLYCLEANFILES += strings.h strings.h-t + +EXTRA_DIST += strings.in.h + +## end gnulib module strings + ## begin gnulib module strndup diff --git a/gl/Makefile.in b/gl/Makefile.in index cc261a5..3c4f1d7 100644 --- a/gl/Makefile.in +++ b/gl/Makefile.in @@ -36,7 +36,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname environ floorf fsusage getaddrinfo gethostname getloadavg getopt-gnu gettext mountlist regex setenv strsep timegm unsetenv vasprintf vsnprintf +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname environ floorf fsusage getaddrinfo gethostname getloadavg getopt-gnu gettext idpriv-droptemp mountlist regex setenv strcase strsep timegm unsetenv vasprintf vsnprintf @@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/gnulib-common.m4 \ $(top_srcdir)/gl/m4/gnulib-comp.m4 \ $(top_srcdir)/gl/m4/hostent.m4 $(top_srcdir)/gl/m4/iconv.m4 \ + $(top_srcdir)/gl/m4/idpriv.m4 \ $(top_srcdir)/gl/m4/include_next.m4 \ $(top_srcdir)/gl/m4/inet_ntop.m4 \ $(top_srcdir)/gl/m4/intlmacosx.m4 \ @@ -153,11 +154,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdbool.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ - $(top_srcdir)/gl/m4/stdlib_h.m4 \ + $(top_srcdir)/gl/m4/stdlib_h.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ - $(top_srcdir)/gl/m4/string_h.m4 $(top_srcdir)/gl/m4/strndup.m4 \ - $(top_srcdir)/gl/m4/strnlen.m4 $(top_srcdir)/gl/m4/strsep.m4 \ - $(top_srcdir)/gl/m4/strstr.m4 \ + $(top_srcdir)/gl/m4/string_h.m4 \ + $(top_srcdir)/gl/m4/strings_h.m4 \ + $(top_srcdir)/gl/m4/strndup.m4 $(top_srcdir)/gl/m4/strnlen.m4 \ + $(top_srcdir)/gl/m4/strsep.m4 $(top_srcdir)/gl/m4/strstr.m4 \ $(top_srcdir)/gl/m4/sys_socket_h.m4 \ $(top_srcdir)/gl/m4/sys_types_h.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ @@ -172,7 +174,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \ $(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/xalloc.m4 \ $(top_srcdir)/gl/m4/xsize.m4 $(top_srcdir)/gl/m4/xstrndup.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs @@ -187,9 +189,9 @@ am_libgnu_a_OBJECTS = base64.$(OBJEXT) sha1.$(OBJEXT) \ dirname.$(OBJEXT) basename.$(OBJEXT) dirname-lgpl.$(OBJEXT) \ basename-lgpl.$(OBJEXT) stripslash.$(OBJEXT) \ exitfail.$(OBJEXT) fd-hook.$(OBJEXT) full-read.$(OBJEXT) \ - localcharset.$(OBJEXT) glthread/lock.$(OBJEXT) \ - malloca.$(OBJEXT) math.$(OBJEXT) safe-read.$(OBJEXT) \ - sockets.$(OBJEXT) sys_socket.$(OBJEXT) \ + idpriv-droptemp.$(OBJEXT) localcharset.$(OBJEXT) \ + glthread/lock.$(OBJEXT) malloca.$(OBJEXT) math.$(OBJEXT) \ + safe-read.$(OBJEXT) sockets.$(OBJEXT) sys_socket.$(OBJEXT) \ glthread/threadlib.$(OBJEXT) unistd.$(OBJEXT) \ wctype-h.$(OBJEXT) xmalloc.$(OBJEXT) xalloc-die.$(OBJEXT) \ xsize.$(OBJEXT) xstrndup.$(OBJEXT) @@ -369,6 +371,7 @@ GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ +GNULIB_FFS = @GNULIB_FFS@ GNULIB_FFSL = @GNULIB_FFSL@ GNULIB_FFSLL = @GNULIB_FFSLL@ GNULIB_FGETC = @GNULIB_FGETC@ @@ -734,6 +737,7 @@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ +HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ @@ -763,6 +767,7 @@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FEATURES_H = @HAVE_FEATURES_H@ +HAVE_FFS = @HAVE_FFS@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FMA = @HAVE_FMA@ @@ -874,8 +879,10 @@ HAVE_SQRTL = @HAVE_SQRTL@ HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ +HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRINGS_H = @HAVE_STRINGS_H@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -966,7 +973,6 @@ LD = @LD@ LDAPINCLUDE = @LDAPINCLUDE@ LDAPLIBS = @LDAPLIBS@ LDFLAGS = @LDFLAGS@ -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ LIBICONV = @LIBICONV@ @@ -992,6 +998,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MATHLIBS = @MATHLIBS@ @@ -1017,6 +1024,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ +NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ @@ -1037,6 +1045,7 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_STDINT_H = @NEXT_STDINT_H@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ +NEXT_STRINGS_H = @NEXT_STRINGS_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ @@ -1096,7 +1105,6 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PST3CFLAGS = @PST3CFLAGS@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -PYTHON = @PYTHON@ RADIUSLIBS = @RADIUSLIBS@ RANLIB = @RANLIB@ RELEASE = @RELEASE@ @@ -1288,7 +1296,6 @@ SCRIPT_TEST = @SCRIPT_TEST@ SED = @SED@ SERVENT_LIB = @SERVENT_LIB@ SET_MAKE = @SET_MAKE@ -SH = @SH@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ @@ -1312,6 +1319,7 @@ WARRANTY = @WARRANTY@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ +WTSAPI32LIBS = @WTSAPI32LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -1399,30 +1407,31 @@ EXTRA_DIST = m4/gnulib-cache.m4 alloca.in.h arpa_inet.in.h btowc.c \ gai_strerror.c getaddrinfo.c gethostname.c w32sock.h \ getloadavg.c getopt.c getopt.in.h getopt1.c getopt_int.h \ $(top_srcdir)/build-aux/config.rpath \ - $(top_srcdir)/build-aux/config.rpath inet_ntop.c intprops.h \ - langinfo.in.h config.charset ref-add.sin ref-del.sin \ - locale.in.h localeconv.c malloc.c malloc.c malloca.h \ - malloca.valgrind math.in.h mbrtowc.c mbsinit.c mbtowc-impl.h \ - mbtowc.c memchr.c memchr.valgrind mktime-internal.h mktime.c \ - mktime-internal.h mktime.c mountlist.c mountlist.h \ - msvc-inval.c msvc-inval.h msvc-nothrow.c msvc-nothrow.h \ - netdb.in.h netinet_in.in.h nl_langinfo.c read.c regcomp.c \ - regex.c regex.h regex_internal.c regex_internal.h regexec.c \ - safe-read.h setenv.c \ - $(top_srcdir)/build-aux/snippet/_Noreturn.h \ + $(top_srcdir)/build-aux/config.rpath idpriv.h inet_ntop.c \ + intprops.h langinfo.in.h config.charset ref-add.sin \ + ref-del.sin locale.in.h localeconv.c malloc.c malloc.c \ + malloca.h malloca.valgrind math.in.h mbrtowc.c mbsinit.c \ + mbtowc-impl.h mbtowc.c memchr.c memchr.valgrind \ + mktime-internal.h mktime.c mktime-internal.h mktime.c \ + mountlist.c mountlist.h msvc-inval.c msvc-inval.h \ + msvc-nothrow.c msvc-nothrow.h netdb.in.h netinet_in.in.h \ + nl_langinfo.c read.c regcomp.c regex.c regex.h \ + regex_internal.c regex_internal.h regexec.c safe-read.h \ + setenv.c $(top_srcdir)/build-aux/snippet/_Noreturn.h \ $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ $(top_srcdir)/build-aux/snippet/c++defs.h \ $(top_srcdir)/build-aux/snippet/warn-on-use.h snprintf.c \ w32sock.h stdalign.in.h stdbool.in.h stddef.in.h stdint.in.h \ - stdio.in.h stdlib.in.h streq.h strerror.c strerror-override.c \ - strerror-override.h string.in.h strndup.c strnlen.c strsep.c \ - str-two-way.h strstr.c sys_socket.in.h sys_types.in.h \ - sys_uio.in.h $(top_srcdir)/build-aux/config.rpath time.in.h \ - time_r.c mktime-internal.h timegm.c unistd.in.h unsetenv.c \ - asnprintf.c float+.h printf-args.c printf-args.h \ - printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h \ - asprintf.c vasprintf.c verify.h vsnprintf.c wchar.in.h \ - wcrtomb.c wctype.in.h xalloc.h xalloc-oversized.h + stdio.in.h stdlib.in.h strcasecmp.c strncasecmp.c streq.h \ + strerror.c strerror-override.c strerror-override.h string.in.h \ + strings.in.h strndup.c strnlen.c strsep.c str-two-way.h \ + strstr.c sys_socket.in.h sys_types.in.h sys_uio.in.h \ + $(top_srcdir)/build-aux/config.rpath time.in.h time_r.c \ + mktime-internal.h timegm.c unistd.in.h unsetenv.c asnprintf.c \ + float+.h printf-args.c printf-args.h printf-parse.c \ + printf-parse.h vasnprintf.c vasnprintf.h asprintf.c \ + vasprintf.c verify.h vsnprintf.c wchar.in.h wcrtomb.c \ + wctype.in.h xalloc.h xalloc-oversized.h # The BUILT_SOURCES created by this Makefile snippet are not used via #include # statements but through direct file reference. Therefore this snippet must be @@ -1437,8 +1446,8 @@ BUILT_SOURCES = $(ALLOCA_H) arpa/inet.h configmake.h $(ERRNO_H) \ $(FLOAT_H) $(GETOPT_H) langinfo.h locale.h math.h netdb.h \ $(NETINET_IN_H) arg-nonnull.h c++defs.h warn-on-use.h \ $(STDALIGN_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h \ - stdlib.h string.h sys/socket.h sys/types.h sys/uio.h time.h \ - unistd.h wchar.h wctype.h + stdlib.h string.h strings.h sys/socket.h sys/types.h sys/uio.h \ + time.h unistd.h wchar.h wctype.h SUFFIXES = .sed .sin MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t arpa/inet.h \ arpa/inet.h-t errno.h errno.h-t float.h float.h-t getopt.h \ @@ -1448,9 +1457,9 @@ MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t arpa/inet.h \ warn-on-use.h warn-on-use.h-t stdalign.h stdalign.h-t \ stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t \ stdio.h stdio.h-t stdlib.h stdlib.h-t string.h string.h-t \ - sys/socket.h sys/socket.h-t sys/types.h sys/types.h-t \ - sys/uio.h sys/uio.h-t time.h time.h-t unistd.h unistd.h-t \ - wchar.h wchar.h-t wctype.h wctype.h-t + strings.h strings.h-t sys/socket.h sys/socket.h-t sys/types.h \ + sys/types.h-t sys/uio.h sys/uio.h-t time.h time.h-t unistd.h \ + unistd.h-t wchar.h wchar.h-t wctype.h wctype.h-t MOSTLYCLEANDIRS = arpa netinet sys sys CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \ ref-del.sed @@ -1460,11 +1469,11 @@ AM_CPPFLAGS = AM_CFLAGS = libgnu_a_SOURCES = base64.h base64.c sha1.c dirname.c basename.c \ dirname-lgpl.c basename-lgpl.c stripslash.c exitfail.c \ - fd-hook.c full-read.h full-read.c gettext.h localcharset.h \ - localcharset.c glthread/lock.h glthread/lock.c malloca.c \ - math.c safe-read.c size_max.h sockets.h sockets.c sys_socket.c \ - glthread/threadlib.c unistd.c wctype-h.c xmalloc.c \ - xalloc-die.c xsize.h xsize.c xstrndup.h xstrndup.c + fd-hook.c full-read.h full-read.c gettext.h idpriv-droptemp.c \ + localcharset.h localcharset.c glthread/lock.h glthread/lock.c \ + malloca.c math.c safe-read.c size_max.h sockets.h sockets.c \ + sys_socket.c glthread/threadlib.c unistd.c wctype-h.c \ + xmalloc.c xalloc-die.c xsize.h xsize.c xstrndup.h xstrndup.c libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) EXTRA_libgnu_a_SOURCES = btowc.c stripslash.c error.c float.c itold.c \ @@ -1473,11 +1482,11 @@ EXTRA_libgnu_a_SOURCES = btowc.c stripslash.c error.c float.c itold.c \ inet_ntop.c localeconv.c malloc.c malloc.c mbrtowc.c mbsinit.c \ mbtowc.c memchr.c mktime.c mktime.c mountlist.c msvc-inval.c \ msvc-nothrow.c nl_langinfo.c read.c regcomp.c regex.c \ - regex_internal.c regexec.c setenv.c snprintf.c strerror.c \ - strerror-override.c strndup.c strnlen.c strsep.c strstr.c \ - time_r.c timegm.c unsetenv.c asnprintf.c printf-args.c \ - printf-parse.c vasnprintf.c asprintf.c vasprintf.c vsnprintf.c \ - wcrtomb.c + regex_internal.c regexec.c setenv.c snprintf.c strcasecmp.c \ + strncasecmp.c strerror.c strerror-override.c strndup.c \ + strnlen.c strsep.c strstr.c time_r.c timegm.c unsetenv.c \ + asnprintf.c printf-args.c printf-parse.c vasnprintf.c \ + asprintf.c vasprintf.c vsnprintf.c wcrtomb.c charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp @@ -1493,7 +1502,7 @@ all: $(BUILT_SOURCES) .SUFFIXES: .SUFFIXES: .sed .sin .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1518,9 +1527,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -1581,6 +1590,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getloadavg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idpriv-droptemp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_ntop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@ @@ -1609,9 +1619,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockets.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripslash.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strncasecmp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strndup.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Po@am__quote@ @@ -2952,6 +2964,28 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H } > $@-t && \ mv $@-t $@ +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_H)|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \ + -e 's|@''GNULIB_FFS''@|$(GNULIB_FFS)|g' \ + -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \ + -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \ + -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(srcdir)/strings.in.h; \ + } > $@-t && \ + mv $@-t $@ + # We need the following in order to create when the system # doesn't have one that works with the given compiler. sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) diff --git a/gl/idpriv-droptemp.c b/gl/idpriv-droptemp.c new file mode 100644 index 0000000..13d1064 --- /dev/null +++ b/gl/idpriv-droptemp.c @@ -0,0 +1,204 @@ +/* Dropping uid/gid privileges of the current process temporarily. + Copyright (C) 2009-2013 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#include "idpriv.h" + +#include +#include +#include +#include + +/* The privileged uid and gid that the process had earlier. */ +#if HAVE_GETUID +static int saved_uid = -1; +#endif +#if HAVE_GETGID +static int saved_gid = -1; +#endif + +int +idpriv_temp_drop (void) +{ +#if HAVE_GETEUID && HAVE_GETEGID && (HAVE_SETRESUID || HAVE_SETREUID) && (HAVE_SETRESGID || HAVE_SETREGID) + int uid = getuid (); + int gid = getgid (); + + /* Find out about the privileged uid and gid at the first call. */ + if (saved_uid == -1) + saved_uid = geteuid (); + if (saved_gid == -1) + saved_gid = getegid (); + + /* Drop the gid privilege first, because in some cases the gid privilege + cannot be dropped after the uid privilege has been dropped. */ + + /* This is for executables that have the setgid bit set. */ +# if HAVE_SETRESGID /* glibc, FreeBSD, OpenBSD, HP-UX */ + if (setresgid (-1, gid, saved_gid) < 0) + return -1; +# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ + if (setregid (-1, gid) < 0) + return -1; +# endif + + /* This is for executables that have the setuid bit set. */ +# if HAVE_SETRESUID /* glibc, FreeBSD, OpenBSD, HP-UX */ + /* See + figure 14. */ + if (setresuid (-1, uid, saved_uid) < 0) + return -1; +# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ + if (setreuid (-1, uid) < 0) + return -1; +# endif + + /* Verify that the privileges have really been dropped. + This verification is here for security reasons. Doesn't matter if it + takes a couple of system calls. + When the verification fails, it indicates that we need to use different + API in the code above. Therefore 'abort ()', not 'return -1'. */ +# if HAVE_GETRESUID /* glibc, FreeBSD, OpenBSD, HP-UX */ + { + uid_t real; + uid_t effective; + uid_t saved; + if (getresuid (&real, &effective, &saved) < 0 + || real != uid + || effective != uid + || saved != saved_uid) + abort (); + } +# else +# if HAVE_GETEUID + if (geteuid () != uid) + abort (); +# endif + if (getuid () != uid) + abort (); +# endif +# if HAVE_GETRESGID /* glibc, FreeBSD, OpenBSD, HP-UX */ + { + uid_t real; + uid_t effective; + uid_t saved; + if (getresgid (&real, &effective, &saved) < 0 + || real != gid + || effective != gid + || saved != saved_gid) + abort (); + } +# else +# if HAVE_GETEGID + if (getegid () != gid) + abort (); +# endif + if (getgid () != gid) + abort (); +# endif + + return 0; +#else + errno = ENOSYS; + return -1; +#endif +} + +int +idpriv_temp_restore (void) +{ +#if HAVE_GETEUID && HAVE_GETEGID && (HAVE_SETRESUID || HAVE_SETREUID) && (HAVE_SETRESGID || HAVE_SETREGID) + int uid = getuid (); + int gid = getgid (); + + if (saved_uid == -1 || saved_gid == -1) + /* Caller error: idpriv_temp_drop was never invoked. */ + abort (); + + /* Acquire the gid privilege last, because in some cases the gid privilege + cannot be acquired before the uid privilege has been acquired. */ + + /* This is for executables that have the setuid bit set. */ +# if HAVE_SETRESUID /* glibc, FreeBSD, OpenBSD, HP-UX */ + /* See + figure 14. */ + if (setresuid (-1, saved_uid, -1) < 0) + return -1; +# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ + if (setreuid (-1, saved_uid) < 0) + return -1; +# endif + + /* This is for executables that have the setgid bit set. */ +# if HAVE_SETRESGID /* glibc, FreeBSD, OpenBSD, HP-UX */ + if (setresgid (-1, saved_gid, -1) < 0) + return -1; +# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ + if (setregid (-1, saved_gid) < 0) + return -1; +# endif + + /* Verify that the privileges have really been acquired. + This verification is here for security reasons. Doesn't matter if it + takes a couple of system calls. + When the verification fails, it indicates that we need to use different + API in the code above. Therefore 'abort ()', not 'return -1'. */ +# if HAVE_GETRESUID /* glibc, FreeBSD, OpenBSD, HP-UX */ + { + uid_t real; + uid_t effective; + uid_t saved; + if (getresuid (&real, &effective, &saved) < 0 + || real != uid + || effective != saved_uid + || saved != saved_uid) + abort (); + } +# else +# if HAVE_GETEUID + if (geteuid () != saved_uid) + abort (); +# endif + if (getuid () != uid) + abort (); +# endif +# if HAVE_GETRESGID /* glibc, FreeBSD, OpenBSD, HP-UX */ + { + uid_t real; + uid_t effective; + uid_t saved; + if (getresgid (&real, &effective, &saved) < 0 + || real != gid + || effective != saved_gid + || saved != saved_gid) + abort (); + } +# else +# if HAVE_GETEGID + if (getegid () != saved_gid) + abort (); +# endif + if (getgid () != gid) + abort (); +# endif + + return 0; +#else + errno = ENOSYS; + return -1; +#endif +} diff --git a/gl/idpriv.h b/gl/idpriv.h new file mode 100644 index 0000000..f454a2c --- /dev/null +++ b/gl/idpriv.h @@ -0,0 +1,116 @@ +/* Dropping uid/gid privileges of the current process. + Copyright (C) 2009-2013 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef _IDPRIV_H +#define _IDPRIV_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* This module allows programs which are installed with setuid or setgid bit + (and which therefore initially run with an effective user id or group id + different from the one of the current user) to drop their uid or gid + privilege, either permanently or temporarily. + + It is absolutely necessary to minimize the amount of code that is running + with escalated privileges (e.g. with effective uid = root). The reason is + that any bug or exploit in a part of a program that is running with + escalated privileges is a security vulnerability that - upon discovery - + puts the users in danger and requires immediate fixing. Then consider that + there's a bug every 10 or 20 lines of code on average... + + For programs that temporarily drop privileges but have the ability to + restore them later, there are additionally the dangers that + - Any bug in the non-privileged part of the program may be used to + create invalid data structures that will trigger security + vulnerabilities in the privileged part of the program. + - Code execution exploits in the non-privileged part of the program may + be used to invoke the function that restores high privileges and then + execute additional arbitrary code. + + 1) The usual, and reasonably safe, way to minimize the amount of code + running with privileges is to create a separate executable, with setuid + or setgid bit, that contains only code for the tasks that require + privileges (and,of course, strict checking of the arguments, so that the + program cannot be abused). The main program is installed without setuid + or setgid bit. + + 2) A less safe way is to do some privileged tasks at the beginning of the + program's run, and drop privileges permanently as soon as possible. + + Note: There may still be security issues if the privileged task puts + sensitive data into the process memory or opens communication channels + to restricted facilities. + + 3) The most unsafe way is to drop privileges temporarily for most of the + main program but to re-enable them for the duration of privileged tasks. + + As explained above, this approach has uncontrollable dangers for + security. + + This approach is normally not usable in multithreaded programs, because + you cannot know what kind of system calls the other threads could be + doing during the time the privileges are enabled. + + With approach 1, you don't need gnulib modules. + With approach 2, you need the gnulib module 'idpriv-drop'. + With approach 3, you need the gnulib module 'idpriv-droptemp'. But really, + you should better stay away from this approach. + */ + +/* For more in-depth discussion of these topics, see the papers/articles + * Hao Chen, David Wagner, Drew Dean: Setuid Demystified + + * Dan Tsafrir, Dilma da Silva, David Wagner: The Murky Issue of Changing + Process Identity: Revising "Setuid Demystified" + + + * Dhruv Mohindra: Observe correct revocation order while relinquishing + privileges + + */ + + +/* For approach 2. */ + +/* Drop the uid and gid privileges of the current process. + Return 0 if successful, or -1 with errno set upon failure. The recommended + handling of failure is to terminate the process. */ +extern int idpriv_drop (void); + + +/* For approach 3. */ + +/* Drop the uid and gid privileges of the current process in a way that allows + them to be restored later. + Return 0 if successful, or -1 with errno set upon failure. The recommended + handling of failure is to terminate the process. */ +extern int idpriv_temp_drop (void); + +/* Restore the uid and gid privileges of the current process. + Return 0 if successful, or -1 with errno set upon failure. The recommended + handling of failure is to not perform the actions that require the escalated + privileges. */ +extern int idpriv_temp_restore (void); + + +#ifdef __cplusplus +} +#endif + + +#endif /* _IDPRIV_H */ diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4 index 2ed3509..d6fca2a 100644 --- a/gl/m4/gnulib-cache.m4 +++ b/gl/m4/gnulib-cache.m4 @@ -27,7 +27,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname environ floorf fsusage getaddrinfo gethostname getloadavg getopt-gnu gettext mountlist regex setenv strsep timegm unsetenv vasprintf vsnprintf +# gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname environ floorf fsusage getaddrinfo gethostname getloadavg getopt-gnu gettext idpriv-droptemp mountlist regex setenv strcase strsep timegm unsetenv vasprintf vsnprintf # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@ -43,9 +43,11 @@ gl_MODULES([ getloadavg getopt-gnu gettext + idpriv-droptemp mountlist regex setenv + strcase strsep timegm unsetenv diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4 index f23f769..67a8156 100644 --- a/gl/m4/gnulib-comp.m4 +++ b/gl/m4/gnulib-comp.m4 @@ -28,7 +28,7 @@ # other built files. -# This macro should be invoked from ./configure.in, in the section +# This macro should be invoked from ./configure.ac, in the section # "Checks for programs", right after AC_PROG_CC, and certainly before # any checks for libraries, header files, types and library functions. AC_DEFUN([gl_EARLY], @@ -70,6 +70,7 @@ AC_DEFUN([gl_EARLY], # Code from module gettext-h: # Code from module havelib: # Code from module hostent: + # Code from module idpriv-droptemp: # Code from module include_next: # Code from module inet_ntop: # Code from module intprops: @@ -119,10 +120,12 @@ AC_DEFUN([gl_EARLY], # Code from module stdint: # Code from module stdio: # Code from module stdlib: + # Code from module strcase: # Code from module streq: # Code from module strerror: # Code from module strerror-override: # Code from module string: + # Code from module strings: # Code from module strndup: # Code from module strnlen: # Code from module strsep: @@ -151,7 +154,7 @@ AC_DEFUN([gl_EARLY], # Code from module xstrndup: ]) -# This macro should be invoked from ./configure.in, in the section +# This macro should be invoked from ./configure.ac, in the section # "Check for header files, types and library functions". AC_DEFUN([gl_INIT], [ @@ -256,6 +259,7 @@ AC_DEFUN([gl_INIT], AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) gl_HOSTENT + gl_IDPRIV gl_FUNC_INET_NTOP if test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1; then AC_LIBOBJ([inet_ntop]) @@ -377,6 +381,15 @@ AC_DEFUN([gl_INIT], gl_STDINT_H gl_STDIO_H gl_STDLIB_H + gl_STRCASE + if test $HAVE_STRCASECMP = 0; then + AC_LIBOBJ([strcasecmp]) + gl_PREREQ_STRCASECMP + fi + if test $HAVE_STRNCASECMP = 0; then + AC_LIBOBJ([strncasecmp]) + gl_PREREQ_STRNCASECMP + fi gl_FUNC_STRERROR if test $REPLACE_STRERROR = 1; then AC_LIBOBJ([strerror]) @@ -390,6 +403,7 @@ AC_DEFUN([gl_INIT], gl_PREREQ_SYS_H_WINSOCK2 fi gl_HEADER_STRING_H + gl_HEADER_STRINGS_H gl_FUNC_STRNDUP if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then AC_LIBOBJ([strndup]) @@ -646,6 +660,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/glthread/lock.c lib/glthread/lock.h lib/glthread/threadlib.c + lib/idpriv-droptemp.c + lib/idpriv.h lib/inet_ntop.c lib/intprops.h lib/itold.c @@ -706,12 +722,15 @@ AC_DEFUN([gl_FILE_LIST], [ lib/stdio.in.h lib/stdlib.in.h lib/str-two-way.h + lib/strcasecmp.c lib/streq.h lib/strerror-override.c lib/strerror-override.h lib/strerror.c lib/string.in.h + lib/strings.in.h lib/stripslash.c + lib/strncasecmp.c lib/strndup.c lib/strnlen.c lib/strsep.c @@ -775,6 +794,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/gnulib-common.m4 m4/hostent.m4 m4/iconv.m4 + m4/idpriv.m4 m4/include_next.m4 m4/inet_ntop.m4 m4/intdiv0.m4 @@ -845,8 +865,10 @@ AC_DEFUN([gl_FILE_LIST], [ m4/stdint_h.m4 m4/stdio_h.m4 m4/stdlib_h.m4 + m4/strcase.m4 m4/strerror.m4 m4/string_h.m4 + m4/strings_h.m4 m4/strndup.m4 m4/strnlen.m4 m4/strsep.m4 diff --git a/gl/m4/idpriv.m4 b/gl/m4/idpriv.m4 new file mode 100644 index 0000000..167f523 --- /dev/null +++ b/gl/m4/idpriv.m4 @@ -0,0 +1,14 @@ +# idpriv.m4 serial 1 +dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_IDPRIV], +[ + dnl Persuade glibc to declare {get,set}res{uid,gid}. + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_FUNCS_ONCE([getuid geteuid getresuid getgid getegid getresgid]) + AC_CHECK_FUNCS_ONCE([setresuid setreuid seteuid setresgid setregid setegid]) +]) diff --git a/gl/m4/strcase.m4 b/gl/m4/strcase.m4 new file mode 100644 index 0000000..22bf57c --- /dev/null +++ b/gl/m4/strcase.m4 @@ -0,0 +1,45 @@ +# strcase.m4 serial 11 +dnl Copyright (C) 2002, 2005-2013 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_STRCASE], +[ + gl_FUNC_STRCASECMP + gl_FUNC_STRNCASECMP +]) + +AC_DEFUN([gl_FUNC_STRCASECMP], +[ + AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) + AC_CHECK_FUNCS([strcasecmp]) + if test $ac_cv_func_strcasecmp = no; then + HAVE_STRCASECMP=0 + fi +]) + +AC_DEFUN([gl_FUNC_STRNCASECMP], +[ + AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) + AC_CHECK_FUNCS([strncasecmp]) + if test $ac_cv_func_strncasecmp = yes; then + HAVE_STRNCASECMP=1 + else + HAVE_STRNCASECMP=0 + fi + AC_CHECK_DECLS([strncasecmp]) + if test $ac_cv_have_decl_strncasecmp = no; then + HAVE_DECL_STRNCASECMP=0 + fi +]) + +# Prerequisites of lib/strcasecmp.c. +AC_DEFUN([gl_PREREQ_STRCASECMP], [ + : +]) + +# Prerequisites of lib/strncasecmp.c. +AC_DEFUN([gl_PREREQ_STRNCASECMP], [ + : +]) diff --git a/gl/m4/strings_h.m4 b/gl/m4/strings_h.m4 new file mode 100644 index 0000000..76ef242 --- /dev/null +++ b/gl/m4/strings_h.m4 @@ -0,0 +1,52 @@ +# Configure a replacement for . +# serial 6 + +# Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_HEADER_STRINGS_H], +[ + dnl Use AC_REQUIRE here, so that the default behavior below is expanded + dnl once only, before all statements that occur in other macros. + AC_REQUIRE([gl_HEADER_STRINGS_H_BODY]) +]) + +AC_DEFUN([gl_HEADER_STRINGS_H_BODY], +[ + AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) + + gl_CHECK_NEXT_HEADERS([strings.h]) + if test $ac_cv_header_strings_h = yes; then + HAVE_STRINGS_H=1 + else + HAVE_STRINGS_H=0 + fi + AC_SUBST([HAVE_STRINGS_H]) + + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use. + gl_WARN_ON_USE_PREPARE([[ + /* Minix 3.1.8 has a bug: must be included before + . */ + #include + #include + ]], [ffs strcasecmp strncasecmp]) +]) + +AC_DEFUN([gl_STRINGS_MODULE_INDICATOR], +[ + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) +]) + +AC_DEFUN([gl_HEADER_STRINGS_H_DEFAULTS], +[ + GNULIB_FFS=0; AC_SUBST([GNULIB_FFS]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_FFS=1; AC_SUBST([HAVE_FFS]) + HAVE_STRCASECMP=1; AC_SUBST([HAVE_STRCASECMP]) + HAVE_DECL_STRNCASECMP=1; AC_SUBST([HAVE_DECL_STRNCASECMP]) +]) diff --git a/gl/strcasecmp.c b/gl/strcasecmp.c new file mode 100644 index 0000000..0f0a742 --- /dev/null +++ b/gl/strcasecmp.c @@ -0,0 +1,62 @@ +/* Case-insensitive string comparison function. + Copyright (C) 1998-1999, 2005-2007, 2009-2013 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +#include + +/* Specification. */ +#include + +#include +#include + +#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) + +/* Compare strings S1 and S2, ignoring case, returning less than, equal to or + greater than zero if S1 is lexicographically less than, equal to or greater + than S2. + Note: This function does not work with multibyte strings! */ + +int +strcasecmp (const char *s1, const char *s2) +{ + const unsigned char *p1 = (const unsigned char *) s1; + const unsigned char *p2 = (const unsigned char *) s2; + unsigned char c1, c2; + + if (p1 == p2) + return 0; + + do + { + c1 = TOLOWER (*p1); + c2 = TOLOWER (*p2); + + if (c1 == '\0') + break; + + ++p1; + ++p2; + } + while (c1 == c2); + + if (UCHAR_MAX <= INT_MAX) + return c1 - c2; + else + /* On machines where 'char' and 'int' are types of the same size, the + difference of two 'unsigned char' values - including the sign bit - + doesn't fit in an 'int'. */ + return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); +} diff --git a/gl/strings.in.h b/gl/strings.in.h new file mode 100644 index 0000000..4469f86 --- /dev/null +++ b/gl/strings.in.h @@ -0,0 +1,122 @@ +/* A substitute . + + Copyright (C) 2007-2013 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +#ifndef _@GUARD_PREFIX@_STRINGS_H + +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif +@PRAGMA_COLUMNS@ + +/* Minix 3.1.8 has a bug: must be included before . + But avoid namespace pollution on glibc systems. */ +#if defined __minix && !defined __GLIBC__ +# include +#endif + +/* The include_next requires a split double-inclusion guard. */ +#if @HAVE_STRINGS_H@ +# @INCLUDE_NEXT@ @NEXT_STRINGS_H@ +#endif + +#ifndef _@GUARD_PREFIX@_STRINGS_H +#define _@GUARD_PREFIX@_STRINGS_H + +#if ! @HAVE_DECL_STRNCASECMP@ +/* Get size_t. */ +# include +#endif + + +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + +/* The definition of _GL_ARG_NONNULL is copied here. */ + +/* The definition of _GL_WARN_ON_USE is copied here. */ + +#ifdef __cplusplus +extern "C" { +#endif + + + /* Find the index of the least-significant set bit. */ +#if @GNULIB_FFS@ +# if !@HAVE_FFS@ +_GL_FUNCDECL_SYS (ffs, int, (int i)); +# endif +_GL_CXXALIAS_SYS (ffs, int, (int i)); +_GL_CXXALIASWARN (ffs); +#elif defined GNULIB_POSIXCHECK +# undef ffs +# if HAVE_RAW_DECL_FFS +_GL_WARN_ON_USE (ffs, "ffs is not portable - use the ffs module"); +# endif +#endif + +/* Compare strings S1 and S2, ignoring case, returning less than, equal to or + greater than zero if S1 is lexicographically less than, equal to or greater + than S2. + Note: This function does not work in multibyte locales. */ +#if ! @HAVE_STRCASECMP@ +extern int strcasecmp (char const *s1, char const *s2) + _GL_ARG_NONNULL ((1, 2)); +#endif +#if defined GNULIB_POSIXCHECK +/* strcasecmp() does not work with multibyte strings: + POSIX says that it operates on "strings", and "string" in POSIX is defined + as a sequence of bytes, not of characters. */ +# undef strcasecmp +# if HAVE_RAW_DECL_STRCASECMP +_GL_WARN_ON_USE (strcasecmp, "strcasecmp cannot work correctly on character " + "strings in multibyte locales - " + "use mbscasecmp if you care about " + "internationalization, or use c_strcasecmp , " + "gnulib module c-strcase) if you want a locale " + "independent function"); +# endif +#endif + +/* Compare no more than N bytes of strings S1 and S2, ignoring case, + returning less than, equal to or greater than zero if S1 is + lexicographically less than, equal to or greater than S2. + Note: This function cannot work correctly in multibyte locales. */ +#if ! @HAVE_DECL_STRNCASECMP@ +extern int strncasecmp (char const *s1, char const *s2, size_t n) + _GL_ARG_NONNULL ((1, 2)); +#endif +#if defined GNULIB_POSIXCHECK +/* strncasecmp() does not work with multibyte strings: + POSIX says that it operates on "strings", and "string" in POSIX is defined + as a sequence of bytes, not of characters. */ +# undef strncasecmp +# if HAVE_RAW_DECL_STRNCASECMP +_GL_WARN_ON_USE (strncasecmp, "strncasecmp cannot work correctly on character " + "strings in multibyte locales - " + "use mbsncasecmp or mbspcasecmp if you care about " + "internationalization, or use c_strncasecmp , " + "gnulib module c-strcase) if you want a locale " + "independent function"); +# endif +#endif + + +#ifdef __cplusplus +} +#endif + +#endif /* _@GUARD_PREFIX@_STRING_H */ +#endif /* _@GUARD_PREFIX@_STRING_H */ diff --git a/gl/strncasecmp.c b/gl/strncasecmp.c new file mode 100644 index 0000000..35840bc --- /dev/null +++ b/gl/strncasecmp.c @@ -0,0 +1,62 @@ +/* strncasecmp.c -- case insensitive string comparator + Copyright (C) 1998-1999, 2005-2007, 2009-2013 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +#include + +/* Specification. */ +#include + +#include +#include + +#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) + +/* Compare no more than N bytes of strings S1 and S2, ignoring case, + returning less than, equal to or greater than zero if S1 is + lexicographically less than, equal to or greater than S2. + Note: This function cannot work correctly in multibyte locales. */ + +int +strncasecmp (const char *s1, const char *s2, size_t n) +{ + register const unsigned char *p1 = (const unsigned char *) s1; + register const unsigned char *p2 = (const unsigned char *) s2; + unsigned char c1, c2; + + if (p1 == p2 || n == 0) + return 0; + + do + { + c1 = TOLOWER (*p1); + c2 = TOLOWER (*p2); + + if (--n == 0 || c1 == '\0') + break; + + ++p1; + ++p2; + } + while (c1 == c2); + + if (UCHAR_MAX <= INT_MAX) + return c1 - c2; + else + /* On machines where 'char' and 'int' are types of the same size, the + difference of two 'unsigned char' values - including the sign bit - + doesn't fit in an 'int'. */ + return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); +} diff --git a/lib/Makefile.am b/lib/Makefile.am index 99fa591..01d73a6 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,19 +2,18 @@ SUBDIRS = . tests -noinst_LIBRARIES = libnagiosplug.a +noinst_LIBRARIES = libmonitoringplug.a -AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" +AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \ + -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins -libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c +libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h if USE_PARSE_INI -libnagiosplug_a_SOURCES += parse_ini.c extra_opts.c +libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c endif USE_PARSE_INI -INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins - test test-debug: cd tests && make $@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 6b3ffb8..674da88 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -79,6 +79,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/gnulib-common.m4 \ $(top_srcdir)/gl/m4/gnulib-comp.m4 \ $(top_srcdir)/gl/m4/hostent.m4 $(top_srcdir)/gl/m4/iconv.m4 \ + $(top_srcdir)/gl/m4/idpriv.m4 \ $(top_srcdir)/gl/m4/include_next.m4 \ $(top_srcdir)/gl/m4/inet_ntop.m4 \ $(top_srcdir)/gl/m4/intlmacosx.m4 \ @@ -128,11 +129,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdbool.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ - $(top_srcdir)/gl/m4/stdlib_h.m4 \ + $(top_srcdir)/gl/m4/stdlib_h.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ - $(top_srcdir)/gl/m4/string_h.m4 $(top_srcdir)/gl/m4/strndup.m4 \ - $(top_srcdir)/gl/m4/strnlen.m4 $(top_srcdir)/gl/m4/strsep.m4 \ - $(top_srcdir)/gl/m4/strstr.m4 \ + $(top_srcdir)/gl/m4/string_h.m4 \ + $(top_srcdir)/gl/m4/strings_h.m4 \ + $(top_srcdir)/gl/m4/strndup.m4 $(top_srcdir)/gl/m4/strnlen.m4 \ + $(top_srcdir)/gl/m4/strsep.m4 $(top_srcdir)/gl/m4/strstr.m4 \ $(top_srcdir)/gl/m4/sys_socket_h.m4 \ $(top_srcdir)/gl/m4/sys_types_h.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ @@ -147,7 +149,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \ $(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/xalloc.m4 \ $(top_srcdir)/gl/m4/xsize.m4 $(top_srcdir)/gl/m4/xstrndup.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs @@ -155,15 +157,16 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -libnagiosplug_a_AR = $(AR) $(ARFLAGS) -libnagiosplug_a_LIBADD = -am__libnagiosplug_a_SOURCES_DIST = utils_base.c utils_disk.c \ +libmonitoringplug_a_AR = $(AR) $(ARFLAGS) +libmonitoringplug_a_LIBADD = +am__libmonitoringplug_a_SOURCES_DIST = utils_base.c utils_disk.c \ utils_tcp.c utils_cmd.c parse_ini.c extra_opts.c @USE_PARSE_INI_TRUE@am__objects_1 = parse_ini.$(OBJEXT) \ @USE_PARSE_INI_TRUE@ extra_opts.$(OBJEXT) -am_libnagiosplug_a_OBJECTS = utils_base.$(OBJEXT) utils_disk.$(OBJEXT) \ - utils_tcp.$(OBJEXT) utils_cmd.$(OBJEXT) $(am__objects_1) -libnagiosplug_a_OBJECTS = $(am_libnagiosplug_a_OBJECTS) +am_libmonitoringplug_a_OBJECTS = utils_base.$(OBJEXT) \ + utils_disk.$(OBJEXT) utils_tcp.$(OBJEXT) utils_cmd.$(OBJEXT) \ + $(am__objects_1) +libmonitoringplug_a_OBJECTS = $(am_libmonitoringplug_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -177,8 +180,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libnagiosplug_a_SOURCES) -DIST_SOURCES = $(am__libnagiosplug_a_SOURCES_DIST) +SOURCES = $(libmonitoringplug_a_SOURCES) +DIST_SOURCES = $(am__libmonitoringplug_a_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -337,6 +340,7 @@ GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ +GNULIB_FFS = @GNULIB_FFS@ GNULIB_FFSL = @GNULIB_FFSL@ GNULIB_FFSLL = @GNULIB_FFSLL@ GNULIB_FGETC = @GNULIB_FGETC@ @@ -702,6 +706,7 @@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ +HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ @@ -731,6 +736,7 @@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FEATURES_H = @HAVE_FEATURES_H@ +HAVE_FFS = @HAVE_FFS@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FMA = @HAVE_FMA@ @@ -842,8 +848,10 @@ HAVE_SQRTL = @HAVE_SQRTL@ HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ +HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRINGS_H = @HAVE_STRINGS_H@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -934,7 +942,6 @@ LD = @LD@ LDAPINCLUDE = @LDAPINCLUDE@ LDAPLIBS = @LDAPLIBS@ LDFLAGS = @LDFLAGS@ -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ LIBICONV = @LIBICONV@ @@ -960,6 +967,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MATHLIBS = @MATHLIBS@ @@ -985,6 +993,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ +NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ @@ -1005,6 +1014,7 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_STDINT_H = @NEXT_STDINT_H@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ +NEXT_STRINGS_H = @NEXT_STRINGS_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ @@ -1064,7 +1074,6 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PST3CFLAGS = @PST3CFLAGS@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -PYTHON = @PYTHON@ RADIUSLIBS = @RADIUSLIBS@ RANLIB = @RANLIB@ RELEASE = @RELEASE@ @@ -1256,7 +1265,6 @@ SCRIPT_TEST = @SCRIPT_TEST@ SED = @SED@ SERVENT_LIB = @SERVENT_LIB@ SET_MAKE = @SET_MAKE@ -SH = @SH@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ @@ -1280,6 +1288,7 @@ WARRANTY = @WARRANTY@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ +WTSAPI32LIBS = @WTSAPI32LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -1345,17 +1354,18 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ with_trusted_path = @with_trusted_path@ SUBDIRS = . tests -noinst_LIBRARIES = libnagiosplug.a -AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" -libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c \ +noinst_LIBRARIES = libmonitoringplug.a +AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \ + -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins + +libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c \ utils_cmd.c $(am__append_1) EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h -INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins all: all-recursive .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1380,18 +1390,18 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libnagiosplug.a: $(libnagiosplug_a_OBJECTS) $(libnagiosplug_a_DEPENDENCIES) $(EXTRA_libnagiosplug_a_DEPENDENCIES) - -rm -f libnagiosplug.a - $(libnagiosplug_a_AR) libnagiosplug.a $(libnagiosplug_a_OBJECTS) $(libnagiosplug_a_LIBADD) - $(RANLIB) libnagiosplug.a +libmonitoringplug.a: $(libmonitoringplug_a_OBJECTS) $(libmonitoringplug_a_DEPENDENCIES) $(EXTRA_libmonitoringplug_a_DEPENDENCIES) + -rm -f libmonitoringplug.a + $(libmonitoringplug_a_AR) libmonitoringplug.a $(libmonitoringplug_a_OBJECTS) $(libmonitoringplug_a_LIBADD) + $(RANLIB) libmonitoringplug.a mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/lib/extra_opts.c b/lib/extra_opts.c index 2939c7a..f4d5e66 100644 --- a/lib/extra_opts.c +++ b/lib/extra_opts.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios-plugins extra_opts library +* Monitoring Plugins extra_opts library * * License: GPL -* Copyright (c) 2007 Nagios Plugins Development Team +* Copyright (c) 2007 Monitoring Plugins Development Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 @@ #define _EXTRA_OPTS_H_ /* - * extra_opts.h: routines for loading nagios-plugin defaults from ini + * extra_opts.h: routines for loading monitoring-plugin defaults from ini * configuration files. */ diff --git a/lib/parse_ini.c b/lib/parse_ini.c index 004396f..25abc89 100644 --- a/lib/parse_ini.c +++ b/lib/parse_ini.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios-plugins parse_ini library +* Monitoring Plugins parse_ini library * * License: GPL -* Copyright (c) 2007 Nagios Plugins Development Team +* Copyright (c) 2007 Monitoring Plugins Development Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,16 +22,15 @@ *****************************************************************************/ #include "common.h" +#include "idpriv.h" #include "utils_base.h" #include "parse_ini.h" -#include +#include #include #include #include -/* TODO: die like N::P if config file is not found */ - /* np_ini_info contains the result of parsing a "locator" in the format * [stanza_name][@config_filename] (check_foo@/etc/foo.ini, for example) */ @@ -40,254 +39,314 @@ typedef struct { char *stanza; } np_ini_info; +static char *default_ini_file_names[] = { + "monitoring-plugins.ini", + "plugins.ini", + "nagios-plugins.ini", + NULL +}; + +static char *default_ini_path_names[] = { + "/usr/local/etc/monitoring-plugins/monitoring-plugins.ini", + "/usr/local/etc/monitoring-plugins.ini", + "/etc/monitoring-plugins/monitoring-plugins.ini", + "/etc/monitoring-plugins.ini", + /* deprecated path names (for backward compatibility): */ + "/etc/nagios/plugins.ini", + "/usr/local/nagios/etc/plugins.ini", + "/usr/local/etc/nagios/plugins.ini", + "/etc/opt/nagios/plugins.ini", + "/etc/nagios-plugins.ini", + "/usr/local/etc/nagios-plugins.ini", + "/etc/opt/nagios-plugins.ini", + NULL +}; + /* eat all characters from a FILE pointer until n is encountered */ #define GOBBLE_TO(f, c, n) do { (c)=fgetc((f)); } while((c)!=EOF && (c)!=(n)) /* internal function that returns the constructed defaults options */ static int read_defaults(FILE *f, const char *stanza, np_arg_list **opts); + /* internal function that converts a single line into options format */ static int add_option(FILE *f, np_arg_list **optlst); -/* internal function to find default file */ -static char* default_file(void); -/* internal function to stat() files */ -static int test_file(const char* env, int len, const char* file, char* temp_file); -/* parse_locator decomposes a string of the form +/* internal functions to find default file */ +static char *default_file(void); +static char *default_file_in_path(void); + +/* + * Parse_locator decomposes a string of the form * [stanza][@filename] - * into its seperate parts + * into its seperate parts. */ -static void parse_locator(const char *locator, const char *def_stanza, np_ini_info *i){ - size_t locator_len=0, stanza_len=0; +static void +parse_locator(const char *locator, const char *def_stanza, np_ini_info *i) +{ + size_t locator_len = 0, stanza_len = 0; /* if locator is NULL we'll use default values */ - if(locator){ - locator_len=strlen(locator); - stanza_len=strcspn(locator, "@"); + if (locator != NULL) { + locator_len = strlen(locator); + stanza_len = strcspn(locator, "@"); } /* if a non-default stanza is provided */ - if(stanza_len>0){ - i->stanza=(char*)malloc(sizeof(char)*(stanza_len+1)); + if (stanza_len > 0) { + i->stanza = malloc(sizeof(char) * (stanza_len + 1)); strncpy(i->stanza, locator, stanza_len); - i->stanza[stanza_len]='\0'; - } else { /* otherwise we use the default stanza */ - i->stanza=strdup(def_stanza); - } - /* if there is no @file part */ - if(stanza_len==locator_len){ - i->file=default_file(); - if(strcmp(i->file, "") == 0){ - die(STATE_UNKNOWN, _("Cannot find '%s' or '%s' in any standard location.\n"), NP_DEFAULT_INI_FILENAME1, NP_DEFAULT_INI_FILENAME2); - } - } else { - i->file=strdup(&(locator[stanza_len+1])); - } + i->stanza[stanza_len] = '\0'; + } else /* otherwise we use the default stanza */ + i->stanza = strdup(def_stanza); - if(i->file==NULL || i->stanza==NULL){ + if (i->stanza == NULL) die(STATE_UNKNOWN, _("malloc() failed!\n")); - } + + /* check whether there's an @file part */ + i->file = stanza_len == locator_len + ? default_file() + : strdup(&(locator[stanza_len + 1])); + if (i->file == NULL || i->file[0] == '\0') + die(STATE_UNKNOWN, + _("Cannot find config file in any standard location.\n")); } -/* this is the externally visible function used by extra_opts */ -np_arg_list* np_get_defaults(const char *locator, const char *default_section){ - FILE *inifile=NULL; - np_arg_list *defaults=NULL; +/* + * This is the externally visible function used by extra_opts. + */ +np_arg_list * +np_get_defaults(const char *locator, const char *default_section) +{ + FILE *inifile = NULL; + np_arg_list *defaults = NULL; np_ini_info i; + int is_suid_plugin = mp_suid(); + + if (is_suid_plugin && idpriv_temp_drop() == -1) + die(STATE_UNKNOWN, _("Cannot drop privileges: %s\n"), + strerror(errno)); parse_locator(locator, default_section, &i); - /* if a file was specified or if we're using the default file */ - if(i.file != NULL && strlen(i.file) > 0){ - if(strcmp(i.file, "-")==0){ - inifile=stdin; - } else { - inifile=fopen(i.file, "r"); - } - if(inifile==NULL) die(STATE_UNKNOWN, _("Can't read config file")); - if(read_defaults(inifile, i.stanza, &defaults)==FALSE) - die(STATE_UNKNOWN, _("Invalid section '%s' in config file '%s'\n"), i.stanza, i.file); + inifile = strcmp(i.file, "-") == 0 ? stdin : fopen(i.file, "r"); - free(i.file); - if(inifile!=stdin) fclose(inifile); - } + if (inifile == NULL) + die(STATE_UNKNOWN, _("Can't read config file: %s\n"), + strerror(errno)); + if (read_defaults(inifile, i.stanza, &defaults) == FALSE) + die(STATE_UNKNOWN, + _("Invalid section '%s' in config file '%s'\n"), i.stanza, + i.file); + + free(i.file); + if (inifile != stdin) + fclose(inifile); free(i.stanza); + if (is_suid_plugin && idpriv_temp_restore() == -1) + die(STATE_UNKNOWN, _("Cannot restore privileges: %s\n"), + strerror(errno)); + return defaults; } -/* read_defaults is where the meat of the parsing takes place. +/* + * The read_defaults() function is where the meat of the parsing takes place. * - * note that this may be called by a setuid binary, so we need to + * Note that this may be called by a setuid binary, so we need to * be extra careful about user-supplied input (i.e. avoiding possible - * format string vulnerabilities, etc) + * format string vulnerabilities, etc). */ -static int read_defaults(FILE *f, const char *stanza, np_arg_list **opts){ - int c, status=FALSE; +static int +read_defaults(FILE *f, const char *stanza, np_arg_list **opts) +{ + int c, status = FALSE; size_t i, stanza_len; - enum { NOSTANZA, WRONGSTANZA, RIGHTSTANZA } stanzastate=NOSTANZA; + enum { NOSTANZA, WRONGSTANZA, RIGHTSTANZA } stanzastate = NOSTANZA; - stanza_len=strlen(stanza); + stanza_len = strlen(stanza); - /* our little stanza-parsing state machine. */ - while((c=fgetc(f))!=EOF){ + /* our little stanza-parsing state machine */ + while ((c = fgetc(f)) != EOF) { /* gobble up leading whitespace */ - if(isspace(c)) continue; - switch(c){ + if (isspace(c)) + continue; + switch (c) { /* globble up coment lines */ - case ';': - case '#': + case ';': + case '#': + GOBBLE_TO(f, c, '\n'); + break; + /* start of a stanza, check to see if it matches */ + case '[': + stanzastate = WRONGSTANZA; + for (i = 0; i < stanza_len; i++) { + c = fgetc(f); + /* strip leading whitespace */ + if (i == 0) + for (; isspace(c); c = fgetc(f)) + continue; + /* nope, read to the end of the line */ + if (c != stanza[i]) { + GOBBLE_TO(f, c, '\n'); + break; + } + } + /* if it matched up to here and the next char is ']'... */ + if (i == stanza_len) { + c = fgetc(f); + /* strip trailing whitespace */ + for (; isspace(c); c = fgetc(f)) + continue; + if (c == ']') + stanzastate = RIGHTSTANZA; + } + break; + /* otherwise, we're in the body of a stanza or a parse error */ + default: + switch (stanzastate) { + /* we never found the start of the first stanza, so + * we're dealing with a config error + */ + case NOSTANZA: + die(STATE_UNKNOWN, "%s\n", + _("Config file error")); + /* we're in a stanza, but for a different plugin */ + case WRONGSTANZA: GOBBLE_TO(f, c, '\n'); break; - /* start of a stanza. check to see if it matches */ - case '[': - stanzastate=WRONGSTANZA; - for(i=0; i= linebuf_sz){ - linebuf_sz=(linebuf_sz>0)?linebuf_sz<<1:read_sz; - linebuf=realloc(linebuf, linebuf_sz); - if(linebuf==NULL) die(STATE_UNKNOWN, _("malloc() failed!\n")); + if (linebuf == NULL || read_pos + read_sz >= linebuf_sz) { + linebuf_sz = linebuf_sz > 0 ? linebuf_sz << 1 : read_sz; + linebuf = realloc(linebuf, linebuf_sz); + if (linebuf == NULL) + die(STATE_UNKNOWN, _("malloc() failed!\n")); } - if(fgets(&linebuf[read_pos], read_sz, f)==NULL) done_reading=1; + if (fgets(&linebuf[read_pos], (int)read_sz, f) == NULL) + done_reading = 1; else { - read_pos=strlen(linebuf); - if(linebuf[read_pos-1]=='\n') { - linebuf[--read_pos]='\0'; - done_reading=1; + read_pos = strlen(linebuf); + if (linebuf[read_pos - 1] == '\n') { + linebuf[--read_pos] = '\0'; + done_reading = 1; } } } - lineend=&linebuf[read_pos]; - /* all that to read one line. isn't C fun? :) now comes the parsing :/ */ + lineend = &linebuf[read_pos]; + /* all that to read one line, isn't C fun? :) now comes the parsing :/ */ /* skip leading whitespace */ - for(optptr=linebuf; optptrnext=NULL; + optnew = malloc(sizeof(np_arg_list)); + optnew->next = NULL; - read_pos=0; - optnew->arg=(char *)malloc(cfg_len+1); + read_pos = 0; + optnew->arg = malloc(cfg_len + 1); /* 1-character params needs only one dash */ - if(opt_len==1) { + if (opt_len == 1) { strncpy(&optnew->arg[read_pos], "-", 1); - read_pos+=1; + read_pos += 1; } else { strncpy(&optnew->arg[read_pos], "--", 2); - read_pos+=2; + read_pos += 2; } - strncpy(&optnew->arg[read_pos], optptr, opt_len); read_pos+=opt_len; - if(value) { - optnew->arg[read_pos++]='='; - strncpy(&optnew->arg[read_pos], valptr, val_len); read_pos+=val_len; + strncpy(&optnew->arg[read_pos], optptr, opt_len); + read_pos += opt_len; + if (value) { + optnew->arg[read_pos++] = '='; + strncpy(&optnew->arg[read_pos], valptr, val_len); + read_pos += val_len; } - optnew->arg[read_pos]='\0'; + optnew->arg[read_pos] = '\0'; /* ...and put that to the end of the list */ - if(*optlst==NULL) { - *optlst=optnew; - } else { - while(opttmp->next!=NULL) { - opttmp=opttmp->next; - } + if (*optlst == NULL) + *optlst = optnew; + else { + while (opttmp->next != NULL) + opttmp = opttmp->next; opttmp->next = optnew; } @@ -295,72 +354,42 @@ static int add_option(FILE *f, np_arg_list **optlst){ return 0; } -static char* default_file(void){ - struct stat sb; - char *np_env=NULL, *default_file=NULL; - char temp_file[MAX_INPUT_BUFFER]; - size_t len; +static char * +default_file(void) +{ + char **p, *ini_file; - if((np_env=getenv("NAGIOS_CONFIG_PATH"))!=NULL) { - /* skip any starting colon... */ - while(*np_env==':') np_env++; - /* Look for NP_DEFAULT_INI_FILENAME1 and NP_DEFAULT_INI_FILENAME2 in - * every PATHs defined (colon-separated). - */ - while((len=strcspn(np_env,":"))>0){ - /* Test NP_DEFAULT_INI_FILENAME[1-2] in current np_env token */ - if(test_file(np_env,len,NP_DEFAULT_INI_FILENAME1,temp_file)==1 || - test_file(np_env,len,NP_DEFAULT_INI_FILENAME2,temp_file)==1){ - default_file=strdup(temp_file); - break; + if ((ini_file = getenv("MP_CONFIG_FILE")) != NULL || + (ini_file = default_file_in_path()) != NULL) + return ini_file; + for (p = default_ini_path_names; *p != NULL; p++) + if (access(*p, F_OK) == 0) + return *p; + return NULL; +} + +static char * +default_file_in_path(void) +{ + char *config_path, **file; + char *dir, *ini_file, *tokens; + + if ((config_path = getenv("NAGIOS_CONFIG_PATH")) == NULL) + return NULL; + /* shall we spit out a warning that NAGIOS_CONFIG_PATH is deprecated? */ + + if ((tokens = strdup(config_path)) == NULL) + die(STATE_UNKNOWN, "%s\n", _("Insufficient Memory")); + for (dir = strtok(tokens, ":"); dir != NULL; dir = strtok(NULL, ":")) { + for (file = default_ini_file_names; *file != NULL; file++) { + if ((asprintf(&ini_file, "%s/%s", dir, *file)) < 0) + die(STATE_UNKNOWN, "%s\n", _("Insufficient Memory")); + if (access(ini_file, F_OK) == 0) { + free(tokens); + return ini_file; } - - /* Move on to the next token */ - np_env+=len; - while(*np_env==':') np_env++; - } /* while(...) */ - } /* if(getenv("NAGIOS_CONFIG_PATH")) */ - - /* Look for NP_DEFAULT_INI_FILENAME1 in NP_DEFAULT_INI_NAGIOS_PATH[1-4] */ - if(!default_file){ - if(test_file(NP_DEFAULT_INI_NAGIOS_PATH1,strlen(NP_DEFAULT_INI_NAGIOS_PATH1),NP_DEFAULT_INI_FILENAME1,temp_file)==1 || - test_file(NP_DEFAULT_INI_NAGIOS_PATH2,strlen(NP_DEFAULT_INI_NAGIOS_PATH2),NP_DEFAULT_INI_FILENAME1,temp_file)==1 || - test_file(NP_DEFAULT_INI_NAGIOS_PATH3,strlen(NP_DEFAULT_INI_NAGIOS_PATH3),NP_DEFAULT_INI_FILENAME1,temp_file)==1 || - test_file(NP_DEFAULT_INI_NAGIOS_PATH4,strlen(NP_DEFAULT_INI_NAGIOS_PATH4),NP_DEFAULT_INI_FILENAME1,temp_file)==1) - default_file=strdup(temp_file); + } } - - /* Look for NP_DEFAULT_INI_FILENAME2 in NP_DEFAULT_INI_PATH[1-3] */ - if(!default_file){ - if(test_file(NP_DEFAULT_INI_PATH1,strlen(NP_DEFAULT_INI_PATH1),NP_DEFAULT_INI_FILENAME2,temp_file)==1 || - test_file(NP_DEFAULT_INI_PATH2,strlen(NP_DEFAULT_INI_PATH2),NP_DEFAULT_INI_FILENAME2,temp_file)==1 || - test_file(NP_DEFAULT_INI_PATH3,strlen(NP_DEFAULT_INI_PATH3),NP_DEFAULT_INI_FILENAME2,temp_file)==1) - default_file=strdup(temp_file); - } - - /* Return default_file or empty string (should return NULL if we want plugins - * to die there)... - */ - if(default_file) - return default_file; - return ""; + free(tokens); + return NULL; } - -/* put together len bytes from env and the filename and test for its - * existence. Returns 1 if found, 0 if not and -1 if test wasn't performed. - */ -static int test_file(const char* env, int len, const char* file, char* temp_file){ - struct stat sb; - - /* test if len + filelen + '/' + '\0' fits in temp_file */ - if((len+strlen(file)+2)>MAX_INPUT_BUFFER) return -1; - - strncpy(temp_file,env,len); - temp_file[len]='\0'; - strncat(temp_file,"/",len+1); - strncat(temp_file,file,len+strlen(file)+1); - - if(stat(temp_file, &sb) != -1) return 1; - return 0; -} - diff --git a/lib/parse_ini.h b/lib/parse_ini.h index e0ba816..e37601b 100644 --- a/lib/parse_ini.h +++ b/lib/parse_ini.h @@ -2,7 +2,7 @@ #define _PARSE_INI_H_ /* - * parse_ini.h: routines for loading nagios-plugin defaults from ini + * parse_ini.h: routines for loading monitoring-plugin defaults from ini * configuration files. */ @@ -13,50 +13,10 @@ typedef struct np_arg_el { struct np_arg_el *next; } np_arg_list; -/* FIXME: This is in plugins/common.c. Should be eventually moved to lib/ - * (although for this particular one a configure settings should be ideal) - */ -#ifndef MAX_INPUT_BUFFER -# define MAX_INPUT_BUFFER 8192 -#endif /* MAX_INPUT_BUFFER */ - -/* Filenames (see below) */ -#ifndef NP_DEFAULT_INI_FILENAME1 -# define NP_DEFAULT_INI_FILENAME1 "plugins.ini" -#endif /* NP_DEFAULT_INI_FILENAME1 */ -#ifndef NP_DEFAULT_INI_FILENAME2 -# define NP_DEFAULT_INI_FILENAME2 "nagios-plugins.ini" -#endif /* NP_DEFAULT_INI_FILENAME2 */ - -/* Config paths ending in nagios (search for NP_DEFAULT_INI_FILENAME1) */ -#ifndef NP_DEFAULT_INI_NAGIOS_PATH1 -# define NP_DEFAULT_INI_NAGIOS_PATH1 "/etc/nagios" -#endif /* NP_DEFAULT_INI_NAGIOS_PATH1 */ -#ifndef NP_DEFAULT_INI_NAGIOS_PATH2 -# define NP_DEFAULT_INI_NAGIOS_PATH2 "/usr/local/nagios/etc" -#endif /* NP_DEFAULT_INI_NAGIOS_PATH2 */ -#ifndef NP_DEFAULT_INI_NAGIOS_PATH3 -# define NP_DEFAULT_INI_NAGIOS_PATH3 "/usr/local/etc/nagios" -#endif /* NP_DEFAULT_INI_NAGIOS_PATH3 */ -#ifndef NP_DEFAULT_INI_NAGIOS_PATH4 -# define NP_DEFAULT_INI_NAGIOS_PATH4 "/etc/opt/nagios" -#endif /* NP_DEFAULT_INI_NAGIOS_PATH4 */ - -/* Config paths not ending in nagios (search for NP_DEFAULT_INI_FILENAME2) */ -#ifndef NP_DEFAULT_INI_PATH1 -# define NP_DEFAULT_INI_PATH1 "/etc" -#endif /* NP_DEFAULT_INI_PATH1 */ -#ifndef NP_DEFAULT_INI_PATH2 -# define NP_DEFAULT_INI_PATH2 "/usr/local/etc" -#endif /* NP_DEFAULT_INI_PATH2 */ -#ifndef NP_DEFAULT_INI_PATH3 -# define NP_DEFAULT_INI_PATH3 "/etc/opt" -#endif /* NP_DEFAULT_INI_PATH3 */ - /* np_load_defaults: load the default configuration (if present) for * a plugin from the ini file */ -np_arg_list* np_get_defaults(const char *locator, const char *default_section); +np_arg_list *np_get_defaults(const char *locator, const char *default_section); #endif /* _PARSE_INI_H_ */ diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index 1af5891..a8d7ade 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -5,9 +5,8 @@ noinst_PROGRAMS = @EXTRA_TEST@ TESTS = @EXTRA_TEST@ check_PROGRAMS = @EXTRA_TEST@ -AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" - -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins +AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \ + -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3 @@ -28,7 +27,7 @@ endif AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags) AM_LDFLAGS = $(tap_ldflags) -ltap -LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a +LDADD = $(top_srcdir)/lib/libmonitoringplug.a $(top_srcdir)/gl/libgnu.a SOURCES = 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 diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index 0c1860e..3cf93f9 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -82,6 +82,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/gnulib-common.m4 \ $(top_srcdir)/gl/m4/gnulib-comp.m4 \ $(top_srcdir)/gl/m4/hostent.m4 $(top_srcdir)/gl/m4/iconv.m4 \ + $(top_srcdir)/gl/m4/idpriv.m4 \ $(top_srcdir)/gl/m4/include_next.m4 \ $(top_srcdir)/gl/m4/inet_ntop.m4 \ $(top_srcdir)/gl/m4/intlmacosx.m4 \ @@ -131,11 +132,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdbool.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ - $(top_srcdir)/gl/m4/stdlib_h.m4 \ + $(top_srcdir)/gl/m4/stdlib_h.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ - $(top_srcdir)/gl/m4/string_h.m4 $(top_srcdir)/gl/m4/strndup.m4 \ - $(top_srcdir)/gl/m4/strnlen.m4 $(top_srcdir)/gl/m4/strsep.m4 \ - $(top_srcdir)/gl/m4/strstr.m4 \ + $(top_srcdir)/gl/m4/string_h.m4 \ + $(top_srcdir)/gl/m4/strings_h.m4 \ + $(top_srcdir)/gl/m4/strndup.m4 $(top_srcdir)/gl/m4/strnlen.m4 \ + $(top_srcdir)/gl/m4/strsep.m4 $(top_srcdir)/gl/m4/strstr.m4 \ $(top_srcdir)/gl/m4/sys_socket_h.m4 \ $(top_srcdir)/gl/m4/sys_types_h.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ @@ -150,7 +152,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \ $(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/xalloc.m4 \ $(top_srcdir)/gl/m4/xsize.m4 $(top_srcdir)/gl/m4/xstrndup.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs @@ -161,52 +163,52 @@ PROGRAMS = $(noinst_PROGRAMS) test_base64_SOURCES = test_base64.c test_base64_OBJECTS = test_base64.$(OBJEXT) test_base64_LDADD = $(LDADD) -test_base64_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \ +test_base64_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a test_cmd_SOURCES = test_cmd.c test_cmd_OBJECTS = test_cmd.$(OBJEXT) test_cmd_LDADD = $(LDADD) -test_cmd_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \ +test_cmd_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a test_disk_SOURCES = test_disk.c test_disk_OBJECTS = test_disk.$(OBJEXT) test_disk_LDADD = $(LDADD) -test_disk_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \ +test_disk_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a test_ini1_SOURCES = test_ini1.c test_ini1_OBJECTS = test_ini1.$(OBJEXT) test_ini1_LDADD = $(LDADD) -test_ini1_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \ +test_ini1_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a test_ini3_SOURCES = test_ini3.c test_ini3_OBJECTS = test_ini3.$(OBJEXT) test_ini3_LDADD = $(LDADD) -test_ini3_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \ +test_ini3_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a test_opts1_SOURCES = test_opts1.c test_opts1_OBJECTS = test_opts1.$(OBJEXT) test_opts1_LDADD = $(LDADD) -test_opts1_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \ +test_opts1_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a test_opts2_SOURCES = test_opts2.c test_opts2_OBJECTS = test_opts2.$(OBJEXT) test_opts2_LDADD = $(LDADD) -test_opts2_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \ +test_opts2_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a test_opts3_SOURCES = test_opts3.c test_opts3_OBJECTS = test_opts3.$(OBJEXT) test_opts3_LDADD = $(LDADD) -test_opts3_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \ +test_opts3_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a test_tcp_SOURCES = test_tcp.c test_tcp_OBJECTS = test_tcp.$(OBJEXT) test_tcp_LDADD = $(LDADD) -test_tcp_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \ +test_tcp_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a test_utils_SOURCES = test_utils.c test_utils_OBJECTS = test_utils.$(OBJEXT) test_utils_LDADD = $(LDADD) -test_utils_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \ +test_utils_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp @@ -346,6 +348,7 @@ GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ +GNULIB_FFS = @GNULIB_FFS@ GNULIB_FFSL = @GNULIB_FFSL@ GNULIB_FFSLL = @GNULIB_FFSLL@ GNULIB_FGETC = @GNULIB_FGETC@ @@ -711,6 +714,7 @@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ +HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ @@ -740,6 +744,7 @@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FEATURES_H = @HAVE_FEATURES_H@ +HAVE_FFS = @HAVE_FFS@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FMA = @HAVE_FMA@ @@ -851,8 +856,10 @@ HAVE_SQRTL = @HAVE_SQRTL@ HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ +HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRINGS_H = @HAVE_STRINGS_H@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -943,7 +950,6 @@ LD = @LD@ LDAPINCLUDE = @LDAPINCLUDE@ LDAPLIBS = @LDAPLIBS@ LDFLAGS = @LDFLAGS@ -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ LIBICONV = @LIBICONV@ @@ -969,6 +975,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MATHLIBS = @MATHLIBS@ @@ -994,6 +1001,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ +NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ @@ -1014,6 +1022,7 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_STDINT_H = @NEXT_STDINT_H@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ +NEXT_STRINGS_H = @NEXT_STRINGS_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ @@ -1073,7 +1082,6 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PST3CFLAGS = @PST3CFLAGS@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -PYTHON = @PYTHON@ RADIUSLIBS = @RADIUSLIBS@ RANLIB = @RANLIB@ RELEASE = @RELEASE@ @@ -1265,7 +1273,6 @@ SCRIPT_TEST = @SCRIPT_TEST@ SED = @SED@ SERVENT_LIB = @SERVENT_LIB@ SET_MAKE = @SET_MAKE@ -SH = @SH@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ @@ -1289,6 +1296,7 @@ WARRANTY = @WARRANTY@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ +WTSAPI32LIBS = @WTSAPI32LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -1358,8 +1366,9 @@ noinst_PROGRAMS = @EXTRA_TEST@ # These two lines support "make check", but we use "make test" TESTS = @EXTRA_TEST@ check_PROGRAMS = @EXTRA_TEST@ -AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins +AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \ + -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins + np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t np_test_files = config-dos.ini config-opts.ini config-tiny.ini plugin.ini plugins.ini EXTRA_DIST = $(np_test_scripts) $(np_test_files) var @@ -1369,13 +1378,13 @@ EXTRA_DIST = $(np_test_scripts) $(np_test_files) var @USE_LIBTAP_LOCAL_TRUE@tap_ldadd = $(top_srcdir)/gl/libgnu.a AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags) AM_LDFLAGS = $(tap_ldflags) -ltap -LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a +LDADD = $(top_srcdir)/lib/libmonitoringplug.a $(top_srcdir)/gl/libgnu.a SOURCES = 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 all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1400,9 +1409,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): diff --git a/lib/tests/test_base64.t b/lib/tests/test_base64.t index 4b9236f..4ad6473 100755 --- a/lib/tests/test_base64.t +++ b/lib/tests/test_base64.t @@ -1,6 +1,6 @@ #!/usr/bin/perl use Test::More; if (! -e "./test_base64") { - plan skip_all => "./test_base64 not compiled - please install tap library to test"; + plan skip_all => "./test_base64 not compiled - please enable libtap library to test"; } exec "./test_base64"; diff --git a/lib/tests/test_cmd.t b/lib/tests/test_cmd.t index 4dd54ef..c50dded 100644 --- a/lib/tests/test_cmd.t +++ b/lib/tests/test_cmd.t @@ -1,6 +1,6 @@ #!/usr/bin/perl use Test::More; if (! -e "./test_cmd") { - plan skip_all => "./test_cmd not compiled - please install tap library to test"; + plan skip_all => "./test_cmd not compiled - please enable libtap library to test"; } exec "./test_cmd"; diff --git a/lib/tests/test_disk.t b/lib/tests/test_disk.t index d32567a..da84dfd 100755 --- a/lib/tests/test_disk.t +++ b/lib/tests/test_disk.t @@ -1,6 +1,6 @@ #!/usr/bin/perl use Test::More; if (! -e "./test_disk") { - plan skip_all => "./test_disk not compiled - please install tap library to test"; + plan skip_all => "./test_disk not compiled - please enable libtap library to test"; } exec "./test_disk"; diff --git a/lib/tests/test_ini1.t b/lib/tests/test_ini1.t index d481011..25baed9 100755 --- a/lib/tests/test_ini1.t +++ b/lib/tests/test_ini1.t @@ -1,6 +1,6 @@ #!/usr/bin/perl use Test::More; if (! -e "./test_ini1") { - plan skip_all => "./test_ini not compiled - please install tap library and/or enable parse-ini to test"; + plan skip_all => "./test_ini not compiled - please enable libtap library and/or extra-opts to test"; } exec "./test_ini1"; diff --git a/lib/tests/test_ini3.t b/lib/tests/test_ini3.t index 4b0be4c..a2ca94a 100755 --- a/lib/tests/test_ini3.t +++ b/lib/tests/test_ini3.t @@ -4,7 +4,7 @@ use strict; use warnings; if (! -e "./test_ini3") { - plan skip_all => "./test_ini not compiled - please install tap library and/or enable parse-ini to test"; + plan skip_all => "./test_ini not compiled - please enable libtap library and/or extra-opts to test"; } # array of argument arrays diff --git a/lib/tests/test_opts1.t b/lib/tests/test_opts1.t index 52eed94..1934f12 100755 --- a/lib/tests/test_opts1.t +++ b/lib/tests/test_opts1.t @@ -1,6 +1,6 @@ #!/usr/bin/perl use Test::More; if (! -e "./test_opts1") { - plan skip_all => "./test_opts1 not compiled - please install tap library and/or enable parse-ini to test"; + plan skip_all => "./test_opts1 not compiled - please enable libtap library and/or extra-opts to test"; } exec "./test_opts1"; diff --git a/lib/tests/test_opts2.t b/lib/tests/test_opts2.t index f7444f6..59b9fdb 100755 --- a/lib/tests/test_opts2.t +++ b/lib/tests/test_opts2.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use Test::More; if (! -e "./test_opts2") { - plan skip_all => "./test_opts2 not compiled - please install tap library and/or enable parse-ini to test"; + plan skip_all => "./test_opts2 not compiled - please enable libtap library and/or extra-opts to test"; } $ENV{"NAGIOS_CONFIG_PATH"} = "."; exec "./test_opts2"; diff --git a/lib/tests/test_opts3.t b/lib/tests/test_opts3.t index fa7876d..8d974ca 100755 --- a/lib/tests/test_opts3.t +++ b/lib/tests/test_opts3.t @@ -4,7 +4,7 @@ use strict; use warnings; if (! -e "./test_opts3") { - plan skip_all => "./test_opts3 not compiled - please install tap library and/or enable parse-ini to test"; + plan skip_all => "./test_opts3 not compiled - please enable libtap library and/or extra-opts to test"; } # array of argument arrays diff --git a/lib/tests/test_tcp.t b/lib/tests/test_tcp.t index 8f34b67..e5e12fc 100755 --- a/lib/tests/test_tcp.t +++ b/lib/tests/test_tcp.t @@ -1,6 +1,6 @@ #!/usr/bin/perl use Test::More; if (! -e "./test_tcp") { - plan skip_all => "./test_tcp not compiled - please install tap library to test"; + plan skip_all => "./test_tcp not compiled - please enable libtap library to test"; } exec "./test_tcp"; diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c index 79e1110..f35b7e2 100644 --- a/lib/tests/test_utils.c +++ b/lib/tests/test_utils.c @@ -21,6 +21,7 @@ #include "tap.h" +#include #include #include @@ -29,31 +30,32 @@ int main (int argc, char **argv) { + char state_path[1024]; range *range; double temp; thresholds *thresholds = NULL; - int rc; + int i, rc; char *temp_string; state_key *temp_state_key = NULL; state_data *temp_state_data; time_t current_time; - plan_tests(150); + plan_tests(185); - ok( this_nagios_plugin==NULL, "nagios_plugin not initialised"); + ok( this_monitoring_plugin==NULL, "monitoring_plugin not initialised"); np_init( "check_test", argc, argv ); - ok( this_nagios_plugin!=NULL, "nagios_plugin now initialised"); - ok( !strcmp(this_nagios_plugin->plugin_name, "check_test"), "plugin name initialised" ); + ok( this_monitoring_plugin!=NULL, "monitoring_plugin now initialised"); + ok( !strcmp(this_monitoring_plugin->plugin_name, "check_test"), "plugin name initialised" ); - ok( this_nagios_plugin->argc==argc, "Argc set" ); - ok( this_nagios_plugin->argv==argv, "Argv set" ); + ok( this_monitoring_plugin->argc==argc, "Argc set" ); + ok( this_monitoring_plugin->argv==argv, "Argv set" ); np_set_args(0,0); - ok( this_nagios_plugin->argc==0, "argc changed" ); - ok( this_nagios_plugin->argv==0, "argv changed" ); + ok( this_monitoring_plugin->argc==0, "argc changed" ); + ok( this_monitoring_plugin->argv==0, "argv changed" ); np_set_args(argc, argv); @@ -182,6 +184,21 @@ main (int argc, char **argv) ok( get_status(30.0001, thresholds) == STATE_WARNING, "30.0001 - warning"); ok( get_status(69, thresholds) == STATE_CRITICAL, "69 - critical"); + rc = _set_thresholds(&thresholds, "-10:-2", "-30:20"); + ok( rc == 0, "Thresholds ('-30:20', '-10:-2') set"); + ok( thresholds->warning->start == -10, "Warning start set correctly"); + ok( thresholds->warning->end == -2, "Warning end set correctly"); + ok( thresholds->critical->start == -30, "Critical start set correctly"); + ok( thresholds->critical->end == 20, "Critical end set correctly"); + ok( get_status(-31, thresholds) == STATE_CRITICAL, "-31 - critical"); + ok( get_status(-29, thresholds) == STATE_WARNING, "-29 - warning"); + ok( get_status(-11, thresholds) == STATE_WARNING, "-11 - warning"); + ok( get_status(-10, thresholds) == STATE_OK, "-10 - ok"); + ok( get_status(-2, thresholds) == STATE_OK, "-2 - ok"); + ok( get_status(-1, thresholds) == STATE_WARNING, "-1 - warning"); + ok( get_status(19, thresholds) == STATE_WARNING, "19 - warning"); + ok( get_status(21, thresholds) == STATE_CRITICAL, "21 - critical"); + char *test; test = np_escaped_string("bob\\n"); ok( strcmp(test, "bob\n") == 0, "bob\\n ok"); @@ -296,23 +313,23 @@ main (int argc, char **argv) diag( "You are probably running in wrong directory. Must run as ./test_utils" ); - this_nagios_plugin->argc=4; - this_nagios_plugin->argv[0] = "./test_utils"; - this_nagios_plugin->argv[1] = "here"; - this_nagios_plugin->argv[2] = "--and"; - this_nagios_plugin->argv[3] = "now"; + this_monitoring_plugin->argc=4; + this_monitoring_plugin->argv[0] = "./test_utils"; + this_monitoring_plugin->argv[1] = "here"; + this_monitoring_plugin->argv[2] = "--and"; + this_monitoring_plugin->argv[3] = "now"; temp_string = (char *) _np_state_generate_key(); ok(!strcmp(temp_string, "94b5e17bf5abf51cb15aff5f69b96f2f8dac5ecd"), "Got based on expected argv" ); - unsetenv("NAGIOS_PLUGIN_STATE_DIRECTORY"); + unsetenv("MP_STATE_PATH"); temp_string = (char *) _np_state_calculate_location_prefix(); ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory" ); - setenv("NAGIOS_PLUGIN_STATE_DIRECTORY", "", 1); + setenv("MP_STATE_PATH", "", 1); temp_string = (char *) _np_state_calculate_location_prefix(); ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory even with empty string" ); - setenv("NAGIOS_PLUGIN_STATE_DIRECTORY", "/usr/local/nagios/var", 1); + setenv("MP_STATE_PATH", "/usr/local/nagios/var", 1); temp_string = (char *) _np_state_calculate_location_prefix(); ok(!strcmp(temp_string, "/usr/local/nagios/var"), "Got default directory" ); @@ -320,36 +337,38 @@ main (int argc, char **argv) ok(temp_state_key==NULL, "temp_state_key initially empty"); - this_nagios_plugin->argc=1; - this_nagios_plugin->argv[0] = "./test_utils"; + this_monitoring_plugin->argc=1; + this_monitoring_plugin->argv[0] = "./test_utils"; np_enable_state(NULL, 51); - temp_state_key = this_nagios_plugin->state; + temp_state_key = this_monitoring_plugin->state; ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" ); ok( !strcmp(temp_state_key->name, "83d877b6cdfefb5d6f06101fd6fe76762f21792c"), "Got generated filename" ); np_enable_state("allowedchars_in_keyname", 77); - temp_state_key = this_nagios_plugin->state; + temp_state_key = this_monitoring_plugin->state; + sprintf(state_path, "/usr/local/nagios/var/%lu/check_test/allowedchars_in_keyname", (unsigned long)geteuid()); ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" ); ok( !strcmp(temp_state_key->name, "allowedchars_in_keyname"), "Got key name with valid chars" ); - ok( !strcmp(temp_state_key->_filename, "/usr/local/nagios/var/check_test/allowedchars_in_keyname"), "Got internal filename" ); + ok( !strcmp(temp_state_key->_filename, state_path), "Got internal filename" ); /* Don't do this test just yet. Will die */ /* np_enable_state("bad^chars$in@here", 77); - temp_state_key = this_nagios_plugin->state; + temp_state_key = this_monitoring_plugin->state; ok( !strcmp(temp_state_key->name, "bad_chars_in_here"), "Got key name with bad chars replaced" ); */ np_enable_state("funnykeyname", 54); - temp_state_key = this_nagios_plugin->state; + temp_state_key = this_monitoring_plugin->state; + sprintf(state_path, "/usr/local/nagios/var/%lu/check_test/funnykeyname", (unsigned long)geteuid()); ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" ); ok( !strcmp(temp_state_key->name, "funnykeyname"), "Got key name" ); - ok( !strcmp(temp_state_key->_filename, "/usr/local/nagios/var/check_test/funnykeyname"), "Got internal filename" ); + ok( !strcmp(temp_state_key->_filename, state_path), "Got internal filename" ); ok( temp_state_key->data_version==54, "Version set" ); temp_state_data = np_state_read(); @@ -367,9 +386,9 @@ main (int argc, char **argv) temp_state_key->_filename="var/statefile"; temp_state_data = np_state_read(); - 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"); - ok( this_nagios_plugin->state->state_data->time==1234567890, "Got time" ); - ok( !strcmp((char *)this_nagios_plugin->state->state_data->data, "String to read"), "Data as expected" ); + 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"); + ok( this_monitoring_plugin->state->state_data->time==1234567890, "Got time" ); + ok( !strcmp((char *)this_monitoring_plugin->state->state_data->data, "String to read"), "Data as expected" ); temp_state_key->data_version=53; temp_state_data = np_state_read(); @@ -379,7 +398,7 @@ main (int argc, char **argv) temp_state_key->_filename="var/nonexistant"; temp_state_data = np_state_read(); ok( temp_state_data==NULL, "Missing file gives NULL" ); - ok( this_nagios_plugin->state->state_data==NULL, "No state information" ); + ok( this_monitoring_plugin->state->state_data==NULL, "No state information" ); temp_state_key->_filename="var/oldformat"; temp_state_data = np_state_read(); @@ -426,7 +445,7 @@ main (int argc, char **argv) temp_state_data = np_state_read(); /* Check time is set to current_time */ ok(system("cmp var/generated var/statefile > /dev/null")!=0, "Generated file should be different this time"); - ok(this_nagios_plugin->state->state_data->time-current_time<=1, "Has time generated from current time"); + ok(this_monitoring_plugin->state->state_data->time-current_time<=1, "Has time generated from current time"); /* Don't know how to automatically test this. Need to be able to redefine die and catch the error */ @@ -438,7 +457,54 @@ main (int argc, char **argv) np_cleanup(); - ok( this_nagios_plugin==NULL, "Free'd this_nagios_plugin" ); + ok(this_monitoring_plugin==NULL, "Free'd this_monitoring_plugin"); + + ok(mp_suid() == FALSE, "Test aren't suid"); + + /* base states with random case */ + char *states[] = { + "Ok", + "wArnINg", + "cRiTIcaL", + "UnKNoWN", + NULL + }; + + for (i=0; states[i]!=NULL; i++) { + /* out of the random case states, create the lower and upper versions + numeric string one */ + char *statelower = strdup(states[i]); + char *stateupper = strdup(states[i]); + char statenum[2]; + char *temp_ptr; + for (temp_ptr = statelower; *temp_ptr; temp_ptr++) { + *temp_ptr = tolower(*temp_ptr); + } + for (temp_ptr = stateupper; *temp_ptr; temp_ptr++) { + *temp_ptr = toupper(*temp_ptr); + } + snprintf(statenum, 2, "%i", i); + + /* Base test names, we'll append the state string */ + char testname[64] = "Translate state string: "; + int tlen = strlen(testname); + + strcpy(testname+tlen, states[i]); + ok(i==mp_translate_state(states[i]), testname); + + strcpy(testname+tlen, statelower); + ok(i==mp_translate_state(statelower), testname); + + strcpy(testname+tlen, stateupper); + ok(i==mp_translate_state(stateupper), testname); + + strcpy(testname+tlen, statenum); + ok(i==mp_translate_state(statenum), testname); + } + ok(ERROR==mp_translate_state("warningfewgw"), "Translate state string with garbage"); + ok(ERROR==mp_translate_state("00"), "Translate state string: bad numeric string 1"); + ok(ERROR==mp_translate_state("01"), "Translate state string: bad numeric string 2"); + ok(ERROR==mp_translate_state("10"), "Translate state string: bad numeric string 3"); + ok(ERROR==mp_translate_state(""), "Translate state string: empty string"); return exit_status(); } diff --git a/lib/tests/test_utils.t b/lib/tests/test_utils.t index 152eb71..e2a9311 100755 --- a/lib/tests/test_utils.t +++ b/lib/tests/test_utils.t @@ -1,6 +1,6 @@ #!/usr/bin/perl use Test::More; if (! -e "./test_utils") { - plan skip_all => "./test_utils not compiled - please install tap library to test"; + plan skip_all => "./test_utils not compiled - please enable libtap library to test"; } exec "./test_utils"; diff --git a/lib/utils_base.c b/lib/utils_base.c index 54463e9..addf26b 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c @@ -3,7 +3,7 @@ * utils_base.c * * License: GPL -* Copyright (c) 2006 Nagios Plugins Development Team +* Copyright (c) 2006 Monitoring Plugins Development Team * * Library of useful functions for plugins * @@ -30,56 +30,58 @@ #include #include #include +#include +#include #define np_free(ptr) { if(ptr) { free(ptr); ptr = NULL; } } -nagios_plugin *this_nagios_plugin=NULL; +monitoring_plugin *this_monitoring_plugin=NULL; int _np_state_read_file(FILE *); void np_init( char *plugin_name, int argc, char **argv ) { - if (this_nagios_plugin==NULL) { - this_nagios_plugin = calloc(1, sizeof(nagios_plugin)); - if (this_nagios_plugin==NULL) { + if (this_monitoring_plugin==NULL) { + this_monitoring_plugin = calloc(1, sizeof(monitoring_plugin)); + if (this_monitoring_plugin==NULL) { die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno)); } - this_nagios_plugin->plugin_name = strdup(plugin_name); - if (this_nagios_plugin->plugin_name==NULL) + this_monitoring_plugin->plugin_name = strdup(plugin_name); + if (this_monitoring_plugin->plugin_name==NULL) die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno)); - this_nagios_plugin->argc = argc; - this_nagios_plugin->argv = argv; + this_monitoring_plugin->argc = argc; + this_monitoring_plugin->argv = argv; } } void np_set_args( int argc, char **argv ) { - if (this_nagios_plugin==NULL) + if (this_monitoring_plugin==NULL) die(STATE_UNKNOWN, _("This requires np_init to be called")); - this_nagios_plugin->argc = argc; - this_nagios_plugin->argv = argv; + this_monitoring_plugin->argc = argc; + this_monitoring_plugin->argv = argv; } void np_cleanup() { - if (this_nagios_plugin!=NULL) { - if(this_nagios_plugin->state!=NULL) { - if(this_nagios_plugin->state->state_data) { - np_free(this_nagios_plugin->state->state_data->data); - np_free(this_nagios_plugin->state->state_data); + if (this_monitoring_plugin!=NULL) { + if(this_monitoring_plugin->state!=NULL) { + if(this_monitoring_plugin->state->state_data) { + np_free(this_monitoring_plugin->state->state_data->data); + np_free(this_monitoring_plugin->state->state_data); } - np_free(this_nagios_plugin->state->name); - np_free(this_nagios_plugin->state); + np_free(this_monitoring_plugin->state->name); + np_free(this_monitoring_plugin->state); } - np_free(this_nagios_plugin->plugin_name); - np_free(this_nagios_plugin); + np_free(this_monitoring_plugin->plugin_name); + np_free(this_monitoring_plugin); } - this_nagios_plugin=NULL; + this_monitoring_plugin=NULL; } -/* Hidden function to get a pointer to this_nagios_plugin for testing */ -void _get_nagios_plugin( nagios_plugin **pointer ){ - *pointer = this_nagios_plugin; +/* Hidden function to get a pointer to this_monitoring_plugin for testing */ +void _get_monitoring_plugin( monitoring_plugin **pointer ){ + *pointer = this_monitoring_plugin; } void @@ -89,7 +91,7 @@ die (int result, const char *fmt, ...) va_start (ap, fmt); vprintf (fmt, ap); va_end (ap); - if(this_nagios_plugin!=NULL) { + if(this_monitoring_plugin!=NULL) { np_cleanup(); } exit (result); @@ -298,19 +300,6 @@ char *np_escaped_string (const char *string) { int np_check_if_root(void) { return (geteuid() == 0); } -int np_warn_if_not_root(void) { - int status = np_check_if_root(); - if(!status) { - printf(_("Warning: ")); - printf(_("This plugin must be either run as root or setuid root.\n")); - printf(_("To run as root, you can use a tool like sudo.\n")); - printf(_("To set the setuid permissions, use the command:\n")); - /* XXX could we use something like progname? */ - printf("\tchmod u+s yourpluginfile\n"); - } - return status; -} - /* * Extract the value from key/value pairs, or return NULL. The value returned * can be free()ed. @@ -367,6 +356,23 @@ char *np_extract_value(const char *varlist, const char *name, char sep) { return value; } + +/* + * Read a string representing a state (ok, warning... or numeric: 0, 1) and + * return the corresponding STATE_ value or ERROR) + */ +int mp_translate_state (char *state_text) { + if (!strcasecmp(state_text,"OK") || !strcmp(state_text,"0")) + return STATE_OK; + if (!strcasecmp(state_text,"WARNING") || !strcmp(state_text,"1")) + return STATE_WARNING; + if (!strcasecmp(state_text,"CRITICAL") || !strcmp(state_text,"2")) + return STATE_CRITICAL; + if (!strcasecmp(state_text,"UNKNOWN") || !strcmp(state_text,"3")) + return STATE_UNKNOWN; + return ERROR; +} + /* * Returns a string to use as a keyname, based on an md5 hash of argv, thus * hopefully a unique key per service/plugin invocation. Use the extra-opts @@ -375,14 +381,14 @@ char *np_extract_value(const char *varlist, const char *name, char sep) { char *_np_state_generate_key() { struct sha1_ctx ctx; int i; - char **argv = this_nagios_plugin->argv; + char **argv = this_monitoring_plugin->argv; unsigned char result[20]; char keyname[41]; char *p=NULL; sha1_init_ctx(&ctx); - for(i=0; iargc; i++) { + for(i=0; iargc; i++) { sha1_process_bytes(argv[i], strlen(argv[i]), &ctx); } @@ -401,9 +407,9 @@ char *_np_state_generate_key() { } void _cleanup_state_data() { - if (this_nagios_plugin->state->state_data!=NULL) { - np_free(this_nagios_plugin->state->state_data->data); - np_free(this_nagios_plugin->state->state_data); + if (this_monitoring_plugin->state->state_data!=NULL) { + np_free(this_monitoring_plugin->state->state_data->data); + np_free(this_monitoring_plugin->state->state_data); } } @@ -415,9 +421,18 @@ void _cleanup_state_data() { char* _np_state_calculate_location_prefix(){ char *env_dir; - env_dir = getenv("NAGIOS_PLUGIN_STATE_DIRECTORY"); - if(env_dir && env_dir[0] != '\0') - return env_dir; + /* Do not allow passing MP_STATE_PATH in setuid plugins + * for security reasons */ + if (mp_suid() == FALSE) { + env_dir = getenv("MP_STATE_PATH"); + if(env_dir && env_dir[0] != '\0') + return env_dir; + /* This is the former ENV, for backward-compatibility */ + env_dir = getenv("NAGIOS_PLUGIN_STATE_DIRECTORY"); + if(env_dir && env_dir[0] != '\0') + return env_dir; + } + return NP_STATE_DIR_PREFIX; } @@ -432,7 +447,7 @@ void np_enable_state(char *keyname, int expected_data_version) { char *temp_keyname = NULL; char *p=NULL; - if(this_nagios_plugin==NULL) + if(this_monitoring_plugin==NULL) die(STATE_UNKNOWN, _("This requires np_init to be called")); this_state = (state_key *) calloc(1, sizeof(state_key)); @@ -456,15 +471,17 @@ void np_enable_state(char *keyname, int expected_data_version) { p++; } this_state->name=temp_keyname; - this_state->plugin_name=this_nagios_plugin->plugin_name; + this_state->plugin_name=this_monitoring_plugin->plugin_name; this_state->data_version=expected_data_version; this_state->state_data=NULL; /* Calculate filename */ - asprintf(&temp_filename, "%s/%s/%s", _np_state_calculate_location_prefix(), this_nagios_plugin->plugin_name, this_state->name); + asprintf(&temp_filename, "%s/%lu/%s/%s", + _np_state_calculate_location_prefix(), (unsigned long)geteuid(), + this_monitoring_plugin->plugin_name, this_state->name); this_state->_filename=temp_filename; - this_nagios_plugin->state = this_state; + this_monitoring_plugin->state = this_state; } /* @@ -479,11 +496,11 @@ state_data *np_state_read() { FILE *statefile; int rc = FALSE; - if(this_nagios_plugin==NULL) + if(this_monitoring_plugin==NULL) die(STATE_UNKNOWN, _("This requires np_init to be called")); /* Open file. If this fails, no previous state found */ - statefile = fopen( this_nagios_plugin->state->_filename, "r" ); + statefile = fopen( this_monitoring_plugin->state->_filename, "r" ); if(statefile!=NULL) { this_state_data = (state_data *) calloc(1, sizeof(state_data)); @@ -492,7 +509,7 @@ state_data *np_state_read() { strerror(errno)); this_state_data->data=NULL; - this_nagios_plugin->state->state_data = this_state_data; + this_monitoring_plugin->state->state_data = this_state_data; rc = _np_state_read_file(statefile); @@ -503,10 +520,10 @@ state_data *np_state_read() { _cleanup_state_data(); } - return this_nagios_plugin->state->state_data; + return this_monitoring_plugin->state->state_data; } -/* +/* * Read the state file */ int _np_state_read_file(FILE *f) { @@ -544,7 +561,7 @@ int _np_state_read_file(FILE *f) { break; case STATE_DATA_VERSION: i=atoi(line); - if(i != this_nagios_plugin->state->data_version) + if(i != this_monitoring_plugin->state->data_version) failure++; else expected=STATE_DATA_TIME; @@ -555,13 +572,13 @@ int _np_state_read_file(FILE *f) { if(data_time > current_time) failure++; else { - this_nagios_plugin->state->state_data->time = data_time; + this_monitoring_plugin->state->state_data->time = data_time; expected=STATE_DATA_TEXT; } break; case STATE_DATA_TEXT: - this_nagios_plugin->state->state_data->data = strdup(line); - if(this_nagios_plugin->state->state_data->data==NULL) + this_monitoring_plugin->state->state_data->data = strdup(line); + if(this_monitoring_plugin->state->state_data->data==NULL) die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno)); expected=STATE_DATA_END; status=TRUE; @@ -596,8 +613,8 @@ void np_state_write_string(time_t data_time, char *data_string) { current_time=data_time; /* If file doesn't currently exist, create directories */ - if(access(this_nagios_plugin->state->_filename,F_OK)!=0) { - asprintf(&directories, "%s", this_nagios_plugin->state->_filename); + if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) { + asprintf(&directories, "%s", this_monitoring_plugin->state->_filename); if(directories==NULL) die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno)); @@ -607,7 +624,7 @@ void np_state_write_string(time_t data_time, char *data_string) { *p='\0'; if((access(directories,F_OK)!=0) && (mkdir(directories, S_IRWXU)!=0)) { /* Can't free this! Otherwise error message is wrong! */ - /* np_free(directories); */ + /* np_free(directories); */ die(STATE_UNKNOWN, _("Cannot create directory: %s"), directories); } *p='/'; @@ -616,7 +633,7 @@ void np_state_write_string(time_t data_time, char *data_string) { np_free(directories); } - asprintf(&temp_file,"%s.XXXXXX",this_nagios_plugin->state->_filename); + asprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename); if(temp_file==NULL) die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno)); @@ -636,7 +653,7 @@ void np_state_write_string(time_t data_time, char *data_string) { fprintf(fp,"# NP State file\n"); fprintf(fp,"%d\n",NP_STATE_FORMAT_VERSION); - fprintf(fp,"%d\n",this_nagios_plugin->state->data_version); + fprintf(fp,"%d\n",this_monitoring_plugin->state->data_version); fprintf(fp,"%lu\n",current_time); fprintf(fp,"%s\n",data_string); @@ -654,7 +671,7 @@ void np_state_write_string(time_t data_time, char *data_string) { die(STATE_UNKNOWN, _("Error writing temp file")); } - if(rename(temp_file, this_nagios_plugin->state->_filename)!=0) { + if(rename(temp_file, this_monitoring_plugin->state->_filename)!=0) { unlink(temp_file); np_free(temp_file); die(STATE_UNKNOWN, _("Cannot rename state temp file")); diff --git a/lib/utils_base.h b/lib/utils_base.h index 0cb371f..42ae0c0 100644 --- a/lib/utils_base.h +++ b/lib/utils_base.h @@ -1,6 +1,6 @@ #ifndef _UTILS_BASE_ #define _UTILS_BASE_ -/* Header file for nagios plugins utils_base.c */ +/* Header file for Monitoring Plugins utils_base.c */ #include "sha1.h" @@ -52,7 +52,7 @@ typedef struct np_struct { state_key *state; int argc; char **argv; - } nagios_plugin; + } monitoring_plugin; range *parse_range_string (char *); int _set_thresholds(thresholds **, char *, char *); @@ -62,7 +62,7 @@ int check_range(double, range *); int get_status(double, thresholds *); /* All possible characters in a threshold range */ -#define NP_THRESHOLDS_CHARS "0123456789.:@~" +#define NP_THRESHOLDS_CHARS "-0123456789.:@~" char *np_escaped_string (const char *); @@ -75,9 +75,10 @@ void die (int, const char *, ...) __attribute__((noreturn,format(printf, 2, 3))) /* a simple check to see if we're running as root. * returns zero on failure, nonzero on success */ int np_check_if_root(void); -/* and a helpful wrapper around that. it returns the same status - * code from the above function, in case it's helpful for testing */ -int np_warn_if_not_root(void); + +/* mp_suid() returns true if the real and effective uids differs, such as when + * running a suid plugin */ +#define mp_suid() (getuid() != geteuid()) /* * Extract the value from key/value pairs, or return NULL. The value returned @@ -93,6 +94,11 @@ char *np_extract_value(const char*, const char*, char); */ #define np_extract_ntpvar(l, n) np_extract_value(l, n, ',') +/* + * Read a string representing a state (ok, warning... or numeric: 0, 1) and + * return the corresponding NP_STATE or ERROR) + */ +int mp_translate_state (char *); void np_enable_state(char *, int); state_data *np_state_read(); diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c index 0c853dc..9e214bd 100644 --- a/lib/utils_cmd.c +++ b/lib/utils_cmd.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios run command utilities +* Monitoring run command utilities * * License: GPL -* Copyright (c) 2005-2006 Nagios Plugins Development Team +* Copyright (c) 2005-2006 Monitoring Plugins Development Team * * Description : * @@ -390,6 +390,9 @@ cmd_file_read ( char *filename, output *out, int flags) if(out) out->lines = _cmd_fetch_output (fd, out, flags); + + if (close(fd) == -1) + die( STATE_UNKNOWN, _("Error closing %s: %s"), filename, strerror(errno) ); return 0; } diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h index 8ebb589..ebaf15b 100644 --- a/lib/utils_cmd.h +++ b/lib/utils_cmd.h @@ -2,7 +2,7 @@ #define _UTILS_CMD_ /* - * Header file for nagios plugins utils_cmd.c + * Header file for Monitoring Plugins utils_cmd.c * * */ 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 @@ * Library for check_disk * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * 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 @@ * Library for check_tcp * * License: GPL -* Copyright (c) 1999-2013 Nagios Plugins Development Team +* Copyright (c) 1999-2013 Monitoring Plugins Development Team * * Description: * 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 @@ # np_mysqlclient.m4 -dnl Copyright (C) 2007 Nagios Plugins Team -dnl This file is free software; the Nagios Plugin Team +dnl Copyright (C) 2007 Monitoring Plugins Team +dnl This file is free software; the Monitoring Plugins Team dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/nagios-plugins.spec b/monitoring-plugins.spec similarity index 89% rename from nagios-plugins.spec rename to monitoring-plugins.spec index 4b922ba..da0ed63 100644 --- a/nagios-plugins.spec +++ b/monitoring-plugins.spec @@ -15,15 +15,15 @@ %define nphome /opt/nagios %define npgrp nagios -Name: nagios-plugins -Version: 1.5 +Name: monitoring-plugins +Version: 2.0 Release: 1 -Summary: Host/service/network monitoring program plugins for Nagios +Summary: Host/service/network monitoring program plugins for Nagios and compatible Group: Applications/System License: GPL -URL: http://nagiosplug.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz +URL: https://www.monitoring-plugins.org/ +Source0: https://www.monitoring-plugins.org/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define npdir %{_builddir}/%{name}-%{version} @@ -34,11 +34,11 @@ Prefix: %{_prefix} Prefix: %{_prefix}/lib/nagios/plugins %endif Packager: Karl DeBisschop -Vendor: Nagios Plugin Development Group -Provides: nagios-plugins +Vendor: Monitoring Plugins Development Team +Provides: monitoring-plugins %{!?custom:%global custom 0} -Obsoletes: nagios-plugins-custom nagios-plugins-extras +Obsoletes: monitoring-plugins-custom monitoring-plugins-extras # Requires @@ -105,8 +105,8 @@ network, and to email or page you when a problem arises or is resolved. Nagios runs on a unix server as a background or daemon process, intermittently running checks on various services that you specify. The actual service checks are performed by separate "plugin" -programs which return the status of the checks to Nagios. This package -contains those plugins. +programs which return the status of the checks to the monitoring +system. This package contains those plugins. %prep @@ -163,8 +163,6 @@ fi %install rm -rf $RPM_BUILD_ROOT make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install -build-aux/install-sh -c -d ${RPM_BUILD_ROOT}%{_sysconfdir} -build-aux/install-sh -c -m 664 command.cfg ${RPM_BUILD_ROOT}%{_sysconfdir} %find_lang %{name} echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang comm -13 %{npdir}/ls-plugins-before %{npdir}/ls-plugins-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang @@ -174,6 +172,10 @@ echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang comm -13 %{npdir}/ls-plugins-scripts-before %{npdir}/ls-plugins-scripts-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang echo "%{_libexecdir}/utils.pm" >> %{name}.lang echo "%{_libexecdir}/utils.sh" >> %{name}.lang +echo "%{_libexecdir}/check_ldaps" >> %{name}.lang + +sed -i '/libnpcommon/d' %{name}.lang +sed -i '/monitoring-plugins.mo/d' %{name}.lang %clean rm -rf $RPM_BUILD_ROOT @@ -184,8 +186,8 @@ rm -rf $RPM_BUILD_ROOT %doc CODING COPYING FAQ INSTALL LEGAL README REQUIREMENTS SUPPORT THANKS %doc ChangeLog command.cfg %if ! %{isaix} -%{_datadir}/locale/de/LC_MESSAGES/nagios-plugins.mo -%{_datadir}/locale/fr/LC_MESSAGES/nagios-plugins.mo +%{_datadir}/locale/de/LC_MESSAGES/monitoring-plugins.mo +%{_datadir}/locale/fr/LC_MESSAGES/monitoring-plugins.mo %endif %changelog diff --git a/nagios-plugins.spec.in b/monitoring-plugins.spec.in similarity index 89% rename from nagios-plugins.spec.in rename to monitoring-plugins.spec.in index 17a44c3..f003498 100644 --- a/nagios-plugins.spec.in +++ b/monitoring-plugins.spec.in @@ -15,15 +15,15 @@ %define nphome /opt/nagios %define npgrp nagios -Name: nagios-plugins +Name: monitoring-plugins Version: @PACKAGE_VERSION@ Release: @RELEASE@ -Summary: Host/service/network monitoring program plugins for Nagios +Summary: Host/service/network monitoring program plugins for Nagios and compatible Group: Applications/System License: GPL -URL: http://nagiosplug.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz +URL: https://www.monitoring-plugins.org/ +Source0: https://www.monitoring-plugins.org/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define npdir %{_builddir}/%{name}-%{version} @@ -34,11 +34,11 @@ Prefix: %{_prefix} Prefix: %{_prefix}/lib/nagios/plugins %endif Packager: Karl DeBisschop -Vendor: Nagios Plugin Development Group -Provides: nagios-plugins +Vendor: Monitoring Plugins Development Team +Provides: monitoring-plugins %{!?custom:%global custom 0} -Obsoletes: nagios-plugins-custom nagios-plugins-extras +Obsoletes: monitoring-plugins-custom monitoring-plugins-extras # Requires @@ -105,8 +105,8 @@ network, and to email or page you when a problem arises or is resolved. Nagios runs on a unix server as a background or daemon process, intermittently running checks on various services that you specify. The actual service checks are performed by separate "plugin" -programs which return the status of the checks to Nagios. This package -contains those plugins. +programs which return the status of the checks to the monitoring +system. This package contains those plugins. %prep @@ -163,8 +163,6 @@ fi %install rm -rf $RPM_BUILD_ROOT make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install -build-aux/install-sh -c -d ${RPM_BUILD_ROOT}%{_sysconfdir} -build-aux/install-sh -c -m 664 command.cfg ${RPM_BUILD_ROOT}%{_sysconfdir} %find_lang %{name} echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang comm -13 %{npdir}/ls-plugins-before %{npdir}/ls-plugins-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang @@ -174,6 +172,10 @@ echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang comm -13 %{npdir}/ls-plugins-scripts-before %{npdir}/ls-plugins-scripts-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang echo "%{_libexecdir}/utils.pm" >> %{name}.lang echo "%{_libexecdir}/utils.sh" >> %{name}.lang +echo "%{_libexecdir}/check_ldaps" >> %{name}.lang + +sed -i '/libnpcommon/d' %{name}.lang +sed -i '/monitoring-plugins.mo/d' %{name}.lang %clean rm -rf $RPM_BUILD_ROOT @@ -184,8 +186,8 @@ rm -rf $RPM_BUILD_ROOT %doc CODING COPYING FAQ INSTALL LEGAL README REQUIREMENTS SUPPORT THANKS %doc ChangeLog command.cfg %if ! %{isaix} -%{_datadir}/locale/de/LC_MESSAGES/nagios-plugins.mo -%{_datadir}/locale/fr/LC_MESSAGES/nagios-plugins.mo +%{_datadir}/locale/de/LC_MESSAGES/monitoring-plugins.mo +%{_datadir}/locale/fr/LC_MESSAGES/monitoring-plugins.mo %endif %changelog diff --git a/pkg/solaris/pkginfo b/pkg/solaris/pkginfo index f555686..be90d5a 100644 --- a/pkg/solaris/pkginfo +++ b/pkg/solaris/pkginfo @@ -1,12 +1,12 @@ PKG="NGOSplugin" -NAME="nagios-plugins" -DESC="Nagios network monitoring plugins" +NAME="monitoring-plugins" +DESC="Network Monitoring Plugins for Nagios and compatible" ARCH="unknown" -VERSION="1.5,REV=2013.10.02.17.25" +VERSION="2.0,REV=2014.07.11.17.16" CATEGORY="application" -VENDOR="Nagios Plugin Development Team" -EMAIL="nagiosplug-devel@lists.sourceforge.net" -PSTAMP="nag20131002172555" +VENDOR="Monitoring Plugins Development Team" +EMAIL="devel@monitoring-plugins.org" +PSTAMP="nag20140711171632" BASEDIR="/" CLASSES="none" diff --git a/pkg/solaris/pkginfo.in b/pkg/solaris/pkginfo.in index 3bed346..835ce6d 100644 --- a/pkg/solaris/pkginfo.in +++ b/pkg/solaris/pkginfo.in @@ -1,11 +1,11 @@ PKG="NGOSplugin" -NAME="nagios-plugins" -DESC="Nagios network monitoring plugins" +NAME="monitoring-plugins" +DESC="Network Monitoring Plugins for Nagios and compatible" ARCH="@PKG_ARCH@" VERSION="@PACKAGE_VERSION@,REV=@REV_DATESTAMP@" CATEGORY="application" -VENDOR="Nagios Plugin Development Team" -EMAIL="nagiosplug-devel@lists.sourceforge.net" +VENDOR="Monitoring Plugins Development Team" +EMAIL="devel@monitoring-plugins.org" PSTAMP="nag@REV_TIMESTAMP@" BASEDIR="/" CLASSES="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 EXTRA_DIST = t pst3.c -BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../gl/libgnu.a +BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS) NETLIBS = $(NETOBJS) $(SOCKETLIBS) @@ -83,7 +83,7 @@ check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) # -m64 needed at compiler and linker phase pst3_CFLAGS = @PST3CFLAGS@ pst3_LDFLAGS = @PST3CFLAGS@ -# pst3 must not use nagiosplug/gnulib includes! +# pst3 must not use monitoringplug/gnulib includes! pst3_CPPFLAGS = check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) diff --git a/plugins-root/Makefile.in b/plugins-root/Makefile.in index 08ea92b..ecd03ea 100644 --- a/plugins-root/Makefile.in +++ b/plugins-root/Makefile.in @@ -80,6 +80,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/gnulib-common.m4 \ $(top_srcdir)/gl/m4/gnulib-comp.m4 \ $(top_srcdir)/gl/m4/hostent.m4 $(top_srcdir)/gl/m4/iconv.m4 \ + $(top_srcdir)/gl/m4/idpriv.m4 \ $(top_srcdir)/gl/m4/include_next.m4 \ $(top_srcdir)/gl/m4/inet_ntop.m4 \ $(top_srcdir)/gl/m4/intlmacosx.m4 \ @@ -129,11 +130,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdbool.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ - $(top_srcdir)/gl/m4/stdlib_h.m4 \ + $(top_srcdir)/gl/m4/stdlib_h.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ - $(top_srcdir)/gl/m4/string_h.m4 $(top_srcdir)/gl/m4/strndup.m4 \ - $(top_srcdir)/gl/m4/strnlen.m4 $(top_srcdir)/gl/m4/strsep.m4 \ - $(top_srcdir)/gl/m4/strstr.m4 \ + $(top_srcdir)/gl/m4/string_h.m4 \ + $(top_srcdir)/gl/m4/strings_h.m4 \ + $(top_srcdir)/gl/m4/strndup.m4 $(top_srcdir)/gl/m4/strnlen.m4 \ + $(top_srcdir)/gl/m4/strsep.m4 $(top_srcdir)/gl/m4/strstr.m4 \ $(top_srcdir)/gl/m4/sys_socket_h.m4 \ $(top_srcdir)/gl/m4/sys_types_h.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ @@ -148,7 +150,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \ $(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/xalloc.m4 \ $(top_srcdir)/gl/m4/xsize.m4 $(top_srcdir)/gl/m4/xstrndup.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs @@ -308,6 +310,7 @@ GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ +GNULIB_FFS = @GNULIB_FFS@ GNULIB_FFSL = @GNULIB_FFSL@ GNULIB_FFSLL = @GNULIB_FFSLL@ GNULIB_FGETC = @GNULIB_FGETC@ @@ -673,6 +676,7 @@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ +HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ @@ -702,6 +706,7 @@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FEATURES_H = @HAVE_FEATURES_H@ +HAVE_FFS = @HAVE_FFS@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FMA = @HAVE_FMA@ @@ -813,8 +818,10 @@ HAVE_SQRTL = @HAVE_SQRTL@ HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ +HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRINGS_H = @HAVE_STRINGS_H@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -905,7 +912,6 @@ LD = @LD@ LDAPINCLUDE = @LDAPINCLUDE@ LDAPLIBS = @LDAPLIBS@ LDFLAGS = @LDFLAGS@ -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ LIBICONV = @LIBICONV@ @@ -931,6 +937,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MATHLIBS = @MATHLIBS@ @@ -956,6 +963,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ +NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ @@ -976,6 +984,7 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_STDINT_H = @NEXT_STDINT_H@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ +NEXT_STRINGS_H = @NEXT_STRINGS_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ @@ -1035,7 +1044,6 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PST3CFLAGS = @PST3CFLAGS@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -PYTHON = @PYTHON@ RADIUSLIBS = @RADIUSLIBS@ RANLIB = @RANLIB@ RELEASE = @RELEASE@ @@ -1227,7 +1235,6 @@ SCRIPT_TEST = @SCRIPT_TEST@ SED = @SED@ SERVENT_LIB = @SERVENT_LIB@ SET_MAKE = @SET_MAKE@ -SH = @SH@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ @@ -1251,6 +1258,7 @@ WARRANTY = @WARRANTY@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ +WTSAPI32LIBS = @WTSAPI32LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -1319,7 +1327,7 @@ with_trusted_path = @with_trusted_path@ AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"' AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@ EXTRA_DIST = t pst3.c -BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../gl/libgnu.a +BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS) NETLIBS = $(NETOBJS) $(SOCKETLIBS) TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir) @@ -1349,7 +1357,7 @@ check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) # -m64 needed at compiler and linker phase pst3_CFLAGS = @PST3CFLAGS@ pst3_LDFLAGS = @PST3CFLAGS@ -# pst3 must not use nagiosplug/gnulib includes! +# pst3 must not use monitoringplug/gnulib includes! pst3_CPPFLAGS = check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS) @@ -1357,7 +1365,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1382,9 +1390,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c index 42eedec..b874c55 100644 --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c @@ -1,10 +1,10 @@ /***************************************************************************** * -* Nagios check_dhcp plugin +* Monitoring check_dhcp plugin * * License: GPL * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org) -* Copyright (c) 2001-2007 Nagios Plugin Development Team +* Copyright (c) 2001-2007 Monitoring Plugins Development Team * * Description: * @@ -35,7 +35,7 @@ const char *progname = "check_dhcp"; const char *copyright = "2001-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -270,9 +270,6 @@ int main(int argc, char **argv){ usage4 (_("Could not parse arguments")); } - /* this plugin almost certainly needs root permissions. */ - np_warn_if_not_root(); - /* create socket for DHCP communications */ dhcp_socket=create_dhcp_socket(); @@ -837,7 +834,7 @@ int add_dhcp_offer(struct in_addr source,dhcp_packet *offer_packet){ return ERROR; /* process all DHCP options present in the packet */ - for(x=4;xoptions[x]==-1) break; diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c index 56685f8..8b563e4 100644 --- a/plugins-root/check_icmp.c +++ b/plugins-root/check_icmp.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_icmp plugin +* Monitoring check_icmp plugin * * License: GPL -* Copyright (c) 2005-2008 Nagios Plugins Development Team +* Copyright (c) 2005-2008 Monitoring Plugins Development Team * Original Author : Andreas Ericsson * * Description: @@ -40,9 +40,9 @@ /* char *progname = "check_icmp"; */ char *progname; const char *copyright = "2005-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; -/** nagios plugins basic includes */ +/** Monitoring Plugins basic includes */ #include "common.h" #include "netutils.h" #include "utils.h" @@ -383,9 +383,6 @@ main(int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - /* print a helpful error message if geteuid != 0 */ - np_warn_if_not_root(); - /* we only need to be setsuid when we get the sockets, so do * that before pointer magic (esp. on network data) */ icmp_sockerrno = udp_sockerrno = tcp_sockerrno = sockets = 0; 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 @@ * pst3 * * License: GPL -* Copyright (c) 2008 Nagios Plugin Development Team +* Copyright (c) 2008 Monitoring Plugins Development Team * * Description: * diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am index 58db060..794a34f 100644 --- a/plugins-scripts/Makefile.am +++ b/plugins-scripts/Makefile.am @@ -19,10 +19,16 @@ libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \ utils.sh utils.pm EXTRA_DIST=check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \ - check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \ + check_log.sh check_oracle.sh check_rpc.pl check_sensors.sh \ check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \ utils.sh.in utils.pm.in t +EDIT = sed \ + -e 's|[@]NP_VERSION[@]|$(NP_VERSION)|g' \ + -e 's|[@]TRUSTED_PATH[@]|$(with_trusted_path)|g' \ + -e 's|[@]PERL[@]|$(PERL)|g' \ + -e 's|[@]libexecdir[@]|$(libexecdir)|g' + TESTS_ENVIRONMENT=perl -I $(top_builddir) -I $(top_srcdir) TESTS = @SCRIPT_TEST@ @@ -38,11 +44,11 @@ test-debug: CLEANFILES=$(libexec_SCRIPTS) .pl : - NP_VERSION=$(NP_VERSION) $(AWK) -f ./subst $< > $@ + $(EDIT) $< > $@ chmod +x $@ .sh : - NP_VERSION=$(NP_VERSION) $(AWK) -f ./subst $< > $@ + $(EDIT) $< > $@ chmod +x $@ clean-local: diff --git a/plugins-scripts/Makefile.in b/plugins-scripts/Makefile.in index 1227561..7d1866e 100644 --- a/plugins-scripts/Makefile.in +++ b/plugins-scripts/Makefile.in @@ -51,7 +51,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = plugins-scripts DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/subst.in $(srcdir)/utils.pm.in $(srcdir)/utils.sh.in + $(srcdir)/utils.pm.in $(srcdir)/utils.sh.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/00gnulib.m4 $(top_srcdir)/gl/m4/alloca.m4 \ @@ -78,6 +78,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/gnulib-common.m4 \ $(top_srcdir)/gl/m4/gnulib-comp.m4 \ $(top_srcdir)/gl/m4/hostent.m4 $(top_srcdir)/gl/m4/iconv.m4 \ + $(top_srcdir)/gl/m4/idpriv.m4 \ $(top_srcdir)/gl/m4/include_next.m4 \ $(top_srcdir)/gl/m4/inet_ntop.m4 \ $(top_srcdir)/gl/m4/intlmacosx.m4 \ @@ -127,11 +128,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdbool.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ - $(top_srcdir)/gl/m4/stdlib_h.m4 \ + $(top_srcdir)/gl/m4/stdlib_h.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ - $(top_srcdir)/gl/m4/string_h.m4 $(top_srcdir)/gl/m4/strndup.m4 \ - $(top_srcdir)/gl/m4/strnlen.m4 $(top_srcdir)/gl/m4/strsep.m4 \ - $(top_srcdir)/gl/m4/strstr.m4 \ + $(top_srcdir)/gl/m4/string_h.m4 \ + $(top_srcdir)/gl/m4/strings_h.m4 \ + $(top_srcdir)/gl/m4/strndup.m4 $(top_srcdir)/gl/m4/strnlen.m4 \ + $(top_srcdir)/gl/m4/strsep.m4 $(top_srcdir)/gl/m4/strstr.m4 \ $(top_srcdir)/gl/m4/sys_socket_h.m4 \ $(top_srcdir)/gl/m4/sys_types_h.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ @@ -146,12 +148,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \ $(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/xalloc.m4 \ $(top_srcdir)/gl/m4/xsize.m4 $(top_srcdir)/gl/m4/xstrndup.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = subst utils.pm utils.sh +CONFIG_CLEAN_FILES = utils.pm utils.sh CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -305,6 +307,7 @@ GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ +GNULIB_FFS = @GNULIB_FFS@ GNULIB_FFSL = @GNULIB_FFSL@ GNULIB_FFSLL = @GNULIB_FFSLL@ GNULIB_FGETC = @GNULIB_FGETC@ @@ -670,6 +673,7 @@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ +HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ @@ -699,6 +703,7 @@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FEATURES_H = @HAVE_FEATURES_H@ +HAVE_FFS = @HAVE_FFS@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FMA = @HAVE_FMA@ @@ -810,8 +815,10 @@ HAVE_SQRTL = @HAVE_SQRTL@ HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ +HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRINGS_H = @HAVE_STRINGS_H@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -902,7 +909,6 @@ LD = @LD@ LDAPINCLUDE = @LDAPINCLUDE@ LDAPLIBS = @LDAPLIBS@ LDFLAGS = @LDFLAGS@ -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ LIBICONV = @LIBICONV@ @@ -928,6 +934,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MATHLIBS = @MATHLIBS@ @@ -953,6 +960,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ +NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ @@ -973,6 +981,7 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_STDINT_H = @NEXT_STDINT_H@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ +NEXT_STRINGS_H = @NEXT_STRINGS_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ @@ -1032,7 +1041,6 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PST3CFLAGS = @PST3CFLAGS@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -PYTHON = @PYTHON@ RADIUSLIBS = @RADIUSLIBS@ RANLIB = @RANLIB@ RELEASE = @RELEASE@ @@ -1224,7 +1232,6 @@ SCRIPT_TEST = @SCRIPT_TEST@ SED = @SED@ SERVENT_LIB = @SERVENT_LIB@ SET_MAKE = @SET_MAKE@ -SH = @SH@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ @@ -1248,6 +1255,7 @@ WARRANTY = @WARRANTY@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ +WTSAPI32LIBS = @WTSAPI32LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -1320,10 +1328,16 @@ libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \ utils.sh utils.pm EXTRA_DIST = check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \ - check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \ + check_log.sh check_oracle.sh check_rpc.pl check_sensors.sh \ check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \ utils.sh.in utils.pm.in t +EDIT = sed \ + -e 's|[@]NP_VERSION[@]|$(NP_VERSION)|g' \ + -e 's|[@]TRUSTED_PATH[@]|$(with_trusted_path)|g' \ + -e 's|[@]PERL[@]|$(PERL)|g' \ + -e 's|[@]libexecdir[@]|$(libexecdir)|g' + TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir) TESTS = @SCRIPT_TEST@ CLEANFILES = $(libexec_SCRIPTS) @@ -1331,7 +1345,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .pl .sh -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1356,13 +1370,11 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -subst: $(top_builddir)/config.status $(srcdir)/subst.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ utils.pm: $(top_builddir)/config.status $(srcdir)/utils.pm.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ utils.sh: $(top_builddir)/config.status $(srcdir)/utils.sh.in @@ -1672,11 +1684,11 @@ test-debug: NPTEST_DEBUG=1 HARNESS_VERBOSE=1 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl t/utils.t # utils.t is excluded from above, so manually ask to test .pl : - NP_VERSION=$(NP_VERSION) $(AWK) -f ./subst $< > $@ + $(EDIT) $< > $@ chmod +x $@ .sh : - NP_VERSION=$(NP_VERSION) $(AWK) -f ./subst $< > $@ + $(EDIT) $< > $@ chmod +x $@ clean-local: diff --git a/plugins-scripts/check_breeze.pl b/plugins-scripts/check_breeze.pl index a4e8542..1a3aceb 100755 --- a/plugins-scripts/check_breeze.pl +++ b/plugins-scripts/check_breeze.pl @@ -1,10 +1,12 @@ -#!/usr/bin/perl -wT +#!@PERL@ -w use strict; use Getopt::Long; use vars qw($opt_V $opt_h $opt_w $opt_c $opt_H $opt_C $PROGNAME); -use lib utils.pm ; +use FindBin; +use lib "$FindBin::Bin"; +use lib '@libexecdir@'; use utils qw(%ERRORS &print_revision &support &usage); $PROGNAME = "check_breeze"; @@ -12,7 +14,7 @@ $PROGNAME = "check_breeze"; sub print_help (); sub print_usage (); -$ENV{'PATH'}=''; +$ENV{'PATH'}='@TRUSTED_PATH@'; $ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl index 0c89db5..4805434 100755 --- a/plugins-scripts/check_disk_smb.pl +++ b/plugins-scripts/check_disk_smb.pl @@ -1,9 +1,9 @@ -#!/usr/bin/perl -w +#!@PERL@ -w # # # check_disk.pl [warn] [critical] [port] # -# Nagios host script to get the disk usage from a SMB share +# Monitoring host script to get the disk usage from a SMB share # # Changes and Modifications # ========================= @@ -24,7 +24,9 @@ use strict; use Getopt::Long; use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $verbose); use vars qw($PROGNAME); -use lib utils.pm ; +use FindBin; +use lib "$FindBin::Bin"; +use lib '@libexecdir@'; use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); sub print_help (); @@ -32,7 +34,7 @@ sub print_usage (); $PROGNAME = "check_disk_smb"; -$ENV{'PATH'}=''; +$ENV{'PATH'}='@TRUSTED_PATH@'; $ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; @@ -171,7 +173,7 @@ my $res = undef; my $perfdata = ""; my @lines = undef; -# Just in case of problems, let's not hang Nagios +# Just in case of problems, let's not hang the monitoring system $SIG{'ALRM'} = sub { print "No Answer from Client\n"; exit $ERRORS{"UNKNOWN"}; @@ -293,7 +295,7 @@ sub print_help () { print_revision($PROGNAME,'@NP_VERSION@'); print "Copyright (c) 2000 Michael Anthon/Karl DeBisschop -Perl Check SMB Disk plugin for Nagios +Perl Check SMB Disk plugin for monitoring "; print_usage(); diff --git a/plugins-scripts/check_file_age.pl b/plugins-scripts/check_file_age.pl index dcd5efa..453e0f5 100755 --- a/plugins-scripts/check_file_age.pl +++ b/plugins-scripts/check_file_age.pl @@ -1,4 +1,4 @@ -#!/bin/perl -w +#!@PERL@ -w # check_file_age.pl Copyright (C) 2003 Steven Grimm # @@ -17,26 +17,31 @@ # GNU General Public License for more details. # # you should have received a copy of the GNU General Public License -# along with this program (or with Nagios); if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA +# along with this program if not, write to the Free Software Foundation, +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA use strict; use English; use Getopt::Long; use File::stat; use vars qw($PROGNAME); -use lib "."; +use FindBin; +use lib "$FindBin::Bin"; +use lib '@libexecdir@'; use utils qw (%ERRORS &print_revision &support); sub print_help (); sub print_usage (); -my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V); +my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V, $opt_i); my ($result, $message, $age, $size, $st); $PROGNAME="check_file_age"; +$ENV{'PATH'}='@TRUSTED_PATH@'; +$ENV{'BASH_ENV'}=''; +$ENV{'ENV'}=''; + $opt_w = 240; $opt_c = 600; $opt_W = 0; @@ -47,6 +52,7 @@ Getopt::Long::Configure('bundling'); GetOptions( "V" => \$opt_V, "version" => \$opt_V, "h" => \$opt_h, "help" => \$opt_h, + "i" => \$opt_i, "ignore-missing" => \$opt_i, "f=s" => \$opt_f, "file" => \$opt_f, "w=f" => \$opt_w, "warning-age=f" => \$opt_w, "W=f" => \$opt_W, "warning-size=f" => \$opt_W, @@ -72,8 +78,15 @@ if (! $opt_f) { # Check that file exists (can be directory or link) unless (-e $opt_f) { - print "FILE_AGE CRITICAL: File not found - $opt_f\n"; - exit $ERRORS{'CRITICAL'}; + if ($opt_i) { + $result = 'OK'; + print "FILE_AGE $result: $opt_f doesn't exist, but ignore-missing was set\n"; + exit $ERRORS{$result}; + + } else { + print "FILE_AGE CRITICAL: File not found - $opt_f\n"; + exit $ERRORS{'CRITICAL'}; + } } $st = File::stat::stat($opt_f); @@ -95,7 +108,7 @@ exit $ERRORS{$result}; sub print_usage () { print "Usage:\n"; - print " $PROGNAME [-w ] [-c ] [-W ] [-C ] -f \n"; + print " $PROGNAME [-w ] [-c ] [-W ] [-C ] [-i] -f \n"; print " $PROGNAME [-h | --help]\n"; print " $PROGNAME [-V | --version]\n"; } @@ -105,6 +118,7 @@ sub print_help () { print "Copyright (c) 2003 Steven Grimm\n\n"; print_usage(); print "\n"; + print " -i | --ignore-missing : return OK if the file does not exist\n"; print " File must be no more than this many seconds old (default: warn 240 secs, crit 600)\n"; print " File must be at least this many bytes long (default: crit 0 bytes)\n"; print "\n"; diff --git a/plugins-scripts/check_flexlm.pl b/plugins-scripts/check_flexlm.pl index 54d933c..5f3ed59 100755 --- a/plugins-scripts/check_flexlm.pl +++ b/plugins-scripts/check_flexlm.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!@PERL@ -w # # usage: # check_flexlm.pl license_file @@ -9,7 +9,7 @@ # Check and interpret the output of lmstat # and create returncodes and output. # -# Contrary to the nagios concept, this script takes +# Contrary to most other plugins, this script takes # a file, not a hostname as an argument and returns # the status of hosts and services described in that # file. Use these hosts.cfg entries as an example @@ -35,7 +35,9 @@ use strict; use Getopt::Long; use vars qw($opt_V $opt_h $opt_F $opt_t $verbose $PROGNAME); -use lib utils.pm; +use FindBin; +use lib "$FindBin::Bin"; +use lib '@libexecdir@'; use utils qw(%ERRORS &print_revision &support &usage); $PROGNAME="check_flexlm"; @@ -43,7 +45,7 @@ $PROGNAME="check_flexlm"; sub print_help (); sub print_usage (); -$ENV{'PATH'}=''; +$ENV{'PATH'}='@TRUSTED_PATH@'; $ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; @@ -72,7 +74,7 @@ unless (defined $opt_F) { print_usage(); exit $ERRORS{'UNKNOWN'}; } -# Just in case of problems, let's not hang Nagios +# Just in case of problems, let's not hang the monitoring system $SIG{'ALRM'} = sub { print "Timeout: No Answer from Client\n"; exit $ERRORS{'UNKNOWN'}; diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl index 588993b..cf2c7b5 100755 --- a/plugins-scripts/check_ifoperstatus.pl +++ b/plugins-scripts/check_ifoperstatus.pl @@ -1,9 +1,9 @@ -#!/usr/local/bin/perl -w +#!@PERL@ -w # -# check_ifoperstatus.pl - nagios plugin +# check_ifoperstatus.pl - monitoring plugin # # Copyright (C) 2000 Christoph Kron, -# Modified 5/2002 to conform to updated Nagios Plugin Guidelines +# Modified 5/2002 to conform to updated Monitoring Plugins Guidelines # Added support for named interfaces per Valdimir Ivaschenko (S. Ghosh) # Added SNMPv3 support (10/2003) # @@ -19,10 +19,11 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA # # -# Report bugs to: nagiosplug-help@lists.sourceforge.net +# Report bugs to: help@monitoring-plugins.org # # 11.01.2000 Version 1.0 # @@ -34,7 +35,9 @@ use POSIX; use strict; -use lib utils.pm ; +use FindBin; +use lib "$FindBin::Bin"; +use lib '@libexecdir@'; use utils qw($TIMEOUT %ERRORS &print_revision &support); use Net::SNMP; @@ -47,6 +50,10 @@ sub usage ($); sub print_usage (); sub process_arguments (); +$ENV{'PATH'}='@TRUSTED_PATH@'; +$ENV{'BASH_ENV'}=''; +$ENV{'ENV'}=''; + my $timeout; my $status; my %ifOperStatus = ('1','up', @@ -97,7 +104,7 @@ my %session_opts; $status = process_arguments(); -# Just in case of problems, let's not hang Nagios +# Just in case of problems, let's not hang the monitoring system $SIG{'ALRM'} = sub { print ("ERROR: No snmp response from $hostname (alarm)\n"); exit $ERRORS{"UNKNOWN"}; @@ -288,7 +295,7 @@ sub print_usage() { sub print_help() { print_revision($PROGNAME, '@NP_VERSION@'); print_usage(); - printf "check_ifoperstatus plugin for Nagios monitors operational \n"; + printf "check_ifoperstatus plugin for monitoring operational \n"; printf "status of a particular network interface on the target host\n"; printf "\nUsage:\n"; printf " -H (--hostname) Hostname to query - (required)\n"; diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl index 63c71ff..fb17d98 100755 --- a/plugins-scripts/check_ifstatus.pl +++ b/plugins-scripts/check_ifstatus.pl @@ -1,10 +1,10 @@ -#!/usr/local/bin/perl -w +#!@PERL@ -w # -# check_ifstatus.pl - nagios plugin +# check_ifstatus.pl - monitoring plugin # # # Copyright (C) 2000 Christoph Kron -# Modified 5/2002 to conform to updated Nagios Plugin Guidelines (S. Ghosh) +# Modified 5/2002 to conform to updated Monitoring Plugins Guidelines (S. Ghosh) # Added -x option (4/2003) # Added -u option (4/2003) # Added -M option (10/2003) @@ -22,17 +22,19 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # # -# Report bugs to: ck@zet.net, nagiosplug-help@lists.sf.net +# Report bugs to: ck@zet.net, help@monitoring-plugins.org # # 11.01.2000 Version 1.0 # use POSIX; use strict; -use lib utils.pm ; +use FindBin; +use lib "$FindBin::Bin"; +use lib '@libexecdir@'; use utils qw($TIMEOUT %ERRORS &print_revision &support); use Net::SNMP; @@ -46,6 +48,9 @@ sub usage ($); sub print_usage (); sub process_arguments (); +$ENV{'PATH'}='@TRUSTED_PATH@'; +$ENV{'BASH_ENV'}=''; +$ENV{'ENV'}=''; my $status; my %ifOperStatus = ('1','up', @@ -99,7 +104,7 @@ my %session_opts; -# Just in case of problems, let's not hang Nagios +# Just in case of problems, let's not hang the monitoring system $SIG{'ALRM'} = sub { print ("ERROR: No snmp response from $hostname (alarm timeout)\n"); exit $ERRORS{"UNKNOWN"}; @@ -239,7 +244,7 @@ sub print_usage() { sub print_help() { print_revision($PROGNAME, '@NP_VERSION@'); print_usage(); - printf "check_ifstatus plugin for Nagios monitors operational \n"; + printf "check_ifstatus plugin for monitoring operational \n"; printf "status of each network interface on the target host\n"; printf "\nUsage:\n"; printf " -H (--hostname) Hostname to query - (required)\n"; diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl index 42a9bca..6d40cf5 100755 --- a/plugins-scripts/check_ircd.pl +++ b/plugins-scripts/check_ircd.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -wT +#!@PERL@ -w # ----------------------------------------------------------------------------- # File Name: check_ircd.pl @@ -16,8 +16,6 @@ # ----------------------------------------------------------------------------- # Copyright 1999 (c) Richard Mayhew # -# Credits go to Ethan Galstad for coding Nagios -# # If any changes are made to this script, please mail me a copy of the # changes :) # @@ -51,7 +49,9 @@ use strict; use Getopt::Long; use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose); use vars qw($PROGNAME); -use lib utils.pm; +use FindBin; +use lib "$FindBin::Bin"; +use lib '@libexecdir@'; use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); # ----------------------------------------------------[ Function Prototypes ]-- @@ -63,9 +63,9 @@ sub bindRemote ($$); # -------------------------------------------------------------[ Enviroment ]-- -$ENV{PATH} = ""; -$ENV{ENV} = ""; -$ENV{BASH_ENV} = ""; +$ENV{'PATH'}='@TRUSTED_PATH@'; +$ENV{'BASH_ENV'}=''; +$ENV{'ENV'}=''; # -----------------------------------------------------------------[ Global ]-- @@ -121,7 +121,7 @@ sub print_help () print_revision($PROGNAME,'@NP_VERSION@'); print "Copyright (c) 2000 Richard Mayhew/Karl DeBisschop -Perl Check IRCD plugin for Nagios +Perl Check IRCD plugin for monitoring "; print_usage(); @@ -205,7 +205,7 @@ MAIN: if ($opt_t && $opt_t =~ /^([0-9]+)$/) { $TIMEOUT = $1; } - # Just in case of problems, let's not hang Nagios + # Just in case of problems, let's not hang the monitoring system $SIG{'ALRM'} = sub { print "Somthing is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n"; exit $ERRORS{"UNKNOWN"}; diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh index a1bfb48..8653a5e 100755 --- a/plugins-scripts/check_log.sh +++ b/plugins-scripts/check_log.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Log file pattern detector plugin for Nagios +# Log file pattern detector plugin for monitoring # Written by Ethan Galstad (nagios@nagios.org) # Last Modified: 07-31-1999 # @@ -29,15 +29,15 @@ # # If you use this plugin make sure to keep the following in mind: # -# 1. The "max_attempts" value for the service should be 1, as this -# will prevent Nagios from retrying the service check (the +# 1. The "max_attempts" value for the service should be 1, as this will +# prevent the monitoring system from retrying the service check (the # next time the check is run it will not produce the same results). # -# 2. The "notify_recovery" value for the service should be 0, so that -# Nagios does not notify you of "recoveries" for the check. Since -# pattern matches in the log file will only be reported once and not -# the next time, there will always be "recoveries" for the service, even -# though recoveries really don't apply to this type of check. +# 2. The "notify_recovery" value for the service should be 0, so that the +# monitoring system does not notify you of "recoveries" for the check. +# Since pattern matches in the log file will only be reported once and +# not the next time, there will always be "recoveries" for the service, +# even though recoveries really don't apply to this type of check. # # 3. You *must* supply a different for each service that # you define to use this plugin script - even if the different services @@ -57,21 +57,13 @@ # Paths to commands used in this script. These # may have to be modified to match your system setup. -# TV: removed PATH restriction. Need to think more about what this means overall -#PATH="" - -ECHO="/bin/echo" -GREP="/bin/egrep" -DIFF="/bin/diff" -TAIL="/bin/tail" -CAT="/bin/cat" -RM="/bin/rm" -CHMOD="/bin/chmod" -TOUCH="/bin/touch" PROGNAME=`/bin/basename $0` PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` REVISION="@NP_VERSION@" +PATH="@TRUSTED_PATH@" + +export PATH . $PROGPATH/utils.sh @@ -86,7 +78,7 @@ print_help() { echo "" print_usage echo "" - echo "Log file pattern detector plugin for Nagios" + echo "Log file pattern detector plugin for monitoring" echo "" support } @@ -167,10 +159,10 @@ done # If the source log file doesn't exist, exit if [ ! -e $logfile ]; then - $ECHO "Log check error: Log file $logfile does not exist!\n" + echo "Log check error: Log file $logfile does not exist!" exit $STATE_UNKNOWN elif [ ! -r $logfile ] ; then - $ECHO "Log check error: Log file $logfile is not readable!\n" + echo "Log check error: Log file $logfile is not readable!" exit $STATE_UNKNOWN fi @@ -179,8 +171,8 @@ fi # the old diff file and exit if [ ! -e $oldlog ]; then - $CAT $logfile > $oldlog - $ECHO "Log check data initialized...\n" + cat $logfile > $oldlog + echo "Log check data initialized..." exit $STATE_OK fi @@ -193,26 +185,26 @@ if [ -x /bin/mktemp ]; then else tempdiff=`/bin/date '+%H%M%S'` tempdiff="/tmp/check_log.${tempdiff}" - $TOUCH $tempdiff - $CHMOD 600 $tempdiff + touch $tempdiff + chmod 600 $tempdiff fi -$DIFF $logfile $oldlog | $GREP -v "^>" > $tempdiff +diff $logfile $oldlog | grep -v "^>" > $tempdiff # Count the number of matching log entries we have -count=`$GREP -c "$query" $tempdiff` +count=`grep -c "$query" $tempdiff` # Get the last matching entry in the diff file -lastentry=`$GREP "$query" $tempdiff | $TAIL -1` +lastentry=`grep "$query" $tempdiff | tail -1` -$RM -f $tempdiff -$CAT $logfile > $oldlog +rm -f $tempdiff +cat $logfile > $oldlog if [ "$count" = "0" ]; then # no matches, exit with no error - $ECHO "Log check ok - 0 pattern matches found\n" + echo "Log check ok - 0 pattern matches found" exitstatus=$STATE_OK else # Print total matche count and the last entry we found - $ECHO "($count) $lastentry" + echo "($count) $lastentry" exitstatus=$STATE_CRITICAL fi diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl index 31eb46a..bd78981 100755 --- a/plugins-scripts/check_mailq.pl +++ b/plugins-scripts/check_mailq.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!@PERL@ -w # check_mailq - check to see how many messages are in the smtp queue awating # transmittal. @@ -20,8 +20,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# +# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 +# USA # ############################################################################ @@ -31,7 +31,9 @@ use Getopt::Long; use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq @lines %srcdomains %dstdomains); -use lib utils.pm; +use FindBin; +use lib "$FindBin::Bin"; +use lib '@libexecdir@'; use utils qw(%ERRORS &print_revision &support &usage ); @@ -39,7 +41,7 @@ sub print_help (); sub print_usage (); sub process_arguments (); -$ENV{'PATH'}=''; +$ENV{'PATH'}='@TRUSTED_PATH@'; $ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; $PROGNAME = "check_mailq"; @@ -199,20 +201,20 @@ if ($mailq eq "sendmail") { ## now check the queue length(s) if ($msg_q == 0) { - $msg = "OK: mailq is empty"; + $msg = "OK: $mailq mailq is empty"; $state = $ERRORS{'OK'}; } else { print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose; # overall queue length if ($msg_q < $opt_w) { - $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; $state = $ERRORS{'OK'}; }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { - $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)"; + $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; $state = $ERRORS{'WARNING'}; }else { - $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)"; + $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; $state = $ERRORS{'CRITICAL'}; } @@ -344,20 +346,20 @@ elsif ( $mailq eq "postfix" ) { # check queue length(s) if ($msg_q == 0){ - $msg = "OK: mailq reports queue is empty"; + $msg = "OK: $mailq mailq reports queue is empty"; $state = $ERRORS{'OK'}; } else { print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose; # overall queue length if ($msg_q < $opt_w) { - $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; $state = $ERRORS{'OK'}; }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { - $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)"; + $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; $state = $ERRORS{'WARNING'}; }else { - $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)"; + $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; $state = $ERRORS{'CRITICAL'}; } @@ -373,7 +375,7 @@ elsif ( $mailq eq "postfix" ) { # } #} } -} # end of ($mailq eq "postfixl") +} # end of ($mailq eq "postfix") elsif ( $mailq eq "qmail" ) { # open qmail-qstat @@ -431,13 +433,13 @@ elsif ( $mailq eq "qmail" ) { # overall queue length if ($msg_q < $opt_w) { - $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; $state = $ERRORS{'OK'}; }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { - $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)"; + $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; $state = $ERRORS{'WARNING'}; }else { - $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)"; + $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; $state = $ERRORS{'CRITICAL'}; } @@ -489,17 +491,54 @@ elsif ( $mailq eq "exim" ) { exit $ERRORS{CRITICAL}; } if ($msg_q < $opt_w) { - $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; $state = $ERRORS{'OK'}; }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { - $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)"; + $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; $state = $ERRORS{'WARNING'}; }else { - $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)"; + $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; $state = $ERRORS{'CRITICAL'}; } } # end of ($mailq eq "exim") +elsif ( $mailq eq "nullmailer" ) { + ## open mailq + if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) { + if (! open (MAILQ, "$utils::PATH_TO_MAILQ | " ) ) { + print "ERROR: could not open $utils::PATH_TO_MAILQ \n"; + exit $ERRORS{'UNKNOWN'}; + } + }elsif( defined $utils::PATH_TO_MAILQ){ + unless (-x $utils::PATH_TO_MAILQ) { + print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; + exit $ERRORS{'UNKNOWN'}; + } + } else { + print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; + exit $ERRORS{'UNKNOWN'}; + } + + while () { + #2006-06-22 16:00:00 282 bytes + + if (/^[1-9][0-9]*-[01][0-9]-[0-3][0-9]\s[0-2][0-9]\:[0-2][0-9]\:[0-2][0-9]\s{2}[0-9]+\sbytes$/) { + $msg_q++ ; + } + } + close(MAILQ) ; + if ($msg_q < $opt_w) { + $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $state = $ERRORS{'OK'}; + }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { + $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; + $state = $ERRORS{'WARNING'}; + }else { + $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; + $state = $ERRORS{'CRITICAL'}; + } +} # end of ($mailq eq "nullmailer") + # Perfdata support print "$msg|unsent=$msg_q;$opt_w;$opt_c;0\n"; exit $state; @@ -559,7 +598,7 @@ sub process_arguments(){ } if (defined $opt_M) { - if ($opt_M =~ /^(sendmail|qmail|postfix|exim)$/) { + if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) { $mailq = $opt_M ; }elsif( $opt_M eq ''){ $mailq = 'sendmail'; @@ -568,7 +607,30 @@ sub process_arguments(){ exit $ERRORS{'UNKNOWN'}; } }else{ - $mailq = 'sendmail' ; + if (defined $utils::PATH_TO_QMAIL_QSTAT + && -x $utils::PATH_TO_QMAIL_QSTAT) + { + $mailq = 'qmail'; + } + elsif (-d '/var/lib/postfix' || -d '/var/local/lib/postfix' + || -e '/usr/sbin/postfix' || -e '/usr/local/sbin/postfix') + { + $mailq = 'postfix'; + } + elsif (-d '/usr/lib/exim4' || -d '/usr/local/lib/exim4' + || -e '/usr/sbin/exim' || -e '/usr/local/sbin/exim') + { + $mailq = 'exim'; + } + elsif (-d '/usr/lib/nullmailer' || -d '/usr/local/lib/nullmailer' + || -e '/usr/sbin/nullmailer-send' + || -e '/usr/local/sbin/nullmailer-send') + { + $mailq = 'nullmailer'; + } + else { + $mailq = 'sendmail'; + } } return $ERRORS{'OK'}; @@ -591,7 +653,7 @@ sub print_help () { print "-W (--Warning) = Min. number of messages for same domain in queue to generate warning\n"; print "-C (--Critical) = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n"; print "-t (--timeout) = Plugin timeout in seconds (default = $utils::TIMEOUT)\n"; - print "-M (--mailserver) = [ sendmail | qmail | postfix | exim ] (default = sendmail)\n"; + print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer ] (default = autodetect)\n"; print "-h (--help)\n"; print "-V (--version)\n"; print "-v (--verbose) = debugging output\n"; @@ -599,6 +661,8 @@ sub print_help () { print "Note: -w and -c are required arguments. -W and -C are optional.\n"; print " -W and -C are applied to domains listed on the queues - both FROM and TO. (sendmail)\n"; print " -W and -C are applied message not yet preproccessed. (qmail)\n"; + print " This plugin tries to autodetect which mailserver you are running,\n"; + print " you can override the autodetection with -M.\n"; print " This plugin uses the system mailq command (sendmail) or qmail-stat (qmail)\n"; print " to look at the queues. Mailq can usually only be accessed by root or \n"; print " a TrustedUser. You will have to set appropriate permissions for the plugin to work.\n"; diff --git a/plugins-scripts/check_ntp.pl b/plugins-scripts/check_ntp.pl deleted file mode 100755 index 5c87e0a..0000000 --- a/plugins-scripts/check_ntp.pl +++ /dev/null @@ -1,471 +0,0 @@ -#!/usr/bin/perl -w -# -# (c)1999 Ian Cass, Knowledge Matters Ltd. -# Read the GNU copyright stuff for all the legalese -# -# Check NTP time servers plugin. This plugin requires the ntpdate utility to -# be installed on the system, however since it's part of the ntp suite, you -# should already have it installed. -# -# -# Nothing clever done in this program - its a very simple bare basics hack to -# get the job done. -# -# Things to do... -# check @words[9] for time differences greater than +/- x secs & return a -# warning. -# -# (c) 1999 Mark Jewiss, Knowledge Matters Limited -# 22-9-1999, 12:45 -# -# Modified script to accept 2 parameters or set defaults. -# Now issues warning or critical alert is time difference is greater than the -# time passed. -# -# These changes have not been tested completely due to the unavailability of a -# server with the incorrect time. -# -# (c) 1999 Bo Kersey, VirCIO - Managed Server Solutions -# 22-10-99, 12:17 -# -# Modified the script to give useage if no parameters are input. -# -# Modified the script to check for negative as well as positive -# time differences. -# -# Modified the script to work with ntpdate 3-5.93e Wed Apr 14 20:23:03 EDT 1999 -# -# Modified the script to work with ntpdate's that return adjust or offset... -# -# -# Script modified 2000 June 01 by William Pietri -# -# Modified script to handle weird cases: -# o NTP server doesn't respond (e.g., has died) -# o Server has correct time but isn't suitable synchronization -# source. This happens while starting up and if contact -# with master has been lost. -# -# Modifed to run under Embedded Perl (sghosh@users.sf.net) -# - combined logic some blocks together.. -# -# Added ntpdate check for stratum 16 desynch peer (James Fidell) Feb 03, 2003 -# -# ntpdate - offset is in seconds -# changed ntpdc to ntpq - jitter/dispersion is in milliseconds -# -# Patch for for regex for stratum1 refid. - -require 5.004; -use POSIX; -use strict; -use Getopt::Long; -use vars qw($opt_V $opt_h $opt_H $opt_t $opt_w $opt_c $opt_O $opt_j $opt_k $verbose $PROGNAME $def_jitter $ipv4 $ipv6); -use lib utils.pm; -use utils qw($TIMEOUT %ERRORS &print_revision &support); - -$PROGNAME="check_ntp"; - -sub print_help (); -sub print_usage (); - -$ENV{'PATH'}=''; -$ENV{'BASH_ENV'}=''; -$ENV{'ENV'}=''; - -# defaults in sec -my $DEFAULT_OFFSET_WARN = 60; # 1 minute -my $DEFAULT_OFFSET_CRIT = 120; # 2 minutes -# default in millisec -my $DEFAULT_JITTER_WARN = 5000; # 5 sec -my $DEFAULT_JITTER_CRIT = 10000; # 10 sec - -Getopt::Long::Configure('bundling'); -GetOptions - ("V" => \$opt_V, "version" => \$opt_V, - "h" => \$opt_h, "help" => \$opt_h, - "v" => \$verbose, "verbose" => \$verbose, - "4" => \$ipv4, "use-ipv4" => \$ipv4, - "6" => \$ipv6, "use-ipv6" => \$ipv6, - "w=f" => \$opt_w, "warning=f" => \$opt_w, # offset|adjust warning if above this number - "c=f" => \$opt_c, "critical=f" => \$opt_c, # offset|adjust critical if above this number - "O" => \$opt_O, "zero-offset" => \$opt_O, # zero-offset bad - "j=s" => \$opt_j, "jwarn=i" => \$opt_j, # jitter warning if above this number - "k=s" => \$opt_k, "jcrit=i" => \$opt_k, # jitter critical if above this number - "t=s" => \$opt_t, "timeout=i" => \$opt_t, - "H=s" => \$opt_H, "hostname=s" => \$opt_H); - -if ($opt_V) { - print_revision($PROGNAME,'@NP_VERSION@'); - exit $ERRORS{'OK'}; -} - -if ($opt_h) { - print_help(); - exit $ERRORS{'OK'}; -} - -# jitter test params specified -if (defined $opt_j || defined $opt_k ) { - $def_jitter = 1; -} - -$opt_H = shift unless ($opt_H); -my $host = $1 if ($opt_H && $opt_H =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z][-a-zA-Z0-9]+(\.[a-zA-Z][-a-zA-Z0-9]+)*)$/); -unless ($host) { - print "No target host specified\n"; - print_usage(); - exit $ERRORS{'UNKNOWN'}; -} - -my ($timeout, $owarn, $ocrit, $jwarn, $jcrit); - -$timeout = $TIMEOUT; -($opt_t) && ($opt_t =~ /^([0-9]+)$/) && ($timeout = $1); - -$owarn = $DEFAULT_OFFSET_WARN; -($opt_w) && ($opt_w =~ /^([0-9.]+)$/) && ($owarn = $1); - -$ocrit = $DEFAULT_OFFSET_CRIT; -($opt_c) && ($opt_c =~ /^([0-9.]+)$/) && ($ocrit = $1); - -$jwarn = $DEFAULT_JITTER_WARN; -($opt_j) && ($opt_j =~ /^([0-9]+)$/) && ($jwarn = $1); - -$jcrit = $DEFAULT_JITTER_CRIT; -($opt_k) && ($opt_k =~ /^([0-9]+)$/) && ($jcrit = $1); - -if ($ocrit < $owarn ) { - print "Critical offset should be larger than warning offset\n"; - print_usage(); - exit $ERRORS{"UNKNOWN"}; -} - -if ($def_jitter) { - if ($opt_k < $opt_j) { - print "Critical jitter should be larger than warning jitter\n"; - print_usage(); - exit $ERRORS{'UNKNOWN'}; - } -} - - -my $stratum = -1; -my $ignoreret = 0; -my $answer = undef; -my $offset = undef; -my $jitter = undef; -my $syspeer = undef; -my $candidate = 0; -my @candidates; -my $msg; # first line of output to print if format is invalid - -my $state = $ERRORS{'UNKNOWN'}; -my $ntpdate_error = $ERRORS{'UNKNOWN'}; -my $jitter_error = $ERRORS{'UNKNOWN'}; - -# some systems don't have a proper ntpq (migrated from ntpdc) -my $have_ntpq = undef; -if ($utils::PATH_TO_NTPQ && -x $utils::PATH_TO_NTPQ ) { - $have_ntpq = 1; -}else{ - $have_ntpq = 0; -} - -# Just in case of problems, let's not hang Nagios -$SIG{'ALRM'} = sub { - print ("ERROR: No response from ntp server (alarm)\n"); - exit $ERRORS{"UNKNOWN"}; -}; -alarm($timeout); - -# Determine protocol to be used for ntpdate and ntpq -my $ntpdate = $utils::PATH_TO_NTPDATE; -my $ntpq = $utils::PATH_TO_NTPQ; -if ($ipv4) { - $ntpdate .= " -4"; - $ntpq .= " -4"; -} -elsif ($ipv6) { - $ntpdate .= " -6"; - $ntpq .= " -6"; -} -# else don't use any flags - -### -### -### First, check ntpdate -### -### - -if (!open (NTPDATE, $ntpdate . " -q $host 2>&1 |")) { - print "Could not open $ntpdate: $!\n"; - exit $ERRORS{"UNKNOWN"}; -} - -my $out; -while () { - #print if ($verbose); # noop - $msg = $_ unless ($msg); - $out .= "$_ "; - - if (/stratum\s(\d+)/) { - $stratum = $1; - } - - if (/(offset|adjust)\s+([-.\d]+)/i) { - $offset = $2; - - # An offset of 0.000000 with an error is probably bogus. Actually, - # it's probably always bogus, but let's be paranoid here. - # Has been reported that 0.0000 happens in a production environment - # on Solaris 8 so this check should be taken out - SF tracker 1150777 - if (defined $opt_O ) { - if ($offset == 0) { undef $offset;} - } - - $ntpdate_error = defined ($offset) ? $ERRORS{"OK"} : $ERRORS{"CRITICAL"}; - print "ntperr = $ntpdate_error \n" if $verbose; - - } - - if (/no server suitable for synchronization found/) { - if ($stratum == 16) { - $ntpdate_error = $ERRORS{"WARNING"}; - $msg = "Desynchronized peer server found"; - $ignoreret=1; - } - else { - $ntpdate_error = $ERRORS{"CRITICAL"}; - $msg = "No suitable peer server found - "; - } - } - -} -$out =~ s/\n//g; -close (NTPDATE) || - die $! ? "$out - Error closing $ntpdate pipe: $!" - : "$out - Exit status: $? from $ntpdate\n"; - -# declare an error if we also get a non-zero return code from ntpdate -# unless already set to critical -if ( $? && !$ignoreret ) { - print "stderr = $? : $! \n" if $verbose; - $ntpdate_error = $ntpdate_error == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"UNKNOWN"} ; - print "ntperr = $ntpdate_error : $!\n" if $verbose; -} - -### -### -### Then scan xntpq/ntpq if it exists -### and look in the 11th column for jitter -### -# Field 1: Tally Code ( Space, 'x','.','-','+','#','*','o') -# Only match for '*' which implies sys.peer -# or 'o' which implies pps.peer -# If both exist, the last one is picked. -# Field 2: address of the remote peer -# Field 3: Refid of the clock (0.0.0.0 if unknown, WWWV/PPS/GPS/ACTS/USNO/PCS/... if Stratum1) -# Field 4: stratum (0-15) -# Field 5: Type of the peer: local (l), unicast (u), multicast (m) -# broadcast (b); not sure about multicast/broadcast -# Field 6: last packet receive (in seconds) -# Field 7: polling interval -# Field 8: reachability resgister (octal) -# Field 9: delay -# Field 10: offset -# Field 11: dispersion/jitter -# -# According to bug 773588 Some solaris xntpd implementations seemto match on -# "#" even though the docs say it exceeds maximum distance. Providing patch -# here which will generate a warining. - -if ($have_ntpq) { - - if ( open(NTPQ, $ntpq . " -np $host 2>&1 |") ) { - while () { - print $_ if ($verbose); - if ( /timed out/ ){ - $have_ntpq = 0 ; - last ; - } - # number of candidates on for sys.peer - if (/^(\*|\+|\#|o])/) { - ++$candidate; - push (@candidates, $_); - print "Candidate count= $candidate\n" if ($verbose); - } - - # match sys.peer or pps.peer - if (/^(\*|o)(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/) { - $syspeer = $2; - $stratum = $4; - $jitter = $11; - print "match $_ \n" if $verbose; - if ($jitter > $jcrit) { - print "Jitter_crit = $11 :$jcrit\n" if ($verbose); - $jitter_error = $ERRORS{'CRITICAL'}; - } elsif ($jitter > $jwarn ) { - print "Jitter_warn = $11 :$jwarn\n" if ($verbose); - $jitter_error = $ERRORS{'WARNING'}; - } else { - $jitter_error = $ERRORS{'OK'}; - } - } else { - print "No match!\n" if $verbose; - $jitter = '(not parsed)'; - } - - } - close NTPQ || - die $! ? "Error closing $ntpq pipe: $!" - : "Exit status: $? from $ntpq\n"; - - # if we did not match sys.peer or pps.peer but matched # candidates only - # generate a warning - # based on bug id 773588 - unless (defined $syspeer) { - if ($#candidates >=0) { - foreach my $c (@candidates) { - $c =~ /^(#)([-0-9.\s]+)\s+([-0-9A-Za-z_().]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/; - $syspeer = $2; - $stratum = $4; - $jitter = $11; - print "candidate match $c \n" if $verbose; - if ($jitter > $jcrit) { - print "Candidate match - Jitter_crit = $11 :$jcrit\n" if ($verbose); - $jitter_error = $ERRORS{'CRITICAL'}; - }elsif ($jitter > $jwarn ) { - print "Candidate match - Jitter_warn = $11 :$jwarn \n" if ($verbose); - $jitter_error = $ERRORS{'WARNING'}; - } else { - $jitter_error = $ERRORS{'WARNING'}; - } - } - - } - } - } -} - - -if ($ntpdate_error != $ERRORS{'OK'}) { - $state = $ntpdate_error; - if ($ntpdate_error == $ERRORS{'WARNING'} ) { - $answer = $msg; - } - else { - $answer = $msg . "Server for ntp probably down"; - } - - if (defined($offset) && abs($offset) > $ocrit) { - $state = $ERRORS{'CRITICAL'}; - $answer = "Server Error and offset $offset sec > +/- $ocrit sec"; - } elsif (defined($offset) && abs($offset) > $owarn) { - $answer = "Server error and offset $offset sec > +/- $owarn sec"; - } elsif (defined($jitter) && abs($jitter) > $jcrit) { - $answer = "Server error and jitter $jitter msec > +/- $jcrit msec"; - } elsif (defined($jitter) && abs($jitter) > $jwarn) { - $answer = "Server error and jitter $jitter msec > +/- $jwarn msec"; - } - -} elsif ($have_ntpq && $jitter_error != $ERRORS{'OK'}) { - $state = $jitter_error; - $answer = "Jitter $jitter too high"; - if (defined($offset) && abs($offset) > $ocrit) { - $state = $ERRORS{'CRITICAL'}; - $answer = "Jitter error and offset $offset sec > +/- $ocrit sec"; - } elsif (defined($offset) && abs($offset) > $owarn) { - $answer = "Jitter error and offset $offset sec > +/- $owarn sec"; - } elsif (defined($jitter) && abs($jitter) > $jcrit) { - $answer = "Jitter error and jitter $jitter msec > +/- $jcrit msec"; - } elsif (defined($jitter) && abs($jitter) > $jwarn) { - $answer = "Jitter error and jitter $jitter msec > +/- $jwarn msec"; - } - -} elsif( !$have_ntpq ) { # no errors from ntpdate and no ntpq or ntpq timed out - if (abs($offset) > $ocrit) { - $state = $ERRORS{'CRITICAL'}; - $answer = "Offset $offset sec > +/- $ocrit sec"; - } elsif (abs($offset) > $owarn) { - $state = $ERRORS{'WARNING'}; - $answer = "Offset $offset sec > +/- $owarn sec"; - } elsif (( abs($offset) > $owarn) && $def_jitter ) { - $state = $ERRORS{'WARNING'}; - $answer = "Offset $offset sec > +/- $owarn sec, ntpq timed out"; - } elsif ( $def_jitter ) { - $state = $ERRORS{'WARNING'}; - $answer = "Offset $offset secs, ntpq timed out"; - } else{ - $state = $ERRORS{'OK'}; - $answer = "Offset $offset secs"; - } - - - -} else { # no errors from ntpdate or ntpq - if (abs($offset) > $ocrit) { - $state = $ERRORS{'CRITICAL'}; - $answer = "Offset $offset sec > +/- $ocrit sec, jitter $jitter msec"; - } elsif (abs($jitter) > $jcrit ) { - $state = $ERRORS{'CRITICAL'}; - $answer = "Jitter $jitter msec> +/- $jcrit msec, offset $offset sec"; - } elsif (abs($offset) > $owarn) { - $state = $ERRORS{'WARNING'}; - $answer = "Offset $offset sec > +/- $owarn sec, jitter $jitter msec"; - } elsif (abs($jitter) > $jwarn ) { - $state = $ERRORS{'WARNING'}; - $answer = "Jitter $jitter msec> +/- $jwarn msec, offset $offset sec"; - - } else { - $state = $ERRORS{'OK'}; - $answer = "Offset $offset secs, jitter $jitter msec, peer is stratum $stratum"; - } - -} - -foreach my $key (keys %ERRORS) { - if ($state==$ERRORS{$key}) { -# print ("NTP $key: $answer"); - print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 . ",peer_stratum=$stratum\n"); - last; - } -} -exit $state; - - -#### -#### subs - -sub print_usage () { - print "Usage: $PROGNAME -H [-46] [-O] [-w ] [-c ] [-j ] [-k ] [-v verbose]\n"; -} - -sub print_help () { - print_revision($PROGNAME,'@NP_VERSION@'); - print "Copyright (c) 2003 Bo Kersey/Karl DeBisschop\n"; - print "\n"; - print_usage(); - print " -Checks the local timestamp offset versus with ntpdate -Checks the jitter/dispersion of clock signal between and its sys.peer with ntpq\n --O (--zero-offset) - A zero offset on \"ntpdate\" will generate a CRITICAL.\n --w (--warning) - Clock offset in seconds at which a warning message will be generated.\n Defaults to $DEFAULT_OFFSET_WARN. --c (--critical) - Clock offset in seconds at which a critical message will be generated.\n Defaults to $DEFAULT_OFFSET_CRIT. --j (--jwarn) - Clock jitter in milliseconds at which a warning message will be generated.\n Defaults to $DEFAULT_JITTER_WARN. --k (--jcrit) - Clock jitter in milliseconds at which a critical message will be generated.\n Defaults to $DEFAULT_JITTER_CRIT. - - If jitter/dispersion is specified with -j or -k and ntpq times out, then a - warning is returned.\n --4 (--use-ipv4) - Use IPv4 connection --6 (--use-ipv6) - Use IPv6 connection -\n"; -support(); -} diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh index 2a8ab21..ceac95d 100755 --- a/plugins-scripts/check_oracle.sh +++ b/plugins-scripts/check_oracle.sh @@ -3,12 +3,13 @@ # latigid010@yahoo.com # 01/06/2000 # -# This Nagios plugin was created to check Oracle status +# This Monitoring plugin was created to check Oracle status # PROGNAME=`basename $0` PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` REVISION="@NP_VERSION@" +PATH="@TRUSTED_PATH@" . $PROGPATH/utils.sh @@ -163,7 +164,7 @@ case "$cmd" in }' ;; --db) - pmonchk=`ps -ef | grep -v grep | grep -c "ora_pmon_${2}$"` + pmonchk=`ps -ef | grep -v grep | grep -E -c "(asm|ora)_pmon_${2}$"` if [ ${pmonchk} -ge 1 ] ; then echo "${2} OK - ${pmonchk} PMON process(es) running" exit $STATE_OK diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl index d2701e9..b1c6147 100755 --- a/plugins-scripts/check_rpc.pl +++ b/plugins-scripts/check_rpc.pl @@ -1,6 +1,6 @@ -#!/usr/local/bin/perl -w +#!@PERL@ -w # -# check_rpc plugin for nagios +# check_rpc plugin for monitoring # # usage: # check_rpc host service @@ -20,7 +20,9 @@ # use strict; -use lib utils.pm; +use FindBin; +use lib "$FindBin::Bin"; +use lib '@libexecdir@'; use utils qw($TIMEOUT %ERRORS &print_revision &support); use vars qw($PROGNAME); my ($verbose,@proto,%prognum,$host,$response,$prognum,$port,$cmd,$progver,$state); @@ -36,9 +38,9 @@ sub print_help (); sub print_usage (); sub in ($$); -$ENV{'BASH_ENV'}=''; +$ENV{'PATH'}='@TRUSTED_PATH@'; +$ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; -$ENV{'PATH'}=''; $ENV{'LC_ALL'}='C'; #Initialise protocol for each progname number @@ -254,7 +256,7 @@ $proto = 't' if ($opt_t); $proto = 'u' if ($opt_u); -# Just in case of problems, let's not hang Nagios +# Just in case of problems, let's not hang the monitoring system $SIG{'ALRM'} = sub { print ("ERROR: No response from RPC server (alarm)\n"); exit $ERRORS{"UNKNOWN"}; diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh index 874e104..05c64c4 100755 --- a/plugins-scripts/check_sensors.sh +++ b/plugins-scripts/check_sensors.sh @@ -1,14 +1,14 @@ #!/bin/sh -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin - PROGNAME=`basename $0` PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` REVISION="@NP_VERSION@" +PATH="@TRUSTED_PATH@" + +export PATH . $PROGPATH/utils.sh - print_usage() { echo "Usage: $PROGNAME" [--ignore-fault] } diff --git a/plugins-scripts/check_wave.pl b/plugins-scripts/check_wave.pl index 2671112..ee0fda4 100755 --- a/plugins-scripts/check_wave.pl +++ b/plugins-scripts/check_wave.pl @@ -1,9 +1,11 @@ -#!/usr/bin/perl -wT +#!@PERL@ -w # use strict; -use lib utils.pm; +use FindBin; +use lib "$FindBin::Bin"; +use lib '@libexecdir@'; use utils qw($TIMEOUT %ERRORS &print_revision &support); use vars qw($PROGNAME); use Getopt::Long; @@ -15,7 +17,7 @@ $PROGNAME = "check_wave"; sub print_help (); sub print_usage (); -$ENV{'PATH'}=''; +$ENV{'PATH'}='@TRUSTED_PATH@'; $ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; diff --git a/plugins-scripts/subst.in b/plugins-scripts/subst.in deleted file mode 100644 index a70ad88..0000000 --- a/plugins-scripts/subst.in +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/awk - -function which(c,path) { - cmd = "test -x " c; - - if (system(cmd)==0) { - return c; - } - - sub(/\/.*\//,"",c); - for (dir in path) { - cmd = "test -x " path[dir] "/" c; - if (system(cmd)==0) { - return path[dir] "/" c; - } - } - - - return c; -} - -# used to replace "use lib utils.pm" with "use lib @libexecdir" -# -function led() { - led1 = "@libexecdir@"; - led2 = "@exec_prefix@"; - led3 = "@prefix@"; - if ( match(led1, /^\$\{exec_prefix\}/ ) != 0 ) { - return "\"" led3 "/libexec\" " ; - - } - return "\"" led1 "\"" ; -} - -BEGIN { - split(ENVIRON["PATH"] ":/sbin:/usr/sbin",path,/:/); - -} - -# Plugin revision -/@NP_VERSION@/ {sub(/@NP_VERSION@/,ENVIRON["NP_VERSION"]);} - -# scripting language (first line) - -/^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");} -/^#! ?\/.*\/perl/ {sub(/^#! ?\/.*\/perl/,"#! @PERL@");} -/^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! @AWK@");} -/^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");} - -# If a script contains a reference to a fully qualified command, -# subst will replace the fully qualified command with whatever is -# returned from the which subroutine. run before changes to INC to add libexecdir -# FIXME: Prepend executables with a substitution keyword instead. -# -/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// { - match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/); - c=substr($0,RSTART,RLENGTH); - sub(c,which(c,path)); -} - -# add to libexecdir to INC for perl utils.pm -/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } } - - -# Trusted path mechanism (deprecated) - -/^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ { - sub(/\=[ \t]*['"][^"']+["']/,"='@with_trusted_path@' # autoconf-derived"); -} - -/^[\t ]*(export[\t ]*)?PATH[\t ]*=['"]+.+["']$/ { - sub(/\=.*$/,"='@with_trusted_path@' # autoconf-derived"); -} - -{ - print; -} - diff --git a/plugins-scripts/t/check_file_age.t b/plugins-scripts/t/check_file_age.t index 384c276..a515649 100644 --- a/plugins-scripts/t/check_file_age.t +++ b/plugins-scripts/t/check_file_age.t @@ -5,7 +5,7 @@ # use strict; -use Test::More tests => 15; +use Test::More tests => 16; use NPTest; my $successOutput = '/^FILE_AGE OK: /'; @@ -57,6 +57,11 @@ $result = NPTest->testCmd( ); cmp_ok( $result->return_code, '==', 0, "Checking file size" ); +$result = NPTest->testCmd( + "./check_file_age -f /non/existent --ignore-missing" + ); +cmp_ok( $result->return_code, '==', 0, "Honours --ignore-missing" ); + $result = NPTest->testCmd( "./check_file_age -f $temp_file -c 1000 -W 101" ); diff --git a/plugins-scripts/utils.pm.in b/plugins-scripts/utils.pm.in index 37cd62c..0f53243 100644 --- a/plugins-scripts/utils.pm.in +++ b/plugins-scripts/utils.pm.in @@ -1,6 +1,6 @@ -# Utility drawer for Nagios plugins. +# Utility drawer for Monitoring Plugins. # -# This will be deprecated soon. Please use Nagios::Plugin from CPAN +# This will be deprecated soon. Please use Monitoring::Plugin from CPAN # for new plugins package utils; diff --git a/plugins-scripts/utils.sh.in b/plugins-scripts/utils.sh.in index 4a07df8..031c035 100644 --- a/plugins-scripts/utils.sh.in +++ b/plugins-scripts/utils.sh.in @@ -6,19 +6,13 @@ STATE_CRITICAL=2 STATE_UNKNOWN=3 STATE_DEPENDENT=4 -if test -x /usr/bin/printf; then - ECHO=/usr/bin/printf -else - ECHO=echo -fi - print_revision() { echo "$1 v$2 (@PACKAGE@ @VERSION@)" - $ECHO "@WARRANTY@" | sed -e 's/\n/ /g' + printf '%b' "@WARRANTY@" } support() { - $ECHO "@SUPPORT@" | sed -e 's/\n/ /g' + printf '%b' "@SUPPORT@" } # diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 031dd25..0ddf9bd 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -11,9 +11,10 @@ endif AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"' -VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t +VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t -INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ +AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl \ + @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ localedir = $(datadir)/locale # gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this @@ -48,7 +49,7 @@ noinst_LIBRARIES = libnpcommon.a libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c \ popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h -BASEOBJS = libnpcommon.a ../lib/libnagiosplug.a ../gl/libgnu.a +BASEOBJS = libnpcommon.a ../lib/libmonitoringplug.a ../gl/libgnu.a NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS) NETLIBS = $(NETOBJS) $(SOCKETLIBS) SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS) @@ -81,11 +82,11 @@ check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS) check_load_LDADD = $(BASEOBJS) check_mrtg_LDADD = $(BASEOBJS) check_mrtgtraf_LDADD = $(BASEOBJS) -check_mysql_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"' -check_mysql_CPPFLAGS = $(MYSQLINCLUDE) +check_mysql_CFLAGS = $(AM_CFLAGS) $(MYSQLCFLAGS) +check_mysql_CPPFLAGS = $(AM_CPPFLAGS) $(MYSQLINCLUDE) check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS) -check_mysql_query_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"' -check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE) +check_mysql_query_CFLAGS = $(AM_CFLAGS) $(MYSQLCFLAGS) +check_mysql_query_CPPFLAGS = $(AM_CPPFLAGS) $(MYSQLINCLUDE) check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS) check_nagios_LDADD = $(BASEOBJS) check_nt_LDADD = $(NETLIBS) @@ -106,7 +107,7 @@ check_tcp_LDADD = $(SSLOBJS) check_time_LDADD = $(NETLIBS) check_ntp_time_LDADD = $(NETLIBS) $(MATHLIBS) check_ups_LDADD = $(NETLIBS) -check_users_LDADD = $(BASEOBJS) +check_users_LDADD = $(BASEOBJS) $(WTSAPI32LIBS) check_by_ssh_LDADD = $(NETLIBS) check_ide_smart_LDADD = $(BASEOBJS) negate_LDADD = $(BASEOBJS) @@ -129,11 +130,10 @@ install-exec-hook: cd $(DESTDIR)$(libexecdir) && \ for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\ if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi - + clean-local: rm -f $(check_tcp_programs) rm -f NP-VERSION-FILE uninstall-local: cd $(DESTDIR)$(libexecdir) && rm -f $(check_tcp_programs) - diff --git a/plugins/Makefile.in b/plugins/Makefile.in index a7e3e43..ce5b403 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/gnulib-common.m4 \ $(top_srcdir)/gl/m4/gnulib-comp.m4 \ $(top_srcdir)/gl/m4/hostent.m4 $(top_srcdir)/gl/m4/iconv.m4 \ + $(top_srcdir)/gl/m4/idpriv.m4 \ $(top_srcdir)/gl/m4/include_next.m4 \ $(top_srcdir)/gl/m4/inet_ntop.m4 \ $(top_srcdir)/gl/m4/intlmacosx.m4 \ @@ -145,11 +146,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdbool.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ - $(top_srcdir)/gl/m4/stdlib_h.m4 \ + $(top_srcdir)/gl/m4/stdlib_h.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ - $(top_srcdir)/gl/m4/string_h.m4 $(top_srcdir)/gl/m4/strndup.m4 \ - $(top_srcdir)/gl/m4/strnlen.m4 $(top_srcdir)/gl/m4/strsep.m4 \ - $(top_srcdir)/gl/m4/strstr.m4 \ + $(top_srcdir)/gl/m4/string_h.m4 \ + $(top_srcdir)/gl/m4/strings_h.m4 \ + $(top_srcdir)/gl/m4/strndup.m4 $(top_srcdir)/gl/m4/strnlen.m4 \ + $(top_srcdir)/gl/m4/strsep.m4 $(top_srcdir)/gl/m4/strstr.m4 \ $(top_srcdir)/gl/m4/sys_socket_h.m4 \ $(top_srcdir)/gl/m4/sys_types_h.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ @@ -164,7 +166,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \ $(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/xalloc.m4 \ $(top_srcdir)/gl/m4/xsize.m4 $(top_srcdir)/gl/m4/xstrndup.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs @@ -326,7 +328,8 @@ check_ups_OBJECTS = check_ups.$(OBJEXT) check_ups_DEPENDENCIES = $(am__DEPENDENCIES_13) check_users_SOURCES = check_users.c check_users_OBJECTS = check_users.$(OBJEXT) -check_users_DEPENDENCIES = $(BASEOBJS) $(am__append_1) +check_users_DEPENDENCIES = $(BASEOBJS) $(am__DEPENDENCIES_1) \ + $(am__append_1) negate_SOURCES = negate.c negate_OBJECTS = negate.$(OBJEXT) negate_DEPENDENCIES = $(BASEOBJS) @@ -378,7 +381,7 @@ CTAGS = ctags am__tty_colors = \ red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t +VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -492,6 +495,7 @@ GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ +GNULIB_FFS = @GNULIB_FFS@ GNULIB_FFSL = @GNULIB_FFSL@ GNULIB_FFSLL = @GNULIB_FFSLL@ GNULIB_FGETC = @GNULIB_FGETC@ @@ -857,6 +861,7 @@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ +HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ @@ -886,6 +891,7 @@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FEATURES_H = @HAVE_FEATURES_H@ +HAVE_FFS = @HAVE_FFS@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FMA = @HAVE_FMA@ @@ -997,8 +1003,10 @@ HAVE_SQRTL = @HAVE_SQRTL@ HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ +HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRINGS_H = @HAVE_STRINGS_H@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -1089,7 +1097,6 @@ LD = @LD@ LDAPINCLUDE = @LDAPINCLUDE@ LDAPLIBS = @LDAPLIBS@ LDFLAGS = @LDFLAGS@ -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ LIBICONV = @LIBICONV@ @@ -1116,6 +1123,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MATHLIBS = @MATHLIBS@ @@ -1141,6 +1149,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ +NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ @@ -1161,6 +1170,7 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_STDINT_H = @NEXT_STDINT_H@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ +NEXT_STRINGS_H = @NEXT_STRINGS_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ @@ -1220,7 +1230,6 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PST3CFLAGS = @PST3CFLAGS@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -PYTHON = @PYTHON@ RADIUSLIBS = @RADIUSLIBS@ RANLIB = @RANLIB@ RELEASE = @RELEASE@ @@ -1412,7 +1421,6 @@ SCRIPT_TEST = @SCRIPT_TEST@ SED = @SED@ SERVENT_LIB = @SERVENT_LIB@ SET_MAKE = @SET_MAKE@ -SH = @SH@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ @@ -1436,6 +1444,7 @@ WARRANTY = @WARRANTY@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ +WTSAPI32LIBS = @WTSAPI32LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -1502,7 +1511,9 @@ top_srcdir = @top_srcdir@ with_trusted_path = @with_trusted_path@ @RELEASE_PRESENT_TRUE@NP_VERSION = @NP_RELEASE@ AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"' -INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ +AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl \ + @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ + check_tcp_programs = check_ftp check_imap check_nntp check_pop \ check_udp check_clamd @check_tcp_ssl@ @@ -1512,7 +1523,7 @@ noinst_LIBRARIES = libnpcommon.a libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c \ popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h -BASEOBJS = libnpcommon.a ../lib/libnagiosplug.a ../gl/libgnu.a +BASEOBJS = libnpcommon.a ../lib/libmonitoringplug.a ../gl/libgnu.a NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS) NETLIBS = $(NETOBJS) $(SOCKETLIBS) SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS) @@ -1536,11 +1547,11 @@ check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS) check_load_LDADD = $(BASEOBJS) check_mrtg_LDADD = $(BASEOBJS) check_mrtgtraf_LDADD = $(BASEOBJS) -check_mysql_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"' -check_mysql_CPPFLAGS = $(MYSQLINCLUDE) +check_mysql_CFLAGS = $(AM_CFLAGS) $(MYSQLCFLAGS) +check_mysql_CPPFLAGS = $(AM_CPPFLAGS) $(MYSQLINCLUDE) check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS) -check_mysql_query_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"' -check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE) +check_mysql_query_CFLAGS = $(AM_CFLAGS) $(MYSQLCFLAGS) +check_mysql_query_CPPFLAGS = $(AM_CPPFLAGS) $(MYSQLINCLUDE) check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS) check_nagios_LDADD = $(BASEOBJS) check_nt_LDADD = $(NETLIBS) @@ -1561,7 +1572,7 @@ check_tcp_LDADD = $(SSLOBJS) check_time_LDADD = $(NETLIBS) check_ntp_time_LDADD = $(NETLIBS) $(MATHLIBS) check_ups_LDADD = $(NETLIBS) -check_users_LDADD = $(BASEOBJS) $(am__append_1) +check_users_LDADD = $(BASEOBJS) $(WTSAPI32LIBS) $(am__append_1) check_by_ssh_LDADD = $(NETLIBS) check_ide_smart_LDADD = $(BASEOBJS) negate_LDADD = $(BASEOBJS) @@ -1570,7 +1581,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1595,9 +1606,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): diff --git a/plugins/check_apt.c b/plugins/check_apt.c index daeb757..07622c2 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_apt plugin +* Monitoring check_apt plugin * * License: GPL -* Copyright (c) 2006-2008 Nagios Plugins Development Team +* Copyright (c) 2006-2008 Monitoring Plugins Development Team * * Original author: Sean Finney * @@ -31,7 +31,7 @@ const char *progname = "check_apt"; const char *copyright = "2006-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "runcmd.h" @@ -124,7 +124,7 @@ int main (int argc, char **argv) { (stderr_warning)?" warnings detected":"", (stderr_warning && exec_warning)?",":"", (exec_warning)?" errors detected":"", - (stderr_warning||exec_warning)?". run with -v for information.":"", + (stderr_warning||exec_warning)?".":"", packages_available, sec_count ); @@ -223,6 +223,9 @@ int run_upgrade(int *pkgcount, int *secpkgcount){ regex_t ireg, ereg, sreg; char *cmdline=NULL, rerrbuf[64]; + /* initialize ereg as it is possible it is printed while uninitialized */ + memset(&ereg, "\0", sizeof(ereg.buffer)); + if(upgrade==NO_UPGRADE) return STATE_OK; /* compile the regexps */ @@ -430,7 +433,7 @@ print_help (void) printf(UT_HELP_VRSN); printf(UT_EXTRA_OPTS); - printf(UT_TIMEOUT, timeout_interval); + printf(UT_PLUG_TIMEOUT, timeout_interval); printf (" %s\n", "-U, --upgrade=OPTS"); printf (" %s\n", _("[Default] Perform an upgrade. If an optional OPTS argument is provided,")); diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index c5f0d52..58f333d 100644 --- a/plugins/check_by_ssh.c +++ b/plugins/check_by_ssh.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_by_ssh plugin +* Monitoring check_by_ssh plugin * * License: GPL -* Copyright (c) 2000-2008 Nagios Plugins Development Team +* Copyright (c) 2000-2008 Monitoring Plugins Development Team * * Description: * @@ -28,7 +28,7 @@ const char *progname = "check_by_ssh"; const char *copyright = "2000-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -246,7 +246,7 @@ process_arguments (int argc, char **argv) } service[services - 1] = p1; break; - case 'n': /* short name of host in nagios configuration */ + case 'n': /* short name of host in the monitoring configuration */ host_shortname = optarg; break; @@ -371,7 +371,7 @@ validate_arguments (void) die (STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname); if (passive && host_shortname == NULL) - die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the nagios configs.\n"), progname); + die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the monitoring configs.\n"), progname); return OK; } @@ -416,11 +416,11 @@ print_help (void) printf (" %s\n","-i, --identity=KEYFILE"); printf (" %s\n", _("identity of an authorized key [optional]")); printf (" %s\n","-O, --output=FILE"); - printf (" %s\n", _("external command file for nagios [optional]")); + printf (" %s\n", _("external command file for monitoring [optional]")); printf (" %s\n","-s, --services=LIST"); - printf (" %s\n", _("list of nagios service names, separated by ':' [optional]")); + printf (" %s\n", _("list of monitoring service names, separated by ':' [optional]")); printf (" %s\n","-n, --name=NAME"); - printf (" %s\n", _("short name of host in nagios configuration [optional]")); + printf (" %s\n", _("short name of host in the monitoring configuration [optional]")); printf (" %s\n","-o, --ssh-option=OPTION"); printf (" %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]")); printf (" %s\n","-F, --configfile"); @@ -428,7 +428,7 @@ print_help (void) printf (" %s\n","-q, --quiet"); printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]")); printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); printf("\n"); printf (" %s\n", _("The most common mode of use is to refer to a local identity file with")); diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c index d4e39e0..cf699e1 100644 --- a/plugins/check_cluster.c +++ b/plugins/check_cluster.c @@ -1,10 +1,10 @@ /***************************************************************************** * -* check_cluster.c - Host and Service Cluster Plugin for Nagios 2.x +* check_cluster.c - Host and Service Cluster Plugin for Monitoring * * License: GPL * Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org) -* Copyright (c) 2007 Nagios Plugins Development Team +* Copyright (c) 2007 Monitoring Plugins Development Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ const char *progname = "check_cluster"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -227,7 +227,7 @@ print_help(void) printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n"); printf(COPYRIGHT, copyright, email); - printf(_("Host/Service Cluster Plugin for Nagios 2")); + printf(_("Host/Service Cluster Plugin for Monitoring")); printf("\n\n"); print_usage(); diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c index 8c4a511..a3d033f 100644 --- a/plugins/check_dbi.c +++ b/plugins/check_dbi.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_dbi plugin +* Monitoring check_dbi plugin * * License: GPL -* Copyright (c) 2011 Nagios Plugins Development Team +* Copyright (c) 2011 Monitoring Plugins Development Team * Author: Sebastian 'tokkee' Harl * * Description: @@ -31,7 +31,7 @@ const char *progname = "check_dbi"; const char *copyright = "2011"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -215,7 +215,7 @@ main (int argc, char **argv) } if (dbi_conn_connect (conn) < 0) { - np_dbi_print_error (conn, "UNKOWN - failed to connect to database"); + np_dbi_print_error (conn, "UNKNOWN - failed to connect to database"); return STATE_UNKNOWN; } @@ -241,7 +241,7 @@ main (int argc, char **argv) printf ("Selecting database '%s'\n", np_dbi_database); if (dbi_conn_select_db (conn, np_dbi_database)) { - np_dbi_print_error (conn, "UNKOWN - failed to select database '%s'", + np_dbi_print_error (conn, "UNKNOWN - failed to select database '%s'", np_dbi_database); return STATE_UNKNOWN; } @@ -456,7 +456,7 @@ process_arguments (int argc, char **argv) new = realloc (np_dbi_options, (np_dbi_options_num + 1) * sizeof (*new)); if (! new) { - printf ("UNKOWN - failed to reallocate memory\n"); + printf ("UNKNOWN - failed to reallocate memory\n"); exit (STATE_UNKNOWN); } @@ -562,7 +562,7 @@ print_help (void) printf (" %s\n", _("(ignore the query result)")); printf ("\n"); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_dig.c b/plugins/check_dig.c index c113d87..d9481f2 100644 --- a/plugins/check_dig.c +++ b/plugins/check_dig.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_dig plugin +* Monitoring check_dig plugin * * License: GPL -* Copyright (c) 2002-2008 Nagios Plugins Development Team +* Copyright (c) 2002-2008 Monitoring Plugins Development Team * * Description: * @@ -34,7 +34,7 @@ const char *progname = "check_dig"; const char *copyright = "2002-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -48,6 +48,7 @@ void print_usage (void); #define UNDEFINED 0 #define DEFAULT_PORT 53 +#define DEFAULT_TRIES 3 char *query_address = NULL; char *record_type = "A"; @@ -57,6 +58,7 @@ char *dig_args = ""; char *query_transport = ""; int verbose = FALSE; int server_port = DEFAULT_PORT; +int number_tries = DEFAULT_TRIES; double warning_interval = UNDEFINED; double critical_interval = UNDEFINED; struct timeval tv; @@ -72,6 +74,7 @@ main (int argc, char **argv) long microsec; double elapsed_time; int result = STATE_UNKNOWN; + int timeout_interval_dig; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -87,9 +90,12 @@ main (int argc, char **argv) if (process_arguments (argc, argv) == ERROR) usage_va(_("Could not parse arguments")); + /* dig applies the timeout to each try, so we need to work around this */ + timeout_interval_dig = timeout_interval / number_tries + number_tries; + /* get the command to run */ - xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s", - PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport); + xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s +tries=%d +time=%d", + PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport, number_tries, timeout_interval_dig); alarm (timeout_interval); gettimeofday (&tv, NULL); @@ -348,7 +354,7 @@ print_help (void) printf (" %s\n","-A, --dig-arguments=STRING"); printf (" %s\n",_("Pass STRING as argument(s) to dig")); printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); printf ("\n"); diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 04d588f..925dfa8 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_disk plugin +* Monitoring check_disk plugin * * License: GPL -* Copyright (c) 1999-2008 Nagios Plugins Development Team +* Copyright (c) 1999-2008 Monitoring Plugins Development Team * * Description: * @@ -29,7 +29,7 @@ const char *progname = "check_disk"; const char *program_name = "check_disk"; /* Required for coreutils libs */ const char *copyright = "1999-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" @@ -52,6 +52,11 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; #endif #include "regex.h" +#ifdef __CYGWIN__ +# include +# undef ERROR +# define ERROR -1 +#endif /* If nonzero, show inode information. */ static int inode_format = 1; @@ -175,6 +180,10 @@ main (int argc, char **argv) struct fs_usage fsp, tmpfsp; struct parameter_list *temp_list, *path; +#ifdef __CYGWIN__ + char mountdir[32]; +#endif + preamble = strdup (" - free space:"); output = strdup (""); details = strdup (""); @@ -221,7 +230,6 @@ main (int argc, char **argv) /* Process for every path in list */ for (path = path_select_list; path; path=path->name_next) { - if (verbose >= 3 && path->freespace_percent->warning != NULL && path->freespace_percent->critical != NULL) printf("Thresholds(pct) for %s warn: %f crit %f\n",path->name, path->freespace_percent->warning->end, path->freespace_percent->critical->end); @@ -234,6 +242,13 @@ main (int argc, char **argv) me = path->best_match; +#ifdef __CYGWIN__ + if (strncmp(path->name, "/cygdrive/", 10) != 0 || strlen(path->name) > 11) + continue; + snprintf(mountdir, sizeof(mountdir), "%s:\\", me->me_mountdir + 10); + if (GetDriveType(mountdir) != DRIVE_FIXED) + me->me_remote = 1; +#endif /* Filters */ /* Remove filesystems already seen */ @@ -877,7 +892,7 @@ print_help (void) printf (" %s\n", "-K, --icritical=PERCENT%"); printf (" %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free")); printf (" %s\n", "-p, --path=PATH, --partition=PARTITION"); - printf (" %s\n", _("Path or partition (may be repeated)")); + printf (" %s\n", _("Mount point or block device as emitted by the mount(8) command (may be repeated)")); printf (" %s\n", "-x, --exclude_device=PATH "); printf (" %s\n", _("Ignore device (only works if -p unspecified)")); printf (" %s\n", "-C, --clear"); @@ -911,7 +926,7 @@ print_help (void) printf (" %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)")); printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION"); printf (" %s\n", _("Regular expression to ignore selected path or partition (may be repeated)")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-u, --units=STRING"); printf (" %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)")); printf (UT_VERBOSE); @@ -970,6 +985,10 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) { } else { /* find all group members */ for (p_list = path_select_list; p_list; p_list=p_list->name_next) { +#ifdef __CYGWIN__ + if (strncmp(p_list->name, "/cygdrive/", 10) != 0) + continue; +#endif if (p_list->group && ! (strcmp(p_list->group, p->group))) { stat_path(p_list); get_fs_usage (p_list->best_match->me_mountdir, p_list->best_match->me_devname, &tmpfsp); diff --git a/plugins/check_dns.c b/plugins/check_dns.c index ac6cfc3..31a953d 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_dns plugin +* Monitoring check_dns plugin * * License: GPL -* Copyright (c) 2000-2008 Nagios Plugins Development Team +* Copyright (c) 2000-2008 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_dns"; const char *copyright = "2000-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -242,7 +242,23 @@ main (int argc, char **argv) } printf (ngettext("%.3f second response time", "%.3f seconds response time", elapsed_time), elapsed_time); printf (_(". %s returns %s"), query_address, address); - printf ("|%s\n", fperfdata ("time", elapsed_time, "s", FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0)); + if ((time_thresholds->warning != NULL) && (time_thresholds->critical != NULL)) { + printf ("|%s\n", fperfdata ("time", elapsed_time, "s", + TRUE, time_thresholds->warning->end, + TRUE, time_thresholds->critical->end, + TRUE, 0, FALSE, 0)); + } else if ((time_thresholds->warning == NULL) && (time_thresholds->critical != NULL)) { + printf ("|%s\n", fperfdata ("time", elapsed_time, "s", + FALSE, 0, + TRUE, time_thresholds->critical->end, + TRUE, 0, FALSE, 0)); + } else if ((time_thresholds->warning != NULL) && (time_thresholds->critical == NULL)) { + printf ("|%s\n", fperfdata ("time", elapsed_time, "s", + TRUE, time_thresholds->warning->end, + FALSE, 0, + TRUE, 0, FALSE, 0)); + } else + printf ("|%s\n", fperfdata ("time", elapsed_time, "s", FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0)); } else if (result == STATE_WARNING) printf (_("DNS WARNING - %s\n"), @@ -474,7 +490,7 @@ print_help (void) printf (" -c, --critical=seconds\n"); printf (" %s\n", _("Return critical if elapsed time exceeds value. Default off")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_SUPPORT); } diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c index 3cfc9ed..3ed6871 100644 --- a/plugins/check_dummy.c +++ b/plugins/check_dummy.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_dummy plugin +* Monitoring check_dummy plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_dummy"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" diff --git a/plugins/check_fping.c b/plugins/check_fping.c index dad000e..46046b4 100644 --- a/plugins/check_fping.c +++ b/plugins/check_fping.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_fping plugin +* Monitoring check_fping plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_fping"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "popen.h" diff --git a/plugins/check_game.c b/plugins/check_game.c index 89bb4b1..29e59e2 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_game plugin +* Monitoring check_game plugin * * License: GPL -* Copyright (c) 2002-2007 Nagios Plugins Development Team +* Copyright (c) 2002-2007 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_game"; const char *copyright = "2002-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -312,7 +312,7 @@ print_help (void) printf (" %s\n", "-pf"); printf (" %s\n", _("Field number in raw qstat output that contains ping time")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf ("\n"); printf ("%s\n", _("Notes:")); diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c index 60e922e..1e7605b 100644 --- a/plugins/check_hpjd.c +++ b/plugins/check_hpjd.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_hpjd plugin +* Monitoring check_hpjd plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_hpjd"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "popen.h" diff --git a/plugins/check_http.c b/plugins/check_http.c index c36d916..5167997 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_http plugin +* Monitoring check_http plugin * * License: GPL -* Copyright (c) 1999-2013 Nagios Plugins Development Team +* Copyright (c) 1999-2013 Monitoring Plugins Development Team * * Description: * @@ -35,7 +35,7 @@ const char *progname = "check_http"; const char *copyright = "1999-2013"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -57,7 +57,7 @@ enum { #ifdef HAVE_SSL int check_cert = FALSE; -int ssl_version; +int ssl_version = 0; int days_till_exp_warn, days_till_exp_crit; char *randbuff; X509 *server_cert; @@ -157,7 +157,7 @@ main (int argc, char **argv) /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */ server_url = strdup(HTTP_URL); server_url_length = strlen(server_url); - xasprintf (&user_agent, "User-Agent: check_http/v%s (nagios-plugins %s)", + xasprintf (&user_agent, "User-Agent: check_http/v%s (monitoring-plugins %s)", NP_VERSION, VERSION); /* Parse extra opts if any */ @@ -257,7 +257,7 @@ process_arguments (int argc, char **argv) } while (1) { - c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:N:E", longopts, &option); + c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:NE", longopts, &option); if (c == -1 || c == EOF) break; @@ -339,10 +339,10 @@ process_arguments (int argc, char **argv) case 'S': /* use SSL */ #ifdef HAVE_SSL enable_ssl: + /* ssl_version initialized to 0 as a default. Only set if it's non-zero. This helps when we include multiple + parameters, like -S and -C combinations */ use_ssl = TRUE; - if (optarg == NULL || c != 'S') - ssl_version = 0; - else { + if (c=='S' && optarg != NULL) { ssl_version = atoi(optarg); if (ssl_version < 1 || ssl_version > 3) usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 (SSLv3)")); @@ -1243,6 +1243,7 @@ redir (char *pos, char *status_line) if (addr == NULL) die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate addr\n")); + memset(addr, 0, MAX_IPV4_HOSTLENGTH); url = malloc (strcspn (pos, "\r\n")); if (url == NULL) die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n")); @@ -1333,8 +1334,8 @@ redir (char *pos, char *status_line) max_depth, type, addr, i, url, (display_html ? "" : "")); if (server_port==i && - !strcmp(server_address, addr) && - (host_name && !strcmp(host_name, addr)) && + !strncmp(server_address, addr, MAX_IPV4_HOSTLENGTH) && + (host_name && !strncmp(host_name, addr, MAX_IPV4_HOSTLENGTH)) && !strcmp(server_url, url)) die (STATE_WARNING, _("HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"), @@ -1343,11 +1344,11 @@ redir (char *pos, char *status_line) strcpy (server_type, type); free (host_name); - host_name = strdup (addr); + host_name = strndup (addr, MAX_IPV4_HOSTLENGTH); if (!(followsticky & STICKY_HOST)) { free (server_address); - server_address = strdup (addr); + server_address = strndup (addr, MAX_IPV4_HOSTLENGTH); } if (!(followsticky & STICKY_PORT)) { server_port = i; @@ -1366,6 +1367,7 @@ redir (char *pos, char *status_line) printf (_("Redirection to %s://%s:%d%s\n"), server_type, host_name ? host_name : server_address, server_port, server_url); + free(addr); check_http (); } @@ -1534,7 +1536,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c index 0a8009a..47605e9 100644 --- a/plugins/check_ide_smart.c +++ b/plugins/check_ide_smart.c @@ -1,13 +1,13 @@ /***************************************************************************** * -* Nagios check_ide_smart plugin +* Monitoring check_ide_smart plugin * ide-smart 1.3 - IDE S.M.A.R.T. checking tool * * License: GPL * Copyright (C) 1998-1999 Ragnar Hojland Espinosa * 1998 Gadi Oxman * Copyright (c) 2000 Robert Dale -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -35,7 +35,7 @@ const char *progname = "check_ide_smart"; const char *copyright = "1998-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -172,12 +172,12 @@ void print_value (value_t *, threshold_t *); void print_values (values_t *, thresholds_t *); int smart_cmd_simple (int, enum SmartCommand, __u8, char); int smart_read_thresholds (int, thresholds_t *); +int verbose = FALSE; int main (int argc, char *argv[]) { char *device = NULL; - int command = -1; int o, longindex; int retval = 0; @@ -191,7 +191,7 @@ main (int argc, char *argv[]) {"quiet-check", no_argument, 0, 'q'}, {"auto-on", no_argument, 0, '1'}, {"auto-off", no_argument, 0, '0'}, - {"nagios", no_argument, 0, 'n'}, + {"nagios", no_argument, 0, 'n'}, /* DEPRECATED, but we still accept it */ {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, {0, 0, 0, 0} @@ -206,7 +206,7 @@ main (int argc, char *argv[]) while (1) { - o = getopt_long (argc, argv, "+d:iq10nhV", longopts, &longindex); + o = getopt_long (argc, argv, "+d:iq10nhVv", longopts, &longindex); if (o == -1 || o == EOF || o == 1) break; @@ -216,19 +216,21 @@ main (int argc, char *argv[]) device = optarg; break; case 'q': - command = 3; + fprintf (stderr, "%s\n", _("DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\".")); + fprintf (stderr, "%s\n", _("Nagios-compatible output is now always returned.")); break; case 'i': - command = 2; - break; case '1': - command = 1; - break; case '0': - command = 0; + printf ("%s\n", _("SMART commands are broken and have been disabled (See Notes in --help).")); + return STATE_CRITICAL; break; case 'n': - command = 4; + fprintf (stderr, "%s\n", _("DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the")); + fprintf (stderr, "%s\n", _("default and will be removed from future releases.")); + break; + case 'v': /* verbose */ + verbose = TRUE; break; case 'h': print_help (); @@ -257,37 +259,16 @@ main (int argc, char *argv[]) return STATE_CRITICAL; } - if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, TRUE)) { + if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, FALSE)) { printf (_("CRITICAL - SMART_CMD_ENABLE\n")); return STATE_CRITICAL; } - switch (command) { - case 0: - retval = smart_cmd_simple (fd, SMART_CMD_AUTO_OFFLINE, 0, TRUE); - break; - case 1: - retval = smart_cmd_simple (fd, SMART_CMD_AUTO_OFFLINE, 0xF8, TRUE); - break; - case 2: - retval = smart_cmd_simple (fd, SMART_CMD_IMMEDIATE_OFFLINE, 0, TRUE); - break; - case 3: - smart_read_values (fd, &values); - smart_read_thresholds (fd, &thresholds); - retval = values_not_passed (&values, &thresholds); - break; - case 4: - smart_read_values (fd, &values); - smart_read_thresholds (fd, &thresholds); - retval = nagios (&values, &thresholds); - break; - default: - smart_read_values (fd, &values); - smart_read_thresholds (fd, &thresholds); - print_values (&values, &thresholds); - break; - } + smart_read_values (fd, &values); + smart_read_thresholds (fd, &thresholds); + retval = nagios (&values, &thresholds); + if (verbose) print_values (&values, &thresholds); + close (fd); return retval; } @@ -368,7 +349,7 @@ values_not_passed (values_t * p, thresholds_t * t) int i; for (i = 0; i < NR_ATTRIBUTES; i++) { if (value->id && threshold->id && value->id == threshold->id) { - if (value->value <= threshold->threshold) { + if (value->value < threshold->threshold) { ++failed; } else { @@ -397,7 +378,7 @@ nagios (values_t * p, thresholds_t * t) int i; for (i = 0; i < NR_ATTRIBUTES; i++) { if (value->id && threshold->id && value->id == threshold->id) { - if (value->value <= threshold->threshold) { + if (value->value < threshold->threshold) { ++failed; if (value->status & 1) { status = PREFAILURE; @@ -438,7 +419,7 @@ nagios (values_t * p, thresholds_t * t) status=STATE_OK; break; default: - printf (_("ERROR - Status '%d' unkown. %d/%d tests passed\n"), status, + printf (_("ERROR - Status '%d' unknown. %d/%d tests passed\n"), status, passed, total); status = STATE_UNKNOWN; break; @@ -454,7 +435,7 @@ print_value (value_t * p, threshold_t * t) printf ("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n", p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory ", p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold, - p->value > t->threshold ? "Passed" : "Failed"); + p->value >= t->threshold ? "Passed" : "Failed"); } @@ -495,7 +476,7 @@ print_values (values_t * p, thresholds_t * t) int smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error) { - int e = 0; + int e = STATE_UNKNOWN; #ifdef __linux__ __u8 args[4]; args[0] = WIN_SMART; @@ -503,11 +484,15 @@ smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error) args[2] = smart_command[command].value; args[3] = 0; if (ioctl (fd, HDIO_DRIVE_CMD, &args)) { - e = errno; - if (show_error) { + e = STATE_CRITICAL; + if (show_error) printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno)); - } + } else { + e = STATE_OK; + if (show_error) + printf (_("OK - Command sent (%s)\n"), smart_command[command].text); } + #endif /* __linux__ */ #ifdef __NetBSD__ struct atareq req; @@ -528,10 +513,15 @@ smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error) } if (errno != 0) { - e = errno; - printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno)); - return e; + e = STATE_CRITICAL; + if (show_error) + printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno)); + } else { + e = STATE_OK; + if (show_error) + printf (_("OK - Command sent (%s)\n"), smart_command[command].text); } + #endif /* __NetBSD__ */ return e; } @@ -592,8 +582,8 @@ print_help (void) { print_revision (progname, NP_VERSION); - printf ("Nagios feature - 1999 Robert Dale \n"); printf ("(C) 1999 Ragnar Hojland Espinosa \n"); + printf ("Plugin implementation - 1999 Robert Dale \n"); printf (COPYRIGHT, copyright, email); printf (_("This plugin checks a local hard drive with the (Linux specific) SMART interface [http://smartlinux.sourceforge.net/smart/index.php].")); @@ -607,17 +597,19 @@ print_help (void) printf (" %s\n", "-d, --device=DEVICE"); printf (" %s\n", _("Select device DEVICE")); - printf (" %s\n", _("Note: if the device is selected with this option, _no_ other options are accepted")); - printf (" %s\n", "-i, --immediate"); - printf (" %s\n", _("Perform immediately offline tests")); - printf (" %s\n", "-q, --quiet-check"); - printf (" %s\n", _("Returns the number of failed tests")); - printf (" %s\n", "-1, --auto-on"); - printf (" %s\n", _("Turn on automatic offline tests")); - printf (" %s\n", "-0, --auto-off"); - printf (" %s\n", _("Turn off automatic offline tests")); - printf (" %s\n", "-n, --nagios"); - printf (" %s\n", _("Output suitable for Nagios")); + printf (" %s\n", _("Note: if the device is specified without this option, any further option will")); + printf (" %s\n", _("be ignored.")); + + printf (UT_VERBOSE); + + printf ("\n"); + printf ("%s\n", _("Notes:")); + printf (" %s\n", _("The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were")); + printf (" %s\n", _("broken in an underhand manner and have been disabled. You can use smartctl")); + printf (" %s\n", _("instead:")); + printf (" %s\n", _("-0/--auto-off: use \"smartctl --offlineauto=off\"")); + printf (" %s\n", _("-1/--auto-on: use \"smartctl --offlineauto=on\"")); + printf (" %s\n", _("-i/--immediate: use \"smartctl --test=offline\"")); printf (UT_SUPPORT); } @@ -638,6 +630,5 @@ void print_usage (void) { printf ("%s\n", _("Usage:")); - printf ("%s [-d ] [-i ] [-q quiet] [-1 ]",progname); - printf (" [-O ] [-n ]\n"); + printf ("%s [-d ] [-v]", progname); } diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index b05aca9..c371be9 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_ldap plugin +* Monitoring check_ldap plugin * * License: GPL -* Copyright (c) 2000-2008 Nagios Plugins Development Team +* Copyright (c) 2000-2008 Monitoring Plugins Development Team * * Description: * @@ -29,7 +29,7 @@ /* progname may be check_ldaps */ char *progname = "check_ldap"; const char *copyright = "2000-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -430,7 +430,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_load.c b/plugins/check_load.c index 296a823..cde63e5 100644 --- a/plugins/check_load.c +++ b/plugins/check_load.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_load plugin +* Monitoring check_load plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_load"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c index d6162f3..cf3fe04 100644 --- a/plugins/check_mrtg.c +++ b/plugins/check_mrtg.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_mrtg plugin +* Monitoring check_mrtg plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -31,7 +31,7 @@ const char *progname = "check_mrtg"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -356,7 +356,7 @@ print_help (void) printf (" %s\n", _("This plugin is useful for monitoring MRTG data that does not correspond to")); printf (" %s\n", _("bandwidth usage. (Use the check_mrtgtraf plugin for monitoring bandwidth).")); printf (" %s\n", _("It can be used to monitor any kind of data that MRTG is monitoring - errors,")); - printf (" %s\n", _("packets/sec, etc. I use MRTG in conjuction with the Novell NLM that allows")); + printf (" %s\n", _("packets/sec, etc. I use MRTG in conjunction with the Novell NLM that allows")); printf (" %s\n", _("me to track processor utilization, user connections, drive space, etc and")); printf (" %s\n\n", _("this plugin works well for monitoring that kind of data as well.")); diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c index a822651..32ba050 100644 --- a/plugins/check_mrtgtraf.c +++ b/plugins/check_mrtgtraf.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_mrtgtraf plugin +* Monitoring check_mrtgtraf plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -34,7 +34,7 @@ const char *progname = "check_mrtgtraf"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; int process_arguments (int, char **); int validate_arguments (void); diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index db670e2..4f09e5f 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c @@ -1,11 +1,11 @@ /***************************************************************************** * -* Nagios check_mysql plugin +* Monitoring check_mysql plugin * * License: GPL * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at) * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) -* Copyright (c) 1999-2011 Nagios Plugins Development Team +* Copyright (c) 1999-2011 Monitoring Plugins Development Team * * Description: * @@ -32,7 +32,7 @@ const char *progname = "check_mysql"; const char *copyright = "1999-2011"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #define SLAVERESULTSIZE 70 @@ -476,12 +476,6 @@ validate_arguments (void) if (db_user == NULL) db_user = strdup(""); - if (opt_file == NULL) - opt_file = strdup(""); - - if (opt_group == NULL) - opt_group = strdup(""); - if (db_host == NULL) db_host = strdup(""); diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c index 0bb83c3..71ab776 100644 --- a/plugins/check_mysql_query.c +++ b/plugins/check_mysql_query.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_mysql_query plugin +* Monitoring check_mysql_query plugin * * License: GPL -* Copyright (c) 2006-2009 Nagios Plugins Development Team +* Copyright (c) 2006-2009 Monitoring Plugins Development Team * Original code from check_mysql, copyright 1999 Didi Rieder * * Description: @@ -31,7 +31,7 @@ const char *progname = "check_mysql_query"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -46,6 +46,8 @@ char *db_host = NULL; char *db_socket = NULL; char *db_pass = NULL; char *db = NULL; +char *opt_file = NULL; +char *opt_group = NULL; unsigned int db_port = MYSQL_PORT; int process_arguments (int, char **); @@ -83,7 +85,13 @@ main (int argc, char **argv) /* initialize mysql */ mysql_init (&mysql); - mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client"); + if (opt_file != NULL) + mysql_options(&mysql,MYSQL_READ_DEFAULT_FILE,opt_file); + + if (opt_group != NULL) + mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,opt_group); + else + mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client"); /* establish a connection to the server and error checking */ if (!mysql_real_connect(&mysql,db_host,db_user,db_pass,db,db_port,db_socket,0)) { @@ -152,7 +160,13 @@ main (int argc, char **argv) } else if (status == STATE_CRITICAL) { printf("QUERY %s: ", _("CRITICAL")); } - printf(_("'%s' returned %f"), sql_query, value); + printf(_("'%s' returned %f | %s"), sql_query, value, + fperfdata("result", value, "", + my_thresholds->warning?TRUE:FALSE, my_thresholds->warning?my_thresholds->warning->end:0, + my_thresholds->critical?TRUE:FALSE, my_thresholds->critical?my_thresholds->critical->end:0, + FALSE, 0, + FALSE, 0) + ); printf("\n"); return status; @@ -174,6 +188,8 @@ process_arguments (int argc, char **argv) {"database", required_argument, 0, 'd'}, {"username", required_argument, 0, 'u'}, {"password", required_argument, 0, 'p'}, + {"file", required_argument, 0, 'f'}, + {"group", required_argument, 0, 'g'}, {"port", required_argument, 0, 'P'}, {"verbose", no_argument, 0, 'v'}, {"version", no_argument, 0, 'V'}, @@ -188,7 +204,7 @@ process_arguments (int argc, char **argv) return ERROR; while (1) { - c = getopt_long (argc, argv, "hvVP:p:u:d:H:s:q:w:c:", longopts, &option); + c = getopt_long (argc, argv, "hvVP:p:u:d:H:s:q:w:c:f:g:", longopts, &option); if (c == -1 || c == EOF) break; @@ -220,6 +236,12 @@ process_arguments (int argc, char **argv) optarg++; } break; + case 'f': /* client options file */ + opt_file = optarg; + break; + case 'g': /* client options group */ + opt_group = optarg; + break; case 'P': /* critical time threshold */ db_port = atoi (optarg); break; @@ -299,6 +321,10 @@ print_help (void) printf (" %s\n", _("Use the specified socket (has no effect if -H is used)")); printf (" -d, --database=STRING\n"); printf (" %s\n", _("Database to check")); + printf (" %s\n", "-f, --file=STRING"); + printf (" %s\n", _("Read from the specified client options file")); + printf (" %s\n", "-g, --group=STRING"); + printf (" %s\n", _("Use a client options group")); printf (" -u, --username=STRING\n"); printf (" %s\n", _("Username to login with")); printf (" -p, --password=STRING\n"); @@ -324,5 +350,5 @@ print_usage (void) { printf ("%s\n", _("Usage:")); printf (" %s -q SQL_query [-w warn] [-c crit] [-H host] [-P port] [-s socket]\n",progname); - printf (" [-d database] [-u user] [-p password]\n"); + printf (" [-d database] [-u user] [-p password] [-f optfile] [-g group]\n"); } 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 @@ /***************************************************************************** * -* Nagios check_nagios plugin +* Monitoring check_nagios plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -34,7 +34,7 @@ const char *progname = "check_nagios"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "runcmd.h" diff --git a/plugins/check_nt.c b/plugins/check_nt.c index 52bbd1c..fefbfb7 100644 --- a/plugins/check_nt.c +++ b/plugins/check_nt.c @@ -1,10 +1,10 @@ /***************************************************************************** * -* Nagios check_nt plugin +* Monitoring check_nt plugin * * License: GPL * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com) -* Copyright (c) 2003-2007 Nagios Plugins Development Team +* Copyright (c) 2003-2007 Monitoring Plugins Development Team * * Description: * @@ -34,7 +34,7 @@ const char *progname = "check_nt"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -203,7 +203,7 @@ int main(int argc, char **argv){ updays = uptime / 86400; uphours = (uptime % 86400) / 3600; upminutes = ((uptime % 86400) % 3600) / 60; - xasprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s)"),updays,uphours, upminutes); + xasprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s)|uptime=%lu"), updays, uphours, upminutes, uptime); if (check_critical_value==TRUE && uptime <= critical_value) return_code=STATE_CRITICAL; else if (check_warning_value==TRUE && uptime <= warning_value) @@ -293,10 +293,10 @@ int main(int argc, char **argv){ /* Divisor should be 1048567, not 3044515, as we are measuring "Commit Charge" here, which equals RAM + Pagefiles. */ - xasprintf(&output_message,_("Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"), + xasprintf(&output_message,_("Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)"), mem_commitLimit / 1048567, mem_commitByte / 1048567, percent_used_space, (mem_commitLimit - mem_commitByte) / 1048567, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100); - xasprintf(&perfdata,_("'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 1048567, + xasprintf(&perfdata,_("'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 1048567, warning_used_space / 1048567, critical_used_space / 1048567, mem_commitLimit / 1048567); return_code=STATE_OK; @@ -750,7 +750,7 @@ void print_help(void) printf (" %s\n", _("The purpose of this is to be run from command line to determine what instances")); printf (" %s\n", _(" are available for monitoring without having to log onto the Windows server")); printf (" %s\n", _(" to run Perfmon directly.")); - printf (" %s\n", _("It can also be used in scripts that automatically create Nagios service")); + printf (" %s\n", _("It can also be used in scripts that automatically create the monitoring service")); printf (" %s\n", _(" configuration files.")); printf (" %s\n", _("Some examples:")); printf (" %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process")); diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index 16be7c5..09a923e 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c @@ -1,10 +1,10 @@ /***************************************************************************** * -* Nagios check_ntp plugin +* Monitoring check_ntp plugin * * License: GPL * Copyright (c) 2006 Sean Finney -* Copyright (c) 2006-2008 Nagios Plugins Development Team +* Copyright (c) 2006-2008 Monitoring Plugins Development Team * * Description: * @@ -32,7 +32,7 @@ const char *progname = "check_ntp"; const char *copyright = "2006-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -54,7 +54,9 @@ void print_help (void); void print_usage (void); /* number of times to perform each request to get a good average. */ +#ifndef AVG_NUM #define AVG_NUM 4 +#endif /* max size of control message data */ #define MAX_CM_SIZE 468 @@ -480,7 +482,7 @@ double offset_request(const char *host, int *status){ } else { /* finally, calculate the average offset */ for(i=0; i -* Copyright (c) 2006-2008 Nagios Plugins Development Team +* Copyright (c) 2006-2008 Monitoring Plugins Development Team * * Description: * @@ -37,7 +37,7 @@ const char *progname = "check_ntp_peer"; const char *copyright = "2006-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -686,7 +686,7 @@ void print_help(void){ printf (" %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")")); printf (" %s\n", "-n, --tcrit=THRESHOLD"); printf (" %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); printf("\n"); diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c index bbcaa0b..72dffbd 100644 --- a/plugins/check_ntp_time.c +++ b/plugins/check_ntp_time.c @@ -1,10 +1,10 @@ /***************************************************************************** * -* Nagios check_ntp_time plugin +* Monitoring check_ntp_time plugin * * License: GPL * Copyright (c) 2006 Sean Finney -* Copyright (c) 2006-2008 Nagios Plugins Development Team +* Copyright (c) 2006-2008 Monitoring Plugins Development Team * * Description: * @@ -36,7 +36,7 @@ const char *progname = "check_ntp_time"; const char *copyright = "2006-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -55,7 +55,9 @@ void print_help (void); void print_usage (void); /* number of times to perform each request to get a good average. */ +#ifndef AVG_NUM #define AVG_NUM 4 +#endif /* max size of control message data */ #define MAX_CM_SIZE 468 @@ -426,7 +428,7 @@ double offset_request(const char *host, int *status){ } else { /* finally, calculate the average offset */ for(i=0; i = number of active connections on TCP port ")); printf (" %s\n", _("UPTIME = system uptime in seconds")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c index 324bd5f..9bad1ec 100644 --- a/plugins/check_pgsql.c +++ b/plugins/check_pgsql.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_pgsql plugin +* Monitoring check_pgsql plugin * * License: GPL -* Copyright (c) 1999-2011 Nagios Plugins Development Team +* Copyright (c) 1999-2011 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_pgsql"; const char *copyright = "1999-2011"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -514,7 +514,7 @@ print_help (void) printf (" %s\n", "-d, --database=STRING"); printf (" %s", _("Database to check ")); - printf (_("(default: %s)"), DEFAULT_DB); + printf (_("(default: %s)\n"), DEFAULT_DB); printf (" %s\n", "-l, --logname = STRING"); printf (" %s\n", _("Login name of user")); printf (" %s\n", "-p, --password = STRING"); @@ -524,7 +524,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-q, --query=STRING"); printf (" %s\n", _("SQL query to run. Only first column in first row will be read")); @@ -563,7 +563,7 @@ print_help (void) printf (" %s\n", _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP")); printf (" %s\n\n", _("connections (start the postmaster with the -i option).")); - printf (" %s\n", _("Typically, the nagios user (unless the --logname option is used) should be")); + printf (" %s\n", _("Typically, the monitoring user (unless the --logname option is used) should be")); printf (" %s\n", _("able to connect to the database without a password. The plugin can also send")); printf (" %s\n", _("a password, but no effort is made to obsure or encrypt the password.")); diff --git a/plugins/check_ping.c b/plugins/check_ping.c index eef2195..dbc5c3e 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_ping plugin +* Monitoring check_ping plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_ping"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -458,7 +458,8 @@ run_ping (const char *cmd, const char *addr) (sscanf(buf,"%*d packets transmitted, %*d received, %d%% loss, time%n",&pl,&match) && match) || (sscanf(buf,"%*d packets transmitted, %*d received, %d%% packet loss, time%n",&pl,&match) && match) || (sscanf(buf,"%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) || - (sscanf(buf,"%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) + (sscanf(buf,"%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) || + (sscanf(buf,"%*[^(](%d%% %*[^)])%n",&pl,&match) && match) ) continue; @@ -471,7 +472,9 @@ run_ping (const char *cmd, const char *addr) (sscanf(buf,"round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f%n",&rta,&match) && match) || (sscanf(buf,"round-trip (ms) min/avg/max = %*f/%f/%*f%n",&rta,&match) && match) || (sscanf(buf,"round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f%n",&rta,&match) && match) || - (sscanf(buf,"rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n",&rta,&match) && match)) + (sscanf(buf,"rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n",&rta,&match) && match) || + (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %fms%n", &rta, &match) && match) + ) continue; } @@ -482,7 +485,11 @@ run_ping (const char *cmd, const char *addr) /* check stderr, setting at least WARNING if there is output here */ /* Add warning into warn_text */ while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) { - if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")) { + if ( + ! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP") + && ! strstr(buf,"Warning: time of day goes back") + + ) { if (verbose >= 3) { printf("Got stderr: %s", buf); } @@ -581,7 +588,7 @@ print_help (void) printf (" %s\n", "-L, --link"); printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf ("\n"); printf ("%s\n", _("THRESHOLD is ,% where is the round trip average travel")); diff --git a/plugins/check_procs.c b/plugins/check_procs.c index d20b027..402aac5 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_procs plugin +* Monitoring check_procs plugin * * License: GPL -* Copyright (c) 2000-2008 Nagios Plugins Development Team +* Copyright (c) 2000-2008 Monitoring Plugins Development Team * * Description: * @@ -34,7 +34,7 @@ const char *progname = "check_procs"; const char *program_name = "check_procs"; /* Required for coreutils libs */ const char *copyright = "2000-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -123,6 +123,7 @@ main (int argc, char **argv) char *procprog; pid_t mypid = 0; + pid_t myppid = 0; struct stat statbuf; dev_t mydev = 0; ino_t myino = 0; @@ -172,6 +173,7 @@ main (int argc, char **argv) /* find ourself */ mypid = getpid(); + myppid = getppid(); if (usepid || stat_exe(mypid, &statbuf) == -1) { /* usepid might have been set by -T */ usepid = 1; @@ -241,6 +243,12 @@ main (int argc, char **argv) printf("not considering - is myself or gone\n"); continue; } + /* Ignore parent*/ + else if (myppid == procpid) { + if (verbose >= 3) + printf("not considering - is parent\n"); + continue; + } /* filter kernel threads (childs of KTHREAD_PARENT)*/ /* TODO adapt for other OSes than GNU/Linux @@ -707,7 +715,7 @@ print_help (void) #if defined( __linux__ ) printf (" %s\n", _("ELAPSED - time elapsed in seconds")); #endif /* defined(__linux__) */ - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-v, --verbose"); printf (" %s\n", _("Extra information. Up to 3 verbosity levels")); diff --git a/plugins/check_radius.c b/plugins/check_radius.c index e54105b..b294347 100644 --- a/plugins/check_radius.c +++ b/plugins/check_radius.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_radius plugin +* Monitoring check_radius plugin * * License: GPL -* Copyright (c) 1999-2008 Nagios Plugins Development Team +* Copyright (c) 1999-2008 Monitoring Plugins Development Team * * Description: * @@ -30,15 +30,16 @@ const char *progname = "check_radius"; const char *copyright = "2000-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" #include "netutils.h" -#ifdef HAVE_LIBRADIUSCLIENT_NG +#if defined(HAVE_LIBFREERADIUS_CLIENT) +#include +#elif defined(HAVE_LIBRADIUSCLIENT_NG) #include -rc_handle *rch = NULL; #else #include #endif @@ -47,11 +48,14 @@ int process_arguments (int, char **); void print_help (void); void print_usage (void); -/* libradiusclient(-ng) wrapper functions */ -#ifdef HAVE_LIBRADIUSCLIENT_NG +#if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) #define my_rc_conf_str(a) rc_conf_str(rch,a) #define my_rc_send_server(a,b) rc_send_server(rch,a,b) +#ifdef HAVE_LIBFREERADIUS_CLIENT +#define my_rc_buildreq(a,b,c,d,e,f) rc_buildreq(rch,a,b,c,d,(a)->secret,e,f) +#else #define my_rc_buildreq(a,b,c,d,e,f) rc_buildreq(rch,a,b,c,d,e,f) +#endif #define my_rc_own_ipaddress() rc_own_ipaddress(rch) #define my_rc_avpair_add(a,b,c,d) rc_avpair_add(rch,a,b,c,-1,d) #define my_rc_read_dictionary(a) rc_read_dictionary(rch, a) @@ -72,6 +76,10 @@ void print_usage (void); int my_rc_read_config(char *); +#if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) +rc_handle *rch = NULL; +#endif + char *server = NULL; char *username = NULL; char *password = NULL; @@ -142,11 +150,10 @@ Please note that all tags must be lowercase to use the DocBook XML DTD. int main (int argc, char **argv) { - UINT4 service; char msg[BUFFER_LEN]; SEND_DATA data; int result = STATE_UNKNOWN; - UINT4 client_id; + uint32_t client_id, service; char *str; setlocale (LC_ALL, ""); @@ -162,7 +169,7 @@ main (int argc, char **argv) str = strdup ("dictionary"); if ((config_file && my_rc_read_config (config_file)) || my_rc_read_dictionary (my_rc_conf_str (str))) - die (STATE_UNKNOWN, _("Config file error")); + die (STATE_UNKNOWN, _("Config file error\n")); service = PW_AUTHENTICATE_ONLY; @@ -171,24 +178,24 @@ main (int argc, char **argv) my_rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) && my_rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) )) - die (STATE_UNKNOWN, _("Out of Memory?")); + die (STATE_UNKNOWN, _("Out of Memory?\n")); if (nasid != NULL) { if (!(my_rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))) - die (STATE_UNKNOWN, _("Invalid NAS-Identifier")); + die (STATE_UNKNOWN, _("Invalid NAS-Identifier\n")); } if (nasipaddress != NULL) { if (rc_good_ipaddr (nasipaddress)) - die (STATE_UNKNOWN, _("Invalid NAS-IP-Address")); + die (STATE_UNKNOWN, _("Invalid NAS-IP-Address\n")); if ((client_id = rc_get_ipaddr(nasipaddress)) == 0) - die (STATE_UNKNOWN, _("Invalid NAS-IP-Address")); + die (STATE_UNKNOWN, _("Invalid NAS-IP-Address\n")); } else { if ((client_id = my_rc_own_ipaddress ()) == 0) - die (STATE_UNKNOWN, _("Can't find local IP for NAS-IP-Address")); + die (STATE_UNKNOWN, _("Can't find local IP for NAS-IP-Address\n")); } if (my_rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == NULL) - die (STATE_UNKNOWN, _("Invalid NAS-IP-Address")); + die (STATE_UNKNOWN, _("Invalid NAS-IP-Address\n")); my_rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval, retries); @@ -199,19 +206,19 @@ main (int argc, char **argv) rc_avpair_free (data.receive_pairs); if (result == TIMEOUT_RC) - die (STATE_CRITICAL, _("Timeout")); + die (STATE_CRITICAL, _("Timeout\n")); if (result == ERROR_RC) - die (STATE_CRITICAL, _("Auth Error")); + die (STATE_CRITICAL, _("Auth Error\n")); if (result == REJECT_RC) - die (STATE_WARNING, _("Auth Failed")); + die (STATE_WARNING, _("Auth Failed\n")); if (result == BADRESP_RC) - die (STATE_WARNING, _("Bad Response")); + die (STATE_WARNING, _("Bad Response\n")); if (expect && !strstr (msg, expect)) - die (STATE_WARNING, "%s", msg); + die (STATE_WARNING, "%s\n", msg); if (result == OK_RC) - die (STATE_OK, _("Auth OK")); + die (STATE_OK, _("Auth OK\n")); (void)snprintf(msg, sizeof(msg), _("Unexpected result code %d"), result); - die (STATE_UNKNOWN, "%s", msg); + die (STATE_UNKNOWN, "%s\n", msg); } @@ -361,7 +368,7 @@ print_help (void) printf (" %s\n", "-r, --retries=INTEGER"); printf (" %s\n", _("Number of times to retry a failed connection")); - printf (UT_TIMEOUT, timeout_interval); + printf (UT_CONN_TIMEOUT, timeout_interval); printf ("\n"); printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections.")); @@ -370,8 +377,8 @@ print_help (void) printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); printf ("%s\n", _("The password option presents a substantial security issue because the")); printf ("%s\n", _("password can possibly be determined by careful watching of the command line")); - printf ("%s\n", _("in a process listing. This risk is exacerbated because nagios will")); - printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that")); + printf ("%s\n", _("in a process listing. This risk is exacerbated because the plugin will")); + printf ("%s\n", _("typically be executed at regular predictable intervals. Please be sure that")); printf ("%s\n", _("the password used does not allow access to sensitive system resources.")); printf (UT_SUPPORT); @@ -392,7 +399,7 @@ print_usage (void) int my_rc_read_config(char * a) { -#ifdef HAVE_LIBRADIUSCLIENT_NG +#if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) rch = rc_read_config(a); return (rch == NULL) ? 1 : 0; #else diff --git a/plugins/check_real.c b/plugins/check_real.c index 18240f3..36f6413 100644 --- a/plugins/check_real.c +++ b/plugins/check_real.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_real plugin +* Monitoring check_real plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_real"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -178,6 +178,7 @@ main (int argc, char **argv) /* watch for the REAL connection string */ result = recv (sd, buffer, MAX_INPUT_BUFFER - 1, 0); + buffer[result] = "\0"; /* null terminate recieved buffer */ /* return a CRITICAL status if we couldn't read any data */ if (result == -1) { @@ -429,7 +430,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index d477a51..2430453 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_smtp plugin +* Monitoring check_smtp plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_smtp"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -822,7 +822,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 52ad31e..2c62a23 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_snmp plugin +* Monitoring check_snmp plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_snmp"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "runcmd.h" @@ -459,7 +459,7 @@ main (int argc, char **argv) /* Process this block for numeric comparisons */ /* Make some special values,like Timeticks numeric only if a threshold is defined */ if (thlds[i]->warning || thlds[i]->critical || calculate_rate) { - ptr = strpbrk (show, "0123456789"); + ptr = strpbrk (show, "-0123456789"); if (ptr == NULL) die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show); while (i >= response_size) { @@ -963,11 +963,16 @@ validate_arguments () if (seclevel == NULL) xasprintf(&seclevel, "noAuthNoPriv"); + if (secname == NULL) + die(STATE_UNKNOWN, _("Required parameter: %s\n"), "secname"); + if (strcmp(seclevel, "noAuthNoPriv") == 0) { - numauthpriv = 2; + numauthpriv = 4; authpriv = calloc (numauthpriv, sizeof (char *)); authpriv[0] = strdup ("-l"); authpriv[1] = strdup ("noAuthNoPriv"); + authpriv[2] = strdup ("-u"); + authpriv[3] = strdup (secname); } else { if (! ( (strcmp(seclevel, "authNoPriv")==0) || (strcmp(seclevel, "authPriv")==0) ) ) { usage2 (_("Invalid seclevel"), seclevel); @@ -976,9 +981,6 @@ validate_arguments () if (authproto == NULL ) xasprintf(&authproto, DEFAULT_AUTH_PROTOCOL); - if (secname == NULL) - die(STATE_UNKNOWN, _("Required parameter: %s\n"), "secname"); - if (authpasswd == NULL) die(STATE_UNKNOWN, _("Required parameter: %s\n"), "authpasswd"); @@ -1160,7 +1162,7 @@ print_help (void) printf (" %s\n", "-D, --output-delimiter=STRING"); printf (" %s\n", _("Separates output on multiple OID requests")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-e, --retries=INTEGER"); printf (" %s\n", _("Number of retries to be used in the requests")); diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c index 6e8a5fc..b6187d6 100644 --- a/plugins/check_ssh.c +++ b/plugins/check_ssh.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_ssh plugin +* Monitoring check_ssh plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_ssh"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -46,6 +46,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; int port = -1; char *server_name = NULL; char *remote_version = NULL; +char *remote_protocol = NULL; int verbose = FALSE; int process_arguments (int, char **); @@ -53,7 +54,7 @@ int validate_arguments (void); void print_help (void); void print_usage (void); -int ssh_connect (char *haddr, int hport, char *remote_version); +int ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol); @@ -78,7 +79,7 @@ main (int argc, char **argv) alarm (socket_timeout); /* ssh_connect exits if error is found */ - result = ssh_connect (server_name, port, remote_version); + result = ssh_connect (server_name, port, remote_version, remote_protocol); alarm (0); @@ -105,6 +106,7 @@ process_arguments (int argc, char **argv) {"timeout", required_argument, 0, 't'}, {"verbose", no_argument, 0, 'v'}, {"remote-version", required_argument, 0, 'r'}, + {"remote-protcol", required_argument, 0, 'P'}, {0, 0, 0, 0} }; @@ -116,7 +118,7 @@ process_arguments (int argc, char **argv) strcpy (argv[c], "-t"); while (1) { - c = getopt_long (argc, argv, "+Vhv46t:r:H:p:", longopts, &option); + c = getopt_long (argc, argv, "+Vhv46t:r:H:p:P:", longopts, &option); if (c == -1 || c == EOF) break; @@ -152,6 +154,9 @@ process_arguments (int argc, char **argv) case 'r': /* remote version */ remote_version = optarg; break; + case 'P': /* remote version */ + remote_protocol = optarg; + break; case 'H': /* host */ if (is_host (optarg) == FALSE) usage2 (_("Invalid hostname/address"), optarg); @@ -206,7 +211,7 @@ validate_arguments (void) int -ssh_connect (char *haddr, int hport, char *remote_version) +ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol) { int sd; int result; @@ -254,6 +259,14 @@ ssh_connect (char *haddr, int hport, char *remote_version) exit (STATE_WARNING); } + if (remote_protocol && strcmp(remote_protocol, ssh_proto)) { + printf + (_("SSH WARNING - %s (protocol %s) protocol version mismatch, expected '%s'\n"), + ssh_server, ssh_proto, remote_protocol); + close(sd); + exit (STATE_WARNING); + } + elapsed_time = (double)deltime(tv) / 1.0e6; printf @@ -291,11 +304,14 @@ print_help (void) printf (UT_IPv46); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-r, --remote-version=STRING"); printf (" %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)")); + printf (" %s\n", "-P, --remote-protocol=STRING"); + printf (" %s\n", _("Warn if protocol doesn't match expected protocol version (ex: 2.0)")); + printf (UT_VERBOSE); printf (UT_SUPPORT); diff --git a/plugins/check_swap.c b/plugins/check_swap.c index 1b2a8dd..88a2a2a 100644 --- a/plugins/check_swap.c +++ b/plugins/check_swap.c @@ -1,14 +1,14 @@ /***************************************************************************** * -* Nagios check_disk plugin +* Monitoring check_disk plugin * * License: GPL * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * -* This file contains the check_disk plugin +* This file contains the check_swap plugin * * * This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ const char *progname = "check_swap"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "popen.h" @@ -60,9 +60,10 @@ void print_help (void); int warn_percent = 0; int crit_percent = 0; float warn_size_bytes = 0; -float crit_size_bytes= 0; +float crit_size_bytes = 0; int verbose; int allswaps; +int no_swap_state = STATE_CRITICAL; int main (int argc, char **argv) @@ -350,7 +351,7 @@ main (int argc, char **argv) if(total_swap_mb) { percent_used = 100 * ((double) used_swap_mb) / ((double) total_swap_mb); } else { - percent_used = 0; + percent_used = 100; } result = max_state (result, check_swap (percent_used, free_swap_mb)); @@ -372,6 +373,9 @@ main (int argc, char **argv) int check_swap (int usp, float free_swap_mb) { + + if (!free_swap_mb) return no_swap_state; + int result = STATE_UNKNOWN; float free_swap = free_swap_mb * (1024 * 1024); /* Convert back to bytes as warn and crit specified in bytes */ if (usp >= 0 && crit_percent != 0 && usp >= (100.0 - crit_percent)) @@ -400,6 +404,7 @@ process_arguments (int argc, char **argv) {"warning", required_argument, 0, 'w'}, {"critical", required_argument, 0, 'c'}, {"allswaps", no_argument, 0, 'a'}, + {"no-swap", required_argument, 0, 'n'}, {"verbose", no_argument, 0, 'v'}, {"version", no_argument, 0, 'V'}, {"help", no_argument, 0, 'h'}, @@ -410,7 +415,7 @@ process_arguments (int argc, char **argv) return ERROR; while (1) { - c = getopt_long (argc, argv, "+?Vvhac:w:", longopts, &option); + c = getopt_long (argc, argv, "+?Vvhac:w:n:", longopts, &option); if (c == -1 || c == EOF) break; @@ -455,6 +460,10 @@ process_arguments (int argc, char **argv) case 'a': /* all swap */ allswaps = TRUE; break; + case 'n': + if ((no_swap_state = mp_translate_state(optarg)) == ERROR) { + usage4 (_("no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); + } case 'v': /* verbose */ verbose++; break; @@ -538,13 +547,16 @@ print_help (void) printf (" %s\n", "-c, --critical=INTEGER"); printf (" %s\n", _("Exit with CRITICAL status if less than INTEGER bytes of swap space are free")); printf (" %s\n", "-c, --critical=PERCENT%%"); - printf (" %s\n", _("Exit with CRITCAL status if less than PERCENT of swap space is free")); + printf (" %s\n", _("Exit with CRITICAL status if less than PERCENT of swap space is free")); printf (" %s\n", "-a, --allswaps"); printf (" %s\n", _("Conduct comparisons for all swap partitions, one by one")); + printf (" %s\n", "-n, --no-swap="); + printf (" %s %s\n", _("Resulting state when there is no swap regardless of thresholds. Default:"), state_text(no_swap_state)); printf (UT_VERBOSE); printf ("\n"); printf ("%s\n", _("Notes:")); + printf (" %s\n", _("Both INTEGER and PERCENT thresholds can be specified, they are all checked.")); printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.")); printf (UT_SUPPORT); @@ -556,6 +568,6 @@ void print_usage (void) { printf ("%s\n", _("Usage:")); - printf ("%s [-av] -w %% -c %%\n",progname); - printf ("%s [-av] -w -c \n", progname); + printf (" %s [-av] -w %% -c %%\n",progname); + printf (" -w -c [-n ]\n"); } diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index 6ab8261..bd7736b 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_tcp plugin +* Monitoring check_tcp plugin * * License: GPL -* Copyright (c) 1999-2013 Nagios Plugins Development Team +* Copyright (c) 1999-2013 Monitoring Plugins Development Team * * Description: * @@ -30,15 +30,14 @@ /* progname "check_tcp" changes depending on symlink called */ char *progname; const char *copyright = "1999-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; - -#include +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" #include "utils.h" #include "utils_tcp.h" +#include #include #ifdef HAVE_SSL @@ -354,8 +353,13 @@ main (int argc, char **argv) printf("Unexpected response from host/socket on "); else printf("%.3f second response time on ", elapsed_time); - if(server_address[0] != '/') - printf("port %d", server_port); + if(server_address[0] != '/') { + if (host_specified) + printf("%s port %d", + server_address, server_port); + else + printf("port %d", server_port); + } else printf("socket %s", server_address); } @@ -670,7 +674,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_time.c b/plugins/check_time.c index 7ee014e..3943742 100644 --- a/plugins/check_time.c +++ b/plugins/check_time.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_time plugin +* Monitoring check_time plugin * * License: GPL -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2007 Monitoring Plugins Development Team * * Description: * @@ -30,7 +30,7 @@ const char *progname = "check_time"; const char *copyright = "1999-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -358,7 +358,7 @@ print_help (void) printf (" %s\n", "-C, --critical-connect=INTEGER"); printf (" %s\n", _("Response time (sec.) necessary to result in critical status")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_SUPPORT); } diff --git a/plugins/check_ups.c b/plugins/check_ups.c index 59dcc26..099881d 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -1,16 +1,16 @@ /***************************************************************************** * -* Nagios check_ups plugin +* Monitoring check_ups plugin * * License: GPL * Copyright (c) 2000 Tom Shields * 2004 Alain Richard * 2004 Arnaud Quette -* Copyright (c) 2002-2007 Nagios Plugins Development Team +* Copyright (c) 2002-2007 Monitoring Plugins Development Team * * Description: * -* This file contains Network UPS Tools plugin for Nagios +* This file contains Network UPS Tools plugin for Monitoring * * This plugin tests the UPS service on the specified host. Network UPS Tools * from www.networkupstools.org must be running for this plugin to work. @@ -34,7 +34,7 @@ const char *progname = "check_ups"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" @@ -66,7 +66,7 @@ enum { #define UPSSTATUS_BOOST 512 #define UPSSTATUS_CHRG 1024 #define UPSSTATUS_DISCHRG 2048 -#define UPSSTATUS_UNKOWN 4096 +#define UPSSTATUS_UNKNOWN 4096 enum { NOSUCHVAR = ERROR-1 }; @@ -181,7 +181,7 @@ main (int argc, char **argv) if (status & UPSSTATUS_DISCHRG) { xasprintf (&ups_status, "%s%s", ups_status, _(", Discharging")); } - if (status & UPSSTATUS_UNKOWN) { + if (status & UPSSTATUS_UNKNOWN) { xasprintf (&ups_status, "%s%s", ups_status, _(", Unknown")); } } @@ -379,7 +379,7 @@ determine_status (void) else if (!strcmp (ptr, "DISCHRG")) status |= UPSSTATUS_DISCHRG; else - status |= UPSSTATUS_UNKOWN; + status |= UPSSTATUS_UNKNOWN; } return OK; @@ -625,7 +625,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); /* TODO: -v clashing with -v/-variable. Commenting out help text since verbose is unused up to now */ diff --git a/plugins/check_users.c b/plugins/check_users.c index ff2aedd..a009f20 100644 --- a/plugins/check_users.c +++ b/plugins/check_users.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios check_users plugin +* Monitoring check_users plugin * * License: GPL -* Copyright (c) 2000-2012 Nagios Plugins Development Team +* Copyright (c) 2000-2012 Monitoring Plugins Development Team * * Description: * @@ -32,12 +32,17 @@ const char *progname = "check_users"; const char *copyright = "2000-2007"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" -#if HAVE_UTMPX_H +#if HAVE_WTSAPI32_H +# include +# include +# undef ERROR +# define ERROR -1 +#elif HAVE_UTMPX_H # include #else # include "popen.h" @@ -58,7 +63,11 @@ main (int argc, char **argv) int users = -1; int result = STATE_UNKNOWN; char *perf; -#if HAVE_UTMPX_H +#if HAVE_WTSAPI32_H + WTS_SESSION_INFO *wtsinfo; + DWORD wtscount; + DWORD index; +#elif HAVE_UTMPX_H struct utmpx *putmpx; #else char input_buffer[MAX_INPUT_BUFFER]; @@ -78,7 +87,36 @@ main (int argc, char **argv) users = 0; -#if HAVE_UTMPX_H +#if HAVE_WTSAPI32_H + if (!WTSEnumerateSessions(WTS_CURRENT_SERVER_HANDLE, + 0, 1, &wtsinfo, &wtscount)) { + printf(_("Could not enumerate RD sessions: %d\n"), GetLastError()); + return STATE_UNKNOWN; + } + + for (index = 0; index < wtscount; index++) { + LPTSTR username; + DWORD size; + int len; + + if (!WTSQuerySessionInformation(WTS_CURRENT_SERVER_HANDLE, + wtsinfo[index].SessionId, WTSUserName, &username, &size)) + continue; + + len = lstrlen(username); + + WTSFreeMemory(username); + + if (len == 0) + continue; + + if (wtsinfo[index].State == WTSActive || + wtsinfo[index].State == WTSDisconnected) + users++; + } + + WTSFreeMemory(wtsinfo); +#elif HAVE_UTMPX_H /* get currently logged users from utmpx */ setutxent (); 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 @@ /***************************************************************************** * -* Nagios plugins common include file +* Monitoring Plugins common include file * * License: GPL * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) -* Copyright (c) 2003-2007 Nagios Plugins Development Team +* Copyright (c) 2003-2007 Monitoring Plugins Development Team * * Description: * diff --git a/plugins/negate.c b/plugins/negate.c index ef7d4e0..beaed1e 100644 --- a/plugins/negate.c +++ b/plugins/negate.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios negate plugin +* Monitoring negate plugin * * License: GPL -* Copyright (c) 2002-2008 Nagios Plugins Development Team +* Copyright (c) 2002-2008 Monitoring Plugins Development Team * * Description: * @@ -31,21 +31,20 @@ const char *progname = "negate"; const char *copyright = "2002-2008"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #define DEFAULT_TIMEOUT 11 -#include - #include "common.h" #include "utils.h" #include "utils_cmd.h" +#include + /* char *command_line; */ static const char **process_arguments (int, char **); -int validate_arguments (char **); -int translate_state (char *); +void validate_arguments (char **); void print_help (void); void print_usage (void); int subst_text = FALSE; @@ -99,8 +98,7 @@ main (int argc, char **argv) die (max_state_alt (result, STATE_UNKNOWN), _("No data returned from command\n")); for (i = 0; i < chld_out.lines; i++) { - if (subst_text && result != state[result] && - result >= 0 && result <= 4) { + if (subst_text && result >= 0 && result <= 4 && result != state[result]) { /* Loop over each match found */ while ((sub = strstr (chld_out.line[i], state_text (result)))) { /* Terminate the first part and skip over the string we'll substitute */ @@ -166,27 +164,27 @@ process_arguments (int argc, char **argv) timeout_interval = atoi (optarg); break; case 'T': /* Result to return on timeouts */ - if ((timeout_state = translate_state(optarg)) == ERROR) + if ((timeout_state = mp_translate_state(optarg)) == ERROR) usage4 (_("Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); break; case 'o': /* replacement for OK */ - if ((state[STATE_OK] = translate_state(optarg)) == ERROR) + if ((state[STATE_OK] = mp_translate_state(optarg)) == ERROR) usage4 (_("Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); permute = FALSE; break; case 'w': /* replacement for WARNING */ - if ((state[STATE_WARNING] = translate_state(optarg)) == ERROR) + if ((state[STATE_WARNING] = mp_translate_state(optarg)) == ERROR) usage4 (_("Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); permute = FALSE; break; case 'c': /* replacement for CRITICAL */ - if ((state[STATE_CRITICAL] = translate_state(optarg)) == ERROR) + if ((state[STATE_CRITICAL] = mp_translate_state(optarg)) == ERROR) usage4 (_("Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); permute = FALSE; break; case 'u': /* replacement for UNKNOWN */ - if ((state[STATE_UNKNOWN] = translate_state(optarg)) == ERROR) + if ((state[STATE_UNKNOWN] = mp_translate_state(optarg)) == ERROR) usage4 (_("Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); permute = FALSE; break; @@ -207,7 +205,7 @@ process_arguments (int argc, char **argv) } -int +void validate_arguments (char **command_line) { if (command_line[0] == NULL) @@ -218,24 +216,6 @@ validate_arguments (char **command_line) } -int -translate_state (char *state_text) -{ - char *temp_ptr; - for (temp_ptr = state_text; *temp_ptr; temp_ptr++) { - *temp_ptr = toupper(*temp_ptr); - } - if (!strcmp(state_text,"OK") || !strcmp(state_text,"0")) - return STATE_OK; - if (!strcmp(state_text,"WARNING") || !strcmp(state_text,"1")) - return STATE_WARNING; - if (!strcmp(state_text,"CRITICAL") || !strcmp(state_text,"2")) - return STATE_CRITICAL; - if (!strcmp(state_text,"UNKNOWN") || !strcmp(state_text,"3")) - return STATE_UNKNOWN; - return ERROR; -} - void print_help (void) { @@ -252,7 +232,7 @@ print_help (void) printf (UT_HELP_VRSN); - printf (UT_TIMEOUT, timeout_interval); + printf (UT_PLUG_TIMEOUT, timeout_interval); printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status.")); printf (" -T, --timeout-result=STATUS\n"); printf (" %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n")); diff --git a/plugins/netutils.c b/plugins/netutils.c index 9f18723..0044046 100644 --- a/plugins/netutils.c +++ b/plugins/netutils.c @@ -1,10 +1,10 @@ /***************************************************************************** * -* Nagios plugins network utilities +* Monitoring Plugins network utilities * * License: GPL * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) -* Copyright (c) 2003-2008 Nagios Plugins Development Team +* Copyright (c) 2003-2008 Monitoring Plugins Development Team * * Description: * diff --git a/plugins/netutils.h b/plugins/netutils.h index 347509e..c6fce90 100644 --- a/plugins/netutils.h +++ b/plugins/netutils.h @@ -1,10 +1,10 @@ /***************************************************************************** * -* Nagios plugins net utilities include file +* Monitoring Plugins net utilities include file * * License: GPL * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) -* Copyright (c) 2003-2007 Nagios Plugins Development Team +* Copyright (c) 2003-2007 Monitoring Plugins Development Team * * Description: * @@ -40,8 +40,8 @@ #ifdef HAVE_SYS_UN_H # include # ifndef UNIX_PATH_MAX - /* linux uses this, on sun it's hard-coded at 108 without a define */ -# define UNIX_PATH_MAX 108 + /* linux uses this, on sun it's hard-coded at 108 without a define, on BSD at 104 */ +# define UNIX_PATH_MAX 104 # endif /* UNIX_PATH_MAX */ #endif /* HAVE_SYS_UN_H */ 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 @@ /***************************************************************************** * -* Nagios plugins popen +* Monitoring Plugins popen * * License: GPL -* Copyright (c) 2005-2007 Nagios Plugins Development Team +* Copyright (c) 2005-2007 Monitoring Plugins Development Team * * Description: * diff --git a/plugins/runcmd.c b/plugins/runcmd.c index 8aba1e3..1a7c904 100644 --- a/plugins/runcmd.c +++ b/plugins/runcmd.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios run command utilities +* Monitoring run command utilities * * License: GPL -* Copyright (c) 2005-2006 Nagios Plugins Development Team +* Copyright (c) 2005-2006 Monitoring Plugins Development Team * * Description : * @@ -261,7 +261,7 @@ runcmd_timeout_alarm_handler (int signo) size_t i; if (signo == SIGALRM) - puts(_("CRITICAL - Plugin timed out while executing system call\n")); + puts(_("CRITICAL - Plugin timed out while executing system call")); if(np_pids) for(i = 0; i < maxfd; i++) { if(np_pids[i] != 0) kill(np_pids[i], SIGKILL); 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 @@ /**************************************************************************** * * License: GPL -* Copyright (c) 2005 Nagios Plugins Development Team +* Copyright (c) 2005 Monitoring Plugins Development Team * Author: Andreas Ericsson * * diff --git a/plugins/sslutils.c b/plugins/sslutils.c index 2ec9190..687bffb 100644 --- a/plugins/sslutils.c +++ b/plugins/sslutils.c @@ -1,9 +1,9 @@ /***************************************************************************** * -* Nagios plugins SSL utilities +* Monitoring Plugins SSL utilities * * License: GPL -* Copyright (c) 2005-2010 Nagios Plugins Development Team +* Copyright (c) 2005-2010 Monitoring Plugins Development Team * * Description: * @@ -86,10 +86,12 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int if (cert && privkey) { SSL_CTX_use_certificate_file(c, cert, SSL_FILETYPE_PEM); SSL_CTX_use_PrivateKey_file(c, privkey, SSL_FILETYPE_PEM); +#ifdef USE_OPENSSL if (!SSL_CTX_check_private_key(c)) { printf ("%s\n", _("CRITICAL - Private key does not seem to match certificate!\n")); return STATE_CRITICAL; } +#endif } #ifdef SSL_OP_NO_TICKET SSL_CTX_set_options(c, SSL_OP_NO_TICKET); diff --git a/plugins/t/NPTest.cache.travis b/plugins/t/NPTest.cache.travis new file mode 100644 index 0000000..c1007de --- /dev/null +++ b/plugins/t/NPTest.cache.travis @@ -0,0 +1,54 @@ +{ + 'MYSQL_LOGIN_DETAILS' => '-u root -d test', + 'NP_ALLOW_SUDO' => 'yes', + 'NP_DNS_SERVER' => '8.8.8.8', + 'NP_GOOD_NTP_SERVICE' => '', + 'NP_HOSTNAME_INVALID' => 'nosuchhost', + 'NP_HOSTNAME_VALID' => 'monitoringplugins.org', + 'NP_HOSTNAME_VALID_IP' => '130.133.8.40', + 'NP_HOSTNAME_VALID_REVERSE' => 'orwell.monitoring-plugins.org.', + 'NP_HOST_DHCP_RESPONSIVE' => '', + 'NP_HOST_NONRESPONSIVE' => '10.0.0.1', + 'NP_HOST_RESPONSIVE' => 'localhost', + 'NP_HOST_SMB' => '', + 'NP_HOST_SNMP' => '', + 'NP_HOST_TCP_FTP' => '', + 'NP_HOST_TCP_HPJD' => '', + 'NP_HOST_TCP_HTTP' => 'localhost', + 'NP_HOST_TCP_HTTP2' => 'labs.consol.de', + 'NP_HOST_TCP_IMAP' => 'imap.web.de', + 'NP_HOST_TCP_POP' => 'pop.web.de', + 'NP_HOST_TCP_SMTP' => 'localhost', + 'NP_HOST_TCP_SMTP_NOTLS' => '', + 'NP_HOST_TCP_SMTP_TLS' => '', + 'NP_INTERNET_ACCESS' => 'yes', + 'NP_MOUNTPOINT2_VALID' => '', + 'NP_MOUNTPOINT_VALID' => '/', + 'NP_MYSQL_SERVER' => 'localhost', + 'NP_HOST_UDP_TIME' => 'localhost', + 'NP_MYSQL_SOCKET' => '/var/run/mysqld/mysqld.sock', + 'NP_MYSQL_WITH_SLAVE' => '', + 'NP_MYSQL_WITH_SLAVE_LOGIN' => '', + 'NP_NO_NTP_SERVICE' => 'localhost', + 'NP_SMB_SHARE' => '', + 'NP_SMB_SHARE_DENY' => '', + 'NP_SMB_SHARE_SPC' => '', + 'NP_SMB_VALID_USER' => '', + 'NP_SMB_VALID_USER_PASS' => '', + 'NP_SNMP_COMMUNITY' => '', + 'NP_SSH_CONFIGFILE' => '~/.ssh/config', + 'NP_SSH_HOST' => 'localhost', + 'NP_SSH_IDENTITY' => '~/.ssh/id_dsa', + 'NP_HOST_TCP_JABBER' => 'jabber.org', + 'host_nonresponsive' => '10.0.0.1', + 'host_responsive' => 'localhost', + 'host_snmp' => '', + 'host_tcp_ftp' => '', + 'host_tcp_http' => 'localhost', + 'host_tcp_imap' => 'imap.nierlein.de', + 'host_tcp_smtp' => 'localhost', + 'hostname_invalid' => 'nosuchhost', + 'snmp_community' => '', + 'user_snmp' => '', + 'host_udp_time' => 'none', +} 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 @@ # # -# TODO: Add in tests for perf data. Need to beef up Nagios::Plugin::Performance to cater for max, min, etc +# TODO: Add in tests for perf data. Need to beef up Monitoring::Plugin::Performance to cater for max, min, etc use strict; use Test::More; @@ -37,7 +37,7 @@ cmp_ok( $c, '==', 2, "Got two mountpoints in output"); # Get perf data -# Should use Nagios::Plugin +# Should use Monitoring::Plugin my @perf_data = sort(split(/ /, $result->perf_output)); diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t index 64aaf0c..4ff553f 100644 --- a/plugins/t/check_dns.t +++ b/plugins/t/check_dns.t @@ -10,14 +10,14 @@ use NPTest; plan skip_all => "check_dns not compiled" unless (-x "check_dns"); -plan tests => 13; +plan tests => 14; my $successOutput = '/DNS OK: [\.0-9]+ seconds? response time/'; my $hostname_valid = getTestParameter( "NP_HOSTNAME_VALID", "A valid (known to DNS) hostname", - "nagios.com" + "monitoring-plugins.org" ); my $hostname_valid_ip = getTestParameter( @@ -54,6 +54,7 @@ cmp_ok( $res->return_code, '==', 2, "Critical threshold passed"); $res = NPTest->testCmd("./check_dns -H $hostname_valid -t 5 -w 0 -c 5"); cmp_ok( $res->return_code, '==', 1, "Warning threshold passed"); +like( $res->output, "/\|time=[\d\.]+s;0.0*;5\.0*;0\.0*/", "Output performance data OK" ); $res = NPTest->testCmd("./check_dns -H $hostname_invalid -t 1"); cmp_ok( $res->return_code, '==', 2, "Invalid $hostname_invalid"); diff --git a/plugins/t/check_fping.t b/plugins/t/check_fping.t index 45a9be8..08692e4 100644 --- a/plugins/t/check_fping.t +++ b/plugins/t/check_fping.t @@ -27,16 +27,18 @@ my $hostname_invalid = getTestParameter( "hostname_invalid", "NP_HOSTNAME_IN my $t; -if ( -x "./check_fping" ) -{ +my $fping = qx(which fping 2> /dev/null); +chomp($fping); +if( ! -x "./check_fping") { + $t += skipMissingCmd( "./check_fping", $tests ); +} +elsif ( $> != 0 && (!$fping || ! -u $fping)) { + $t += skipMsg( "./check_fping", $tests ); +} else { $t += checkCmd( "./check_fping $host_responsive", 0, $successOutput ); $t += checkCmd( "./check_fping $host_nonresponsive", [ 1, 2 ] ); $t += checkCmd( "./check_fping $hostname_invalid", [ 1, 2 ] ); } -else -{ - $t += skipMissingCmd( "./check_fping", $tests ); -} exit(0) if defined($Test::Harness::VERSION); exit($tests - $t); diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t index 2908673..2539a28 100644 --- a/plugins/t/check_http.t +++ b/plugins/t/check_http.t @@ -31,8 +31,8 @@ my $internet_access = getTestParameter( "NP_INTERNET_ACCESS", "yes"); my $host_tcp_http2 = getTestParameter( "NP_HOST_TCP_HTTP2", - "A host providing an index page containing the string 'nagios'", - "nagios.org" ); + "A host providing an index page containing the string 'monitoring'", + "test.monitoring-plugins.org" ); $res = NPTest->testCmd( @@ -62,27 +62,27 @@ cmp_ok( $res->return_code, '==', 2, "Webserver $hostname_invalid not valid" ); like( $res->output, "/Unable to open TCP socket|Socket timeout after/", "Output OK"); SKIP: { - skip "No host serving nagios in index file", 7 unless $host_tcp_http2; + skip "No host serving monitoring in index file", 7 unless $host_tcp_http2; - $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios'" ); - cmp_ok( $res->return_code, "==", 0, "Got a reference to 'nagios'"); + $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'monitoring'" ); + cmp_ok( $res->return_code, "==", 0, "Got a reference to 'monitoring'"); - $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs'" ); - cmp_ok( $res->return_code, "==", 2, "Not got 'nAGiOs'"); + $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'mONiTORing'" ); + cmp_ok( $res->return_code, "==", 2, "Not got 'mONiTORing'"); like ( $res->output, "/pattern not found/", "Error message says 'pattern not found'"); - $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -R 'nAGiOs'" ); - cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'nAGiOs'"); + $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -R 'mONiTORing'" ); + cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'mONiTORing'"); - $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios' --invert-regex" ); + $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'monitoring' --invert-regex" ); cmp_ok( $res->return_code, "==", 2, "Invert results work when found"); like ( $res->output, "/pattern found/", "Error message says 'pattern found'"); - $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs' --invert-regex" ); + $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'mONiTORing' --invert-regex" ); cmp_ok( $res->return_code, "==", 0, "And also when not found"); } SKIP: { - skip "No internet access", 11 if $internet_access eq "no"; + skip "No internet access", 16 if $internet_access eq "no"; $res = NPTest->testCmd( "./check_http --ssl www.verisign.com" diff --git a/plugins/t/check_jabber.t b/plugins/t/check_jabber.t index 1aaf812..7a708d5 100644 --- a/plugins/t/check_jabber.t +++ b/plugins/t/check_jabber.t @@ -29,7 +29,7 @@ my $hostname_invalid = getTestParameter( ); -my $jabberOK = '/JABBER OK\s-\s\d+\.\d+\ssecond response time on port 5222/'; +my $jabberOK = '/JABBER OK\s-\s\d+\.\d+\ssecond response time on '.$host_tcp_jabber.' port 5222/'; my $jabberUnresponsive = '/CRITICAL\s-\sSocket timeout after\s\d+\sseconds/'; @@ -40,7 +40,7 @@ my $r; SKIP: { skip "No jabber server defined", 6 unless $host_tcp_jabber; - $r = NPTest->testCmd( "./check_jabber $host_tcp_jabber" ); + $r = NPTest->testCmd( "./check_jabber -H $host_tcp_jabber" ); is( $r->return_code, 0, "Connected okay"); like( $r->output, $jabberOK, "Output as expected" ); @@ -48,7 +48,7 @@ SKIP: { is( $r->return_code, 0, "Connected okay, within limits" ); like( $r->output, $jabberOK, "Output as expected" ); - $r = NPTest->testCmd( "./check_jabber $host_tcp_jabber -wt 9 -ct 9 -to 10" ); + $r = NPTest->testCmd( "./check_jabber -H $host_tcp_jabber -wt 9 -ct 9 -to 10" ); is( $r->return_code, 0, "Old syntax okay" ); like( $r->output, $jabberOK, "Output as expected" ); diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t index d971645..28cd4cd 100644 --- a/plugins/t/check_mysql.t +++ b/plugins/t/check_mysql.t @@ -21,27 +21,29 @@ plan skip_all => "check_mysql not compiled" unless (-x "check_mysql"); plan tests => 15; my $bad_login_output = '/Access denied for user /'; -my $mysqlserver = getTestParameter( - "NP_MYSQL_SERVER", +my $mysqlserver = getTestParameter( + "NP_MYSQL_SERVER", "A MySQL Server hostname or IP with no slaves setup" ); -my $mysqlsocket = getTestParameter( - "NP_MYSQL_SOCKET", - "A MySQL Server socket with no slaves setup" +my $mysqlsocket = getTestParameter( + "NP_MYSQL_SOCKET", + "Full path to a MySQL Server socket with no slaves setup" ); -my $mysql_login_details = getTestParameter( - "MYSQL_LOGIN_DETAILS", - "Command line parameters to specify login access", - "-u user -ppw -d db", +my $mysql_login_details = getTestParameter( + "MYSQL_LOGIN_DETAILS", + "Command line parameters to specify login access (requires " . + "REPLICATION CLIENT privleges)", + "-u test -ptest", ); -my $with_slave = getTestParameter( - "NP_MYSQL_WITH_SLAVE", +my $with_slave = getTestParameter( + "NP_MYSQL_WITH_SLAVE", "MySQL server with slaves setup" ); -my $with_slave_login = getTestParameter( - "NP_MYSQL_WITH_SLAVE_LOGIN", - "Login details for server with slave", - "-uroot -ppw" +my $with_slave_login = getTestParameter( + "NP_MYSQL_WITH_SLAVE_LOGIN", + "Login details for server with slave (requires REPLICATION CLIENT " . + "privleges)", + $mysql_login_details || "-u test -ptest" ); my $result; diff --git a/plugins/t/check_ntp.t b/plugins/t/check_ntp.t index 3eee6e1..74d890f 100644 --- a/plugins/t/check_ntp.t +++ b/plugins/t/check_ntp.t @@ -23,12 +23,12 @@ my $no_ntp_service = getTestParameter( "NP_NO_NTP_SERVICE", "A host NOT providing the NTP service", "localhost" ); -my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE", +my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE", "The hostname of system not responsive to network requests", "10.0.0.1" ); -my $hostname_invalid = getTestParameter( "NP_HOSTNAME_INVALID", - "An invalid (not known to DNS) hostname", +my $hostname_invalid = getTestParameter( "NP_HOSTNAME_INVALID", + "An invalid (not known to DNS) hostname", "nosuchhost"); my $ntp_okmatch1 = '/^NTP\sOK:\sOffset\s-?[0-9]+(\.[0-9]+)?(e-[0-9]{2})?\ssecs/'; @@ -43,7 +43,7 @@ my $ntp_nosuchhost = '/^check_ntp.*: Invalid hostname/address - ' . $hostname_in foreach my $plugin (@PLUGINS1) { SKIP: { - skip "No NTP server defined", 1 unless $ntp_service; + skip "No NTP server defined", 6 unless $ntp_service; $res = NPTest->testCmd( "./$plugin -H $ntp_service -w 1000 -c 2000" ); @@ -88,7 +88,7 @@ foreach my $plugin (@PLUGINS1) { foreach my $plugin (@PLUGINS2) { SKIP: { - skip "No NTP server defined", 1 unless $ntp_service; + skip "No NTP server defined", 6 unless $ntp_service; $res = NPTest->testCmd( "./$plugin -H $ntp_service -w 1000 -c 2000 -W 20 -C 21 -j 100000 -k 200000 -m 1: -n 0:" ); diff --git a/plugins/t/check_procs.t b/plugins/t/check_procs.t index 1dea564..abe7284 100644 --- a/plugins/t/check_procs.t +++ b/plugins/t/check_procs.t @@ -13,7 +13,7 @@ my $t; if (`uname -s` eq "SunOS\n" && ! -x "/usr/local/nagios/libexec/pst3") { plan skip_all => "Ignoring tests on solaris because of pst3"; } else { - plan tests => 12; + plan tests => 14; } my $result; @@ -26,6 +26,11 @@ $result = NPTest->testCmd( "./check_procs -w 100000 -c 100000 -s Z" ); is( $result->return_code, 0, "Checking less than 100000 zombie processes" ); like( $result->output, '/^PROCS OK: [0-9]+ process(es)? with /', "Output correct" ); +if(fork() == 0) { exec("sleep 7"); } else { sleep(1) } # fork a test process in child and give child time to fork in parent +$result = NPTest->testCmd( "./check_procs -a 'sleep 7'" ); +is( $result->return_code, 0, "Parent process is ignored" ); +like( $result->output, '/^PROCS OK: 1 process?/', "Output correct" ); + $result = NPTest->testCmd( "./check_procs -w 0 -c 100000" ); is( $result->return_code, 1, "Checking warning if processes > 0" ); like( $result->output, '/^PROCS WARNING: [0-9]+ process(es)? | procs=[0-9]+;0;100000;0;$/', "Output correct" ); diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t index 6de5f29..2d6c44a 100644 --- a/plugins/t/check_snmp.t +++ b/plugins/t/check_snmp.t @@ -10,7 +10,7 @@ use NPTest; BEGIN { plan skip_all => 'check_snmp is not compiled' unless -x "./check_snmp"; - plan tests => 60; + plan tests => 61; } my $res; @@ -26,6 +26,7 @@ my $host_nonresponsive = getTestParameter( "host_nonresponsive", "NP_HOST_NONRES my $hostname_invalid = getTestParameter( "hostname_invalid", "NP_HOSTNAME_INVALID", "nosuchhost", "An invalid (not known to DNS) hostname" ); +my $user_snmp = getTestParameter( "user_snmp", "NP_SNMP_USER", "auth_md5", "An SNMP user"); $res = NPTest->testCmd( "./check_snmp -t 1" ); is( $res->return_code, 3, "No host name" ); @@ -35,7 +36,7 @@ $res = NPTest->testCmd( "./check_snmp -H fakehostname" ); is( $res->return_code, 3, "No OIDs specified" ); is( $res->output, "No OIDs specified" ); -$res = NPTest->testCmd( "./check_snmp -H fakehost -o oids -P 3 --seclevel=rubbish" ); +$res = NPTest->testCmd( "./check_snmp -H fakehost -o oids -P 3 -U not_a_user --seclevel=rubbish" ); is( $res->return_code, 3, "Invalid seclevel" ); like( $res->output, "/check_snmp: Invalid seclevel - rubbish/" ); @@ -44,7 +45,7 @@ is( $res->return_code, 3, "Invalid protocol" ); like( $res->output, "/check_snmp: Invalid SNMP version - 3c/" ); SKIP: { - skip "no snmp host defined", 38 if ( ! $host_snmp ); + skip "no snmp host defined", 48 if ( ! $host_snmp ); $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysUpTime.0 -w 1: -c 1:"); cmp_ok( $res->return_code, '==', 0, "Exit OK when querying uptime" ); @@ -154,6 +155,12 @@ SKIP: { like($res->output, '/^SNMP OK - Timeticks:\s\(\d+\)\s+(?:\d+ days?,\s+)?\d+:\d+:\d+\.\d+\s.*$/', "Timetick used as a string, result printed rather than parsed"); } +SKIP: { + skip "no SNMP user defined", 1 if ( ! $user_snmp ); + $res = NPTest->testCmd( "./check_snmp -H $host_snmp -o HOST-RESOURCES-MIB::hrSystemUptime.0 -P 3 -U $user_snmp -L noAuthNoPriv"); + like( $res->output, '/^SNMP OK - Timeticks:\s\(\d+\)\s+(?:\d+ days?,\s+)?\d+:\d+:\d+\.\d+\s.*$/', "noAuthNoPriv security level works properly" ); +} + # These checks need a complete command line. An invalid community is used so # the tests can run on hosts w/o snmp host/community in NPTest.cache. Execution will fail anyway SKIP: { diff --git a/plugins/t/check_tcp.t b/plugins/t/check_tcp.t index abb16ae..f996685 100644 --- a/plugins/t/check_tcp.t +++ b/plugins/t/check_tcp.t @@ -12,7 +12,6 @@ BEGIN { use NPTest; $has_ipv6 = NPTest::has_ipv6(); $tests = $has_ipv6 ? 14 : 11; - plan tests => $tests; } @@ -25,20 +24,29 @@ my $host_nonresponsive = getTestParameter( "host_nonresponsive", "NP_HOST_NONRES my $hostname_invalid = getTestParameter( "hostname_invalid", "NP_HOSTNAME_INVALID", "nosuchhost", "An invalid (not known to DNS) hostname" ); +my $internet_access = getTestParameter( "NP_INTERNET_ACCESS", + "Is this system directly connected to the internet?", + "yes"); + my $successOutput = '/^TCP OK\s-\s+[0-9]?\.?[0-9]+ second response time on port [0-9]+/'; my $failedExpect = '/^TCP WARNING\s-\sUnexpected response from host/socket on port [0-9]+/'; my $t; +$tests = $tests - 4 if $internet_access eq "no"; +plan tests => $tests; + $t += checkCmd( "./check_tcp $host_tcp_http -p 80 -wt 300 -ct 600", 0, $successOutput ); $t += checkCmd( "./check_tcp $host_tcp_http -p 81 -wt 0 -ct 0 -to 1", 2 ); # use invalid port for this test $t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt 0 -ct 0 -to 1", 2 ); $t += checkCmd( "./check_tcp $hostname_invalid -p 80 -wt 0 -ct 0 -to 1", 2 ); -$t += checkCmd( "./check_tcp -S -D 1 -H www.verisign.com -p 443", 0 ); -$t += checkCmd( "./check_tcp -S -D 9000,1 -H www.verisign.com -p 443", 1 ); -$t += checkCmd( "./check_tcp -S -D 9000 -H www.verisign.com -p 443", 1 ); -$t += checkCmd( "./check_tcp -S -D 9000,8999 -H www.verisign.com -p 443", 2 ); +if($internet_access ne "no") { + $t += checkCmd( "./check_tcp -S -D 1 -H www.verisign.com -p 443", 0 ); + $t += checkCmd( "./check_tcp -S -D 9000,1 -H www.verisign.com -p 443", 1 ); + $t += checkCmd( "./check_tcp -S -D 9000 -H www.verisign.com -p 443", 1 ); + $t += checkCmd( "./check_tcp -S -D 9000,8999 -H www.verisign.com -p 443", 2 ); +} # Need the \r\n to make it more standards compliant with web servers. Need the various quotes # so that perl doesn't interpret the \r\n and is passed onto command line correctly diff --git a/plugins/t/check_udp.t b/plugins/t/check_udp.t index 619cadf..1f6fee7 100644 --- a/plugins/t/check_udp.t +++ b/plugins/t/check_udp.t @@ -62,7 +62,7 @@ SKIP: { cmp_ok( $res->return_code, '==', '2', "Hung waiting for response"); like ( $res->output, '/Socket timeout after 5 seconds/', "Timeout message"); like ( $duration, '/^[56]$/', "Timeout after 5 (possibly 6) seconds"); - my $read_nc = ; + my $read_nc = || ''; close NC; cmp_ok( $read_nc, 'eq', "foofoo", "Data received correctly" ); } diff --git a/plugins/t/negate.t b/plugins/t/negate.t index 0afe3ae..f18acc3 100644 --- a/plugins/t/negate.t +++ b/plugins/t/negate.t @@ -78,7 +78,7 @@ foreach my $current_state (keys(%state)) { } } -# Same as aboce with substitute +# Same as above with substitute foreach my $current_state (keys(%state)) { foreach my $new_state (keys(%state)) { $res = NPTest->testCmd( "./negate -s --$current_state=$new_state ./check_dummy ".$state{$current_state}." 'Fake $new_state'" ); diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t index c3085e1..225b449 100755 --- a/plugins/tests/check_http.t +++ b/plugins/tests/check_http.t @@ -7,7 +7,7 @@ # Country Name (2 letter code) [AU]:UK # State or Province Name (full name) [Some-State]:Derbyshire # Locality Name (eg, city) []:Belper -# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Nagios Plugins +# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Monitoring Plugins # Organizational Unit Name (eg, section) []: # Common Name (eg, YOUR name) []:Ton Voon # Email Address []:tonvoon@mac.com @@ -20,8 +20,9 @@ use FindBin qw($Bin); my $common_tests = 70; my $ssl_only_tests = 8; # Check that all dependent modules are available +eval "use HTTP::Daemon 6.01;"; +plan skip_all => 'HTTP::Daemon >= 6.01 required' if $@; eval { - require HTTP::Daemon; require HTTP::Status; require HTTP::Response; }; @@ -392,27 +393,21 @@ sub run_common_tests { skip "This doesn't seems to work all the time", 1 unless ($ENV{HTTP_EXTERNAL}); $cmd = "$command -f follow -u /redir_external -t 5"; eval { - local $SIG{ALRM} = sub { die "alarm\n" }; - alarm(2); - $result = NPTest->testCmd( $cmd ); - alarm(0); }; - is( $@, "alarm\n", $cmd ); + $result = NPTest->testCmd( $cmd, 2 ); + }; + like( $@, "/timeout in command: $cmd/", $cmd ); } $cmd = "$command -u /timeout -t 5"; eval { - local $SIG{ALRM} = sub { die "alarm\n" }; - alarm(2); - $result = NPTest->testCmd( $cmd ); - alarm(0); }; - is( $@, "alarm\n", $cmd ); + $result = NPTest->testCmd( $cmd, 2 ); + }; + like( $@, "/timeout in command: $cmd/", $cmd ); $cmd = "$command -f follow -u /redir_timeout -t 2"; eval { - local $SIG{ALRM} = sub { die "alarm\n" }; - alarm(5); - $result = NPTest->testCmd( $cmd ); - alarm(0); }; - isnt( $@, "alarm\n", $cmd ); + $result = NPTest->testCmd( $cmd, 5 ); + }; + is( $@, "", $cmd ); } diff --git a/plugins/tests/check_procs.t b/plugins/tests/check_procs.t old mode 100644 new mode 100755 index d71c83a..54d43d9 --- a/plugins/tests/check_procs.t +++ b/plugins/tests/check_procs.t @@ -18,59 +18,68 @@ my $command = "./check_procs --input-file=tests/var/ps-axwo.darwin"; $result = NPTest->testCmd( "$command" ); is( $result->return_code, 0, "Run with no options" ); -like( $result->output, '/^PROCS OK: 95 processes$/', "Output correct" ); +is( $result->output, "PROCS OK: 95 processes | procs=95;;;0;", "Output correct" ); $result = NPTest->testCmd( "$command -w 5" ); is( $result->return_code, 1, "Checking > 5 processes" ); -like( $result->output, '/^PROCS WARNING: 95 processes$/', "Output correct" ); +is( $result->output, "PROCS WARNING: 95 processes | procs=95;5;;0;", "Output correct" ); $result = NPTest->testCmd( "$command -w 4 -c 44" ); is( $result->return_code, 2, "Checking critical" ); -like( $result->output, '/^PROCS CRITICAL: 95 processes$/', "Output correct" ); +is( $result->output, "PROCS CRITICAL: 95 processes | procs=95;4;44;0;", "Output correct" ); $result = NPTest->testCmd( "$command -w 100 -c 200" ); is( $result->return_code, 0, "Checking no threshold breeched" ); -like( $result->output, '/^PROCS OK: 95 processes$/', "Output correct" ); +is( $result->output, "PROCS OK: 95 processes | procs=95;100;200;0;", "Output correct" ); $result = NPTest->testCmd( "$command -C launchd -c 5" ); is( $result->return_code, 2, "Checking processes filtered by command name" ); -like( $result->output, '/^PROCS CRITICAL: 6 processes with command name \'launchd\'$/', "Output correct" ); +is( $result->output, "PROCS CRITICAL: 6 processes with command name 'launchd' | procs=6;;5;0;", "Output correct" ); -$result = NPTest->testCmd( "$command -u 501 -w 39 -c 41" ); -is( $result->return_code, 1, "Checking processes filtered by userid" ); -like( $result->output, '/^PROCS WARNING: 40 processes with UID = 501 (.*)$/', "Output correct" ); +SKIP: { + skip 'user with uid 501 required', 4 unless getpwuid(501); -$result = NPTest->testCmd( "$command -C launchd -u 501" ); -is( $result->return_code, 0, "Checking processes filtered by command name and userid" ); -like( $result->output, '/^PROCS OK: 1 process with command name \'launchd\', UID = 501 (.*)$/', "Output correct" ); + $result = NPTest->testCmd( "$command -u 501 -w 39 -c 41" ); + is( $result->return_code, 1, "Checking processes filtered by userid" ); + like( $result->output, '/^PROCS WARNING: 40 processes with UID = 501 (.*)$/', "Output correct" ); -$result = NPTest->testCmd( "$command -u -2 -w 2:2" ); -is( $result->return_code, 1, "Checking processes with userid=-2" ); -like( $result->output, '/^PROCS WARNING: 3 processes with UID = -2 \(nobody\)$/', "Output correct" ); + $result = NPTest->testCmd( "$command -C launchd -u 501" ); + is( $result->return_code, 0, "Checking processes filtered by command name and userid" ); + like( $result->output, '/^PROCS OK: 1 process with command name \'launchd\', UID = 501 (.*)$/', "Output correct" ); +} -$result = NPTest->testCmd( "$command -u -2 -w 3:3" ); -is( $result->return_code, 0, "Checking processes with userid=-2 past threshold" ); -like( $result->output, '/^PROCS OK: 3 processes with UID = -2 \(nobody\)$/', "Output correct" ); +SKIP: { + skip 'user with uid -2 required', 8 unless getpwuid(-2); + skip 'uid -2 must have name "nobody"', 8 unless getpwuid(-2) eq 'nobody'; -$result = NPTest->testCmd( "$command -u -2 -a usb" ); -is( $result->return_code, 0, "Checking processes with userid=-2 and usb in arguments" ); -like( $result->output, '/^PROCS OK: 1 process with UID = -2 \(nobody\), args \'usb\'/', "Output correct" ); + $result = NPTest->testCmd( "$command -u -2 -w 2:2" ); + is( $result->return_code, 1, "Checking processes with userid=-2" ); + like( $result->output, '/^PROCS WARNING: 3 processes with UID = -2 \(nobody\)$/', "Output correct" ); -$result = NPTest->testCmd( "$command -u -2 -a UsB" ); -is( $result->return_code, 0, "Checking case sensitivity of args" ); -like( $result->output, '/^PROCS OK: 0 processes with UID = -2 \(nobody\), args \'UsB\'/', "Output correct" ); + $result = NPTest->testCmd( "$command -u -2 -w 3:3" ); + is( $result->return_code, 0, "Checking processes with userid=-2 past threshold" ); + like( $result->output, '/^PROCS OK: 3 processes with UID = -2 \(nobody\)$/', "Output correct" ); + + $result = NPTest->testCmd( "$command -u -2 -a usb" ); + is( $result->return_code, 0, "Checking processes with userid=-2 and usb in arguments" ); + like( $result->output, '/^PROCS OK: 1 process with UID = -2 \(nobody\), args \'usb\'/', "Output correct" ); + + $result = NPTest->testCmd( "$command -u -2 -a UsB" ); + is( $result->return_code, 0, "Checking case sensitivity of args" ); + like( $result->output, '/^PROCS OK: 0 processes with UID = -2 \(nobody\), args \'UsB\'/', "Output correct" ); +}; $result = NPTest->testCmd( "$command --ereg-argument-array='mdworker.*501'" ); is( $result->return_code, 0, "Checking regexp search of arguments" ); -is( $result->output, "PROCS OK: 1 process with regex args 'mdworker.*501'", "Output correct" ); +is( $result->output, "PROCS OK: 1 process with regex args 'mdworker.*501' | procs=1;;;0;", "Output correct" ); $result = NPTest->testCmd( "$command --vsz 1000000" ); is( $result->return_code, 0, "Checking filter by VSZ" ); -like( $result->output, '/^PROCS OK: 24 processes with VSZ >= 1000000$/', "Output correct" ); +is( $result->output, 'PROCS OK: 24 processes with VSZ >= 1000000 | procs=24;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command --rss 100000" ); is( $result->return_code, 0, "Checking filter by RSS" ); -like( $result->output, '/^PROCS OK: 3 processes with RSS >= 100000$/', "Output correct" ); +is( $result->output, 'PROCS OK: 3 processes with RSS >= 100000 | procs=3;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command -s S" ); is( $result->return_code, 0, "Checking filter for sleeping processes" ); @@ -86,34 +95,38 @@ like( $result->output, '/^PROCS CRITICAL: 39 processes with PPID = 1/', "Output $result = NPTest->testCmd( "$command -P 0.71" ); is( $result->return_code, 0, "Checking filter for percentage cpu > 0.71" ); -is( $result->output, 'PROCS OK: 7 processes with PCPU >= 0.71', "Output correct" ); +is( $result->output, 'PROCS OK: 7 processes with PCPU >= 0.71 | procs=7;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command -P 0.70" ); is( $result->return_code, 0, "Checking filter for percentage cpu > 0.70" ); -is( $result->output, 'PROCS OK: 8 processes with PCPU >= 0.70', "Output correct" ); +is( $result->output, 'PROCS OK: 8 processes with PCPU >= 0.70 | procs=8;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command --metric=CPU -w 8" ); is( $result->return_code, 1, "Checking against metric of CPU > 8" ); -is( $result->output, 'CPU WARNING: 1 warn out of 95 processes', "Output correct" ); +is( $result->output, 'CPU WARNING: 1 warn out of 95 processes | procs=95;;;0; procs_warn=1;;;0; procs_crit=0;;;0;', "Output correct" ); # TODO: Because of a conversion to int, if CPU is 1.45%, will not alert, but 2.01% will. -$result = NPTest->testCmd( "$command --metric=CPU -w 1 -u 501 -v" ); -is( $result->return_code, 1, "Checking against metric of CPU > 1 with uid=501 - TODO" ); -is( $result->output, 'CPU WARNING: 2 warn out of 40 processes with UID = 501 (tonvoon) [Skype, PubSubAgent]', "Output correct" ); +SKIP: { + skip 'user with uid 501 required', 2 unless getpwuid(501); + + $result = NPTest->testCmd( "$command --metric=CPU -w 1 -u 501 -v" ); + is( $result->return_code, 1, "Checking against metric of CPU > 1 with uid=501 - TODO" ); + is( $result->output, 'CPU WARNING: 2 warn out of 40 processes with UID = 501 (tonvoon) [Skype, PubSubAgent]', "Output correct" ); +}; $result = NPTest->testCmd( "$command --metric=VSZ -w 1200000 -v" ); is( $result->return_code, 1, "Checking against VSZ > 1.2GB" ); -is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype]', "Output correct" ); +is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype] | procs=95;;;0; procs_warn=4;;;0; procs_crit=0;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command --metric=VSZ -w 1200000 -v" ); is( $result->return_code, 1, "Checking against VSZ > 1.2GB" ); -is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype]', "Output correct" ); +is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype] | procs=95;;;0; procs_warn=4;;;0; procs_crit=0;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command --metric=RSS -c 70000 -v" ); is( $result->return_code, 2, "Checking against RSS > 70MB" ); -is( $result->output, 'RSS CRITICAL: 5 crit, 0 warn out of 95 processes [WindowServer, SystemUIServer, Safari, Mail, Safari]', "Output correct" ); +is( $result->output, 'RSS CRITICAL: 5 crit, 0 warn out of 95 processes [WindowServer, SystemUIServer, Safari, Mail, Safari] | procs=95;;;0; procs_warn=0;;;0; procs_crit=5;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command --ereg-argument-array='(nosuchname|nosuch2name)'" ); is( $result->return_code, 0, "Checking no pipe symbol in output" ); -is( $result->output, "PROCS OK: 0 processes with regex args '(nosuchname,nosuch2name)'", "Output correct" ); +is( $result->output, "PROCS OK: 0 processes with regex args '(nosuchname,nosuch2name)' | procs=0;;;0;", "Output correct" ); diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t index 1ef0b20..aace9bc 100755 --- a/plugins/tests/check_snmp.t +++ b/plugins/tests/check_snmp.t @@ -8,7 +8,7 @@ use Test::More; use NPTest; use FindBin qw($Bin); -my $tests = 53; +my $tests = 67; # Check that all dependent modules are available eval { require NetSNMP::OID; @@ -59,7 +59,7 @@ if ($ARGV[0] && $ARGV[0] eq "-d") { } # We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data -$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'} ||= "/var/tmp"; +$ENV{'MP_STATE_PATH'} ||= "/var/tmp"; my $res; @@ -79,7 +79,7 @@ Copyright (c) 1986-2004 by cisco Systems, Inc. $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.0 -o sysContact.0 -o .1.3.6.1.4.1.8072.3.2.67.1"); cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" ); like($res->output, '/^SNMP OK - /', "String contains SNMP OK"); -like($res->output, '/'.quotemeta('SNMP OK - Cisco Internetwork Operating System Software Alice Kisco Outernetwork Oserating Gystem Totware | +like($res->output, '/'.quotemeta('SNMP OK - Cisco Internetwork Operating System Software ').'"?Alice"?'.quotemeta(' Kisco Outernetwork Oserating Gystem Totware | .1.3.6.1.4.1.8072.3.2.67.0: "Cisco Internetwork Operating System Software IOS (tm) Catalyst 4000 \"L3\" Switch Software (cat4000-I9K91S-M), Version @@ -109,7 +109,7 @@ like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C "And now have fun with with this: \"C:\\\\\" because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3"); -system("rm -f ".$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'}."/check_snmp/*"); +system("rm -f ".$ENV{'MP_STATE_PATH'}."/check_snmp/*"); $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" ); is($res->return_code, 0, "Returns OK"); is($res->output, "No previous data to calculate rate - assume okay"); @@ -214,3 +214,31 @@ $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1 is($res->return_code, 0, "String check should check whole string, not a parsed number" ); is($res->output, 'SNMP OK - "CUSTOM CHECK OK: foo is 12345" | ', "String check witn numbers returns whole string"); +$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" ); +is($res->return_code, 0, "Negative integer check OK" ); +is($res->output, 'SNMP OK - -2 | iso.3.6.1.4.1.8072.3.2.67.16=-2 ', "Negative integer check OK output" ); + +$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" ); +is($res->return_code, 1, "Negative integer check WARNING" ); +is($res->output, 'SNMP WARNING - *-3* | iso.3.6.1.4.1.8072.3.2.67.16=-3 ', "Negative integer check WARNING output" ); + +$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" ); +is($res->return_code, 2, "Negative integer check CRITICAL" ); +is($res->output, 'SNMP CRITICAL - *-4* | iso.3.6.1.4.1.8072.3.2.67.16=-4 ', "Negative integer check CRITICAL output" ); + +$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.17 -w -3: -c -6:" ); +is($res->return_code, 1, "Negative integer as string, WARNING" ); +is($res->output, 'SNMP WARNING - *-4* | iso.3.6.1.4.1.8072.3.2.67.17=-4 ', "Negative integer as string, WARNING output" ); + +$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.17 -w -2: -c -3:" ); +is($res->return_code, 2, "Negative integer as string, CRITICAL" ); +is($res->output, 'SNMP CRITICAL - *-4* | iso.3.6.1.4.1.8072.3.2.67.17=-4 ', "Negative integer as string, CRITICAL output" ); + +$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -c ~:-6.5" ); +is($res->return_code, 0, "Negative float OK" ); +is($res->output, 'SNMP OK - -6.6 | iso.3.6.1.4.1.8072.3.2.67.18=-6.6 ', "Negative float OK output" ); + +$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -w ~:-6.65 -c ~:-6.55" ); +is($res->return_code, 1, "Negative float WARNING" ); +is($res->output, 'SNMP WARNING - *-6.6* | iso.3.6.1.4.1.8072.3.2.67.18=-6.6 ', "Negative float WARNING output" ); + diff --git a/plugins/tests/check_snmp_agent.pl b/plugins/tests/check_snmp_agent.pl index 8cacd52..0e41d57 100644 --- a/plugins/tests/check_snmp_agent.pl +++ b/plugins/tests/check_snmp_agent.pl @@ -7,7 +7,7 @@ use NetSNMP::OID qw(:all); use NetSNMP::agent; use NetSNMP::ASN qw(ASN_OCTET_STR ASN_COUNTER ASN_COUNTER64 ASN_INTEGER ASN_INTEGER64 ASN_UNSIGNED ASN_UNSIGNED64); -#use Math::Int64 qw(uint64); # Skip that module whie we don't need it +#use Math::Int64 qw(uint64); # Skip that module while we don't need it sub uint64 { return $_ } if (!$agent) { @@ -16,8 +16,6 @@ if (!$agent) { } my $baseoid = '.1.3.6.1.4.1.8072.3.2.67'; -# Next are arrays of indexes (Type, initial value and increments) -# Undef miltipliers are randomized my $multiline = 'Cisco Internetwork Operating System Software IOS (tm) Catalyst 4000 "L3" Switch Software (cat4000-I9K91S-M), Version 12.2(20)EWA, RELEASE SOFTWARE (fc1) @@ -33,10 +31,12 @@ ends with with this: C:\\'; my $multilin5 = 'And now have fun with with this: "C:\\" because we\'re not done yet!'; -# 0..15 <---- please update comment when adding/removing fields -my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR ); -my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"', 'CUSTOM CHECK OK: foo is 12345' ); -my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef, undef ); +# Next are arrays of indexes (Type, initial value and increments) +# 0..16 <---- please update comment when adding/removing fields +my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_INTEGER, ASN_OCTET_STR, ASN_OCTET_STR ); +my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"', 'CUSTOM CHECK OK: foo is 12345', -2, '-4', '-6.6' ); +# undef increments are randomized +my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef, undef, -1, undef, undef ); # Number of elements in our OID my $oidelts; diff --git a/plugins/tests/var/ps_axwo.debian b/plugins/tests/var/ps_axwo.debian index 0d7d7bc..37a2d35 100644 --- a/plugins/tests/var/ps_axwo.debian +++ b/plugins/tests/var/ps_axwo.debian @@ -31,7 +31,7 @@ S 0 6907 1 2308 892 0.0 mysqld_safe /bin/sh /usr/bin/mysqld_ S 103 6944 6907 123220 27724 0.0 mysqld /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --user=mysql --pid-file=/var/run/mysqld/mysqld.pid --skip-locking --port=3306 --socket=/var/run/mysqld/mysqld.sock S 0 6945 6907 1488 420 0.0 logger logger -p daemon.err -t mysqld_safe -i -t mysqld S 1001 17778 1 6436 1588 0.0 snmpd /usr/sbin/snmpd -u nagios -Lsd -Lf /dev/null -p/var/run/snmpd.pid -Ss 0 17789 1 9496 5556 0.0 snmptrapd /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/nagios/snmp/load -p /var/run/snmptrapd.pid +Ss 0 17789 1 9496 5556 0.0 snmptrapd /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/monitoring/snmp/load -p /var/run/snmptrapd.pid Ss 0 847 2319 14452 1752 0.0 sshd sshd: tonvoon [priv] S 1000 857 847 14616 1832 0.0 sshd sshd: tonvoon@pts/3 Ss 1000 860 857 2984 1620 0.0 bash -bash @@ -79,6 +79,6 @@ Ss 1001 23783 1 3220 764 0.0 ndo2db /usr/local/nagios/bin/nd Ss 1001 23784 1 6428 4948 0.0 import_ndologsd import_ndologsd S+ 1001 9803 18955 4132 1936 0.0 ssh ssh altinity@cube02.lei.altinity S 1001 22505 22324 20256 1616 0.0 nagios ../../bin/nagios -d /usr/local/nagios/etc/nagios.cfg -S 1001 22506 22505 1676 608 0.0 check_ping /usr/local/nagios/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1 +S 1001 22506 22505 1676 608 0.0 check_ping /usr/local/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1 S 1001 22507 22506 1660 492 0.0 ping /bin/ping -n -U -w 10 -c 1 192.168.10.23 R+ 1001 22508 23370 2308 680 0.0 ps ps axwo stat uid pid ppid vsz rss pcpu comm args diff --git a/plugins/urlize.c b/plugins/urlize.c index 30b2a35..6fda72d 100644 --- a/plugins/urlize.c +++ b/plugins/urlize.c @@ -1,17 +1,16 @@ /***************************************************************************** * -* Nagios urlize plugin +* Monitoring urlize plugin * * License: GPL -* Copyright (c) 2000-2007 Nagios Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * * This file contains the urlize plugin * * This plugin wraps the text output of another command (plugin) in HTML -* tags, thus displaying the child plugin's output as a clickable link in the -* Nagios status screen. This plugin returns the status of the invoked plugin. +* tags. This plugin returns the status of the invoked plugin. * * * This program is free software: you can redistribute it and/or modify @@ -32,7 +31,7 @@ const char *progname = "urlize"; const char *copyright = "2000-2006"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; +const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "utils.h" @@ -166,9 +165,9 @@ print_help (void) printf ("Copyright (c) 2000 Karl DeBisschop \n"); printf (COPYRIGHT, copyright, email); - printf ("%s\n", _("This plugin wraps the text output of another command (plugin)")); - printf ("%s\n", _("in HTML tags, thus displaying the child plugin's output as a clickable link in")); - printf ("%s\n", _("the Nagios status screen. This plugin returns the status of the invoked plugin.")); + printf ("%s\n", _("This plugin wraps the text output of another command (plugin) in HTML ")); + printf ("%s\n", _("tags, thus displaying the child plugin's output as a clickable link in compatible")); + printf ("%s\n", _("monitoring status screen. This plugin returns the status of the invoked plugin.")); printf ("\n\n"); diff --git a/plugins/utils.c b/plugins/utils.c index b57d5e1..58b153d 100644 --- a/plugins/utils.c +++ b/plugins/utils.c @@ -4,7 +4,7 @@ * * License: GPL * Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net) -* Copyright (c) 2002-2007 Nagios Plugin Development Team +* Copyright (c) 2002-2007 Monitoring Plugins Development Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/utils.h b/plugins/utils.h index 657d4bf..4c4aacc 100644 --- a/plugins/utils.h +++ b/plugins/utils.h @@ -1,6 +1,6 @@ #ifndef NP_UTILS_H #define NP_UTILS_H -/* Header file for nagios plugins utils.c */ +/* Header file for Monitoring Plugins utils.c */ /* This file should be included in all plugins */ @@ -131,7 +131,7 @@ char *fperfdata (const char *, {"warning",required_argument,0,'w'},\ {"hostname",required_argument,0,'H'} -#define COPYRIGHT "Copyright (c) %s Nagios Plugin Development Team\n\ +#define COPYRIGHT "Copyright (c) %s Monitoring Plugins Development Team\n\ \t<%s>\n\n" #define UT_HLP_VRS _("\ @@ -159,7 +159,8 @@ char *fperfdata (const char *, #define UT_VERBOSE _("\ -v, --verbose\n\ - Show details for command-line debugging (Nagios may truncate output)\n") + Show details for command-line debugging (output may be truncated by\n\ + the monitoring system)\n") #define UT_WARN_CRIT _("\ -w, --warning=DOUBLE\n\ @@ -173,31 +174,36 @@ char *fperfdata (const char *, -c, --critical=RANGE\n\ Critical range\n") -#define UT_TIMEOUT _("\ +#define UT_CONN_TIMEOUT _("\ -t, --timeout=INTEGER\n\ Seconds before connection times out (default: %d)\n") +#define UT_PLUG_TIMEOUT _("\ + -t, --timeout=INTEGER\n\ + Seconds before plugin times out (default: %d)\n") + #ifdef NP_EXTRA_OPTS #define UT_EXTRA_OPTS _("\ --extra-opts=[section][@file]\n\ - Read options from an ini file. See http://nagiosplugins.org/extra-opts\n\ + Read options from an ini file. See\n\ + https://www.monitoring-plugins.org/doc/extra-opts.html\n\ for usage and examples.\n") #else -#define UT_EXTRA_OPTS "" +#define UT_EXTRA_OPTS " \b" #endif #define UT_THRESHOLDS_NOTES _("\ See:\n\ - http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT\n\ + https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\ for THRESHOLD format and examples.\n") #define UT_SUPPORT _("\n\ -Send email to nagios-users@lists.sourceforge.net if you have questions\n\ -regarding use of this software. To submit patches or suggest improvements,\n\ -send email to nagiosplug-devel@lists.sourceforge.net\n\n") +Send email to help@monitoring-plugins.org if you have questions regarding\n\ +use of this software. To submit patches or suggest improvements, send email\n\ +to devel@monitoring-plugins.org\n\n") #define UT_NOWARRANTY _("\n\ -The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\ +The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\ copies of the plugins under the terms of the GNU General Public License.\n\ For more information about these matters, see the file named COPYING.\n") diff --git a/po/Makevars b/po/Makevars index 152edec..1bf1e0d 100644 --- a/po/Makevars +++ b/po/Makevars @@ -18,12 +18,12 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --flag=error:3:c-format --flag=error # or entity, or to disclaim their copyright. The empty string stands for # the public domain; in this case the translators are expected to disclaim # their copyright. -COPYRIGHT_HOLDER = Nagios Plugin Development Group +COPYRIGHT_HOLDER = Monitoring Plugins Development Team # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = # Email address were to send bug report for the .po translation files -PACKAGE_BUGREPORT = nagiosplug-devel@lists.sourceforge.net +PACKAGE_BUGREPORT = devel@monitoring-plugins.org diff --git a/po/de.gmo b/po/de.gmo index d30f064..d125b81 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index fa3d53e..1e728d3 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: nagiosplug\n" -"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-10-02 17:27+0200\n" +"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" +"POT-Creation-Date: 2014-07-11 17:17+0200\n" "PO-Revision-Date: 2004-12-23 17:46+0100\n" "Last-Translator: <>\n" "Language-Team: English \n" @@ -19,25 +19,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);X-Generator: KBabel 1.3.1\n" -#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:88 -#: plugins/check_disk.c:194 plugins/check_dns.c:102 plugins/check_dummy.c:52 +#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:91 +#: plugins/check_disk.c:203 plugins/check_dns.c:102 plugins/check_dummy.c:52 #: plugins/check_fping.c:93 plugins/check_game.c:82 plugins/check_hpjd.c:103 #: plugins/check_http.c:167 plugins/check_ldap.c:109 plugins/check_load.c:122 #: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:122 -#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:770 -#: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:552 +#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:781 +#: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:554 #: plugins/check_nwstat.c:173 plugins/check_overcr.c:102 -#: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:171 -#: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:144 -#: plugins/check_snmp.c:240 plugins/check_ssh.c:73 plugins/check_swap.c:110 -#: plugins/check_tcp.c:218 plugins/check_time.c:78 plugins/check_ups.c:122 -#: plugins/check_users.c:77 plugins/negate.c:214 plugins-root/check_dhcp.c:270 +#: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:172 +#: plugins/check_radius.c:167 plugins/check_real.c:80 plugins/check_smtp.c:144 +#: plugins/check_snmp.c:240 plugins/check_ssh.c:74 plugins/check_swap.c:111 +#: plugins/check_tcp.c:217 plugins/check_time.c:78 plugins/check_ups.c:122 +#: plugins/check_users.c:86 plugins/negate.c:212 plugins-root/check_dhcp.c:270 msgid "Could not parse arguments" msgstr "Argumente konnten nicht ausgewertet werden" -#: plugins/check_by_ssh.c:90 plugins/check_dig.c:82 plugins/check_dns.c:95 +#: plugins/check_by_ssh.c:90 plugins/check_dig.c:85 plugins/check_dns.c:95 #: plugins/check_nagios.c:95 plugins/check_pgsql.c:178 plugins/check_ping.c:99 -#: plugins/check_procs.c:186 plugins/check_snmp.c:336 plugins/negate.c:79 +#: plugins/check_procs.c:188 plugins/check_snmp.c:336 plugins/negate.c:78 msgid "Cannot catch SIGALRM" msgstr "Konnte SIGALRM nicht erhalten" @@ -61,18 +61,18 @@ msgstr "SSH WARNING: Konnte %s nicht msgid "%s: Error parsing output\n" msgstr "" -#: plugins/check_by_ssh.c:220 plugins/check_disk.c:476 +#: plugins/check_by_ssh.c:220 plugins/check_disk.c:491 #: plugins/check_http.c:278 plugins/check_ldap.c:293 plugins/check_pgsql.c:311 -#: plugins/check_procs.c:429 plugins/check_radius.c:308 -#: plugins/check_real.c:356 plugins/check_smtp.c:581 plugins/check_snmp.c:736 -#: plugins/check_ssh.c:138 plugins/check_tcp.c:505 plugins/check_time.c:302 -#: plugins/check_ups.c:556 plugins/negate.c:164 +#: plugins/check_procs.c:437 plugins/check_radius.c:315 +#: plugins/check_real.c:357 plugins/check_smtp.c:581 plugins/check_snmp.c:736 +#: plugins/check_ssh.c:140 plugins/check_tcp.c:509 plugins/check_time.c:302 +#: plugins/check_ups.c:556 plugins/negate.c:162 msgid "Timeout interval must be a positive integer" msgstr "Timeout interval muss ein positiver Integer sein" #: plugins/check_by_ssh.c:230 plugins/check_pgsql.c:341 -#: plugins/check_radius.c:272 plugins/check_real.c:327 -#: plugins/check_smtp.c:506 plugins/check_tcp.c:511 plugins/check_time.c:296 +#: plugins/check_radius.c:279 plugins/check_real.c:328 +#: plugins/check_smtp.c:506 plugins/check_tcp.c:515 plugins/check_time.c:296 #: plugins/check_ups.c:518 msgid "Port must be a positive integer" msgstr "Port muss ein positiver Integer sein" @@ -114,10 +114,10 @@ msgstr "" "%s: Im passive mode muss ein Servicename für jeden Befehl angegeben werden.\n" #: plugins/check_by_ssh.c:374 -#, c-format +#, fuzzy, c-format msgid "" -"%s: In passive mode, you must provide the host short name from the nagios " -"configs.\n" +"%s: In passive mode, you must provide the host short name from the " +"monitoring configs.\n" msgstr "" "%s: Im passive mode muss der \"host short name\" aus der Nagios " "Konfiguration angegeben werden\n" @@ -164,15 +164,15 @@ msgid "identity of an authorized key [optional]" msgstr "" #: plugins/check_by_ssh.c:419 -msgid "external command file for nagios [optional]" +msgid "external command file for monitoring [optional]" msgstr "" #: plugins/check_by_ssh.c:421 -msgid "list of nagios service names, separated by ':' [optional]" +msgid "list of monitoring service names, separated by ':' [optional]" msgstr "" #: plugins/check_by_ssh.c:423 -msgid "short name of host in nagios configuration [optional]" +msgid "short name of host in the monitoring configuration [optional]" msgstr "" #: plugins/check_by_ssh.c:425 @@ -225,35 +225,35 @@ msgid "" msgstr "" #: plugins/check_by_ssh.c:445 plugins/check_cluster.c:261 -#: plugins/check_dig.c:355 plugins/check_disk.c:924 plugins/check_http.c:1560 -#: plugins/check_nagios.c:312 plugins/check_ntp.c:869 -#: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:633 -#: plugins/check_procs.c:755 plugins/negate.c:271 plugins/urlize.c:180 +#: plugins/check_dig.c:361 plugins/check_disk.c:939 plugins/check_http.c:1562 +#: plugins/check_nagios.c:312 plugins/check_ntp.c:880 +#: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:635 +#: plugins/check_procs.c:763 plugins/negate.c:251 plugins/urlize.c:179 msgid "Examples:" msgstr "" #: plugins/check_by_ssh.c:460 plugins/check_cluster.c:274 -#: plugins/check_dig.c:367 plugins/check_disk.c:941 plugins/check_dns.c:486 +#: plugins/check_dig.c:373 plugins/check_disk.c:956 plugins/check_dns.c:502 #: plugins/check_dummy.c:122 plugins/check_fping.c:505 -#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1590 +#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1592 #: plugins/check_ldap.c:451 plugins/check_load.c:334 plugins/check_mrtg.c:382 -#: plugins/check_mysql.c:569 plugins/check_nagios.c:323 plugins/check_nt.c:774 -#: plugins/check_ntp.c:888 plugins/check_ntp_peer.c:725 -#: plugins/check_ntp_time.c:642 plugins/check_nwstat.c:1685 +#: plugins/check_mysql.c:563 plugins/check_nagios.c:323 plugins/check_nt.c:774 +#: plugins/check_ntp.c:899 plugins/check_ntp_peer.c:725 +#: plugins/check_ntp_time.c:644 plugins/check_nwstat.c:1685 #: plugins/check_overcr.c:467 plugins/check_pgsql.c:578 -#: plugins/check_ping.c:603 plugins/check_procs.c:773 -#: plugins/check_radius.c:385 plugins/check_real.c:451 -#: plugins/check_smtp.c:843 plugins/check_snmp.c:1207 plugins/check_ssh.c:309 -#: plugins/check_swap.c:558 plugins/check_tcp.c:684 plugins/check_time.c:371 -#: plugins/check_ups.c:660 plugins/check_users.c:240 -#: plugins/check_ide_smart.c:640 plugins/negate.c:295 plugins/urlize.c:197 -#: plugins-root/check_dhcp.c:1422 plugins-root/check_icmp.c:1354 +#: plugins/check_ping.c:610 plugins/check_procs.c:781 +#: plugins/check_radius.c:392 plugins/check_real.c:452 +#: plugins/check_smtp.c:843 plugins/check_snmp.c:1209 plugins/check_ssh.c:325 +#: plugins/check_swap.c:570 plugins/check_tcp.c:688 plugins/check_time.c:371 +#: plugins/check_ups.c:660 plugins/check_users.c:278 +#: plugins/check_ide_smart.c:632 plugins/negate.c:275 plugins/urlize.c:196 +#: plugins-root/check_dhcp.c:1419 plugins-root/check_icmp.c:1351 msgid "Usage:" msgstr "" #: plugins/check_cluster.c:230 #, c-format -msgid "Host/Service Cluster Plugin for Nagios 2" +msgid "Host/Service Cluster Plugin for Monitoring" msgstr "" #: plugins/check_cluster.c:236 plugins/check_nt.c:676 @@ -293,13 +293,14 @@ msgid "commas" msgstr "" #: plugins/check_cluster.c:257 plugins/check_game.c:318 -#: plugins/check_http.c:1542 plugins/check_ldap.c:438 plugins/check_mrtg.c:363 -#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:558 -#: plugins/check_nt.c:758 plugins/check_ntp.c:865 plugins/check_ntp_peer.c:696 -#: plugins/check_ntp_time.c:626 plugins/check_nwstat.c:1670 -#: plugins/check_overcr.c:456 plugins/check_snmp.c:1178 -#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:277 -#: plugins-root/check_icmp.c:1329 +#: plugins/check_http.c:1544 plugins/check_ldap.c:438 plugins/check_mrtg.c:363 +#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:552 +#: plugins/check_nt.c:758 plugins/check_ntp.c:876 plugins/check_ntp_peer.c:696 +#: plugins/check_ntp_time.c:628 plugins/check_nwstat.c:1670 +#: plugins/check_overcr.c:456 plugins/check_snmp.c:1180 +#: plugins/check_swap.c:558 plugins/check_ups.c:642 +#: plugins/check_ide_smart.c:606 plugins/negate.c:257 +#: plugins-root/check_icmp.c:1326 msgid "Notes:" msgstr "" @@ -312,72 +313,72 @@ msgstr "" msgid "state." msgstr "" -#: plugins/check_dig.c:100 plugins/check_dig.c:102 +#: plugins/check_dig.c:106 plugins/check_dig.c:108 #, c-format msgid "Looking for: '%s'\n" msgstr "" -#: plugins/check_dig.c:109 +#: plugins/check_dig.c:115 msgid "dig returned an error status" msgstr "dig hat einen Fehler zurückgegeben" -#: plugins/check_dig.c:134 +#: plugins/check_dig.c:140 msgid "Server not found in ANSWER SECTION" msgstr "Server nicht gefunden in ANSWER SECTION" -#: plugins/check_dig.c:144 +#: plugins/check_dig.c:150 msgid "No ANSWER SECTION found" msgstr "Keine ANSWER SECTION gefunden" -#: plugins/check_dig.c:171 +#: plugins/check_dig.c:177 #, fuzzy msgid "Probably a non-existent host/domain" msgstr "nicht existierender Host/Domain" -#: plugins/check_dig.c:233 +#: plugins/check_dig.c:239 #, fuzzy, c-format msgid "Port must be a positive integer - %s" msgstr "Port muss ein positiver Integer sein - %s" -#: plugins/check_dig.c:244 +#: plugins/check_dig.c:250 #, fuzzy, c-format msgid "Warning interval must be a positive integer - %s" msgstr "Warning interval muss ein positiver Integer sein - %s" -#: plugins/check_dig.c:252 +#: plugins/check_dig.c:258 #, fuzzy, c-format msgid "Critical interval must be a positive integer - %s" msgstr "Critical interval muss ein positiver Integer sein - %s" -#: plugins/check_dig.c:260 +#: plugins/check_dig.c:266 #, fuzzy, c-format msgid "Timeout interval must be a positive integer - %s" msgstr "Timeout interval muss ein positiver Integer sein - %s" -#: plugins/check_dig.c:325 +#: plugins/check_dig.c:331 #, fuzzy, c-format msgid "This plugin test the DNS service on the specified host using dig" msgstr "Testet den DNS Dienst auf dem angegebenen Host mit dig" -#: plugins/check_dig.c:338 +#: plugins/check_dig.c:344 msgid "Force dig to only use IPv4 query transport" msgstr "" -#: plugins/check_dig.c:340 +#: plugins/check_dig.c:346 msgid "Force dig to only use IPv6 query transport" msgstr "" -#: plugins/check_dig.c:342 +#: plugins/check_dig.c:348 #, fuzzy msgid "Machine name to lookup" msgstr "zu prüfender Hostname" -#: plugins/check_dig.c:344 +#: plugins/check_dig.c:350 #, fuzzy msgid "Record type to lookup (default: A)" msgstr "abzufragender Datensatztyp (Default: A)" -#: plugins/check_dig.c:346 +#: plugins/check_dig.c:352 #, fuzzy msgid "" "An address expected to be in the answer section. If not set, uses whatever" @@ -385,96 +386,96 @@ msgstr "" "Adresse die in der ANSWER SECTION erwartet wird.wenn nicht gesetzt, " "ubernommen aus -l" -#: plugins/check_dig.c:347 +#: plugins/check_dig.c:353 msgid "was in -l" msgstr "" -#: plugins/check_dig.c:349 +#: plugins/check_dig.c:355 msgid "Pass STRING as argument(s) to dig" msgstr "" -#: plugins/check_disk.c:216 +#: plugins/check_disk.c:225 #, fuzzy, c-format msgid "DISK %s: %s not found\n" msgstr "%s [%s nicht gefunden]" -#: plugins/check_disk.c:216 plugins/check_disk.c:956 plugins/check_dns.c:241 +#: plugins/check_disk.c:225 plugins/check_disk.c:971 plugins/check_dns.c:241 #: plugins/check_dummy.c:74 plugins/check_mysql.c:299 #: plugins/check_nagios.c:104 plugins/check_nagios.c:168 #: plugins/check_nagios.c:172 plugins/check_pgsql.c:601 #: plugins/check_pgsql.c:618 plugins/check_pgsql.c:627 -#: plugins/check_pgsql.c:642 plugins/check_procs.c:343 +#: plugins/check_pgsql.c:642 plugins/check_procs.c:351 #, c-format msgid "CRITICAL" msgstr "CRITICAL" -#: plugins/check_disk.c:550 +#: plugins/check_disk.c:565 #, c-format msgid "unit type %s not known\n" msgstr "unbekannter unit type: %s\n" -#: plugins/check_disk.c:553 +#: plugins/check_disk.c:568 #, c-format msgid "failed allocating storage for '%s'\n" msgstr "konnte keinen Speicher für '%s' reservieren\n" -#: plugins/check_disk.c:577 plugins/check_disk.c:618 plugins/check_disk.c:626 -#: plugins/check_disk.c:633 plugins/check_disk.c:637 plugins/check_disk.c:677 -#: plugins/check_disk.c:683 plugins/check_disk.c:702 plugins/check_dummy.c:77 +#: plugins/check_disk.c:592 plugins/check_disk.c:633 plugins/check_disk.c:641 +#: plugins/check_disk.c:648 plugins/check_disk.c:652 plugins/check_disk.c:692 +#: plugins/check_disk.c:698 plugins/check_disk.c:717 plugins/check_dummy.c:77 #: plugins/check_dummy.c:80 plugins/check_pgsql.c:643 -#: plugins/check_procs.c:498 +#: plugins/check_procs.c:506 #, c-format msgid "UNKNOWN" msgstr "UNKNOWN" -#: plugins/check_disk.c:577 +#: plugins/check_disk.c:592 msgid "Must set a threshold value before using -p\n" msgstr "" -#: plugins/check_disk.c:618 +#: plugins/check_disk.c:633 msgid "Must set -E before selecting paths\n" msgstr "" -#: plugins/check_disk.c:626 +#: plugins/check_disk.c:641 msgid "Must set group value before selecting paths\n" msgstr "" -#: plugins/check_disk.c:633 +#: plugins/check_disk.c:648 msgid "" "Paths need to be selected before using -i/-I. Use -A to select all paths " "explicitly" msgstr "" -#: plugins/check_disk.c:637 plugins/check_disk.c:683 plugins/check_procs.c:498 +#: plugins/check_disk.c:652 plugins/check_disk.c:698 plugins/check_procs.c:506 msgid "Could not compile regular expression" msgstr "" -#: plugins/check_disk.c:677 +#: plugins/check_disk.c:692 msgid "Must set a threshold value before using -r/-R\n" msgstr "" -#: plugins/check_disk.c:703 +#: plugins/check_disk.c:718 msgid "Regular expression did not match any path or disk" msgstr "" -#: plugins/check_disk.c:749 +#: plugins/check_disk.c:764 #, fuzzy msgid "Unknown argument" msgstr "Unbekanntes Argument" -#: plugins/check_disk.c:783 +#: plugins/check_disk.c:798 #, c-format msgid " for %s\n" msgstr "" -#: plugins/check_disk.c:857 +#: plugins/check_disk.c:872 #, fuzzy msgid "" "This plugin checks the amount of used disk space on a mounted file system" msgstr "" "Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem" -#: plugins/check_disk.c:858 +#: plugins/check_disk.c:873 #, fuzzy msgid "" "and generates an alert if free space is less than one of the threshold values" @@ -482,149 +483,151 @@ msgstr "" "und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte " "unterschritten wird." -#: plugins/check_disk.c:868 +#: plugins/check_disk.c:883 msgid "Exit with WARNING status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:870 +#: plugins/check_disk.c:885 msgid "Exit with WARNING status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:872 +#: plugins/check_disk.c:887 msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:874 +#: plugins/check_disk.c:889 msgid "Exit with CRITICAL status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:876 +#: plugins/check_disk.c:891 msgid "Exit with WARNING status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:878 +#: plugins/check_disk.c:893 msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:880 -msgid "Path or partition (may be repeated)" +#: plugins/check_disk.c:895 +msgid "" +"Mount point or block device as emitted by the mount(8) command (may be " +"repeated)" msgstr "" -#: plugins/check_disk.c:882 +#: plugins/check_disk.c:897 msgid "Ignore device (only works if -p unspecified)" msgstr "" -#: plugins/check_disk.c:884 +#: plugins/check_disk.c:899 msgid "Clear thresholds" msgstr "" -#: plugins/check_disk.c:886 +#: plugins/check_disk.c:901 msgid "For paths or partitions specified with -p, only check for exact paths" msgstr "" -#: plugins/check_disk.c:888 +#: plugins/check_disk.c:903 msgid "Display only devices/mountpoints with errors" msgstr "" -#: plugins/check_disk.c:890 +#: plugins/check_disk.c:905 msgid "Don't account root-reserved blocks into freespace in perfdata" msgstr "" -#: plugins/check_disk.c:892 +#: plugins/check_disk.c:907 msgid "" "Group paths. Thresholds apply to (free-)space of all partitions together" msgstr "" -#: plugins/check_disk.c:894 +#: plugins/check_disk.c:909 msgid "Same as '--units kB'" msgstr "" -#: plugins/check_disk.c:896 +#: plugins/check_disk.c:911 msgid "Only check local filesystems" msgstr "" -#: plugins/check_disk.c:898 +#: plugins/check_disk.c:913 msgid "" "Only check local filesystems against thresholds. Yet call stat on remote " "filesystems" msgstr "" -#: plugins/check_disk.c:899 +#: plugins/check_disk.c:914 msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)" msgstr "" -#: plugins/check_disk.c:901 +#: plugins/check_disk.c:916 msgid "Display the mountpoint instead of the partition" msgstr "" -#: plugins/check_disk.c:903 +#: plugins/check_disk.c:918 msgid "Same as '--units MB'" msgstr "" -#: plugins/check_disk.c:905 +#: plugins/check_disk.c:920 msgid "Explicitly select all paths. This is equivalent to -R '.*'" msgstr "" -#: plugins/check_disk.c:907 +#: plugins/check_disk.c:922 msgid "" "Case insensitive regular expression for path/partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:909 +#: plugins/check_disk.c:924 msgid "Regular expression for path or partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:911 +#: plugins/check_disk.c:926 msgid "" "Regular expression to ignore selected path/partition (case insensitive) (may " "be repeated)" msgstr "" -#: plugins/check_disk.c:913 +#: plugins/check_disk.c:928 msgid "" "Regular expression to ignore selected path or partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:916 +#: plugins/check_disk.c:931 msgid "Choose bytes, kB, MB, GB, TB (default: MB)" msgstr "" -#: plugins/check_disk.c:919 +#: plugins/check_disk.c:934 msgid "Ignore all filesystems of indicated type (may be repeated)" msgstr "" -#: plugins/check_disk.c:921 +#: plugins/check_disk.c:936 msgid "Check only filesystems of indicated type (may be repeated)" msgstr "" -#: plugins/check_disk.c:926 +#: plugins/check_disk.c:941 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" msgstr "" -#: plugins/check_disk.c:928 +#: plugins/check_disk.c:943 msgid "" "Checks all filesystems not matching -r at 100M and 50M. The fs matching the -" "r regex" msgstr "" -#: plugins/check_disk.c:929 +#: plugins/check_disk.c:944 msgid "" "are grouped which means the freespace thresholds are applied to all disks " "together" msgstr "" -#: plugins/check_disk.c:931 +#: plugins/check_disk.c:946 msgid "" "Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use " "100M/50M" msgstr "" -#: plugins/check_disk.c:957 +#: plugins/check_disk.c:972 #, c-format msgid "%s %s: %s\n" msgstr "" -#: plugins/check_disk.c:957 +#: plugins/check_disk.c:972 msgid "is not accessible" msgstr "" @@ -662,7 +665,7 @@ msgid "server %s is not authoritative for %s" msgstr "Server %s ist nicht autoritativ für %s" #: plugins/check_dns.c:237 plugins/check_dummy.c:68 plugins/check_nagios.c:182 -#: plugins/check_pgsql.c:638 plugins/check_procs.c:336 +#: plugins/check_pgsql.c:638 plugins/check_procs.c:344 #, c-format msgid "OK" msgstr "OK" @@ -670,7 +673,7 @@ msgstr "OK" #: plugins/check_dns.c:239 plugins/check_dummy.c:71 plugins/check_mysql.c:296 #: plugins/check_nagios.c:182 plugins/check_pgsql.c:607 #: plugins/check_pgsql.c:612 plugins/check_pgsql.c:640 -#: plugins/check_procs.c:338 +#: plugins/check_procs.c:346 #, c-format msgid "WARNING" msgstr "WARNING" @@ -687,135 +690,135 @@ msgstr[1] "%.3f Sekunden Antwortzeit " msgid ". %s returns %s" msgstr "%s hat %s zurückgegeben" -#: plugins/check_dns.c:248 +#: plugins/check_dns.c:264 #, c-format msgid "DNS WARNING - %s\n" msgstr "DNS WARNING - %s\n" -#: plugins/check_dns.c:249 plugins/check_dns.c:252 plugins/check_dns.c:255 +#: plugins/check_dns.c:265 plugins/check_dns.c:268 plugins/check_dns.c:271 msgid " Probably a non-existent host/domain" msgstr "nicht existierender Host/Domain" -#: plugins/check_dns.c:251 +#: plugins/check_dns.c:267 #, c-format msgid "DNS CRITICAL - %s\n" msgstr "DNS CRITICAL - %s\n" -#: plugins/check_dns.c:254 +#: plugins/check_dns.c:270 #, fuzzy, c-format msgid "DNS UNKNOWN - %s\n" msgstr "DNS UNKNOW - %s\n" -#: plugins/check_dns.c:267 +#: plugins/check_dns.c:283 msgid "Note: nslookup is deprecated and may be removed from future releases." msgstr "" -#: plugins/check_dns.c:268 +#: plugins/check_dns.c:284 msgid "Consider using the `dig' or `host' programs instead. Run nslookup with" msgstr "" -#: plugins/check_dns.c:269 +#: plugins/check_dns.c:285 msgid "the `-sil[ent]' option to prevent this message from appearing." msgstr "" -#: plugins/check_dns.c:274 +#: plugins/check_dns.c:290 #, c-format msgid "No response from DNS %s\n" msgstr "Keine Antwort von DNS %s\n" -#: plugins/check_dns.c:278 +#: plugins/check_dns.c:294 #, c-format msgid "DNS %s has no records\n" msgstr "Nameserver %s hat keine Datensätze\n" -#: plugins/check_dns.c:286 +#: plugins/check_dns.c:302 #, c-format msgid "Connection to DNS %s was refused\n" msgstr "Verbindung zum Nameserver %s wurde verweigert\n" -#: plugins/check_dns.c:290 +#: plugins/check_dns.c:306 #, c-format msgid "Query was refused by DNS server at %s\n" msgstr "" -#: plugins/check_dns.c:294 +#: plugins/check_dns.c:310 #, c-format msgid "No information returned by DNS server at %s\n" msgstr "" -#: plugins/check_dns.c:300 +#: plugins/check_dns.c:316 #, c-format msgid "Domain %s was not found by the server\n" msgstr "Domäne %s wurde vom Server nicht gefunden\n" -#: plugins/check_dns.c:304 +#: plugins/check_dns.c:320 msgid "Network is unreachable\n" msgstr "Netzwerk nicht erreichbar\n" -#: plugins/check_dns.c:308 +#: plugins/check_dns.c:324 #, c-format msgid "DNS failure for %s\n" msgstr "DNS Fehler für %s\n" -#: plugins/check_dns.c:372 plugins/check_dns.c:380 plugins/check_dns.c:387 -#: plugins/check_dns.c:392 plugins/check_dns.c:414 plugins/check_dns.c:422 +#: plugins/check_dns.c:388 plugins/check_dns.c:396 plugins/check_dns.c:403 +#: plugins/check_dns.c:408 plugins/check_dns.c:430 plugins/check_dns.c:438 #: plugins/check_game.c:211 plugins/check_game.c:219 msgid "Input buffer overflow\n" msgstr "Eingabe-Pufferüberlauf\n" -#: plugins/check_dns.c:450 +#: plugins/check_dns.c:466 msgid "" "This plugin uses the nslookup program to obtain the IP address for the given " "host/domain query." msgstr "" -#: plugins/check_dns.c:451 +#: plugins/check_dns.c:467 msgid "An optional DNS server to use may be specified." msgstr "" -#: plugins/check_dns.c:452 +#: plugins/check_dns.c:468 msgid "" "If no DNS server is specified, the default server(s) specified in /etc/" "resolv.conf will be used." msgstr "" -#: plugins/check_dns.c:462 +#: plugins/check_dns.c:478 msgid "The name or address you want to query" msgstr "" -#: plugins/check_dns.c:464 +#: plugins/check_dns.c:480 msgid "Optional DNS server you want to use for the lookup" msgstr "" -#: plugins/check_dns.c:466 +#: plugins/check_dns.c:482 msgid "" "Optional IP-ADDRESS you expect the DNS server to return. HOST must end with" msgstr "" -#: plugins/check_dns.c:467 +#: plugins/check_dns.c:483 msgid "" "a dot (.). This option can be repeated multiple times (Returns OK if any" msgstr "" -#: plugins/check_dns.c:468 +#: plugins/check_dns.c:484 msgid "" "value match). If multiple addresses are returned at once, you have to match" msgstr "" -#: plugins/check_dns.c:469 +#: plugins/check_dns.c:485 msgid "" "the whole string of addresses separated with commas (sorted alphabetically)." msgstr "" -#: plugins/check_dns.c:471 +#: plugins/check_dns.c:487 msgid "Optionally expect the DNS server to be authoritative for the lookup" msgstr "" -#: plugins/check_dns.c:473 +#: plugins/check_dns.c:489 msgid "Return warning if elapsed time exceeds value. Default off" msgstr "" -#: plugins/check_dns.c:475 +#: plugins/check_dns.c:491 msgid "Return critical if elapsed time exceeds value. Default off" msgstr "" @@ -838,13 +841,13 @@ msgid "of the argument with optional text" msgstr "" #: plugins/check_fping.c:125 plugins/check_hpjd.c:128 plugins/check_ping.c:438 -#: plugins/check_swap.c:175 plugins/check_users.c:94 plugins/urlize.c:110 +#: plugins/check_swap.c:176 plugins/check_users.c:132 plugins/urlize.c:109 #, c-format msgid "Could not open pipe: %s\n" msgstr "Pipe: %s konnte nicht geöffnet werden\n" #: plugins/check_fping.c:131 plugins/check_hpjd.c:134 plugins/check_load.c:153 -#: plugins/check_swap.c:181 plugins/check_users.c:100 plugins/urlize.c:116 +#: plugins/check_swap.c:182 plugins/check_users.c:138 plugins/urlize.c:115 #, c-format msgid "Could not open stderr for %s\n" msgstr "Konnte stderr nicht öffnen für: %s\n" @@ -895,12 +898,12 @@ msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n" #: plugins/check_fping.c:326 plugins/check_fping.c:332 #: plugins/check_hpjd.c:338 plugins/check_hpjd.c:361 plugins/check_mysql.c:371 -#: plugins/check_mysql.c:455 plugins/check_ntp.c:709 -#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:496 +#: plugins/check_mysql.c:455 plugins/check_ntp.c:720 +#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:498 #: plugins/check_pgsql.c:335 plugins/check_ping.c:295 plugins/check_ping.c:418 -#: plugins/check_radius.c:264 plugins/check_real.c:314 -#: plugins/check_real.c:376 plugins/check_smtp.c:499 plugins/check_smtp.c:641 -#: plugins/check_ssh.c:157 plugins/check_time.c:240 plugins/check_time.c:315 +#: plugins/check_radius.c:271 plugins/check_real.c:315 +#: plugins/check_real.c:377 plugins/check_smtp.c:499 plugins/check_smtp.c:641 +#: plugins/check_ssh.c:162 plugins/check_time.c:240 plugins/check_time.c:315 #: plugins/check_ups.c:504 plugins/check_ups.c:573 msgid "Invalid hostname/address" msgstr "Ungültige(r) Hostname/Adresse" @@ -927,9 +930,9 @@ msgstr "Warnung time muss ein positiver Integer sein" msgid "Interval must be a positive integer" msgstr "Timeout interval muss ein positiver Integer sein" -#: plugins/check_fping.c:402 plugins/check_ntp.c:733 -#: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:523 -#: plugins/check_radius.c:314 plugins/check_time.c:319 +#: plugins/check_fping.c:402 plugins/check_ntp.c:744 +#: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:525 +#: plugins/check_radius.c:321 plugins/check_time.c:319 msgid "Hostname was not supplied" msgstr "" @@ -959,12 +962,12 @@ msgid "" "reducing system load)" msgstr "" -#: plugins/check_fping.c:474 plugins/check_ping.c:575 +#: plugins/check_fping.c:474 plugins/check_ping.c:582 #, fuzzy msgid "warning threshold pair" msgstr "Warning threshold Integer sein" -#: plugins/check_fping.c:476 plugins/check_ping.c:577 +#: plugins/check_fping.c:476 plugins/check_ping.c:584 #, fuzzy msgid "critical threshold pair" msgstr "Critical threshold muss ein Integer sein" @@ -1153,8 +1156,8 @@ msgid "file does not exist or is not readable" msgstr "" #: plugins/check_http.c:310 plugins/check_http.c:315 plugins/check_http.c:321 -#: plugins/check_smtp.c:600 plugins/check_tcp.c:576 plugins/check_tcp.c:580 -#: plugins/check_tcp.c:586 +#: plugins/check_smtp.c:600 plugins/check_tcp.c:580 plugins/check_tcp.c:584 +#: plugins/check_tcp.c:590 msgid "Invalid certificate expiration period" msgstr "Ungültiger Zertifikatsablauftermin" @@ -1164,7 +1167,7 @@ msgid "" "(SSLv3)" msgstr "" -#: plugins/check_http.c:354 plugins/check_tcp.c:599 +#: plugins/check_http.c:354 plugins/check_tcp.c:603 #, fuzzy msgid "Invalid option - SSL is not available" msgstr "Ungültige Option - SSL ist nicht verfügbar\n" @@ -1187,9 +1190,9 @@ msgstr "Ung msgid "Could Not Compile Regular Expression: %s" msgstr "" -#: plugins/check_http.c:464 plugins/check_ntp.c:722 -#: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:512 -#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:477 +#: plugins/check_http.c:464 plugins/check_ntp.c:733 +#: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:514 +#: plugins/check_smtp.c:621 plugins/check_ssh.c:151 plugins/check_tcp.c:481 msgid "IPv6 support not available" msgstr "IPv6 Unterstützung nicht vorhanden" @@ -1336,342 +1339,342 @@ msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n" msgid "HTTP UNKNOWN - Could not allocate addr\n" msgstr "HTTP UNKNOWN - Konnte addr nicht zuweisen\n" -#: plugins/check_http.c:1248 plugins/check_http.c:1279 +#: plugins/check_http.c:1249 plugins/check_http.c:1280 #, fuzzy msgid "HTTP UNKNOWN - Could not allocate URL\n" msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n" -#: plugins/check_http.c:1257 +#: plugins/check_http.c:1258 #, c-format msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1272 +#: plugins/check_http.c:1273 #, fuzzy, c-format msgid "HTTP UNKNOWN - Empty redirect location%s\n" msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n" -#: plugins/check_http.c:1322 +#: plugins/check_http.c:1323 #, c-format msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1332 +#: plugins/check_http.c:1333 #, fuzzy, c-format msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" -#: plugins/check_http.c:1340 +#: plugins/check_http.c:1341 #, c-format msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" -#: plugins/check_http.c:1361 +#: plugins/check_http.c:1362 #, fuzzy, c-format msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" -#: plugins/check_http.c:1366 +#: plugins/check_http.c:1367 #, c-format msgid "Redirection to %s://%s:%d%s\n" msgstr "" -#: plugins/check_http.c:1440 +#: plugins/check_http.c:1442 #, fuzzy msgid "This plugin tests the HTTP service on the specified host. It can test" msgstr "" "Testet den DNS Dienst auf dem angegebenen Host mit dig\n" "\n" -#: plugins/check_http.c:1441 +#: plugins/check_http.c:1443 msgid "normal (http) and secure (https) servers, follow redirects, search for" msgstr "" -#: plugins/check_http.c:1442 +#: plugins/check_http.c:1444 msgid "strings and regular expressions, check connection times, and report on" msgstr "" -#: plugins/check_http.c:1443 +#: plugins/check_http.c:1445 #, fuzzy msgid "certificate expiration times." msgstr "Clientzertifikat benötigt\n" -#: plugins/check_http.c:1449 +#: plugins/check_http.c:1451 #, c-format msgid "NOTE: One or both of -H and -I must be specified" msgstr "" -#: plugins/check_http.c:1457 +#: plugins/check_http.c:1459 msgid "Host name argument for servers using host headers (virtual host)" msgstr "" -#: plugins/check_http.c:1458 +#: plugins/check_http.c:1460 msgid "Append a port to include it in the header (eg: example.com:5000)" msgstr "" -#: plugins/check_http.c:1460 +#: plugins/check_http.c:1462 msgid "" "IP address or name (use numeric address if possible to bypass DNS lookup)." msgstr "" -#: plugins/check_http.c:1462 +#: plugins/check_http.c:1464 msgid "Port number (default: " msgstr "" -#: plugins/check_http.c:1469 +#: plugins/check_http.c:1471 msgid "" "Connect via SSL. Port defaults to 443. VERSION is optional, and prevents" msgstr "" -#: plugins/check_http.c:1470 +#: plugins/check_http.c:1472 msgid "auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)." msgstr "" -#: plugins/check_http.c:1472 +#: plugins/check_http.c:1474 msgid "Enable SSL/TLS hostname extension support (SNI)" msgstr "" -#: plugins/check_http.c:1474 +#: plugins/check_http.c:1476 msgid "" "Minimum number of days a certificate has to be valid. Port defaults to 443" msgstr "" -#: plugins/check_http.c:1475 +#: plugins/check_http.c:1477 msgid "(when this option is used the URL is not checked.)" msgstr "" -#: plugins/check_http.c:1477 +#: plugins/check_http.c:1479 msgid "Name of file that contains the client certificate (PEM format)" msgstr "" -#: plugins/check_http.c:1478 +#: plugins/check_http.c:1480 msgid "to be used in establishing the SSL session" msgstr "" -#: plugins/check_http.c:1480 +#: plugins/check_http.c:1482 msgid "Name of file containing the private key (PEM format)" msgstr "" -#: plugins/check_http.c:1481 +#: plugins/check_http.c:1483 msgid "matching the client certificate" msgstr "" -#: plugins/check_http.c:1485 +#: plugins/check_http.c:1487 msgid "Comma-delimited list of strings, at least one of them is expected in" msgstr "" -#: plugins/check_http.c:1486 +#: plugins/check_http.c:1488 msgid "the first (status) line of the server response (default: " msgstr "" -#: plugins/check_http.c:1488 +#: plugins/check_http.c:1490 msgid "" "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" msgstr "" -#: plugins/check_http.c:1490 +#: plugins/check_http.c:1492 msgid "String to expect in the response headers" msgstr "" -#: plugins/check_http.c:1492 +#: plugins/check_http.c:1494 msgid "String to expect in the content" msgstr "" -#: plugins/check_http.c:1494 +#: plugins/check_http.c:1496 msgid "URL to GET or POST (default: /)" msgstr "" -#: plugins/check_http.c:1496 +#: plugins/check_http.c:1498 msgid "URL encoded http POST data" msgstr "" -#: plugins/check_http.c:1498 +#: plugins/check_http.c:1500 msgid "Set HTTP method." msgstr "" -#: plugins/check_http.c:1500 +#: plugins/check_http.c:1502 msgid "Don't wait for document body: stop reading after headers." msgstr "" -#: plugins/check_http.c:1501 +#: plugins/check_http.c:1503 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" msgstr "" -#: plugins/check_http.c:1503 +#: plugins/check_http.c:1505 msgid "Warn if document is more than SECONDS old. the number can also be of" msgstr "" -#: plugins/check_http.c:1504 +#: plugins/check_http.c:1506 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." msgstr "" -#: plugins/check_http.c:1506 +#: plugins/check_http.c:1508 msgid "specify Content-Type header media type when POSTing\n" msgstr "" -#: plugins/check_http.c:1509 +#: plugins/check_http.c:1511 msgid "Allow regex to span newlines (must precede -r or -R)" msgstr "" -#: plugins/check_http.c:1511 +#: plugins/check_http.c:1513 msgid "Search page for regex STRING" msgstr "" -#: plugins/check_http.c:1513 +#: plugins/check_http.c:1515 msgid "Search page for case-insensitive regex STRING" msgstr "" -#: plugins/check_http.c:1515 +#: plugins/check_http.c:1517 msgid "Return CRITICAL if found, OK if not\n" msgstr "" -#: plugins/check_http.c:1518 +#: plugins/check_http.c:1520 msgid "Username:password on sites with basic authentication" msgstr "" -#: plugins/check_http.c:1520 +#: plugins/check_http.c:1522 msgid "Username:password on proxy-servers with basic authentication" msgstr "" -#: plugins/check_http.c:1522 +#: plugins/check_http.c:1524 msgid "String to be sent in http header as \"User Agent\"" msgstr "" -#: plugins/check_http.c:1524 +#: plugins/check_http.c:1526 msgid "" "Any other tags to be sent in http header. Use multiple times for additional " "headers" msgstr "" -#: plugins/check_http.c:1526 +#: plugins/check_http.c:1528 msgid "Print additional performance data" msgstr "" -#: plugins/check_http.c:1528 +#: plugins/check_http.c:1530 msgid "Wrap output in HTML link (obsoleted by urlize)" msgstr "" -#: plugins/check_http.c:1530 +#: plugins/check_http.c:1532 msgid "How to handle redirected pages. sticky is like follow but stick to the" msgstr "" -#: plugins/check_http.c:1531 +#: plugins/check_http.c:1533 msgid "specified IP address. stickyport also ensures port stays the same." msgstr "" -#: plugins/check_http.c:1533 +#: plugins/check_http.c:1535 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" msgstr "" -#: plugins/check_http.c:1543 +#: plugins/check_http.c:1545 #, fuzzy msgid "This plugin will attempt to open an HTTP connection with the host." msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_http.c:1544 +#: plugins/check_http.c:1546 msgid "" "Successful connects return STATE_OK, refusals and timeouts return " "STATE_CRITICAL" msgstr "" -#: plugins/check_http.c:1545 +#: plugins/check_http.c:1547 msgid "" "other errors return STATE_UNKNOWN. Successful connects, but incorrect " "reponse" msgstr "" -#: plugins/check_http.c:1546 +#: plugins/check_http.c:1548 msgid "" "messages from the host result in STATE_WARNING return values. If you are" msgstr "" -#: plugins/check_http.c:1547 +#: plugins/check_http.c:1549 msgid "" "checking a virtual server that uses 'host headers' you must supply the FQDN" msgstr "" -#: plugins/check_http.c:1548 +#: plugins/check_http.c:1550 msgid "(fully qualified domain name) as the [host_name] argument." msgstr "" -#: plugins/check_http.c:1552 +#: plugins/check_http.c:1554 msgid "This plugin can also check whether an SSL enabled web server is able to" msgstr "" -#: plugins/check_http.c:1553 +#: plugins/check_http.c:1555 msgid "serve content (optionally within a specified time) or whether the X509 " msgstr "" -#: plugins/check_http.c:1554 +#: plugins/check_http.c:1556 msgid "certificate is still valid for the specified number of days." msgstr "" -#: plugins/check_http.c:1556 +#: plugins/check_http.c:1558 #, fuzzy msgid "Please note that this plugin does not check if the presented server" msgstr "" "Testet den DNS Dienst auf dem angegebenen Host mit dig\n" "\n" -#: plugins/check_http.c:1557 +#: plugins/check_http.c:1559 msgid "certificate matches the hostname of the server, or if the certificate" msgstr "" -#: plugins/check_http.c:1558 +#: plugins/check_http.c:1560 msgid "has a valid chain of trust to one of the locally installed CAs." msgstr "" -#: plugins/check_http.c:1562 +#: plugins/check_http.c:1564 msgid "" "When the 'www.verisign.com' server returns its content within 5 seconds," msgstr "" -#: plugins/check_http.c:1563 +#: plugins/check_http.c:1565 msgid "" "a STATE_OK will be returned. When the server returns its content but exceeds" msgstr "" -#: plugins/check_http.c:1564 +#: plugins/check_http.c:1566 msgid "" "the 5-second threshold, a STATE_WARNING will be returned. When an error " "occurs," msgstr "" -#: plugins/check_http.c:1565 +#: plugins/check_http.c:1567 msgid "a STATE_CRITICAL will be returned." msgstr "" -#: plugins/check_http.c:1568 +#: plugins/check_http.c:1570 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 14 days," msgstr "" -#: plugins/check_http.c:1569 plugins/check_http.c:1575 +#: plugins/check_http.c:1571 plugins/check_http.c:1577 msgid "" "a STATE_OK is returned. When the certificate is still valid, but for less " "than" msgstr "" -#: plugins/check_http.c:1570 +#: plugins/check_http.c:1572 msgid "" "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" msgstr "" -#: plugins/check_http.c:1571 +#: plugins/check_http.c:1573 #, fuzzy msgid "the certificate is expired." msgstr "Clientzertifikat benötigt\n" -#: plugins/check_http.c:1574 +#: plugins/check_http.c:1576 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 30 days," msgstr "" -#: plugins/check_http.c:1576 +#: plugins/check_http.c:1578 msgid "30 days, but more than 14 days, a STATE_WARNING is returned." msgstr "" -#: plugins/check_http.c:1577 +#: plugins/check_http.c:1579 msgid "" "A STATE_CRITICAL will be returned when certificate expires in less than 14 " "days" @@ -1998,7 +2001,7 @@ msgstr "" #: plugins/check_mrtg.c:359 msgid "" -"packets/sec, etc. I use MRTG in conjuction with the Novell NLM that allows" +"packets/sec, etc. I use MRTG in conjunction with the Novell NLM that allows" msgstr "" #: plugins/check_mrtg.c:360 @@ -2157,101 +2160,101 @@ msgstr "" msgid "Slave running: %s" msgstr "" -#: plugins/check_mysql.c:505 +#: plugins/check_mysql.c:499 msgid "This program tests connections to a MySQL server" msgstr "" -#: plugins/check_mysql.c:516 +#: plugins/check_mysql.c:510 msgid "Use the specified socket (has no effect if -H is used)" msgstr "" -#: plugins/check_mysql.c:519 +#: plugins/check_mysql.c:513 msgid "Check database with indicated name" msgstr "" -#: plugins/check_mysql.c:521 +#: plugins/check_mysql.c:515 msgid "Read from the specified client options file" msgstr "" -#: plugins/check_mysql.c:523 +#: plugins/check_mysql.c:517 msgid "Use a client options group" msgstr "" -#: plugins/check_mysql.c:525 +#: plugins/check_mysql.c:519 msgid "Connect using the indicated username" msgstr "" -#: plugins/check_mysql.c:527 +#: plugins/check_mysql.c:521 msgid "Use the indicated password to authenticate the connection" msgstr "" -#: plugins/check_mysql.c:528 +#: plugins/check_mysql.c:522 msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!" msgstr "" -#: plugins/check_mysql.c:529 +#: plugins/check_mysql.c:523 msgid "Your clear-text password could be visible as a process table entry" msgstr "" -#: plugins/check_mysql.c:531 +#: plugins/check_mysql.c:525 msgid "Check if the slave thread is running properly." msgstr "" -#: plugins/check_mysql.c:533 +#: plugins/check_mysql.c:527 msgid "Exit with WARNING status if slave server is more than INTEGER seconds" msgstr "" -#: plugins/check_mysql.c:534 plugins/check_mysql.c:537 +#: plugins/check_mysql.c:528 plugins/check_mysql.c:531 msgid "behind master" msgstr "" -#: plugins/check_mysql.c:536 +#: plugins/check_mysql.c:530 msgid "Exit with CRITICAL status if slave server is more then INTEGER seconds" msgstr "" -#: plugins/check_mysql.c:539 +#: plugins/check_mysql.c:533 msgid "Use ssl encryptation" msgstr "" -#: plugins/check_mysql.c:541 +#: plugins/check_mysql.c:535 msgid "Path to CA signing the cert" msgstr "" -#: plugins/check_mysql.c:543 +#: plugins/check_mysql.c:537 msgid "Path to SSL certificate" msgstr "" -#: plugins/check_mysql.c:545 +#: plugins/check_mysql.c:539 msgid "Path to private SSL key" msgstr "" -#: plugins/check_mysql.c:547 +#: plugins/check_mysql.c:541 msgid "Path to CA directory" msgstr "" -#: plugins/check_mysql.c:549 +#: plugins/check_mysql.c:543 msgid "List of valid SSL ciphers" msgstr "" -#: plugins/check_mysql.c:553 +#: plugins/check_mysql.c:547 msgid "" "There are no required arguments. By default, the local database is checked" msgstr "" -#: plugins/check_mysql.c:554 +#: plugins/check_mysql.c:548 msgid "" "using the default unix socket. You can force TCP on localhost by using an" msgstr "" -#: plugins/check_mysql.c:555 +#: plugins/check_mysql.c:549 msgid "IP address or FQDN ('localhost' will use the socket as well)." msgstr "" -#: plugins/check_mysql.c:559 +#: plugins/check_mysql.c:553 msgid "You must specify -p with an empty string to force an empty password," msgstr "" -#: plugins/check_mysql.c:560 +#: plugins/check_mysql.c:554 msgid "overriding any my.cnf settings." msgstr "" @@ -2272,7 +2275,7 @@ msgstr "" msgid "Cannot parse Nagios log file for valid time" msgstr "" -#: plugins/check_nagios.c:183 plugins/check_procs.c:348 +#: plugins/check_nagios.c:183 plugins/check_procs.c:356 #, c-format msgid "%d process" msgid_plural "%d processes" @@ -2379,7 +2382,7 @@ msgstr "" #: plugins/check_nt.c:206 #, c-format -msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)" +msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)|uptime=%lu" msgstr "" #: plugins/check_nt.c:220 @@ -2412,12 +2415,12 @@ msgstr "" #: plugins/check_nt.c:296 #, c-format msgid "" -"Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)" +"Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)" msgstr "" #: plugins/check_nt.c:299 #, c-format -msgid "'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f" +msgid "'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f" msgstr "" #: plugins/check_nt.c:335 plugins/check_nt.c:420 plugins/check_nt.c:450 @@ -2664,7 +2667,9 @@ msgid " to run Perfmon directly." msgstr "" #: plugins/check_nt.c:753 -msgid "It can also be used in scripts that automatically create Nagios service" +msgid "" +"It can also be used in scripts that automatically create the monitoring " +"service" msgstr "" #: plugins/check_nt.c:754 @@ -2701,81 +2706,92 @@ msgstr "" msgid "and on the client service it's connecting to." msgstr "" -#: plugins/check_ntp.c:807 plugins/check_ntp_peer.c:612 -#: plugins/check_ntp_time.c:571 +#: plugins/check_ntp.c:615 +#, c-format +msgid "Cannot read from socket: %s" +msgstr "" + +#: plugins/check_ntp.c:617 +#, c-format +msgid "" +"Invalid NTP response: %d bytes read does not equal %d plus %d data segment" +msgstr "" + +#: plugins/check_ntp.c:818 plugins/check_ntp_peer.c:612 +#: plugins/check_ntp_time.c:573 msgid "NTP CRITICAL:" msgstr "NTP CRITICAL:" -#: plugins/check_ntp.c:810 plugins/check_ntp_peer.c:615 -#: plugins/check_ntp_time.c:574 +#: plugins/check_ntp.c:821 plugins/check_ntp_peer.c:615 +#: plugins/check_ntp_time.c:576 msgid "NTP WARNING:" msgstr "NTP WARNING:" -#: plugins/check_ntp.c:813 plugins/check_ntp_peer.c:618 -#: plugins/check_ntp_time.c:577 +#: plugins/check_ntp.c:824 plugins/check_ntp_peer.c:618 +#: plugins/check_ntp_time.c:579 msgid "NTP OK:" msgstr "NTP OK:" -#: plugins/check_ntp.c:816 plugins/check_ntp_peer.c:621 -#: plugins/check_ntp_time.c:580 +#: plugins/check_ntp.c:827 plugins/check_ntp_peer.c:621 +#: plugins/check_ntp_time.c:582 msgid "NTP UNKNOWN:" msgstr "NTP UNKNOWN:" -#: plugins/check_ntp.c:820 plugins/check_ntp_peer.c:630 -#: plugins/check_ntp_time.c:584 +#: plugins/check_ntp.c:831 plugins/check_ntp_peer.c:630 +#: plugins/check_ntp_time.c:586 msgid "Offset unknown" msgstr "" -#: plugins/check_ntp.c:823 plugins/check_ntp_peer.c:633 -#: plugins/check_ntp_time.c:587 +#: plugins/check_ntp.c:834 plugins/check_ntp_peer.c:633 +#: plugins/check_ntp_time.c:589 msgid "Offset" msgstr "" -#: plugins/check_ntp.c:844 plugins/check_ntp_peer.c:662 +#: plugins/check_ntp.c:855 plugins/check_ntp_peer.c:662 #, fuzzy msgid "This plugin checks the selected ntp server" msgstr "" "Testet den DNS Dienst auf dem angegebenen Host mit dig\n" "\n" -#: plugins/check_ntp.c:854 plugins/check_ntp_peer.c:674 -#: plugins/check_ntp_time.c:614 +#: plugins/check_ntp.c:865 plugins/check_ntp_peer.c:674 +#: plugins/check_ntp_time.c:616 msgid "Offset to result in warning status (seconds)" msgstr "" -#: plugins/check_ntp.c:856 plugins/check_ntp_peer.c:676 -#: plugins/check_ntp_time.c:616 +#: plugins/check_ntp.c:867 plugins/check_ntp_peer.c:676 +#: plugins/check_ntp_time.c:618 msgid "Offset to result in critical status (seconds)" msgstr "" -#: plugins/check_ntp.c:858 plugins/check_ntp_peer.c:682 +#: plugins/check_ntp.c:869 plugins/check_ntp_peer.c:682 #, fuzzy msgid "Warning threshold for jitter" msgstr "Warning threshold Integer sein" -#: plugins/check_ntp.c:860 plugins/check_ntp_peer.c:684 +#: plugins/check_ntp.c:871 plugins/check_ntp_peer.c:684 #, fuzzy msgid "Critical threshold for jitter" msgstr "Critical threshold muss ein Integer sein" -#: plugins/check_ntp.c:870 +#: plugins/check_ntp.c:881 msgid "Normal offset check:" msgstr "" -#: plugins/check_ntp.c:873 plugins/check_ntp_peer.c:709 +#: plugins/check_ntp.c:884 plugins/check_ntp_peer.c:709 msgid "" "Check jitter too, avoiding critical notifications if jitter isn't available" msgstr "" -#: plugins/check_ntp.c:874 plugins/check_ntp_peer.c:710 +#: plugins/check_ntp.c:885 plugins/check_ntp_peer.c:710 msgid "(See Notes above for more details on thresholds formats):" msgstr "" -#: plugins/check_ntp.c:879 plugins/check_ntp.c:886 +#: plugins/check_ntp.c:890 plugins/check_ntp.c:897 msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or" msgstr "" -#: plugins/check_ntp.c:880 plugins/check_ntp.c:887 +#: plugins/check_ntp.c:891 plugins/check_ntp.c:898 msgid "check_ntp_time instead." msgstr "" @@ -2851,18 +2867,18 @@ msgstr "" msgid "Check only stratum:" msgstr "" -#: plugins/check_ntp_time.c:602 +#: plugins/check_ntp_time.c:604 #, fuzzy msgid "This plugin checks the clock offset with the ntp server" msgstr "" "Testet den DNS Dienst auf dem angegebenen Host mit dig\n" "\n" -#: plugins/check_ntp_time.c:612 +#: plugins/check_ntp_time.c:614 msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found" msgstr "" -#: plugins/check_ntp_time.c:621 +#: plugins/check_ntp_time.c:623 #, fuzzy msgid "This plugin checks the clock offset between the local host and a" msgstr "" @@ -2871,19 +2887,19 @@ msgstr "" "unterschritten wird.\n" "\n" -#: plugins/check_ntp_time.c:622 +#: plugins/check_ntp_time.c:624 msgid "remote NTP server. It is independent of any commandline programs or" msgstr "" -#: plugins/check_ntp_time.c:623 +#: plugins/check_ntp_time.c:625 msgid "external libraries." msgstr "" -#: plugins/check_ntp_time.c:627 +#: plugins/check_ntp_time.c:629 msgid "If you'd rather want to monitor an NTP server, please use" msgstr "" -#: plugins/check_ntp_time.c:628 +#: plugins/check_ntp_time.c:630 msgid "check_ntp_peer." msgstr "" @@ -3466,13 +3482,13 @@ msgid " %s - database %s (%f sec.)|%s\n" msgstr "" #: plugins/check_pgsql.c:317 plugins/check_time.c:277 plugins/check_time.c:289 -#: plugins/check_users.c:181 +#: plugins/check_users.c:219 msgid "Critical threshold must be a positive integer" msgstr "Critical threshold muss ein positiver Integer sein" #: plugins/check_pgsql.c:323 plugins/check_time.c:258 plugins/check_time.c:282 -#: plugins/check_users.c:187 plugins/check_users.c:197 -#: plugins/check_users.c:203 +#: plugins/check_users.c:225 plugins/check_users.c:235 +#: plugins/check_users.c:241 msgid "Warning threshold must be a positive integer" msgstr "Warning threshold muss ein positiver Integer sein" @@ -3495,7 +3511,7 @@ msgstr "" #: plugins/check_pgsql.c:517 #, c-format -msgid "(default: %s)" +msgid "(default: %s)\n" msgstr "" #: plugins/check_pgsql.c:519 @@ -3624,7 +3640,8 @@ msgstr "" #: plugins/check_pgsql.c:566 msgid "" -"Typically, the nagios user (unless the --logname option is used) should be" +"Typically, the monitoring user (unless the --logname option is used) should " +"be" msgstr "" #: plugins/check_pgsql.c:567 @@ -3752,302 +3769,302 @@ msgstr "" msgid "Cannot open stderr for %s\n" msgstr "" -#: plugins/check_ping.c:492 plugins/check_ping.c:494 +#: plugins/check_ping.c:499 plugins/check_ping.c:501 msgid "System call sent warnings to stderr " msgstr "" -#: plugins/check_ping.c:519 +#: plugins/check_ping.c:526 #, fuzzy, c-format msgid "CRITICAL - Network Unreachable (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:521 +#: plugins/check_ping.c:528 #, fuzzy, c-format msgid "CRITICAL - Host Unreachable (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:523 +#: plugins/check_ping.c:530 #, fuzzy, c-format msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:525 +#: plugins/check_ping.c:532 #, fuzzy, c-format msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:527 +#: plugins/check_ping.c:534 #, fuzzy, c-format msgid "CRITICAL - Network Prohibited (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:529 +#: plugins/check_ping.c:536 #, fuzzy, c-format msgid "CRITICAL - Host Prohibited (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:531 +#: plugins/check_ping.c:538 #, fuzzy, c-format msgid "CRITICAL - Packet Filtered (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:533 +#: plugins/check_ping.c:540 #, fuzzy, c-format msgid "CRITICAL - Host not found (%s)\n" msgstr "CRITICAL - Text nicht gefunden%s|%s %s\n" -#: plugins/check_ping.c:535 +#: plugins/check_ping.c:542 #, fuzzy, c-format msgid "CRITICAL - Time to live exceeded (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:537 +#: plugins/check_ping.c:544 #, fuzzy, c-format msgid "CRITICAL - Destination Unreachable (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:544 +#: plugins/check_ping.c:551 msgid "Unable to realloc warn_text\n" msgstr "" -#: plugins/check_ping.c:561 +#: plugins/check_ping.c:568 #, c-format msgid "Use ping to check connection statistics for a remote host." msgstr "" -#: plugins/check_ping.c:573 +#: plugins/check_ping.c:580 msgid "host to ping" msgstr "" -#: plugins/check_ping.c:579 +#: plugins/check_ping.c:586 msgid "number of ICMP ECHO packets to send" msgstr "" -#: plugins/check_ping.c:580 +#: plugins/check_ping.c:587 #, c-format msgid "(Default: %d)\n" msgstr "" -#: plugins/check_ping.c:582 +#: plugins/check_ping.c:589 msgid "show HTML in the plugin output (obsoleted by urlize)" msgstr "" -#: plugins/check_ping.c:587 +#: plugins/check_ping.c:594 msgid "THRESHOLD is ,% where is the round trip average travel" msgstr "" -#: plugins/check_ping.c:588 +#: plugins/check_ping.c:595 msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the" msgstr "" -#: plugins/check_ping.c:589 +#: plugins/check_ping.c:596 msgid "percentage of packet loss to trigger an alarm state." msgstr "" -#: plugins/check_ping.c:592 +#: plugins/check_ping.c:599 #, fuzzy msgid "" "This plugin uses the ping command to probe the specified host for packet loss" msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_ping.c:593 +#: plugins/check_ping.c:600 msgid "" "(percentage) and round trip average (milliseconds). It can produce HTML " "output" msgstr "" -#: plugins/check_ping.c:594 +#: plugins/check_ping.c:601 msgid "" "linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in" msgstr "" -#: plugins/check_ping.c:595 +#: plugins/check_ping.c:602 msgid "the contrib area of the downloads section at http://www.nagios.org/" msgstr "" -#: plugins/check_procs.c:191 +#: plugins/check_procs.c:193 #, c-format msgid "CMD: %s\n" msgstr "" -#: plugins/check_procs.c:196 +#: plugins/check_procs.c:198 msgid "System call sent warnings to stderr" msgstr "" -#: plugins/check_procs.c:318 +#: plugins/check_procs.c:326 #, c-format msgid "Not parseable: %s" msgstr "" -#: plugins/check_procs.c:323 +#: plugins/check_procs.c:331 #, c-format msgid "Unable to read output\n" msgstr "" -#: plugins/check_procs.c:340 +#: plugins/check_procs.c:348 #, c-format msgid "%d warn out of " msgstr "" -#: plugins/check_procs.c:345 +#: plugins/check_procs.c:353 #, c-format msgid "%d crit, %d warn out of " msgstr "" -#: plugins/check_procs.c:351 +#: plugins/check_procs.c:359 #, c-format msgid " with %s" msgstr "" -#: plugins/check_procs.c:445 +#: plugins/check_procs.c:453 #, fuzzy msgid "Parent Process ID must be an integer!" msgstr "Argument für check_dummy muss ein Integer sein" -#: plugins/check_procs.c:451 plugins/check_procs.c:578 +#: plugins/check_procs.c:459 plugins/check_procs.c:586 #, c-format msgid "%s%sSTATE = %s" msgstr "" -#: plugins/check_procs.c:460 +#: plugins/check_procs.c:468 #, fuzzy msgid "UID was not found" msgstr "%s [%s nicht gefunden]" -#: plugins/check_procs.c:466 +#: plugins/check_procs.c:474 #, fuzzy msgid "User name was not found" msgstr "%s [%s nicht gefunden]" -#: plugins/check_procs.c:481 +#: plugins/check_procs.c:489 #, c-format msgid "%s%scommand name '%s'" msgstr "" -#: plugins/check_procs.c:516 +#: plugins/check_procs.c:524 #, fuzzy msgid "RSS must be an integer!" msgstr "skip lines muss ein Integer sein" -#: plugins/check_procs.c:523 +#: plugins/check_procs.c:531 #, fuzzy msgid "VSZ must be an integer!" msgstr "skip lines muss ein Integer sein" -#: plugins/check_procs.c:531 +#: plugins/check_procs.c:539 msgid "PCPU must be a float!" msgstr "" -#: plugins/check_procs.c:555 +#: plugins/check_procs.c:563 msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!" msgstr "" -#: plugins/check_procs.c:686 +#: plugins/check_procs.c:694 msgid "" "Checks all processes and generates WARNING or CRITICAL states if the " "specified" msgstr "" -#: plugins/check_procs.c:687 +#: plugins/check_procs.c:695 msgid "" "metric is outside the required threshold ranges. The metric defaults to " "number" msgstr "" -#: plugins/check_procs.c:688 +#: plugins/check_procs.c:696 msgid "" "of processes. Search filters can be applied to limit the processes to check." msgstr "" -#: plugins/check_procs.c:697 +#: plugins/check_procs.c:705 msgid "Generate warning state if metric is outside this range" msgstr "" -#: plugins/check_procs.c:699 +#: plugins/check_procs.c:707 msgid "Generate critical state if metric is outside this range" msgstr "" -#: plugins/check_procs.c:701 +#: plugins/check_procs.c:709 msgid "Check thresholds against metric. Valid types:" msgstr "" -#: plugins/check_procs.c:702 +#: plugins/check_procs.c:710 msgid "PROCS - number of processes (default)" msgstr "" -#: plugins/check_procs.c:703 +#: plugins/check_procs.c:711 msgid "VSZ - virtual memory size" msgstr "" -#: plugins/check_procs.c:704 +#: plugins/check_procs.c:712 msgid "RSS - resident set memory size" msgstr "" -#: plugins/check_procs.c:705 +#: plugins/check_procs.c:713 msgid "CPU - percentage CPU" msgstr "" -#: plugins/check_procs.c:708 +#: plugins/check_procs.c:716 msgid "ELAPSED - time elapsed in seconds" msgstr "" -#: plugins/check_procs.c:713 +#: plugins/check_procs.c:721 msgid "Extra information. Up to 3 verbosity levels" msgstr "" -#: plugins/check_procs.c:716 +#: plugins/check_procs.c:724 msgid "Filter own process the traditional way by PID instead of /proc/pid/exe" msgstr "" -#: plugins/check_procs.c:721 +#: plugins/check_procs.c:729 msgid "Only scan for processes that have, in the output of `ps`, one or" msgstr "" -#: plugins/check_procs.c:722 +#: plugins/check_procs.c:730 msgid "more of the status flags you specify (for example R, Z, S, RS," msgstr "" -#: plugins/check_procs.c:723 +#: plugins/check_procs.c:731 msgid "RSZDT, plus others based on the output of your 'ps' command)." msgstr "" -#: plugins/check_procs.c:725 +#: plugins/check_procs.c:733 msgid "Only scan for children of the parent process ID indicated." msgstr "" -#: plugins/check_procs.c:727 +#: plugins/check_procs.c:735 msgid "Only scan for processes with VSZ higher than indicated." msgstr "" -#: plugins/check_procs.c:729 +#: plugins/check_procs.c:737 msgid "Only scan for processes with RSS higher than indicated." msgstr "" -#: plugins/check_procs.c:731 +#: plugins/check_procs.c:739 msgid "Only scan for processes with PCPU higher than indicated." msgstr "" -#: plugins/check_procs.c:733 +#: plugins/check_procs.c:741 msgid "Only scan for processes with user name or ID indicated." msgstr "" -#: plugins/check_procs.c:735 +#: plugins/check_procs.c:743 msgid "Only scan for processes with args that contain STRING." msgstr "" -#: plugins/check_procs.c:737 +#: plugins/check_procs.c:745 msgid "Only scan for processes with args that contain the regex STRING." msgstr "" -#: plugins/check_procs.c:739 +#: plugins/check_procs.c:747 msgid "Only scan for exact matches of COMMAND (without path)." msgstr "" -#: plugins/check_procs.c:741 +#: plugins/check_procs.c:749 msgid "Only scan for non kernel threads (works on Linux only)." msgstr "" -#: plugins/check_procs.c:743 +#: plugins/check_procs.c:751 #, c-format msgid "" "\n" @@ -4057,7 +4074,7 @@ msgid "" "\n" msgstr "" -#: plugins/check_procs.c:748 +#: plugins/check_procs.c:756 #, c-format msgid "" "This plugin checks the number of currently running processes and\n" @@ -4068,166 +4085,170 @@ msgid "" "\n" msgstr "" -#: plugins/check_procs.c:757 +#: plugins/check_procs.c:765 msgid "Warning if not two processes with command name portsentry." msgstr "" -#: plugins/check_procs.c:758 +#: plugins/check_procs.c:766 msgid "Critical if < 2 or > 1024 processes" msgstr "" -#: plugins/check_procs.c:760 +#: plugins/check_procs.c:768 msgid "Warning alert if > 10 processes with command arguments containing" msgstr "" -#: plugins/check_procs.c:761 +#: plugins/check_procs.c:769 msgid "'/usr/local/bin/perl' and owned by root" msgstr "" -#: plugins/check_procs.c:763 +#: plugins/check_procs.c:771 msgid "Alert if VSZ of any processes over 50K or 100K" msgstr "" -#: plugins/check_procs.c:765 +#: plugins/check_procs.c:773 #, c-format msgid "Alert if CPU of any processes over 10%% or 20%%" msgstr "" -#: plugins/check_radius.c:165 -msgid "Config file error" +#: plugins/check_radius.c:172 +msgid "Config file error\n" msgstr "" -#: plugins/check_radius.c:174 -msgid "Out of Memory?" -msgstr "" - -#: plugins/check_radius.c:178 -msgid "Invalid NAS-Identifier" -msgstr "" - -#: plugins/check_radius.c:183 plugins/check_radius.c:185 -#: plugins/check_radius.c:191 +#: plugins/check_radius.c:181 #, fuzzy -msgid "Invalid NAS-IP-Address" +msgid "Out of Memory?\n" +msgstr "Kein Papier" + +#: plugins/check_radius.c:185 +#, fuzzy +msgid "Invalid NAS-Identifier\n" msgstr "Ungültige(r) Hostname/Adresse" -#: plugins/check_radius.c:188 -msgid "Can't find local IP for NAS-IP-Address" +#: plugins/check_radius.c:190 plugins/check_radius.c:192 +#: plugins/check_radius.c:198 +#, fuzzy +msgid "Invalid NAS-IP-Address\n" +msgstr "Ungültige(r) Hostname/Adresse" + +#: plugins/check_radius.c:195 +msgid "Can't find local IP for NAS-IP-Address\n" msgstr "" -#: plugins/check_radius.c:202 -msgid "Timeout" +#: plugins/check_radius.c:209 +msgid "Timeout\n" msgstr "" -#: plugins/check_radius.c:204 -msgid "Auth Error" -msgstr "" - -#: plugins/check_radius.c:206 -msgid "Auth Failed" -msgstr "" - -#: plugins/check_radius.c:208 -msgid "Bad Response" -msgstr "" - -#: plugins/check_radius.c:212 -msgid "Auth OK" +#: plugins/check_radius.c:211 +msgid "Auth Error\n" msgstr "" #: plugins/check_radius.c:213 +#, fuzzy +msgid "Auth Failed\n" +msgstr "Fehlgeschlagen" + +#: plugins/check_radius.c:215 +msgid "Bad Response\n" +msgstr "" + +#: plugins/check_radius.c:219 +msgid "Auth OK\n" +msgstr "" + +#: plugins/check_radius.c:220 #, fuzzy, c-format msgid "Unexpected result code %d" msgstr "Erwartet: %s aber: %s erhalten" -#: plugins/check_radius.c:302 +#: plugins/check_radius.c:309 msgid "Number of retries must be a positive integer" msgstr "" -#: plugins/check_radius.c:316 +#: plugins/check_radius.c:323 msgid "User not specified" msgstr "" -#: plugins/check_radius.c:318 +#: plugins/check_radius.c:325 msgid "Password not specified" msgstr "" -#: plugins/check_radius.c:320 +#: plugins/check_radius.c:327 msgid "Configuration file not specified" msgstr "" -#: plugins/check_radius.c:338 +#: plugins/check_radius.c:345 #, fuzzy msgid "Tests to see if a RADIUS server is accepting connections." msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_radius.c:350 +#: plugins/check_radius.c:357 msgid "The user to authenticate" msgstr "" -#: plugins/check_radius.c:352 +#: plugins/check_radius.c:359 msgid "Password for autentication (SECURITY RISK)" msgstr "" -#: plugins/check_radius.c:354 +#: plugins/check_radius.c:361 msgid "NAS identifier" msgstr "" -#: plugins/check_radius.c:356 +#: plugins/check_radius.c:363 msgid "NAS IP Address" msgstr "" -#: plugins/check_radius.c:358 +#: plugins/check_radius.c:365 msgid "Configuration file" msgstr "" -#: plugins/check_radius.c:360 +#: plugins/check_radius.c:367 msgid "Response string to expect from the server" msgstr "" -#: plugins/check_radius.c:362 +#: plugins/check_radius.c:369 msgid "Number of times to retry a failed connection" msgstr "" -#: plugins/check_radius.c:367 +#: plugins/check_radius.c:374 #, fuzzy msgid "" "This plugin tests a RADIUS server to see if it is accepting connections." msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_radius.c:368 +#: plugins/check_radius.c:375 msgid "" "The server to test must be specified in the invocation, as well as a user" msgstr "" -#: plugins/check_radius.c:369 +#: plugins/check_radius.c:376 msgid "" "name and password. A configuration file may also be present. The format of" msgstr "" -#: plugins/check_radius.c:370 +#: plugins/check_radius.c:377 msgid "" "the configuration file is described in the radiusclient library sources." msgstr "" -#: plugins/check_radius.c:371 +#: plugins/check_radius.c:378 msgid "The password option presents a substantial security issue because the" msgstr "" -#: plugins/check_radius.c:372 +#: plugins/check_radius.c:379 msgid "" "password can possibly be determined by careful watching of the command line" msgstr "" -#: plugins/check_radius.c:373 -msgid "in a process listing. This risk is exacerbated because nagios will" +#: plugins/check_radius.c:380 +msgid "in a process listing. This risk is exacerbated because the plugin will" msgstr "" -#: plugins/check_radius.c:374 -msgid "run the plugin at regular predictable intervals. Please be sure that" +#: plugins/check_radius.c:381 +msgid "" +"typically be executed at regular predictable intervals. Please be sure that" msgstr "" -#: plugins/check_radius.c:375 +#: plugins/check_radius.c:382 msgid "the password used does not allow access to sensitive system resources." msgstr "" @@ -4241,79 +4262,79 @@ msgstr "" msgid "No data received from %s\n" msgstr "" -#: plugins/check_real.c:118 plugins/check_real.c:191 +#: plugins/check_real.c:118 plugins/check_real.c:192 #, fuzzy msgid "Invalid REAL response received from host" msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_real.c:120 plugins/check_real.c:193 +#: plugins/check_real.c:120 plugins/check_real.c:194 #, c-format msgid "Invalid REAL response received from host on port %d\n" msgstr "" -#: plugins/check_real.c:184 plugins/check_tcp.c:311 +#: plugins/check_real.c:185 plugins/check_tcp.c:310 #, c-format msgid "No data received from host\n" msgstr "" -#: plugins/check_real.c:247 +#: plugins/check_real.c:248 #, c-format msgid "REAL %s - %d second response time\n" msgstr "" -#: plugins/check_real.c:336 plugins/check_ups.c:536 +#: plugins/check_real.c:337 plugins/check_ups.c:536 msgid "Warning time must be a positive integer" msgstr "Warnung time muss ein positiver Integer sein" -#: plugins/check_real.c:345 plugins/check_ups.c:527 +#: plugins/check_real.c:346 plugins/check_ups.c:527 msgid "Critical time must be a positive integer" msgstr "Critical time muss ein positiver Integer sein" -#: plugins/check_real.c:381 +#: plugins/check_real.c:382 #, fuzzy msgid "You must provide a server to check" msgstr "%s: Hostname muss angegeben werden\n" -#: plugins/check_real.c:413 +#: plugins/check_real.c:414 #, fuzzy msgid "This plugin tests the REAL service on the specified host." msgstr "" "Testet den DNS Dienst auf dem angegebenen Host mit dig\n" "\n" -#: plugins/check_real.c:425 +#: plugins/check_real.c:426 msgid "Connect to this url" msgstr "" -#: plugins/check_real.c:427 +#: plugins/check_real.c:428 #, c-format msgid "String to expect in first line of server response (default: %s)\n" msgstr "" -#: plugins/check_real.c:437 +#: plugins/check_real.c:438 #, fuzzy msgid "This plugin will attempt to open an RTSP connection with the host." msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_real.c:438 plugins/check_smtp.c:830 +#: plugins/check_real.c:439 plugins/check_smtp.c:830 msgid "Successul connects return STATE_OK, refusals and timeouts return" msgstr "" -#: plugins/check_real.c:439 -msgid "" -"STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful connects," -msgstr "" - #: plugins/check_real.c:440 msgid "" -"but incorrect reponse messages from the host result in STATE_WARNING return" +"STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful connects," msgstr "" #: plugins/check_real.c:441 +msgid "" +"but incorrect reponse messages from the host result in STATE_WARNING return" +msgstr "" + +#: plugins/check_real.c:442 msgid "values." msgstr "" -#: plugins/check_smtp.c:150 plugins/check_swap.c:265 plugins/check_swap.c:271 +#: plugins/check_smtp.c:150 plugins/check_swap.c:266 plugins/check_swap.c:272 #, c-format msgid "malloc() failed!\n" msgstr "" @@ -4498,7 +4519,7 @@ msgstr "" msgid "FQDN used for HELO" msgstr "" -#: plugins/check_smtp.c:809 plugins/check_tcp.c:665 +#: plugins/check_smtp.c:809 plugins/check_tcp.c:669 msgid "Minimum number of days a certificate has to be valid." msgstr "" @@ -4612,447 +4633,473 @@ msgstr "" "Kein Hostname angegeben\n" "\n" -#: plugins/check_snmp.c:973 -msgid "Invalid seclevel" -msgstr "" - -#: plugins/check_snmp.c:980 plugins/check_snmp.c:983 plugins/check_snmp.c:1001 +#: plugins/check_snmp.c:967 plugins/check_snmp.c:985 plugins/check_snmp.c:1003 #, c-format msgid "Required parameter: %s\n" msgstr "" -#: plugins/check_snmp.c:1022 +#: plugins/check_snmp.c:978 +msgid "Invalid seclevel" +msgstr "" + +#: plugins/check_snmp.c:1024 msgid "Invalid SNMP version" msgstr "" -#: plugins/check_snmp.c:1039 +#: plugins/check_snmp.c:1041 msgid "Unbalanced quotes\n" msgstr "" -#: plugins/check_snmp.c:1088 +#: plugins/check_snmp.c:1090 msgid "Check status of remote machines and obtain system information via SNMP" msgstr "" -#: plugins/check_snmp.c:1101 +#: plugins/check_snmp.c:1103 msgid "Use SNMP GETNEXT instead of SNMP GET" msgstr "" -#: plugins/check_snmp.c:1103 +#: plugins/check_snmp.c:1105 msgid "SNMP protocol version" msgstr "" -#: plugins/check_snmp.c:1105 +#: plugins/check_snmp.c:1107 msgid "SNMPv3 securityLevel" msgstr "" -#: plugins/check_snmp.c:1107 +#: plugins/check_snmp.c:1109 msgid "SNMPv3 auth proto" msgstr "" -#: plugins/check_snmp.c:1109 +#: plugins/check_snmp.c:1111 msgid "SNMPv3 priv proto (default DES)" msgstr "" -#: plugins/check_snmp.c:1113 +#: plugins/check_snmp.c:1115 msgid "Optional community string for SNMP communication" msgstr "" -#: plugins/check_snmp.c:1114 +#: plugins/check_snmp.c:1116 msgid "default is" msgstr "" -#: plugins/check_snmp.c:1116 +#: plugins/check_snmp.c:1118 msgid "SNMPv3 username" msgstr "" -#: plugins/check_snmp.c:1118 +#: plugins/check_snmp.c:1120 msgid "SNMPv3 authentication password" msgstr "" -#: plugins/check_snmp.c:1120 +#: plugins/check_snmp.c:1122 msgid "SNMPv3 privacy password" msgstr "" -#: plugins/check_snmp.c:1124 +#: plugins/check_snmp.c:1126 msgid "Object identifier(s) or SNMP variables whose value you wish to query" msgstr "" -#: plugins/check_snmp.c:1126 +#: plugins/check_snmp.c:1128 msgid "" "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'" msgstr "" -#: plugins/check_snmp.c:1127 +#: plugins/check_snmp.c:1129 msgid "for symbolic OIDs.)" msgstr "" -#: plugins/check_snmp.c:1129 +#: plugins/check_snmp.c:1131 msgid "Delimiter to use when parsing returned data. Default is" msgstr "" -#: plugins/check_snmp.c:1130 +#: plugins/check_snmp.c:1132 msgid "Any data on the right hand side of the delimiter is considered" msgstr "" -#: plugins/check_snmp.c:1131 +#: plugins/check_snmp.c:1133 msgid "to be the data that should be used in the evaluation." msgstr "" -#: plugins/check_snmp.c:1135 +#: plugins/check_snmp.c:1137 #, fuzzy msgid "Warning threshold range(s)" msgstr "Warning threshold Integer sein" -#: plugins/check_snmp.c:1137 +#: plugins/check_snmp.c:1139 #, fuzzy msgid "Critical threshold range(s)" msgstr "Critical threshold muss ein Integer sein" -#: plugins/check_snmp.c:1139 +#: plugins/check_snmp.c:1141 msgid "Enable rate calculation. See 'Rate Calculation' below" msgstr "" -#: plugins/check_snmp.c:1141 +#: plugins/check_snmp.c:1143 msgid "" "Converts rate per second. For example, set to 60 to convert to per minute" msgstr "" -#: plugins/check_snmp.c:1143 +#: plugins/check_snmp.c:1145 msgid "Add/substract the specified OFFSET to numeric sensor data" msgstr "" -#: plugins/check_snmp.c:1147 -msgid "Return OK state (for that OID) if STRING is an exact match" -msgstr "" - #: plugins/check_snmp.c:1149 -msgid "" -"Return OK state (for that OID) if extended regular expression REGEX matches" +msgid "Return OK state (for that OID) if STRING is an exact match" msgstr "" #: plugins/check_snmp.c:1151 msgid "" -"Return OK state (for that OID) if case-insensitive extended REGEX matches" +"Return OK state (for that OID) if extended regular expression REGEX matches" msgstr "" #: plugins/check_snmp.c:1153 +msgid "" +"Return OK state (for that OID) if case-insensitive extended REGEX matches" +msgstr "" + +#: plugins/check_snmp.c:1155 msgid "Invert search result (CRITICAL if found)" msgstr "" -#: plugins/check_snmp.c:1157 +#: plugins/check_snmp.c:1159 msgid "Prefix label for output from plugin" msgstr "" -#: plugins/check_snmp.c:1159 +#: plugins/check_snmp.c:1161 msgid "Units label(s) for output data (e.g., 'sec.')." msgstr "" -#: plugins/check_snmp.c:1161 +#: plugins/check_snmp.c:1163 msgid "Separates output on multiple OID requests" msgstr "" -#: plugins/check_snmp.c:1165 +#: plugins/check_snmp.c:1167 msgid "Number of retries to be used in the requests" msgstr "" -#: plugins/check_snmp.c:1168 +#: plugins/check_snmp.c:1170 msgid "Label performance data with OIDs instead of --label's" msgstr "" -#: plugins/check_snmp.c:1173 +#: plugins/check_snmp.c:1175 msgid "" "This plugin uses the 'snmpget' command included with the NET-SNMP package." msgstr "" -#: plugins/check_snmp.c:1174 +#: plugins/check_snmp.c:1176 msgid "" "if you don't have the package installed, you will need to download it from" msgstr "" -#: plugins/check_snmp.c:1175 +#: plugins/check_snmp.c:1177 msgid "http://net-snmp.sourceforge.net before you can use this plugin." msgstr "" -#: plugins/check_snmp.c:1179 +#: plugins/check_snmp.c:1181 msgid "" "- Multiple OIDs (and labels) may be indicated by a comma or space-delimited " msgstr "" -#: plugins/check_snmp.c:1180 +#: plugins/check_snmp.c:1182 msgid "list (lists with internal spaces must be quoted)." msgstr "" -#: plugins/check_snmp.c:1184 +#: plugins/check_snmp.c:1186 msgid "" "- When checking multiple OIDs, separate ranges by commas like '-w " "1:10,1:,:20'" msgstr "" -#: plugins/check_snmp.c:1185 +#: plugins/check_snmp.c:1187 msgid "- Note that only one string and one regex may be checked at present" msgstr "" -#: plugins/check_snmp.c:1186 +#: plugins/check_snmp.c:1188 msgid "" "- All evaluation methods other than PR, STR, and SUBSTR expect that the value" msgstr "" -#: plugins/check_snmp.c:1187 +#: plugins/check_snmp.c:1189 msgid "returned from the SNMP query is an unsigned integer." msgstr "" -#: plugins/check_snmp.c:1190 +#: plugins/check_snmp.c:1192 msgid "Rate Calculation:" msgstr "" -#: plugins/check_snmp.c:1191 +#: plugins/check_snmp.c:1193 msgid "In many places, SNMP returns counters that are only meaningful when" msgstr "" -#: plugins/check_snmp.c:1192 +#: plugins/check_snmp.c:1194 msgid "calculating the counter difference since the last check. check_snmp" msgstr "" -#: plugins/check_snmp.c:1193 +#: plugins/check_snmp.c:1195 msgid "saves the last state information in a file so that the rate per second" msgstr "" -#: plugins/check_snmp.c:1194 +#: plugins/check_snmp.c:1196 msgid "can be calculated. Use the --rate option to save state information." msgstr "" -#: plugins/check_snmp.c:1195 +#: plugins/check_snmp.c:1197 msgid "" "On the first run, there will be no prior state - this will return with OK." msgstr "" -#: plugins/check_snmp.c:1196 +#: plugins/check_snmp.c:1198 msgid "The state is uniquely determined by the arguments to the plugin, so" msgstr "" -#: plugins/check_snmp.c:1197 +#: plugins/check_snmp.c:1199 msgid "changing the arguments will create a new state file." msgstr "" -#: plugins/check_ssh.c:165 +#: plugins/check_ssh.c:170 #, fuzzy msgid "Port number must be a positive integer" msgstr "Port muss ein positiver Integer sein" -#: plugins/check_ssh.c:232 +#: plugins/check_ssh.c:237 #, c-format msgid "Server answer: %s" msgstr "" -#: plugins/check_ssh.c:251 +#: plugins/check_ssh.c:256 #, c-format msgid "SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n" msgstr "" -#: plugins/check_ssh.c:260 +#: plugins/check_ssh.c:264 +#, c-format +msgid "" +"SSH WARNING - %s (protocol %s) protocol version mismatch, expected '%s'\n" +msgstr "" + +#: plugins/check_ssh.c:273 #, c-format msgid "SSH OK - %s (protocol %s) | %s\n" msgstr "" -#: plugins/check_ssh.c:281 +#: plugins/check_ssh.c:294 msgid "Try to connect to an SSH server at specified server and port" msgstr "" -#: plugins/check_ssh.c:297 +#: plugins/check_ssh.c:310 msgid "" "Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)" msgstr "" -#: plugins/check_swap.c:169 +#: plugins/check_ssh.c:313 +msgid "Warn if protocol doesn't match expected protocol version (ex: 2.0)" +msgstr "" + +#: plugins/check_swap.c:170 #, c-format msgid "Command: %s\n" msgstr "" -#: plugins/check_swap.c:171 +#: plugins/check_swap.c:172 #, c-format msgid "Format: %s\n" msgstr "" -#: plugins/check_swap.c:207 +#: plugins/check_swap.c:208 #, c-format msgid "total=%.0f, used=%.0f, free=%.0f\n" msgstr "" -#: plugins/check_swap.c:221 +#: plugins/check_swap.c:222 #, c-format msgid "total=%.0f, free=%.0f\n" msgstr "" -#: plugins/check_swap.c:253 +#: plugins/check_swap.c:254 msgid "Error getting swap devices\n" msgstr "" -#: plugins/check_swap.c:256 +#: plugins/check_swap.c:257 msgid "SWAP OK: No swap devices defined\n" msgstr "" -#: plugins/check_swap.c:277 plugins/check_swap.c:319 +#: plugins/check_swap.c:278 plugins/check_swap.c:320 msgid "swapctl failed: " msgstr "" -#: plugins/check_swap.c:278 plugins/check_swap.c:320 +#: plugins/check_swap.c:279 plugins/check_swap.c:321 msgid "Error in swapctl call\n" msgstr "" -#: plugins/check_swap.c:357 +#: plugins/check_swap.c:358 #, c-format msgid "SWAP %s - %d%% free (%d MB out of %d MB) %s|" msgstr "" -#: plugins/check_swap.c:435 +#: plugins/check_swap.c:440 msgid "Warning threshold must be integer or percentage!" msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein" -#: plugins/check_swap.c:453 +#: plugins/check_swap.c:458 msgid "Critical threshold must be integer or percentage!" msgstr "Critical threshold muss ein Integer oder ein Prozentwert sein!" -#: plugins/check_swap.c:507 +#: plugins/check_swap.c:465 +msgid "" +"no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " +"or integer (0-3)." +msgstr "" + +#: plugins/check_swap.c:516 #, fuzzy msgid "Warning percentage should be more than critical percentage" msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein" -#: plugins/check_swap.c:511 +#: plugins/check_swap.c:520 msgid "Warning free space should be more than critical free space" msgstr "" -#: plugins/check_swap.c:525 +#: plugins/check_swap.c:534 msgid "Check swap space on local machine." msgstr "" -#: plugins/check_swap.c:535 +#: plugins/check_swap.c:544 msgid "" "Exit with WARNING status if less than INTEGER bytes of swap space are free" msgstr "" -#: plugins/check_swap.c:537 +#: plugins/check_swap.c:546 msgid "Exit with WARNING status if less than PERCENT of swap space is free" msgstr "" -#: plugins/check_swap.c:539 +#: plugins/check_swap.c:548 msgid "" "Exit with CRITICAL status if less than INTEGER bytes of swap space are free" msgstr "" -#: plugins/check_swap.c:541 -msgid "Exit with CRITCAL status if less than PERCENT of swap space is free" +#: plugins/check_swap.c:550 +msgid "Exit with CRITICAL status if less than PERCENT of swap space is free" msgstr "" -#: plugins/check_swap.c:543 +#: plugins/check_swap.c:552 msgid "Conduct comparisons for all swap partitions, one by one" msgstr "" -#: plugins/check_swap.c:548 +#: plugins/check_swap.c:554 +msgid "" +"Resulting state when there is no swap regardless of thresholds. Default:" +msgstr "" + +#: plugins/check_swap.c:559 +msgid "" +"Both INTEGER and PERCENT thresholds can be specified, they are all checked." +msgstr "" + +#: plugins/check_swap.c:560 msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s." msgstr "" -#: plugins/check_tcp.c:206 +#: plugins/check_tcp.c:205 msgid "CRITICAL - Generic check_tcp called with unknown service\n" msgstr "" -#: plugins/check_tcp.c:230 +#: plugins/check_tcp.c:229 msgid "With UDP checks, a send/expect string must be specified." msgstr "" -#: plugins/check_tcp.c:431 +#: plugins/check_tcp.c:435 msgid "No arguments found" msgstr "" -#: plugins/check_tcp.c:534 +#: plugins/check_tcp.c:538 msgid "Maxbytes must be a positive integer" msgstr "Maxbytes muss ein positiver Integer sein" -#: plugins/check_tcp.c:552 +#: plugins/check_tcp.c:556 msgid "Refuse must be one of ok, warn, crit" msgstr "" -#: plugins/check_tcp.c:562 +#: plugins/check_tcp.c:566 msgid "Mismatch must be one of ok, warn, crit" msgstr "" -#: plugins/check_tcp.c:568 +#: plugins/check_tcp.c:572 msgid "Delay must be a positive integer" msgstr "Delay muss ein positiver Integer sein" -#: plugins/check_tcp.c:613 +#: plugins/check_tcp.c:617 #, fuzzy msgid "You must provide a server address" msgstr "%s: Hostname muss angegeben werden\n" -#: plugins/check_tcp.c:615 +#: plugins/check_tcp.c:619 #, fuzzy msgid "Invalid hostname, address or socket" msgstr "Ungültige(r) Hostname/Adresse" -#: plugins/check_tcp.c:629 +#: plugins/check_tcp.c:633 #, fuzzy, c-format msgid "" "This plugin tests %s connections with the specified host (or unix socket).\n" "\n" msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_tcp.c:642 +#: plugins/check_tcp.c:646 msgid "" "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or " "quit option" msgstr "" -#: plugins/check_tcp.c:643 +#: plugins/check_tcp.c:647 msgid "Default: nothing added to send, \\r\\n added to end of quit" msgstr "" -#: plugins/check_tcp.c:645 +#: plugins/check_tcp.c:649 msgid "String to send to the server" msgstr "" -#: plugins/check_tcp.c:647 +#: plugins/check_tcp.c:651 msgid "String to expect in server response" msgstr "" -#: plugins/check_tcp.c:647 +#: plugins/check_tcp.c:651 msgid "(may be repeated)" msgstr "" -#: plugins/check_tcp.c:649 +#: plugins/check_tcp.c:653 msgid "All expect strings need to occur in server response. Default is any" msgstr "" -#: plugins/check_tcp.c:651 +#: plugins/check_tcp.c:655 msgid "String to send server to initiate a clean close of the connection" msgstr "" -#: plugins/check_tcp.c:653 +#: plugins/check_tcp.c:657 msgid "Accept TCP refusals with states ok, warn, crit (default: crit)" msgstr "" -#: plugins/check_tcp.c:655 +#: plugins/check_tcp.c:659 msgid "" "Accept expected string mismatches with states ok, warn, crit (default: warn)" msgstr "" -#: plugins/check_tcp.c:657 +#: plugins/check_tcp.c:661 #, fuzzy msgid "Hide output from TCP socket" msgstr "Konnte TCP socket nicht öffnen\n" -#: plugins/check_tcp.c:659 +#: plugins/check_tcp.c:663 msgid "Close connection once more than this number of bytes are received" msgstr "" -#: plugins/check_tcp.c:661 +#: plugins/check_tcp.c:665 msgid "Seconds to wait between sending string and polling for response" msgstr "" -#: plugins/check_tcp.c:666 +#: plugins/check_tcp.c:670 msgid "1st is #days for warning, 2nd is critical (if not specified - 0)." msgstr "" -#: plugins/check_tcp.c:668 +#: plugins/check_tcp.c:672 msgid "Use SSL for the connection." msgstr "" @@ -5289,21 +5336,26 @@ msgstr "" msgid "http://www.networkupstools.org" msgstr "" -#: plugins/check_users.c:110 +#: plugins/check_users.c:93 +#, fuzzy, c-format +msgid "Could not enumerate RD sessions: %d\n" +msgstr "Konnte·url·nicht·zuweisen\n" + +#: plugins/check_users.c:148 #, c-format msgid "# users=%d" msgstr "" -#: plugins/check_users.c:133 +#: plugins/check_users.c:171 msgid "Unable to read output" msgstr "" -#: plugins/check_users.c:140 +#: plugins/check_users.c:178 #, c-format msgid "USERS %s - %d users currently logged in |%s\n" msgstr "" -#: plugins/check_users.c:219 +#: plugins/check_users.c:257 #, fuzzy msgid "This plugin checks the number of users currently logged in on the local" msgstr "" @@ -5312,230 +5364,266 @@ msgstr "" "unterschritten wird.\n" "\n" -#: plugins/check_users.c:220 +#: plugins/check_users.c:258 msgid "" "system and generates an error if the number exceeds the thresholds specified." msgstr "" -#: plugins/check_users.c:230 +#: plugins/check_users.c:268 msgid "Set WARNING status if more than INTEGER users are logged in" msgstr "" -#: plugins/check_users.c:232 +#: plugins/check_users.c:270 msgid "Set CRITICAL status if more than INTEGER users are logged in" msgstr "" -#: plugins/check_ide_smart.c:256 +#: plugins/check_ide_smart.c:219 +msgid "" +"DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"." +msgstr "" + +#: plugins/check_ide_smart.c:220 +msgid "Nagios-compatible output is now always returned." +msgstr "" + +#: plugins/check_ide_smart.c:225 +msgid "SMART commands are broken and have been disabled (See Notes in --help)." +msgstr "" + +#: plugins/check_ide_smart.c:229 +msgid "" +"DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the" +msgstr "" + +#: plugins/check_ide_smart.c:230 +msgid "default and will be removed from future releases." +msgstr "" + +#: plugins/check_ide_smart.c:258 #, fuzzy, c-format msgid "CRITICAL - Couldn't open device %s: %s\n" msgstr "CRITICAL - Device konnte nicht geöffnet werden: %s\n" -#: plugins/check_ide_smart.c:261 +#: plugins/check_ide_smart.c:263 #, c-format msgid "CRITICAL - SMART_CMD_ENABLE\n" msgstr "" -#: plugins/check_ide_smart.c:323 plugins/check_ide_smart.c:350 +#: plugins/check_ide_smart.c:304 plugins/check_ide_smart.c:331 #, c-format msgid "CRITICAL - SMART_READ_VALUES: %s\n" msgstr "" -#: plugins/check_ide_smart.c:421 +#: plugins/check_ide_smart.c:402 #, c-format msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n" msgstr "" -#: plugins/check_ide_smart.c:429 +#: plugins/check_ide_smart.c:410 #, c-format msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n" msgstr "" -#: plugins/check_ide_smart.c:437 +#: plugins/check_ide_smart.c:418 #, c-format msgid "OK - Operational (%d/%d tests passed)\n" msgstr "" -#: plugins/check_ide_smart.c:441 +#: plugins/check_ide_smart.c:422 #, c-format -msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n" +msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n" msgstr "" -#: plugins/check_ide_smart.c:474 +#: plugins/check_ide_smart.c:455 #, c-format msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n" msgstr "" -#: plugins/check_ide_smart.c:480 +#: plugins/check_ide_smart.c:461 #, c-format msgid "OffLineCapability=%d {%s %s %s}\n" msgstr "" -#: plugins/check_ide_smart.c:486 +#: plugins/check_ide_smart.c:467 #, c-format msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n" msgstr "" -#: plugins/check_ide_smart.c:508 plugins/check_ide_smart.c:532 +#: plugins/check_ide_smart.c:489 plugins/check_ide_smart.c:518 #, c-format msgid "CRITICAL - %s: %s\n" msgstr "" -#: plugins/check_ide_smart.c:553 plugins/check_ide_smart.c:580 +#: plugins/check_ide_smart.c:493 plugins/check_ide_smart.c:522 +#, c-format +msgid "OK - Command sent (%s)\n" +msgstr "" + +#: plugins/check_ide_smart.c:543 plugins/check_ide_smart.c:570 #, c-format msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n" msgstr "" -#: plugins/check_ide_smart.c:599 +#: plugins/check_ide_smart.c:589 #, c-format msgid "" "This plugin checks a local hard drive with the (Linux specific) SMART " "interface [http://smartlinux.sourceforge.net/smart/index.php]." msgstr "" -#: plugins/check_ide_smart.c:609 +#: plugins/check_ide_smart.c:599 msgid "Select device DEVICE" msgstr "" -#: plugins/check_ide_smart.c:610 +#: plugins/check_ide_smart.c:600 msgid "" -"Note: if the device is selected with this option, _no_ other options are " -"accepted" +"Note: if the device is specified without this option, any further option will" +msgstr "" + +#: plugins/check_ide_smart.c:601 +msgid "be ignored." +msgstr "" + +#: plugins/check_ide_smart.c:607 +msgid "" +"The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were" +msgstr "" + +#: plugins/check_ide_smart.c:608 +msgid "" +"broken in an underhand manner and have been disabled. You can use smartctl" +msgstr "" + +#: plugins/check_ide_smart.c:609 +msgid "instead:" +msgstr "" + +#: plugins/check_ide_smart.c:610 +msgid "-0/--auto-off: use \"smartctl --offlineauto=off\"" +msgstr "" + +#: plugins/check_ide_smart.c:611 +msgid "-1/--auto-on: use \"smartctl --offlineauto=on\"" msgstr "" #: plugins/check_ide_smart.c:612 -msgid "Perform immediately offline tests" +msgid "-i/--immediate: use \"smartctl --test=offline\"" msgstr "" -#: plugins/check_ide_smart.c:614 -msgid "Returns the number of failed tests" -msgstr "" - -#: plugins/check_ide_smart.c:616 -msgid "Turn on automatic offline tests" -msgstr "" - -#: plugins/check_ide_smart.c:618 -msgid "Turn off automatic offline tests" -msgstr "" - -#: plugins/check_ide_smart.c:620 -msgid "Output suitable for Nagios" -msgstr "" - -#: plugins/negate.c:99 +#: plugins/negate.c:98 #, fuzzy msgid "No data returned from command\n" msgstr "Keine Daten empfangen %s\n" -#: plugins/negate.c:170 +#: plugins/negate.c:168 msgid "" "Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " "or integer (0-3)." msgstr "" -#: plugins/negate.c:174 +#: plugins/negate.c:172 msgid "" "Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer " "(0-3)." msgstr "" -#: plugins/negate.c:180 +#: plugins/negate.c:178 msgid "" "Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " "integer (0-3)." msgstr "" -#: plugins/negate.c:185 +#: plugins/negate.c:183 msgid "" "Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " "integer (0-3)." msgstr "" -#: plugins/negate.c:190 +#: plugins/negate.c:188 msgid "" "Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " "integer (0-3)." msgstr "" -#: plugins/negate.c:217 +#: plugins/negate.c:215 msgid "Require path to command" msgstr "" -#: plugins/negate.c:246 +#: plugins/negate.c:226 msgid "" "Negates the status of a plugin (returns OK for CRITICAL and vice-versa)." msgstr "" -#: plugins/negate.c:247 +#: plugins/negate.c:227 msgid "Additional switches can be used to control which state becomes what." msgstr "" -#: plugins/negate.c:256 +#: plugins/negate.c:236 msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status." msgstr "" -#: plugins/negate.c:258 +#: plugins/negate.c:238 msgid "Custom result on Negate timeouts; see below for STATUS definition\n" msgstr "" -#: plugins/negate.c:264 +#: plugins/negate.c:244 #, c-format msgid "" " STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n" msgstr "" -#: plugins/negate.c:265 +#: plugins/negate.c:245 #, c-format msgid "" " quotes. Numeric values are accepted. If nothing is specified, permutes\n" msgstr "" -#: plugins/negate.c:266 +#: plugins/negate.c:246 #, c-format msgid " OK and CRITICAL.\n" msgstr "" -#: plugins/negate.c:268 +#: plugins/negate.c:248 #, c-format msgid "" " Substitute output text as well. Will only substitute text in CAPITALS\n" msgstr "" -#: plugins/negate.c:273 +#: plugins/negate.c:253 msgid "Run check_ping and invert result. Must use full path to plugin" msgstr "" -#: plugins/negate.c:275 +#: plugins/negate.c:255 msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL" msgstr "" -#: plugins/negate.c:278 +#: plugins/negate.c:258 msgid "" "This plugin is a wrapper to take the output of another plugin and invert it." msgstr "" -#: plugins/negate.c:279 +#: plugins/negate.c:259 msgid "The full path of the plugin must be provided." msgstr "" -#: plugins/negate.c:280 +#: plugins/negate.c:260 msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL." msgstr "" -#: plugins/negate.c:281 +#: plugins/negate.c:261 msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK." msgstr "" -#: plugins/negate.c:282 +#: plugins/negate.c:262 msgid "Otherwise, the output state of the wrapped plugin is unchanged." msgstr "" -#: plugins/negate.c:284 +#: plugins/negate.c:264 msgid "" "Using timeout-result, it is possible to override the timeout behaviour or a" msgstr "" -#: plugins/negate.c:285 +#: plugins/negate.c:265 msgid "plugin by setting the negate timeout a bit lower." msgstr "" @@ -5570,7 +5658,7 @@ msgstr "" msgid "Receive failed" msgstr "" -#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1342 +#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1339 #, fuzzy, c-format msgid "Invalid hostname/address - %s" msgstr "" @@ -5605,55 +5693,56 @@ msgstr "" msgid "sysconf error for _SC_OPEN_MAX" msgstr "" -#: plugins/urlize.c:130 +#: plugins/urlize.c:129 #, c-format msgid "" "%s UNKNOWN - No data received from host\n" "CMD: %s\n" msgstr "" +#: plugins/urlize.c:168 +msgid "" +"This plugin wraps the text output of another command (plugin) in HTML " +msgstr "" + #: plugins/urlize.c:169 -msgid "This plugin wraps the text output of another command (plugin)" +msgid "" +"tags, thus displaying the child plugin's output as a clickable link in " +"compatible" msgstr "" #: plugins/urlize.c:170 msgid "" -"in HTML tags, thus displaying the child plugin's output as a clickable " -"link in" -msgstr "" - -#: plugins/urlize.c:171 -msgid "" -"the Nagios status screen. This plugin returns the status of the invoked " +"monitoring status screen. This plugin returns the status of the invoked " "plugin." msgstr "" -#: plugins/urlize.c:181 +#: plugins/urlize.c:180 msgid "" "Pay close attention to quoting to ensure that the shell passes the expected" msgstr "" -#: plugins/urlize.c:182 +#: plugins/urlize.c:181 msgid "data to the plugin. For example, in:" msgstr "" -#: plugins/urlize.c:183 +#: plugins/urlize.c:182 msgid "urlize http://example.com/ check_http -H example.com -r 'two words'" msgstr "" -#: plugins/urlize.c:184 +#: plugins/urlize.c:183 msgid "the shell will remove the single quotes and urlize will see:" msgstr "" -#: plugins/urlize.c:185 +#: plugins/urlize.c:184 msgid "urlize http://example.com/ check_http -H example.com -r two words" msgstr "" -#: plugins/urlize.c:186 +#: plugins/urlize.c:185 msgid "You probably want:" msgstr "" -#: plugins/urlize.c:187 +#: plugins/urlize.c:186 msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" msgstr "" @@ -5714,10 +5803,11 @@ msgstr "" #: plugins/utils.h:160 msgid "" " -v, --verbose\n" -" Show details for command-line debugging (Nagios may truncate output)\n" +" Show details for command-line debugging (output may be truncated by\n" +" the monitoring system)\n" msgstr "" -#: plugins/utils.h:164 +#: plugins/utils.h:165 msgid "" " -w, --warning=DOUBLE\n" " Response time to result in warning status (seconds)\n" @@ -5725,7 +5815,7 @@ msgid "" " Response time to result in critical status (seconds)\n" msgstr "" -#: plugins/utils.h:170 +#: plugins/utils.h:171 msgid "" " -w, --warning=RANGE\n" " Warning range (format: start:end). Alert if outside this range\n" @@ -5733,7 +5823,7 @@ msgid "" " Critical range\n" msgstr "" -#: plugins/utils.h:176 +#: plugins/utils.h:177 #, c-format msgid "" " -t, --timeout=INTEGER\n" @@ -5741,433 +5831,441 @@ msgid "" msgstr "" #: plugins/utils.h:181 +#, c-format +msgid "" +" -t, --timeout=INTEGER\n" +" Seconds before plugin times out (default: %d)\n" +msgstr "" + +#: plugins/utils.h:186 msgid "" " --extra-opts=[section][@file]\n" -" Read options from an ini file. See http://nagiosplugins.org/extra-opts\n" +" Read options from an ini file. See\n" +" https://www.monitoring-plugins.org/doc/extra-opts.html\n" " for usage and examples.\n" msgstr "" -#: plugins/utils.h:189 +#: plugins/utils.h:195 msgid "" " See:\n" -" http://nagiosplug.sourceforge.net/developer-guidelines." -"html#THRESHOLDFORMAT\n" +" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" " for THRESHOLD format and examples.\n" msgstr "" -#: plugins/utils.h:194 +#: plugins/utils.h:200 msgid "" "\n" -"Send email to nagios-users@lists.sourceforge.net if you have questions\n" -"regarding use of this software. To submit patches or suggest improvements,\n" -"send email to nagiosplug-devel@lists.sourceforge.net\n" +"Send email to help@monitoring-plugins.org if you have questions regarding\n" +"use of this software. To submit patches or suggest improvements, send email\n" +"to devel@monitoring-plugins.org\n" "\n" msgstr "" -#: plugins/utils.h:199 +#: plugins/utils.h:205 msgid "" "\n" -"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n" +"The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may " +"redistribute\n" "copies of the plugins under the terms of the GNU General Public License.\n" "For more information about these matters, see the file named COPYING.\n" msgstr "" -#: plugins-root/check_dhcp.c:320 +#: plugins-root/check_dhcp.c:317 #, c-format msgid "Error: Could not get hardware address of interface '%s'\n" msgstr "" -#: plugins-root/check_dhcp.c:342 +#: plugins-root/check_dhcp.c:339 #, c-format msgid "Error: if_nametoindex error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:347 +#: plugins-root/check_dhcp.c:344 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:352 +#: plugins-root/check_dhcp.c:349 #, c-format msgid "" "Error: Couldn't get hardware address from interface %s. malloc error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:357 +#: plugins-root/check_dhcp.c:354 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:388 +#: plugins-root/check_dhcp.c:385 #, c-format msgid "" "Error: can't find unit number in interface_name (%s) - expecting TypeNumber " "eg lnc0.\n" msgstr "" -#: plugins-root/check_dhcp.c:393 plugins-root/check_dhcp.c:405 +#: plugins-root/check_dhcp.c:390 plugins-root/check_dhcp.c:402 #, c-format msgid "" "Error: can't read MAC address from DLPI streams interface for device %s unit " "%d.\n" msgstr "" -#: plugins-root/check_dhcp.c:411 +#: plugins-root/check_dhcp.c:408 #, c-format msgid "" "Error: can't get MAC address for this architecture. Use the --mac option.\n" msgstr "" -#: plugins-root/check_dhcp.c:430 +#: plugins-root/check_dhcp.c:427 #, c-format msgid "Error: Cannot determine IP address of interface %s\n" msgstr "" -#: plugins-root/check_dhcp.c:438 +#: plugins-root/check_dhcp.c:435 #, c-format msgid "Error: Cannot get interface IP address on this platform.\n" msgstr "" -#: plugins-root/check_dhcp.c:443 +#: plugins-root/check_dhcp.c:440 #, c-format msgid "Pretending to be relay client %s\n" msgstr "" -#: plugins-root/check_dhcp.c:528 +#: plugins-root/check_dhcp.c:525 #, c-format msgid "DHCPDISCOVER to %s port %d\n" msgstr "" -#: plugins-root/check_dhcp.c:580 +#: plugins-root/check_dhcp.c:577 #, c-format msgid "Result=ERROR\n" msgstr "" -#: plugins-root/check_dhcp.c:586 +#: plugins-root/check_dhcp.c:583 #, c-format msgid "Result=OK\n" msgstr "" -#: plugins-root/check_dhcp.c:596 +#: plugins-root/check_dhcp.c:593 #, c-format msgid "DHCPOFFER from IP address %s" msgstr "" -#: plugins-root/check_dhcp.c:597 +#: plugins-root/check_dhcp.c:594 #, c-format msgid " via %s\n" msgstr "" -#: plugins-root/check_dhcp.c:604 +#: plugins-root/check_dhcp.c:601 #, c-format msgid "" "DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n" msgstr "" -#: plugins-root/check_dhcp.c:626 +#: plugins-root/check_dhcp.c:623 #, c-format msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n" msgstr "" -#: plugins-root/check_dhcp.c:644 +#: plugins-root/check_dhcp.c:641 #, c-format msgid "Total responses seen on the wire: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:645 +#: plugins-root/check_dhcp.c:642 #, fuzzy, c-format msgid "Valid responses for this machine: %d\n" msgstr "Keine Antwort vom Host \n" -#: plugins-root/check_dhcp.c:660 +#: plugins-root/check_dhcp.c:657 #, c-format msgid "send_dhcp_packet result: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:693 +#: plugins-root/check_dhcp.c:690 #, fuzzy, c-format msgid "No (more) data received (nfound: %d)\n" msgstr "Keine Daten empfangen %s\n" -#: plugins-root/check_dhcp.c:712 +#: plugins-root/check_dhcp.c:709 #, c-format msgid "recvfrom() failed, " msgstr "" -#: plugins-root/check_dhcp.c:719 +#: plugins-root/check_dhcp.c:716 #, c-format msgid "receive_dhcp_packet() result: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:720 +#: plugins-root/check_dhcp.c:717 #, c-format msgid "receive_dhcp_packet() source: %s\n" msgstr "" -#: plugins-root/check_dhcp.c:750 +#: plugins-root/check_dhcp.c:747 #, c-format msgid "Error: Could not create socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:760 +#: plugins-root/check_dhcp.c:757 #, c-format msgid "Error: Could not set reuse address option on DHCP socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:766 +#: plugins-root/check_dhcp.c:763 #, c-format msgid "Error: Could not set broadcast option on DHCP socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:775 +#: plugins-root/check_dhcp.c:772 #, c-format msgid "" "Error: Could not bind socket to interface %s. Check your privileges...\n" msgstr "" -#: plugins-root/check_dhcp.c:786 +#: plugins-root/check_dhcp.c:783 #, c-format msgid "" "Error: Could not bind to DHCP socket (port %d)! Check your privileges...\n" msgstr "" -#: plugins-root/check_dhcp.c:820 +#: plugins-root/check_dhcp.c:817 #, c-format msgid "Requested server address: %s\n" msgstr "" -#: plugins-root/check_dhcp.c:882 +#: plugins-root/check_dhcp.c:879 #, c-format msgid "Lease Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:884 +#: plugins-root/check_dhcp.c:881 #, c-format msgid "Lease Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:886 +#: plugins-root/check_dhcp.c:883 #, c-format msgid "Renewal Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:888 +#: plugins-root/check_dhcp.c:885 #, c-format msgid "Renewal Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:890 +#: plugins-root/check_dhcp.c:887 #, c-format msgid "Rebinding Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:891 +#: plugins-root/check_dhcp.c:888 #, c-format msgid "Rebinding Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:919 +#: plugins-root/check_dhcp.c:916 #, c-format msgid "Added offer from server @ %s" msgstr "" -#: plugins-root/check_dhcp.c:920 +#: plugins-root/check_dhcp.c:917 #, c-format msgid " of IP address %s\n" msgstr "" -#: plugins-root/check_dhcp.c:987 +#: plugins-root/check_dhcp.c:984 #, c-format msgid "DHCP Server Match: Offerer=%s" msgstr "" -#: plugins-root/check_dhcp.c:988 +#: plugins-root/check_dhcp.c:985 #, c-format msgid " Requested=%s" msgstr "" -#: plugins-root/check_dhcp.c:990 +#: plugins-root/check_dhcp.c:987 #, c-format msgid " (duplicate)" msgstr "" -#: plugins-root/check_dhcp.c:991 +#: plugins-root/check_dhcp.c:988 #, c-format msgid "\n" msgstr "" -#: plugins-root/check_dhcp.c:1039 +#: plugins-root/check_dhcp.c:1036 #, c-format msgid "No DHCPOFFERs were received.\n" msgstr "" -#: plugins-root/check_dhcp.c:1043 +#: plugins-root/check_dhcp.c:1040 #, c-format msgid "Received %d DHCPOFFER(s)" msgstr "" -#: plugins-root/check_dhcp.c:1046 +#: plugins-root/check_dhcp.c:1043 #, c-format msgid ", %s%d of %d requested servers responded" msgstr "" -#: plugins-root/check_dhcp.c:1049 +#: plugins-root/check_dhcp.c:1046 #, c-format msgid ", requested address (%s) was %soffered" msgstr "" -#: plugins-root/check_dhcp.c:1049 +#: plugins-root/check_dhcp.c:1046 msgid "not " msgstr "" -#: plugins-root/check_dhcp.c:1051 +#: plugins-root/check_dhcp.c:1048 #, c-format msgid ", max lease time = " msgstr "" -#: plugins-root/check_dhcp.c:1053 +#: plugins-root/check_dhcp.c:1050 #, c-format msgid "Infinity" msgstr "" -#: plugins-root/check_dhcp.c:1234 +#: plugins-root/check_dhcp.c:1231 #, c-format msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1246 +#: plugins-root/check_dhcp.c:1243 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1259 +#: plugins-root/check_dhcp.c:1256 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n" msgstr "" -#: plugins-root/check_dhcp.c:1271 +#: plugins-root/check_dhcp.c:1268 #, c-format msgid "" "Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1295 +#: plugins-root/check_dhcp.c:1292 #, c-format msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1374 +#: plugins-root/check_dhcp.c:1371 #, c-format msgid "Hardware address: " msgstr "" -#: plugins-root/check_dhcp.c:1390 +#: plugins-root/check_dhcp.c:1387 msgid "This plugin tests the availability of DHCP servers on a network." msgstr "" -#: plugins-root/check_dhcp.c:1402 +#: plugins-root/check_dhcp.c:1399 msgid "IP address of DHCP server that we must hear from" msgstr "" -#: plugins-root/check_dhcp.c:1404 +#: plugins-root/check_dhcp.c:1401 msgid "IP address that should be offered by at least one DHCP server" msgstr "" -#: plugins-root/check_dhcp.c:1406 +#: plugins-root/check_dhcp.c:1403 msgid "Seconds to wait for DHCPOFFER before timeout occurs" msgstr "" -#: plugins-root/check_dhcp.c:1408 +#: plugins-root/check_dhcp.c:1405 msgid "Interface to to use for listening (i.e. eth0)" msgstr "" -#: plugins-root/check_dhcp.c:1410 +#: plugins-root/check_dhcp.c:1407 msgid "MAC address to use in the DHCP request" msgstr "" -#: plugins-root/check_dhcp.c:1412 +#: plugins-root/check_dhcp.c:1409 msgid "Unicast testing: mimic a DHCP relay, requires -s" msgstr "" -#: plugins-root/check_icmp.c:1295 +#: plugins-root/check_icmp.c:1292 msgid "specify a target" msgstr "" -#: plugins-root/check_icmp.c:1297 +#: plugins-root/check_icmp.c:1294 #, fuzzy msgid "warning threshold (currently " msgstr "Warning threshold Integer sein" -#: plugins-root/check_icmp.c:1300 +#: plugins-root/check_icmp.c:1297 #, fuzzy msgid "critical threshold (currently " msgstr "Critical threshold muss ein Integer sein" -#: plugins-root/check_icmp.c:1303 +#: plugins-root/check_icmp.c:1300 #, fuzzy msgid "specify a source IP address or device name" msgstr "Hostname oder Serveradresse muss angegeben werden" -#: plugins-root/check_icmp.c:1305 +#: plugins-root/check_icmp.c:1302 msgid "number of packets to send (currently " msgstr "" -#: plugins-root/check_icmp.c:1308 +#: plugins-root/check_icmp.c:1305 msgid "max packet interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1311 +#: plugins-root/check_icmp.c:1308 msgid "max target interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1314 +#: plugins-root/check_icmp.c:1311 msgid "number of alive hosts required for success" msgstr "" -#: plugins-root/check_icmp.c:1317 +#: plugins-root/check_icmp.c:1314 msgid "TTL on outgoing packets (currently " msgstr "" -#: plugins-root/check_icmp.c:1320 +#: plugins-root/check_icmp.c:1317 msgid "timeout value (seconds, currently " msgstr "" -#: plugins-root/check_icmp.c:1323 +#: plugins-root/check_icmp.c:1320 msgid "Number of icmp data bytes to send" msgstr "" -#: plugins-root/check_icmp.c:1324 +#: plugins-root/check_icmp.c:1321 msgid "Packet size will be data bytes + icmp header (currently" msgstr "" -#: plugins-root/check_icmp.c:1326 +#: plugins-root/check_icmp.c:1323 msgid "verbose" msgstr "" -#: plugins-root/check_icmp.c:1330 +#: plugins-root/check_icmp.c:1327 msgid "The -H switch is optional. Naming a host (or several) to check is not." msgstr "" -#: plugins-root/check_icmp.c:1332 +#: plugins-root/check_icmp.c:1329 msgid "" "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" msgstr "" -#: plugins-root/check_icmp.c:1333 +#: plugins-root/check_icmp.c:1330 msgid "packet loss. The default values should work well for most users." msgstr "" -#: plugins-root/check_icmp.c:1334 +#: plugins-root/check_icmp.c:1331 msgid "" "You can specify different RTA factors using the standardized abbreviations" msgstr "" -#: plugins-root/check_icmp.c:1335 +#: plugins-root/check_icmp.c:1332 msgid "" "us (microseconds), ms (milliseconds, default) or just plain s for seconds." msgstr "" -#: plugins-root/check_icmp.c:1341 +#: plugins-root/check_icmp.c:1338 msgid "The -v switch can be specified several times for increased verbosity." msgstr "" @@ -6409,9 +6507,6 @@ msgstr "" #~ msgid "Client Certificate Required\n" #~ msgstr "Clientzertifikat benötigt\n" -#~ msgid "Failed" -#~ msgstr "Fehlgeschlagen" - #~ msgid "CRITICAL - Cannot create SSL context.\n" #~ msgstr "CRITICAL - Konnte SSL Kontext nicht erzeugen.\n" diff --git a/po/fr.gmo b/po/fr.gmo index 23b3dd2..7b5efba 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index c9c483a..1fe560b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" -"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-10-02 17:27+0200\n" +"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" +"POT-Creation-Date: 2014-07-11 17:17+0200\n" "PO-Revision-Date: 2010-04-21 23:38-0400\n" "Last-Translator: Thomas Guyot-Sionnest \n" "Language-Team: Nagios Plugin Development Mailing List \n" +"devel@monitoring-plugins.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,25 +22,25 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:88 -#: plugins/check_disk.c:194 plugins/check_dns.c:102 plugins/check_dummy.c:52 +#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:91 +#: plugins/check_disk.c:203 plugins/check_dns.c:102 plugins/check_dummy.c:52 #: plugins/check_fping.c:93 plugins/check_game.c:82 plugins/check_hpjd.c:103 #: plugins/check_http.c:167 plugins/check_ldap.c:109 plugins/check_load.c:122 #: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:122 -#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:770 -#: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:552 +#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:781 +#: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:554 #: plugins/check_nwstat.c:173 plugins/check_overcr.c:102 -#: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:171 -#: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:144 -#: plugins/check_snmp.c:240 plugins/check_ssh.c:73 plugins/check_swap.c:110 -#: plugins/check_tcp.c:218 plugins/check_time.c:78 plugins/check_ups.c:122 -#: plugins/check_users.c:77 plugins/negate.c:214 plugins-root/check_dhcp.c:270 +#: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:172 +#: plugins/check_radius.c:167 plugins/check_real.c:80 plugins/check_smtp.c:144 +#: plugins/check_snmp.c:240 plugins/check_ssh.c:74 plugins/check_swap.c:111 +#: plugins/check_tcp.c:217 plugins/check_time.c:78 plugins/check_ups.c:122 +#: plugins/check_users.c:86 plugins/negate.c:212 plugins-root/check_dhcp.c:270 msgid "Could not parse arguments" msgstr "Impossible de décomposer les arguments" -#: plugins/check_by_ssh.c:90 plugins/check_dig.c:82 plugins/check_dns.c:95 +#: plugins/check_by_ssh.c:90 plugins/check_dig.c:85 plugins/check_dns.c:95 #: plugins/check_nagios.c:95 plugins/check_pgsql.c:178 plugins/check_ping.c:99 -#: plugins/check_procs.c:186 plugins/check_snmp.c:336 plugins/negate.c:79 +#: plugins/check_procs.c:188 plugins/check_snmp.c:336 plugins/negate.c:78 msgid "Cannot catch SIGALRM" msgstr "Impossible d'obtenir le signal SIGALRM" @@ -64,18 +64,18 @@ msgstr "SSH AVERTISSEMENT: impossible d'ouvrir %s\n" msgid "%s: Error parsing output\n" msgstr "%s: Erreur d'analyse du résultat\n" -#: plugins/check_by_ssh.c:220 plugins/check_disk.c:476 +#: plugins/check_by_ssh.c:220 plugins/check_disk.c:491 #: plugins/check_http.c:278 plugins/check_ldap.c:293 plugins/check_pgsql.c:311 -#: plugins/check_procs.c:429 plugins/check_radius.c:308 -#: plugins/check_real.c:356 plugins/check_smtp.c:581 plugins/check_snmp.c:736 -#: plugins/check_ssh.c:138 plugins/check_tcp.c:505 plugins/check_time.c:302 -#: plugins/check_ups.c:556 plugins/negate.c:164 +#: plugins/check_procs.c:437 plugins/check_radius.c:315 +#: plugins/check_real.c:357 plugins/check_smtp.c:581 plugins/check_snmp.c:736 +#: plugins/check_ssh.c:140 plugins/check_tcp.c:509 plugins/check_time.c:302 +#: plugins/check_ups.c:556 plugins/negate.c:162 msgid "Timeout interval must be a positive integer" msgstr "Le délai d'attente doit être un entier positif" #: plugins/check_by_ssh.c:230 plugins/check_pgsql.c:341 -#: plugins/check_radius.c:272 plugins/check_real.c:327 -#: plugins/check_smtp.c:506 plugins/check_tcp.c:511 plugins/check_time.c:296 +#: plugins/check_radius.c:279 plugins/check_real.c:328 +#: plugins/check_smtp.c:506 plugins/check_tcp.c:515 plugins/check_time.c:296 #: plugins/check_ups.c:518 msgid "Port must be a positive integer" msgstr "Le numéro du port doit être un entier positif" @@ -114,10 +114,10 @@ msgstr "" "%s: En mode passif, vous devez fournir un service pour chaque commande.\n" #: plugins/check_by_ssh.c:374 -#, c-format +#, fuzzy, c-format msgid "" -"%s: In passive mode, you must provide the host short name from the nagios " -"configs.\n" +"%s: In passive mode, you must provide the host short name from the " +"monitoring configs.\n" msgstr "" "%s: En mode passif, vous devez fournir le nom court du hôte mentionné dans " "la configuration de nagios.\n" @@ -162,15 +162,18 @@ msgid "identity of an authorized key [optional]" msgstr "Identité de la clé autorisée [optionnel]" #: plugins/check_by_ssh.c:419 -msgid "external command file for nagios [optional]" +#, fuzzy +msgid "external command file for monitoring [optional]" msgstr "commande externe pour nagios [optionnel]" #: plugins/check_by_ssh.c:421 -msgid "list of nagios service names, separated by ':' [optional]" +#, fuzzy +msgid "list of monitoring service names, separated by ':' [optional]" msgstr "liste des services nagios, séparés par ':' [optionnel] " #: plugins/check_by_ssh.c:423 -msgid "short name of host in nagios configuration [optional]" +#, fuzzy +msgid "short name of host in the monitoring configuration [optional]" msgstr "nom court de l'hôte dans la configuration nagios [optionnel]" #: plugins/check_by_ssh.c:425 @@ -228,35 +231,35 @@ msgstr "" "multiples options '-C)" #: plugins/check_by_ssh.c:445 plugins/check_cluster.c:261 -#: plugins/check_dig.c:355 plugins/check_disk.c:924 plugins/check_http.c:1560 -#: plugins/check_nagios.c:312 plugins/check_ntp.c:869 -#: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:633 -#: plugins/check_procs.c:755 plugins/negate.c:271 plugins/urlize.c:180 +#: plugins/check_dig.c:361 plugins/check_disk.c:939 plugins/check_http.c:1562 +#: plugins/check_nagios.c:312 plugins/check_ntp.c:880 +#: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:635 +#: plugins/check_procs.c:763 plugins/negate.c:251 plugins/urlize.c:179 msgid "Examples:" msgstr "Exemples:" #: plugins/check_by_ssh.c:460 plugins/check_cluster.c:274 -#: plugins/check_dig.c:367 plugins/check_disk.c:941 plugins/check_dns.c:486 +#: plugins/check_dig.c:373 plugins/check_disk.c:956 plugins/check_dns.c:502 #: plugins/check_dummy.c:122 plugins/check_fping.c:505 -#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1590 +#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1592 #: plugins/check_ldap.c:451 plugins/check_load.c:334 plugins/check_mrtg.c:382 -#: plugins/check_mysql.c:569 plugins/check_nagios.c:323 plugins/check_nt.c:774 -#: plugins/check_ntp.c:888 plugins/check_ntp_peer.c:725 -#: plugins/check_ntp_time.c:642 plugins/check_nwstat.c:1685 +#: plugins/check_mysql.c:563 plugins/check_nagios.c:323 plugins/check_nt.c:774 +#: plugins/check_ntp.c:899 plugins/check_ntp_peer.c:725 +#: plugins/check_ntp_time.c:644 plugins/check_nwstat.c:1685 #: plugins/check_overcr.c:467 plugins/check_pgsql.c:578 -#: plugins/check_ping.c:603 plugins/check_procs.c:773 -#: plugins/check_radius.c:385 plugins/check_real.c:451 -#: plugins/check_smtp.c:843 plugins/check_snmp.c:1207 plugins/check_ssh.c:309 -#: plugins/check_swap.c:558 plugins/check_tcp.c:684 plugins/check_time.c:371 -#: plugins/check_ups.c:660 plugins/check_users.c:240 -#: plugins/check_ide_smart.c:640 plugins/negate.c:295 plugins/urlize.c:197 -#: plugins-root/check_dhcp.c:1422 plugins-root/check_icmp.c:1354 +#: plugins/check_ping.c:610 plugins/check_procs.c:781 +#: plugins/check_radius.c:392 plugins/check_real.c:452 +#: plugins/check_smtp.c:843 plugins/check_snmp.c:1209 plugins/check_ssh.c:325 +#: plugins/check_swap.c:570 plugins/check_tcp.c:688 plugins/check_time.c:371 +#: plugins/check_ups.c:660 plugins/check_users.c:278 +#: plugins/check_ide_smart.c:632 plugins/negate.c:275 plugins/urlize.c:196 +#: plugins-root/check_dhcp.c:1419 plugins-root/check_icmp.c:1351 msgid "Usage:" msgstr "Utilisation:" #: plugins/check_cluster.c:230 -#, c-format -msgid "Host/Service Cluster Plugin for Nagios 2" +#, fuzzy, c-format +msgid "Host/Service Cluster Plugin for Monitoring" msgstr "Plugin de Cluster d'Hôte/Service pour Nagios 2" #: plugins/check_cluster.c:236 plugins/check_nt.c:676 @@ -296,13 +299,14 @@ msgid "commas" msgstr "virgules" #: plugins/check_cluster.c:257 plugins/check_game.c:318 -#: plugins/check_http.c:1542 plugins/check_ldap.c:438 plugins/check_mrtg.c:363 -#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:558 -#: plugins/check_nt.c:758 plugins/check_ntp.c:865 plugins/check_ntp_peer.c:696 -#: plugins/check_ntp_time.c:626 plugins/check_nwstat.c:1670 -#: plugins/check_overcr.c:456 plugins/check_snmp.c:1178 -#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:277 -#: plugins-root/check_icmp.c:1329 +#: plugins/check_http.c:1544 plugins/check_ldap.c:438 plugins/check_mrtg.c:363 +#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:552 +#: plugins/check_nt.c:758 plugins/check_ntp.c:876 plugins/check_ntp_peer.c:696 +#: plugins/check_ntp_time.c:628 plugins/check_nwstat.c:1670 +#: plugins/check_overcr.c:456 plugins/check_snmp.c:1180 +#: plugins/check_swap.c:558 plugins/check_ups.c:642 +#: plugins/check_ide_smart.c:606 plugins/negate.c:257 +#: plugins-root/check_icmp.c:1326 msgid "Notes:" msgstr "Notes:" @@ -315,275 +319,277 @@ msgstr "" msgid "state." msgstr "" -#: plugins/check_dig.c:100 plugins/check_dig.c:102 +#: plugins/check_dig.c:106 plugins/check_dig.c:108 #, c-format msgid "Looking for: '%s'\n" msgstr "Recherche de: '%s'\n" -#: plugins/check_dig.c:109 +#: plugins/check_dig.c:115 msgid "dig returned an error status" msgstr "dig à renvoyé un état d'erreur" -#: plugins/check_dig.c:134 +#: plugins/check_dig.c:140 msgid "Server not found in ANSWER SECTION" msgstr "Le serveur n'a pas été trouvé dans l'ANSWER SECTION" -#: plugins/check_dig.c:144 +#: plugins/check_dig.c:150 msgid "No ANSWER SECTION found" msgstr "Pas d' ANSWER SECTION trouvé" -#: plugins/check_dig.c:171 +#: plugins/check_dig.c:177 msgid "Probably a non-existent host/domain" msgstr "Probablement un hôte/domaine inexistant" -#: plugins/check_dig.c:233 +#: plugins/check_dig.c:239 #, c-format msgid "Port must be a positive integer - %s" msgstr "Le numéro du port doit être un entier positif - %s" -#: plugins/check_dig.c:244 +#: plugins/check_dig.c:250 #, c-format msgid "Warning interval must be a positive integer - %s" msgstr "Le seuil d'avertissement doit être un entier positif - %s" -#: plugins/check_dig.c:252 +#: plugins/check_dig.c:258 #, c-format msgid "Critical interval must be a positive integer - %s" msgstr "Le seuil critique doit être un entier positif - %s" -#: plugins/check_dig.c:260 +#: plugins/check_dig.c:266 #, c-format msgid "Timeout interval must be a positive integer - %s" msgstr "Le délai d'attente doit être un entier positif - %s" -#: plugins/check_dig.c:325 +#: plugins/check_dig.c:331 #, c-format msgid "This plugin test the DNS service on the specified host using dig" msgstr "Ce plugin teste le service DNS sur l'hôte spécifié en utilisant dig" -#: plugins/check_dig.c:338 +#: plugins/check_dig.c:344 msgid "Force dig to only use IPv4 query transport" msgstr "" -#: plugins/check_dig.c:340 +#: plugins/check_dig.c:346 msgid "Force dig to only use IPv6 query transport" msgstr "" -#: plugins/check_dig.c:342 +#: plugins/check_dig.c:348 msgid "Machine name to lookup" msgstr "Nom de machine à rechercher" -#: plugins/check_dig.c:344 +#: plugins/check_dig.c:350 msgid "Record type to lookup (default: A)" msgstr "Type d'enregistrement à rechercher (par défaut: A)" -#: plugins/check_dig.c:346 +#: plugins/check_dig.c:352 msgid "" "An address expected to be in the answer section. If not set, uses whatever" msgstr "" "Une adresse qui devrait se trouver dans la section réponce. Si omit, utilise" -#: plugins/check_dig.c:347 +#: plugins/check_dig.c:353 msgid "was in -l" msgstr "ce qui est passé au paramètre -l" -#: plugins/check_dig.c:349 +#: plugins/check_dig.c:355 msgid "Pass STRING as argument(s) to dig" msgstr "" -#: plugins/check_disk.c:216 +#: plugins/check_disk.c:225 #, c-format msgid "DISK %s: %s not found\n" msgstr "DISK %s: %s non trouvé\n" -#: plugins/check_disk.c:216 plugins/check_disk.c:956 plugins/check_dns.c:241 +#: plugins/check_disk.c:225 plugins/check_disk.c:971 plugins/check_dns.c:241 #: plugins/check_dummy.c:74 plugins/check_mysql.c:299 #: plugins/check_nagios.c:104 plugins/check_nagios.c:168 #: plugins/check_nagios.c:172 plugins/check_pgsql.c:601 #: plugins/check_pgsql.c:618 plugins/check_pgsql.c:627 -#: plugins/check_pgsql.c:642 plugins/check_procs.c:343 +#: plugins/check_pgsql.c:642 plugins/check_procs.c:351 #, c-format msgid "CRITICAL" msgstr "CRITIQUE" -#: plugins/check_disk.c:550 +#: plugins/check_disk.c:565 #, c-format msgid "unit type %s not known\n" msgstr "unité de type %s inconnue\n" -#: plugins/check_disk.c:553 +#: plugins/check_disk.c:568 #, c-format msgid "failed allocating storage for '%s'\n" msgstr "Impossible d'allouer de l'espace pour '%s'\n" -#: plugins/check_disk.c:577 plugins/check_disk.c:618 plugins/check_disk.c:626 -#: plugins/check_disk.c:633 plugins/check_disk.c:637 plugins/check_disk.c:677 -#: plugins/check_disk.c:683 plugins/check_disk.c:702 plugins/check_dummy.c:77 +#: plugins/check_disk.c:592 plugins/check_disk.c:633 plugins/check_disk.c:641 +#: plugins/check_disk.c:648 plugins/check_disk.c:652 plugins/check_disk.c:692 +#: plugins/check_disk.c:698 plugins/check_disk.c:717 plugins/check_dummy.c:77 #: plugins/check_dummy.c:80 plugins/check_pgsql.c:643 -#: plugins/check_procs.c:498 +#: plugins/check_procs.c:506 #, c-format msgid "UNKNOWN" msgstr "INCONNU" -#: plugins/check_disk.c:577 +#: plugins/check_disk.c:592 msgid "Must set a threshold value before using -p\n" msgstr "" -#: plugins/check_disk.c:618 +#: plugins/check_disk.c:633 msgid "Must set -E before selecting paths\n" msgstr "" -#: plugins/check_disk.c:626 +#: plugins/check_disk.c:641 msgid "Must set group value before selecting paths\n" msgstr "" -#: plugins/check_disk.c:633 +#: plugins/check_disk.c:648 msgid "" "Paths need to be selected before using -i/-I. Use -A to select all paths " "explicitly" msgstr "" -#: plugins/check_disk.c:637 plugins/check_disk.c:683 plugins/check_procs.c:498 +#: plugins/check_disk.c:652 plugins/check_disk.c:698 plugins/check_procs.c:506 msgid "Could not compile regular expression" msgstr "Impossible de compiler l'expression rationnelle" -#: plugins/check_disk.c:677 +#: plugins/check_disk.c:692 msgid "Must set a threshold value before using -r/-R\n" msgstr "" -#: plugins/check_disk.c:703 +#: plugins/check_disk.c:718 msgid "Regular expression did not match any path or disk" msgstr "" -#: plugins/check_disk.c:749 +#: plugins/check_disk.c:764 msgid "Unknown argument" msgstr "Argument inconnu" -#: plugins/check_disk.c:783 +#: plugins/check_disk.c:798 #, c-format msgid " for %s\n" msgstr " pour %s\n" -#: plugins/check_disk.c:857 +#: plugins/check_disk.c:872 msgid "" "This plugin checks the amount of used disk space on a mounted file system" msgstr "Ce plugin vérifie la place utilisé sur un système de fichier monté" -#: plugins/check_disk.c:858 +#: plugins/check_disk.c:873 msgid "" "and generates an alert if free space is less than one of the threshold values" msgstr "" "et génère une alerte si la place disponible est plus petite qu'un des seuils " "fourni" -#: plugins/check_disk.c:868 +#: plugins/check_disk.c:883 msgid "Exit with WARNING status if less than INTEGER units of disk are free" msgstr "" "Sortir avec un résultat AVERTISSEMENT si moins de X unités de disques sont " "libres" -#: plugins/check_disk.c:870 +#: plugins/check_disk.c:885 msgid "Exit with WARNING status if less than PERCENT of disk space is free" msgstr "" "Sortir avec un résultat AVERTISSEMENT si moins de X pour-cent du disque est " "libre" -#: plugins/check_disk.c:872 +#: plugins/check_disk.c:887 msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" msgstr "" "Sortir avec un résultat CRITIQUE si moins de X unités du disque sont libres" -#: plugins/check_disk.c:874 +#: plugins/check_disk.c:889 #, fuzzy msgid "Exit with CRITICAL status if less than PERCENT of disk space is free" msgstr "" "Sortir avec un résultat CRITIQUE si moins de X pour-cent du disque est libre" -#: plugins/check_disk.c:876 +#: plugins/check_disk.c:891 msgid "Exit with WARNING status if less than PERCENT of inode space is free" msgstr "" "Sortir avec un résultat AVERTISSEMENT si moins de X pour-cent des inodes " "sont libres" -#: plugins/check_disk.c:878 +#: plugins/check_disk.c:893 msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" msgstr "" "Sortir avec un résultat CRITIQUE si moins de X pour-cent des inodes sont " "libres" -#: plugins/check_disk.c:880 -msgid "Path or partition (may be repeated)" -msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" +#: plugins/check_disk.c:895 +msgid "" +"Mount point or block device as emitted by the mount(8) command (may be " +"repeated)" +msgstr "" -#: plugins/check_disk.c:882 +#: plugins/check_disk.c:897 msgid "Ignore device (only works if -p unspecified)" msgstr "Ignorer le périphérique (marche seulement lorsque -p est utilisé)" -#: plugins/check_disk.c:884 +#: plugins/check_disk.c:899 msgid "Clear thresholds" msgstr "Effacer les seuils" -#: plugins/check_disk.c:886 +#: plugins/check_disk.c:901 msgid "For paths or partitions specified with -p, only check for exact paths" msgstr "" -#: plugins/check_disk.c:888 +#: plugins/check_disk.c:903 msgid "Display only devices/mountpoints with errors" msgstr "Afficher seulement les périphériques/point de montage avec des erreurs" -#: plugins/check_disk.c:890 +#: plugins/check_disk.c:905 msgid "Don't account root-reserved blocks into freespace in perfdata" msgstr "" -#: plugins/check_disk.c:892 +#: plugins/check_disk.c:907 msgid "" "Group paths. Thresholds apply to (free-)space of all partitions together" msgstr "" -#: plugins/check_disk.c:894 +#: plugins/check_disk.c:909 msgid "Same as '--units kB'" msgstr "Pareil à '--units kB'" -#: plugins/check_disk.c:896 +#: plugins/check_disk.c:911 msgid "Only check local filesystems" msgstr "Vérifier seulement les systèmes de fichiers locaux" -#: plugins/check_disk.c:898 +#: plugins/check_disk.c:913 msgid "" "Only check local filesystems against thresholds. Yet call stat on remote " "filesystems" msgstr "" -#: plugins/check_disk.c:899 +#: plugins/check_disk.c:914 msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)" msgstr "" -#: plugins/check_disk.c:901 +#: plugins/check_disk.c:916 msgid "Display the mountpoint instead of the partition" msgstr "Afficher le point de montage au lieu de la partition" -#: plugins/check_disk.c:903 +#: plugins/check_disk.c:918 msgid "Same as '--units MB'" msgstr "Pareil à '--units MB'" -#: plugins/check_disk.c:905 +#: plugins/check_disk.c:920 msgid "Explicitly select all paths. This is equivalent to -R '.*'" msgstr "" -#: plugins/check_disk.c:907 +#: plugins/check_disk.c:922 msgid "" "Case insensitive regular expression for path/partition (may be repeated)" msgstr "" "Expression rationnelle indépendante de la case pour un répertoire ou une " "partition (peut être utilisé plusieurs fois)" -#: plugins/check_disk.c:909 +#: plugins/check_disk.c:924 msgid "Regular expression for path or partition (may be repeated)" msgstr "" "Expression rationnelle pour un répertoire ou une partition (peut être " "utilisé plusieurs fois)" -#: plugins/check_disk.c:911 +#: plugins/check_disk.c:926 msgid "" "Regular expression to ignore selected path/partition (case insensitive) (may " "be repeated)" @@ -591,58 +597,58 @@ msgstr "" "Expression rationnelle pour ignorer un répertoire ou une partition (peut " "être utilisé plusieurs fois)" -#: plugins/check_disk.c:913 +#: plugins/check_disk.c:928 msgid "" "Regular expression to ignore selected path or partition (may be repeated)" msgstr "" "Expression rationnelle pour ignorer un répertoire ou une partition (peut " "être utilisé plusieurs fois)" -#: plugins/check_disk.c:916 +#: plugins/check_disk.c:931 msgid "Choose bytes, kB, MB, GB, TB (default: MB)" msgstr "Choisissez octets, kb, MB, GB, TB (par défaut: MB)" -#: plugins/check_disk.c:919 +#: plugins/check_disk.c:934 msgid "Ignore all filesystems of indicated type (may be repeated)" msgstr "" "Ignorer tout les systèmes de fichiers qui correspondent au type indiqué " "(peut être utilisé plusieurs fois)" -#: plugins/check_disk.c:921 +#: plugins/check_disk.c:936 #, fuzzy msgid "Check only filesystems of indicated type (may be repeated)" msgstr "" "Ignorer tout les systèmes de fichiers qui correspondent au type indiqué " "(peut être utilisé plusieurs fois)" -#: plugins/check_disk.c:926 +#: plugins/check_disk.c:941 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" msgstr "Vérifie /tmp à 10% et /var à 5% et / à 100MB et 50MB" -#: plugins/check_disk.c:928 +#: plugins/check_disk.c:943 msgid "" "Checks all filesystems not matching -r at 100M and 50M. The fs matching the -" "r regex" msgstr "" -#: plugins/check_disk.c:929 +#: plugins/check_disk.c:944 msgid "" "are grouped which means the freespace thresholds are applied to all disks " "together" msgstr "" -#: plugins/check_disk.c:931 +#: plugins/check_disk.c:946 msgid "" "Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use " "100M/50M" msgstr "" -#: plugins/check_disk.c:957 +#: plugins/check_disk.c:972 #, c-format msgid "%s %s: %s\n" msgstr "" -#: plugins/check_disk.c:957 +#: plugins/check_disk.c:972 msgid "is not accessible" msgstr "" @@ -679,7 +685,7 @@ msgid "server %s is not authoritative for %s" msgstr "serveur %s n'est pas autoritaire pour %s" #: plugins/check_dns.c:237 plugins/check_dummy.c:68 plugins/check_nagios.c:182 -#: plugins/check_pgsql.c:638 plugins/check_procs.c:336 +#: plugins/check_pgsql.c:638 plugins/check_procs.c:344 #, c-format msgid "OK" msgstr "OK" @@ -687,7 +693,7 @@ msgstr "OK" #: plugins/check_dns.c:239 plugins/check_dummy.c:71 plugins/check_mysql.c:296 #: plugins/check_nagios.c:182 plugins/check_pgsql.c:607 #: plugins/check_pgsql.c:612 plugins/check_pgsql.c:640 -#: plugins/check_procs.c:338 +#: plugins/check_procs.c:346 #, c-format msgid "WARNING" msgstr "AVERTISSEMENT" @@ -704,87 +710,87 @@ msgstr[1] "%.3f secondes de temps de réponse " msgid ". %s returns %s" msgstr ". %s renvoie %s" -#: plugins/check_dns.c:248 +#: plugins/check_dns.c:264 #, c-format msgid "DNS WARNING - %s\n" msgstr "DNS AVERTISSEMENT - %s\n" -#: plugins/check_dns.c:249 plugins/check_dns.c:252 plugins/check_dns.c:255 +#: plugins/check_dns.c:265 plugins/check_dns.c:268 plugins/check_dns.c:271 msgid " Probably a non-existent host/domain" msgstr " Probablement un hôte/domaine inexistant" -#: plugins/check_dns.c:251 +#: plugins/check_dns.c:267 #, c-format msgid "DNS CRITICAL - %s\n" msgstr "DNS CRITIQUE - %s\n" -#: plugins/check_dns.c:254 +#: plugins/check_dns.c:270 #, c-format msgid "DNS UNKNOWN - %s\n" msgstr "DNS INCONNU - %s\n" -#: plugins/check_dns.c:267 +#: plugins/check_dns.c:283 msgid "Note: nslookup is deprecated and may be removed from future releases." msgstr "" "Note: nslookup est obsolète et pourra être retiré dans les prochaines " "versions." -#: plugins/check_dns.c:268 +#: plugins/check_dns.c:284 msgid "Consider using the `dig' or `host' programs instead. Run nslookup with" msgstr "" "Veuillez utiliser le programme 'dig' ou 'host' à la place. Faire fonctionner " "nslookup avec" -#: plugins/check_dns.c:269 +#: plugins/check_dns.c:285 msgid "the `-sil[ent]' option to prevent this message from appearing." msgstr "L'option '-sil[ent]' empêche l'apparition de ce message." -#: plugins/check_dns.c:274 +#: plugins/check_dns.c:290 #, c-format msgid "No response from DNS %s\n" msgstr "Pas de réponse du DNS %s\n" -#: plugins/check_dns.c:278 +#: plugins/check_dns.c:294 #, c-format msgid "DNS %s has no records\n" msgstr "Le DNS %s n'a pas d'enregistrements\n" -#: plugins/check_dns.c:286 +#: plugins/check_dns.c:302 #, c-format msgid "Connection to DNS %s was refused\n" msgstr "La connexion au DNS %s à été refusée\n" -#: plugins/check_dns.c:290 +#: plugins/check_dns.c:306 #, c-format msgid "Query was refused by DNS server at %s\n" msgstr "La requête à été refusée par le serveur DNS %s\n" -#: plugins/check_dns.c:294 +#: plugins/check_dns.c:310 #, c-format msgid "No information returned by DNS server at %s\n" msgstr "Pas d'information renvoyée par le serveur DNS %s\n" -#: plugins/check_dns.c:300 +#: plugins/check_dns.c:316 #, c-format msgid "Domain %s was not found by the server\n" msgstr "Le domaine %s n'a pas été trouvé par le serveur\n" -#: plugins/check_dns.c:304 +#: plugins/check_dns.c:320 msgid "Network is unreachable\n" msgstr "Le réseau est inaccessible\n" -#: plugins/check_dns.c:308 +#: plugins/check_dns.c:324 #, c-format msgid "DNS failure for %s\n" msgstr "DNS à échoué pour %s\n" -#: plugins/check_dns.c:372 plugins/check_dns.c:380 plugins/check_dns.c:387 -#: plugins/check_dns.c:392 plugins/check_dns.c:414 plugins/check_dns.c:422 +#: plugins/check_dns.c:388 plugins/check_dns.c:396 plugins/check_dns.c:403 +#: plugins/check_dns.c:408 plugins/check_dns.c:430 plugins/check_dns.c:438 #: plugins/check_game.c:211 plugins/check_game.c:219 msgid "Input buffer overflow\n" msgstr "Le tampon d'entrée a débordé\n" -#: plugins/check_dns.c:450 +#: plugins/check_dns.c:466 msgid "" "This plugin uses the nslookup program to obtain the IP address for the given " "host/domain query." @@ -792,11 +798,11 @@ msgstr "" "Ce plugin utilise le programme nslookup pour obtenir l'adresse IP de l'hôte/" "domaine à interroger." -#: plugins/check_dns.c:451 +#: plugins/check_dns.c:467 msgid "An optional DNS server to use may be specified." msgstr "Un serveur DNS à utiliser peut être indiqué." -#: plugins/check_dns.c:452 +#: plugins/check_dns.c:468 msgid "" "If no DNS server is specified, the default server(s) specified in /etc/" "resolv.conf will be used." @@ -804,49 +810,49 @@ msgstr "" "Si aucun serveur DNS n'est spécifié, les serveurs spécifiés dans /etc/resolv." "conf seront utilisé." -#: plugins/check_dns.c:462 +#: plugins/check_dns.c:478 msgid "The name or address you want to query" msgstr "Le nom ou l'adresse que vous voulez interroger" -#: plugins/check_dns.c:464 +#: plugins/check_dns.c:480 msgid "Optional DNS server you want to use for the lookup" msgstr "Serveur DNS que vous voulez utiliser pour la recherche" -#: plugins/check_dns.c:466 +#: plugins/check_dns.c:482 msgid "" "Optional IP-ADDRESS you expect the DNS server to return. HOST must end with" msgstr "" "Adresse IP que le serveur DNS doit retourner. Les hôtes doivent se terminer " -#: plugins/check_dns.c:467 +#: plugins/check_dns.c:483 msgid "" "a dot (.). This option can be repeated multiple times (Returns OK if any" msgstr "avec un point (.). Cette option peut être répétée (Retourne OK si une" -#: plugins/check_dns.c:468 +#: plugins/check_dns.c:484 msgid "" "value match). If multiple addresses are returned at once, you have to match" msgstr "" "valeur correspond). Si plusieurs adresses sont retournées en même temps," -#: plugins/check_dns.c:469 +#: plugins/check_dns.c:485 msgid "" "the whole string of addresses separated with commas (sorted alphabetically)." msgstr "" "vous devrez toutes les inscrire séparées pas des virgules (en ordre " "alphabétique)" -#: plugins/check_dns.c:471 +#: plugins/check_dns.c:487 msgid "Optionally expect the DNS server to be authoritative for the lookup" msgstr "Serveur DNS qui doit normalement être autoritaire pour la recherche" -#: plugins/check_dns.c:473 +#: plugins/check_dns.c:489 msgid "Return warning if elapsed time exceeds value. Default off" msgstr "" "Renvoie une alerte si le temps écoulé dépasse la valeur indiquée. Désactivé " "par défaut" -#: plugins/check_dns.c:475 +#: plugins/check_dns.c:491 msgid "Return critical if elapsed time exceeds value. Default off" msgstr "" "Renvoie critique si le temps utilisé dépasse la valeur indiquée. Désactivé " @@ -872,13 +878,13 @@ msgid "of the argument with optional text" msgstr "du paramètre avec un texte optionnel" #: plugins/check_fping.c:125 plugins/check_hpjd.c:128 plugins/check_ping.c:438 -#: plugins/check_swap.c:175 plugins/check_users.c:94 plugins/urlize.c:110 +#: plugins/check_swap.c:176 plugins/check_users.c:132 plugins/urlize.c:109 #, c-format msgid "Could not open pipe: %s\n" msgstr "Impossible d'ouvrir le pipe: %s\n" #: plugins/check_fping.c:131 plugins/check_hpjd.c:134 plugins/check_load.c:153 -#: plugins/check_swap.c:181 plugins/check_users.c:100 plugins/urlize.c:116 +#: plugins/check_swap.c:182 plugins/check_users.c:138 plugins/urlize.c:115 #, c-format msgid "Could not open stderr for %s\n" msgstr "Impossible d'ouvrir la sortie d'erreur standard pour %s\n" @@ -929,12 +935,12 @@ msgstr "FPING %s - %s (perte=%.0f%% )|%s\n" #: plugins/check_fping.c:326 plugins/check_fping.c:332 #: plugins/check_hpjd.c:338 plugins/check_hpjd.c:361 plugins/check_mysql.c:371 -#: plugins/check_mysql.c:455 plugins/check_ntp.c:709 -#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:496 +#: plugins/check_mysql.c:455 plugins/check_ntp.c:720 +#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:498 #: plugins/check_pgsql.c:335 plugins/check_ping.c:295 plugins/check_ping.c:418 -#: plugins/check_radius.c:264 plugins/check_real.c:314 -#: plugins/check_real.c:376 plugins/check_smtp.c:499 plugins/check_smtp.c:641 -#: plugins/check_ssh.c:157 plugins/check_time.c:240 plugins/check_time.c:315 +#: plugins/check_radius.c:271 plugins/check_real.c:315 +#: plugins/check_real.c:377 plugins/check_smtp.c:499 plugins/check_smtp.c:641 +#: plugins/check_ssh.c:162 plugins/check_time.c:240 plugins/check_time.c:315 #: plugins/check_ups.c:504 plugins/check_ups.c:573 msgid "Invalid hostname/address" msgstr "Adresse/Nom d'hôte invalide" @@ -959,9 +965,9 @@ msgstr "Le seuil d'avertissement doit être un entier positif" msgid "Interval must be a positive integer" msgstr "Le délai d'attente doit être un entier positif" -#: plugins/check_fping.c:402 plugins/check_ntp.c:733 -#: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:523 -#: plugins/check_radius.c:314 plugins/check_time.c:319 +#: plugins/check_fping.c:402 plugins/check_ntp.c:744 +#: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:525 +#: plugins/check_radius.c:321 plugins/check_time.c:319 msgid "Hostname was not supplied" msgstr "Le nom de l'hôte n'a pas été spécifié" @@ -998,11 +1004,11 @@ msgstr "" "nom ou adresse IP des hôtes à pinger (l'indication d'un adresse IP évite une " "recherche sur le nom, ce qui réduit la charge système)" -#: plugins/check_fping.c:474 plugins/check_ping.c:575 +#: plugins/check_fping.c:474 plugins/check_ping.c:582 msgid "warning threshold pair" msgstr "Valeurs pour le seuil d'avertissement" -#: plugins/check_fping.c:476 plugins/check_ping.c:577 +#: plugins/check_fping.c:476 plugins/check_ping.c:584 msgid "critical threshold pair" msgstr "Valeurs pour le seuil critique" @@ -1188,8 +1194,8 @@ msgid "file does not exist or is not readable" msgstr "" #: plugins/check_http.c:310 plugins/check_http.c:315 plugins/check_http.c:321 -#: plugins/check_smtp.c:600 plugins/check_tcp.c:576 plugins/check_tcp.c:580 -#: plugins/check_tcp.c:586 +#: plugins/check_smtp.c:600 plugins/check_tcp.c:580 plugins/check_tcp.c:584 +#: plugins/check_tcp.c:590 msgid "Invalid certificate expiration period" msgstr "Période d'expiration du certificat invalide" @@ -1199,7 +1205,7 @@ msgid "" "(SSLv3)" msgstr "" -#: plugins/check_http.c:354 plugins/check_tcp.c:599 +#: plugins/check_http.c:354 plugins/check_tcp.c:603 msgid "Invalid option - SSL is not available" msgstr "Option invalide - SSL n'est pas disponible" @@ -1221,9 +1227,9 @@ msgstr "Numéro de port invalide" msgid "Could Not Compile Regular Expression: %s" msgstr "Impossible de compiler l'expression rationnelle: %s" -#: plugins/check_http.c:464 plugins/check_ntp.c:722 -#: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:512 -#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:477 +#: plugins/check_http.c:464 plugins/check_ntp.c:733 +#: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:514 +#: plugins/check_smtp.c:621 plugins/check_ssh.c:151 plugins/check_tcp.c:481 msgid "IPv6 support not available" msgstr "Support IPv6 non disponible" @@ -1367,351 +1373,351 @@ msgstr "%s - %d octets en %.3f secondes de temps de réponse %s|%s %s" msgid "HTTP UNKNOWN - Could not allocate addr\n" msgstr "HTTP INCONNU - Impossible d'allouer une adresse\n" -#: plugins/check_http.c:1248 plugins/check_http.c:1279 +#: plugins/check_http.c:1249 plugins/check_http.c:1280 msgid "HTTP UNKNOWN - Could not allocate URL\n" msgstr "HTTP INCONNU - Impossible d'allouer l'URL\n" -#: plugins/check_http.c:1257 +#: plugins/check_http.c:1258 #, c-format msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" msgstr "" "HTTP INCONNU - Impossible de trouver l'endroit de la redirection - %s%s\n" -#: plugins/check_http.c:1272 +#: plugins/check_http.c:1273 #, c-format msgid "HTTP UNKNOWN - Empty redirect location%s\n" msgstr "HTTP INCONNU - endroit de redirection vide%s\n" -#: plugins/check_http.c:1322 +#: plugins/check_http.c:1323 #, c-format msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" msgstr "" "HTTP INCONNU - Impossible de définir l'endroit de la redirection - %s%s\n" -#: plugins/check_http.c:1332 +#: plugins/check_http.c:1333 #, c-format msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" msgstr "" "HTTP AVERTISSEMENT - le niveau maximum de redirection %d à été dépassé - " "%s://%s:%d%s%s\n" -#: plugins/check_http.c:1340 +#: plugins/check_http.c:1341 #, c-format msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" msgstr "" "HTTP AVERTISSEMENT - la redirection crée une boucle infinie - %s://%s:%d%s" "%s\n" -#: plugins/check_http.c:1361 +#: plugins/check_http.c:1362 #, c-format msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" msgstr "HTTP INCONNU - Redirection à un port supérieur à %d - %s://%s:%d%s%s\n" -#: plugins/check_http.c:1366 +#: plugins/check_http.c:1367 #, c-format msgid "Redirection to %s://%s:%d%s\n" msgstr "Redirection vers %s://%s:%d%s\n" -#: plugins/check_http.c:1440 +#: plugins/check_http.c:1442 msgid "This plugin tests the HTTP service on the specified host. It can test" msgstr "" "Ce plugin teste le service HTTP sur l'hôte spécifié. Il peut tester les" -#: plugins/check_http.c:1441 +#: plugins/check_http.c:1443 msgid "normal (http) and secure (https) servers, follow redirects, search for" msgstr "" "serveurs normaux (http) et sécurisés (https), suivre les redirections, " "rechercher des" -#: plugins/check_http.c:1442 +#: plugins/check_http.c:1444 msgid "strings and regular expressions, check connection times, and report on" msgstr "" "chaînes de caractères et expressions rationnelles, vérifier le temps de " "réponse" -#: plugins/check_http.c:1443 +#: plugins/check_http.c:1445 msgid "certificate expiration times." msgstr "et rapporter la date d'expiration du certificat." -#: plugins/check_http.c:1449 +#: plugins/check_http.c:1451 #, c-format msgid "NOTE: One or both of -H and -I must be specified" msgstr "NOTE: les paramètres -H et -I peuvent être spécifiés" -#: plugins/check_http.c:1457 +#: plugins/check_http.c:1459 msgid "Host name argument for servers using host headers (virtual host)" msgstr "" -#: plugins/check_http.c:1458 +#: plugins/check_http.c:1460 msgid "Append a port to include it in the header (eg: example.com:5000)" msgstr "" -#: plugins/check_http.c:1460 +#: plugins/check_http.c:1462 msgid "" "IP address or name (use numeric address if possible to bypass DNS lookup)." msgstr "" -#: plugins/check_http.c:1462 +#: plugins/check_http.c:1464 msgid "Port number (default: " msgstr "Numéro du port (défaut: " -#: plugins/check_http.c:1469 +#: plugins/check_http.c:1471 msgid "" "Connect via SSL. Port defaults to 443. VERSION is optional, and prevents" msgstr "" -#: plugins/check_http.c:1470 +#: plugins/check_http.c:1472 msgid "auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)." msgstr "" -#: plugins/check_http.c:1472 +#: plugins/check_http.c:1474 msgid "Enable SSL/TLS hostname extension support (SNI)" msgstr "" -#: plugins/check_http.c:1474 +#: plugins/check_http.c:1476 msgid "" "Minimum number of days a certificate has to be valid. Port defaults to 443" msgstr "" "Nombre de jours minimum pour que le certificat soit valide. Port par défaut " "443" -#: plugins/check_http.c:1475 +#: plugins/check_http.c:1477 msgid "(when this option is used the URL is not checked.)" msgstr "" -#: plugins/check_http.c:1477 +#: plugins/check_http.c:1479 msgid "Name of file that contains the client certificate (PEM format)" msgstr "" -#: plugins/check_http.c:1478 +#: plugins/check_http.c:1480 msgid "to be used in establishing the SSL session" msgstr "" -#: plugins/check_http.c:1480 +#: plugins/check_http.c:1482 msgid "Name of file containing the private key (PEM format)" msgstr "" -#: plugins/check_http.c:1481 +#: plugins/check_http.c:1483 msgid "matching the client certificate" msgstr "" -#: plugins/check_http.c:1485 +#: plugins/check_http.c:1487 msgid "Comma-delimited list of strings, at least one of them is expected in" msgstr "" "Liste the chaines de charactères séparées par des virgules, au moins une " "d'elles" -#: plugins/check_http.c:1486 +#: plugins/check_http.c:1488 msgid "the first (status) line of the server response (default: " msgstr "est attendue dans la première ligne de réponse du serveur (défaut: " -#: plugins/check_http.c:1488 +#: plugins/check_http.c:1490 msgid "" "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" msgstr "" "Si spécifié, surpasse toute autre logique de status (ex: 3xx, 4xx, 5xx)" -#: plugins/check_http.c:1490 +#: plugins/check_http.c:1492 #, fuzzy msgid "String to expect in the response headers" msgstr "Chaîne de caractères à attendre en réponse" -#: plugins/check_http.c:1492 +#: plugins/check_http.c:1494 msgid "String to expect in the content" msgstr "Chaîne de caractère attendue dans le contenu" -#: plugins/check_http.c:1494 +#: plugins/check_http.c:1496 msgid "URL to GET or POST (default: /)" msgstr "URL pour le GET ou le POST (défaut: /)" -#: plugins/check_http.c:1496 +#: plugins/check_http.c:1498 msgid "URL encoded http POST data" msgstr "" -#: plugins/check_http.c:1498 +#: plugins/check_http.c:1500 msgid "Set HTTP method." msgstr "" -#: plugins/check_http.c:1500 +#: plugins/check_http.c:1502 msgid "Don't wait for document body: stop reading after headers." msgstr "" "Ne pas attendre pour le corps du document: arrêter de lire après les entêtes" -#: plugins/check_http.c:1501 +#: plugins/check_http.c:1503 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" msgstr "(Veuillez noter qu'un HTTP GET ou POST est effectué, pas un HEAD.)" -#: plugins/check_http.c:1503 +#: plugins/check_http.c:1505 msgid "Warn if document is more than SECONDS old. the number can also be of" msgstr "" -#: plugins/check_http.c:1504 +#: plugins/check_http.c:1506 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." msgstr "" -#: plugins/check_http.c:1506 +#: plugins/check_http.c:1508 msgid "specify Content-Type header media type when POSTing\n" msgstr "" -#: plugins/check_http.c:1509 +#: plugins/check_http.c:1511 msgid "Allow regex to span newlines (must precede -r or -R)" msgstr "" -#: plugins/check_http.c:1511 +#: plugins/check_http.c:1513 msgid "Search page for regex STRING" msgstr "" -#: plugins/check_http.c:1513 +#: plugins/check_http.c:1515 msgid "Search page for case-insensitive regex STRING" msgstr "" -#: plugins/check_http.c:1515 +#: plugins/check_http.c:1517 msgid "Return CRITICAL if found, OK if not\n" msgstr "" -#: plugins/check_http.c:1518 +#: plugins/check_http.c:1520 msgid "Username:password on sites with basic authentication" msgstr "" -#: plugins/check_http.c:1520 +#: plugins/check_http.c:1522 msgid "Username:password on proxy-servers with basic authentication" msgstr "" -#: plugins/check_http.c:1522 +#: plugins/check_http.c:1524 msgid "String to be sent in http header as \"User Agent\"" msgstr "" -#: plugins/check_http.c:1524 +#: plugins/check_http.c:1526 msgid "" "Any other tags to be sent in http header. Use multiple times for additional " "headers" msgstr "" -#: plugins/check_http.c:1526 +#: plugins/check_http.c:1528 msgid "Print additional performance data" msgstr "" -#: plugins/check_http.c:1528 +#: plugins/check_http.c:1530 msgid "Wrap output in HTML link (obsoleted by urlize)" msgstr "" -#: plugins/check_http.c:1530 +#: plugins/check_http.c:1532 msgid "How to handle redirected pages. sticky is like follow but stick to the" msgstr "" -#: plugins/check_http.c:1531 +#: plugins/check_http.c:1533 msgid "specified IP address. stickyport also ensures port stays the same." msgstr "" -#: plugins/check_http.c:1533 +#: plugins/check_http.c:1535 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" msgstr "" -#: plugins/check_http.c:1543 +#: plugins/check_http.c:1545 msgid "This plugin will attempt to open an HTTP connection with the host." msgstr "Ce plugin va essayer d'ouvrir un connexion SMTP avec l'hôte." -#: plugins/check_http.c:1544 +#: plugins/check_http.c:1546 msgid "" "Successful connects return STATE_OK, refusals and timeouts return " "STATE_CRITICAL" msgstr "" -#: plugins/check_http.c:1545 +#: plugins/check_http.c:1547 msgid "" "other errors return STATE_UNKNOWN. Successful connects, but incorrect " "reponse" msgstr "" -#: plugins/check_http.c:1546 +#: plugins/check_http.c:1548 msgid "" "messages from the host result in STATE_WARNING return values. If you are" msgstr "" -#: plugins/check_http.c:1547 +#: plugins/check_http.c:1549 msgid "" "checking a virtual server that uses 'host headers' you must supply the FQDN" msgstr "" -#: plugins/check_http.c:1548 +#: plugins/check_http.c:1550 msgid "(fully qualified domain name) as the [host_name] argument." msgstr "" -#: plugins/check_http.c:1552 +#: plugins/check_http.c:1554 msgid "This plugin can also check whether an SSL enabled web server is able to" msgstr "" -#: plugins/check_http.c:1553 +#: plugins/check_http.c:1555 msgid "serve content (optionally within a specified time) or whether the X509 " msgstr "" -#: plugins/check_http.c:1554 +#: plugins/check_http.c:1556 msgid "certificate is still valid for the specified number of days." msgstr "" -#: plugins/check_http.c:1556 +#: plugins/check_http.c:1558 #, fuzzy msgid "Please note that this plugin does not check if the presented server" msgstr "Ce plugin vérifie le service ntp sur l'hôte" -#: plugins/check_http.c:1557 +#: plugins/check_http.c:1559 msgid "certificate matches the hostname of the server, or if the certificate" msgstr "" -#: plugins/check_http.c:1558 +#: plugins/check_http.c:1560 msgid "has a valid chain of trust to one of the locally installed CAs." msgstr "" -#: plugins/check_http.c:1562 +#: plugins/check_http.c:1564 msgid "" "When the 'www.verisign.com' server returns its content within 5 seconds," msgstr "" -#: plugins/check_http.c:1563 +#: plugins/check_http.c:1565 msgid "" "a STATE_OK will be returned. When the server returns its content but exceeds" msgstr "" -#: plugins/check_http.c:1564 +#: plugins/check_http.c:1566 msgid "" "the 5-second threshold, a STATE_WARNING will be returned. When an error " "occurs," msgstr "" -#: plugins/check_http.c:1565 +#: plugins/check_http.c:1567 msgid "a STATE_CRITICAL will be returned." msgstr "" -#: plugins/check_http.c:1568 +#: plugins/check_http.c:1570 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 14 days," msgstr "" -#: plugins/check_http.c:1569 plugins/check_http.c:1575 +#: plugins/check_http.c:1571 plugins/check_http.c:1577 msgid "" "a STATE_OK is returned. When the certificate is still valid, but for less " "than" msgstr "" -#: plugins/check_http.c:1570 +#: plugins/check_http.c:1572 msgid "" "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" msgstr "" -#: plugins/check_http.c:1571 +#: plugins/check_http.c:1573 msgid "the certificate is expired." msgstr "le certificat est expiré." -#: plugins/check_http.c:1574 +#: plugins/check_http.c:1576 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 30 days," msgstr "" -#: plugins/check_http.c:1576 +#: plugins/check_http.c:1578 msgid "30 days, but more than 14 days, a STATE_WARNING is returned." msgstr "" -#: plugins/check_http.c:1577 +#: plugins/check_http.c:1579 msgid "" "A STATE_CRITICAL will be returned when certificate expires in less than 14 " "days" @@ -2047,7 +2053,7 @@ msgstr "" #: plugins/check_mrtg.c:359 msgid "" -"packets/sec, etc. I use MRTG in conjuction with the Novell NLM that allows" +"packets/sec, etc. I use MRTG in conjunction with the Novell NLM that allows" msgstr "" #: plugins/check_mrtg.c:360 @@ -2207,104 +2213,104 @@ msgstr "erreur esclave lecture d'une ligne: %s\n" msgid "Slave running: %s" msgstr "L'esclave fonctionne: %s" -#: plugins/check_mysql.c:505 +#: plugins/check_mysql.c:499 msgid "This program tests connections to a MySQL server" msgstr "Ce plugin teste une connexion vers un serveur MySQL" -#: plugins/check_mysql.c:516 +#: plugins/check_mysql.c:510 msgid "Use the specified socket (has no effect if -H is used)" msgstr "" -#: plugins/check_mysql.c:519 +#: plugins/check_mysql.c:513 msgid "Check database with indicated name" msgstr "" -#: plugins/check_mysql.c:521 +#: plugins/check_mysql.c:515 msgid "Read from the specified client options file" msgstr "" -#: plugins/check_mysql.c:523 +#: plugins/check_mysql.c:517 msgid "Use a client options group" msgstr "" -#: plugins/check_mysql.c:525 +#: plugins/check_mysql.c:519 msgid "Connect using the indicated username" msgstr "" -#: plugins/check_mysql.c:527 +#: plugins/check_mysql.c:521 msgid "Use the indicated password to authenticate the connection" msgstr "" -#: plugins/check_mysql.c:528 +#: plugins/check_mysql.c:522 msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!" msgstr "" -#: plugins/check_mysql.c:529 +#: plugins/check_mysql.c:523 msgid "Your clear-text password could be visible as a process table entry" msgstr "" -#: plugins/check_mysql.c:531 +#: plugins/check_mysql.c:525 msgid "Check if the slave thread is running properly." msgstr "" -#: plugins/check_mysql.c:533 +#: plugins/check_mysql.c:527 msgid "Exit with WARNING status if slave server is more than INTEGER seconds" msgstr "" "Sortir avec un résultat AVERTISSEMENT si le serveur esclave est plus de X " -#: plugins/check_mysql.c:534 plugins/check_mysql.c:537 +#: plugins/check_mysql.c:528 plugins/check_mysql.c:531 msgid "behind master" msgstr "secondes en retard sur le maître" -#: plugins/check_mysql.c:536 +#: plugins/check_mysql.c:530 msgid "Exit with CRITICAL status if slave server is more then INTEGER seconds" msgstr "Sortir avec un résultat CRITIQUE si le serveur esclave est plus de X " -#: plugins/check_mysql.c:539 +#: plugins/check_mysql.c:533 msgid "Use ssl encryptation" msgstr "" -#: plugins/check_mysql.c:541 +#: plugins/check_mysql.c:535 msgid "Path to CA signing the cert" msgstr "" -#: plugins/check_mysql.c:543 +#: plugins/check_mysql.c:537 msgid "Path to SSL certificate" msgstr "" -#: plugins/check_mysql.c:545 +#: plugins/check_mysql.c:539 msgid "Path to private SSL key" msgstr "" -#: plugins/check_mysql.c:547 +#: plugins/check_mysql.c:541 msgid "Path to CA directory" msgstr "" -#: plugins/check_mysql.c:549 +#: plugins/check_mysql.c:543 msgid "List of valid SSL ciphers" msgstr "" -#: plugins/check_mysql.c:553 +#: plugins/check_mysql.c:547 msgid "" "There are no required arguments. By default, the local database is checked" msgstr "" "Il n'y a pas d'arguments nécessaires. Par défaut la base de donnée locale " "est testée" -#: plugins/check_mysql.c:554 +#: plugins/check_mysql.c:548 msgid "" "using the default unix socket. You can force TCP on localhost by using an" msgstr "" -#: plugins/check_mysql.c:555 +#: plugins/check_mysql.c:549 msgid "IP address or FQDN ('localhost' will use the socket as well)." msgstr "" -#: plugins/check_mysql.c:559 +#: plugins/check_mysql.c:553 msgid "You must specify -p with an empty string to force an empty password," msgstr "" -#: plugins/check_mysql.c:560 +#: plugins/check_mysql.c:554 msgid "overriding any my.cnf settings." msgstr "" @@ -2326,7 +2332,7 @@ msgid "Cannot parse Nagios log file for valid time" msgstr "" "Impossible de trouver une date/heure valide dans le fichier de log de Nagios" -#: plugins/check_nagios.c:183 plugins/check_procs.c:348 +#: plugins/check_nagios.c:183 plugins/check_procs.c:356 #, c-format msgid "%d process" msgid_plural "%d processes" @@ -2424,8 +2430,8 @@ msgid "not enough values for -l parameters" msgstr "pas assez de valeur pour l'argument -l" #: plugins/check_nt.c:206 -#, c-format -msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)" +#, fuzzy, c-format +msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)|uptime=%lu" msgstr "Système démarré - %u jour(s) %u heure(s) %u minute(s)" #: plugins/check_nt.c:220 @@ -2457,16 +2463,16 @@ msgid "could not fetch information from server\n" msgstr "Impossible d'obtenir l'information depuis le serveur\n" #: plugins/check_nt.c:296 -#, c-format +#, fuzzy, c-format msgid "" -"Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)" +"Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)" msgstr "" "Mémoire utilisée: total:%.2f Mb - utilisée: %.2f Mb (%.0f%%) - libre: %.2f " "Mb (%.0f%%)" #: plugins/check_nt.c:299 -#, c-format -msgid "'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f" +#, fuzzy, c-format +msgid "'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f" msgstr "'Mémoire utilisée'=%.2fMb;%.2f;%.2f;0.00;%.2f" #: plugins/check_nt.c:335 plugins/check_nt.c:420 plugins/check_nt.c:450 @@ -2715,7 +2721,9 @@ msgid " to run Perfmon directly." msgstr "" #: plugins/check_nt.c:753 -msgid "It can also be used in scripts that automatically create Nagios service" +msgid "" +"It can also be used in scripts that automatically create the monitoring " +"service" msgstr "" #: plugins/check_nt.c:754 @@ -2758,79 +2766,90 @@ msgstr "" msgid "and on the client service it's connecting to." msgstr "et dans le service auquel il se connecte." -#: plugins/check_ntp.c:807 plugins/check_ntp_peer.c:612 -#: plugins/check_ntp_time.c:571 +#: plugins/check_ntp.c:615 +#, c-format +msgid "Cannot read from socket: %s" +msgstr "" + +#: plugins/check_ntp.c:617 +#, c-format +msgid "" +"Invalid NTP response: %d bytes read does not equal %d plus %d data segment" +msgstr "" + +#: plugins/check_ntp.c:818 plugins/check_ntp_peer.c:612 +#: plugins/check_ntp_time.c:573 msgid "NTP CRITICAL:" msgstr "NTP CRITIQUE:" -#: plugins/check_ntp.c:810 plugins/check_ntp_peer.c:615 -#: plugins/check_ntp_time.c:574 +#: plugins/check_ntp.c:821 plugins/check_ntp_peer.c:615 +#: plugins/check_ntp_time.c:576 msgid "NTP WARNING:" msgstr "NTP AVERTISSEMENT:" -#: plugins/check_ntp.c:813 plugins/check_ntp_peer.c:618 -#: plugins/check_ntp_time.c:577 +#: plugins/check_ntp.c:824 plugins/check_ntp_peer.c:618 +#: plugins/check_ntp_time.c:579 msgid "NTP OK:" msgstr "NTP OK:" -#: plugins/check_ntp.c:816 plugins/check_ntp_peer.c:621 -#: plugins/check_ntp_time.c:580 +#: plugins/check_ntp.c:827 plugins/check_ntp_peer.c:621 +#: plugins/check_ntp_time.c:582 msgid "NTP UNKNOWN:" msgstr "NTP INCONNU:" -#: plugins/check_ntp.c:820 plugins/check_ntp_peer.c:630 -#: plugins/check_ntp_time.c:584 +#: plugins/check_ntp.c:831 plugins/check_ntp_peer.c:630 +#: plugins/check_ntp_time.c:586 msgid "Offset unknown" msgstr "Décalage inconnu" -#: plugins/check_ntp.c:823 plugins/check_ntp_peer.c:633 -#: plugins/check_ntp_time.c:587 +#: plugins/check_ntp.c:834 plugins/check_ntp_peer.c:633 +#: plugins/check_ntp_time.c:589 msgid "Offset" msgstr "Décalage" -#: plugins/check_ntp.c:844 plugins/check_ntp_peer.c:662 +#: plugins/check_ntp.c:855 plugins/check_ntp_peer.c:662 msgid "This plugin checks the selected ntp server" msgstr "Ce plugin vérifie le service ntp sur l'hôte" -#: plugins/check_ntp.c:854 plugins/check_ntp_peer.c:674 -#: plugins/check_ntp_time.c:614 +#: plugins/check_ntp.c:865 plugins/check_ntp_peer.c:674 +#: plugins/check_ntp_time.c:616 msgid "Offset to result in warning status (seconds)" msgstr "Décalage résultant en un avertissement (secondes)" -#: plugins/check_ntp.c:856 plugins/check_ntp_peer.c:676 -#: plugins/check_ntp_time.c:616 +#: plugins/check_ntp.c:867 plugins/check_ntp_peer.c:676 +#: plugins/check_ntp_time.c:618 msgid "Offset to result in critical status (seconds)" msgstr "Décalage résultant en un état critique (secondes)" -#: plugins/check_ntp.c:858 plugins/check_ntp_peer.c:682 +#: plugins/check_ntp.c:869 plugins/check_ntp_peer.c:682 msgid "Warning threshold for jitter" msgstr "Seuil d'avertissement pour la variation (jitter)" -#: plugins/check_ntp.c:860 plugins/check_ntp_peer.c:684 +#: plugins/check_ntp.c:871 plugins/check_ntp_peer.c:684 msgid "Critical threshold for jitter" msgstr "Seuil critique pour la variation (jitter)" -#: plugins/check_ntp.c:870 +#: plugins/check_ntp.c:881 msgid "Normal offset check:" msgstr "Vérification normale du décalage:" -#: plugins/check_ntp.c:873 plugins/check_ntp_peer.c:709 +#: plugins/check_ntp.c:884 plugins/check_ntp_peer.c:709 msgid "" "Check jitter too, avoiding critical notifications if jitter isn't available" msgstr "" "Vérifier aussi la variation (jitter) en évitant les notifications s'il n'est " "pas dispoible" -#: plugins/check_ntp.c:874 plugins/check_ntp_peer.c:710 +#: plugins/check_ntp.c:885 plugins/check_ntp_peer.c:710 msgid "(See Notes above for more details on thresholds formats):" msgstr "" "(Voir les Notes ci-dessus pour plus de détails sur le format des seuils)" -#: plugins/check_ntp.c:879 plugins/check_ntp.c:886 +#: plugins/check_ntp.c:890 plugins/check_ntp.c:897 msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or" msgstr "ATTENTION: check_ntp est périmé, utilisez plutôt check_ntp_peer" -#: plugins/check_ntp.c:880 plugins/check_ntp.c:887 +#: plugins/check_ntp.c:891 plugins/check_ntp.c:898 msgid "check_ntp_time instead." msgstr "ou check_ntp_time." @@ -2911,31 +2930,31 @@ msgstr "" msgid "Check only stratum:" msgstr "Vérification du stratum seulement:" -#: plugins/check_ntp_time.c:602 +#: plugins/check_ntp_time.c:604 msgid "This plugin checks the clock offset with the ntp server" msgstr "Ce plugin vérifie le décalage de l'horloge avec le serveur ntp" -#: plugins/check_ntp_time.c:612 +#: plugins/check_ntp_time.c:614 msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found" msgstr "Retourne INCONNU au lieu de CRITIQUE si le décalage est inconnu" -#: plugins/check_ntp_time.c:621 +#: plugins/check_ntp_time.c:623 msgid "This plugin checks the clock offset between the local host and a" msgstr "Ce plugin vérifie le décalage de l'horloge entre se serveur local et" -#: plugins/check_ntp_time.c:622 +#: plugins/check_ntp_time.c:624 msgid "remote NTP server. It is independent of any commandline programs or" msgstr "le serveur NTP distant. Il ne fait aucun recours aux programmes de" -#: plugins/check_ntp_time.c:623 +#: plugins/check_ntp_time.c:625 msgid "external libraries." msgstr "la ligne de commande ou libraries externes." -#: plugins/check_ntp_time.c:627 +#: plugins/check_ntp_time.c:629 msgid "If you'd rather want to monitor an NTP server, please use" msgstr "Si vous voulez plutôt surveiller un serveur NTP, veuillez" -#: plugins/check_ntp_time.c:628 +#: plugins/check_ntp_time.c:630 msgid "check_ntp_peer." msgstr "utiliser check_ntp_peer." @@ -3523,13 +3542,13 @@ msgid " %s - database %s (%f sec.)|%s\n" msgstr " %s - base de données %s (%d sec.)|%s\n" #: plugins/check_pgsql.c:317 plugins/check_time.c:277 plugins/check_time.c:289 -#: plugins/check_users.c:181 +#: plugins/check_users.c:219 msgid "Critical threshold must be a positive integer" msgstr "Le seuil critique doit être un entier positif" #: plugins/check_pgsql.c:323 plugins/check_time.c:258 plugins/check_time.c:282 -#: plugins/check_users.c:187 plugins/check_users.c:197 -#: plugins/check_users.c:203 +#: plugins/check_users.c:225 plugins/check_users.c:235 +#: plugins/check_users.c:241 msgid "Warning threshold must be a positive integer" msgstr "Le seuil d'avertissement doit être un entier positif" @@ -3551,9 +3570,9 @@ msgid "Database to check " msgstr "" #: plugins/check_pgsql.c:517 -#, c-format -msgid "(default: %s)" -msgstr "" +#, fuzzy, c-format +msgid "(default: %s)\n" +msgstr "(Défaut: %d)\n" #: plugins/check_pgsql.c:519 msgid "Login name of user" @@ -3685,7 +3704,8 @@ msgstr "" #: plugins/check_pgsql.c:566 msgid "" -"Typically, the nagios user (unless the --logname option is used) should be" +"Typically, the monitoring user (unless the --logname option is used) should " +"be" msgstr "" #: plugins/check_pgsql.c:567 @@ -3815,304 +3835,304 @@ msgstr " (%d) ne peut pas être plus large que (%d)\n" msgid "Cannot open stderr for %s\n" msgstr "Impossible d'ouvrir le canal d'erreur standard pour %s\n" -#: plugins/check_ping.c:492 plugins/check_ping.c:494 +#: plugins/check_ping.c:499 plugins/check_ping.c:501 msgid "System call sent warnings to stderr " msgstr "" "Les appel système enverront leurs messages d'avertissement vers le canal " "d'erreur standard" -#: plugins/check_ping.c:519 +#: plugins/check_ping.c:526 #, fuzzy, c-format msgid "CRITICAL - Network Unreachable (%s)\n" msgstr "CRITIQUE - Le réseau est inaccessible (%s)" -#: plugins/check_ping.c:521 +#: plugins/check_ping.c:528 #, fuzzy, c-format msgid "CRITICAL - Host Unreachable (%s)\n" msgstr "CRITIQUE - Hôte inaccessible (%s)" -#: plugins/check_ping.c:523 +#: plugins/check_ping.c:530 #, fuzzy, c-format msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n" msgstr "CRITIQUE - Paquet ICMP incorrect: Port inaccessible (%s)" -#: plugins/check_ping.c:525 +#: plugins/check_ping.c:532 #, fuzzy, c-format msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n" msgstr "CRITIQUE - Paquet ICMP incorrect: Protocole inaccessible (%s)" -#: plugins/check_ping.c:527 +#: plugins/check_ping.c:534 #, fuzzy, c-format msgid "CRITICAL - Network Prohibited (%s)\n" msgstr "CRITIQUE - L'accès au réseau est interdit (%s)" -#: plugins/check_ping.c:529 +#: plugins/check_ping.c:536 #, fuzzy, c-format msgid "CRITICAL - Host Prohibited (%s)\n" msgstr "CRITIQUE - L'accès a l'hôte est interdit (%s)" -#: plugins/check_ping.c:531 +#: plugins/check_ping.c:538 #, fuzzy, c-format msgid "CRITICAL - Packet Filtered (%s)\n" msgstr "CRITIQUE - Paquet filtré (%s)" -#: plugins/check_ping.c:533 +#: plugins/check_ping.c:540 #, fuzzy, c-format msgid "CRITICAL - Host not found (%s)\n" msgstr "CRITIQUE - Hôte non trouvé (%s)" -#: plugins/check_ping.c:535 +#: plugins/check_ping.c:542 #, fuzzy, c-format msgid "CRITICAL - Time to live exceeded (%s)\n" msgstr "CRITIQUE - La durée de vie du paquet est dépassée (%s)" -#: plugins/check_ping.c:537 +#: plugins/check_ping.c:544 #, fuzzy, c-format msgid "CRITICAL - Destination Unreachable (%s)\n" msgstr "CRITIQUE - Hôte inaccessible (%s)" -#: plugins/check_ping.c:544 +#: plugins/check_ping.c:551 #, fuzzy msgid "Unable to realloc warn_text\n" msgstr "Impossible de réattribuer le texte d'avertissement" -#: plugins/check_ping.c:561 +#: plugins/check_ping.c:568 #, c-format msgid "Use ping to check connection statistics for a remote host." msgstr "" "Utilise ping pour vérifier les statistiques de connections d'un hôte distant." -#: plugins/check_ping.c:573 +#: plugins/check_ping.c:580 msgid "host to ping" msgstr "hôte à tester" -#: plugins/check_ping.c:579 +#: plugins/check_ping.c:586 msgid "number of ICMP ECHO packets to send" msgstr "nombre de paquets ICMP à envoyer" -#: plugins/check_ping.c:580 +#: plugins/check_ping.c:587 #, c-format msgid "(Default: %d)\n" msgstr "(Défaut: %d)\n" -#: plugins/check_ping.c:582 +#: plugins/check_ping.c:589 msgid "show HTML in the plugin output (obsoleted by urlize)" msgstr "" -#: plugins/check_ping.c:587 +#: plugins/check_ping.c:594 msgid "THRESHOLD is ,% where is the round trip average travel" msgstr "" "Le seuil est ,% où est le temps moyen pour l'aller retour (ms)" -#: plugins/check_ping.c:588 +#: plugins/check_ping.c:595 msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the" msgstr "qui déclenche un résultat AVERTISSEMENT ou CRITIQUE, et est le " -#: plugins/check_ping.c:589 +#: plugins/check_ping.c:596 msgid "percentage of packet loss to trigger an alarm state." msgstr "pourcentage de paquets perdus pour déclencher une alarme." -#: plugins/check_ping.c:592 +#: plugins/check_ping.c:599 msgid "" "This plugin uses the ping command to probe the specified host for packet loss" msgstr "" "Ce plugin utilise la commande ping pour vérifier l'hôte spécifié pour les " "pertes de paquets" -#: plugins/check_ping.c:593 +#: plugins/check_ping.c:600 msgid "" "(percentage) and round trip average (milliseconds). It can produce HTML " "output" msgstr "" -#: plugins/check_ping.c:594 +#: plugins/check_ping.c:601 msgid "" "linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in" msgstr "" -#: plugins/check_ping.c:595 +#: plugins/check_ping.c:602 msgid "the contrib area of the downloads section at http://www.nagios.org/" msgstr "" -#: plugins/check_procs.c:191 +#: plugins/check_procs.c:193 #, c-format msgid "CMD: %s\n" msgstr "Commande: %s\n" -#: plugins/check_procs.c:196 +#: plugins/check_procs.c:198 msgid "System call sent warnings to stderr" msgstr "" "L'appel système à retourné des avertissement vers le canal d'erreur standard" -#: plugins/check_procs.c:318 +#: plugins/check_procs.c:326 #, c-format msgid "Not parseable: %s" msgstr "Impossible de parcourir les arguments: %s" -#: plugins/check_procs.c:323 +#: plugins/check_procs.c:331 #, c-format msgid "Unable to read output\n" msgstr "Impossible de lire les données en entrée\n" -#: plugins/check_procs.c:340 +#: plugins/check_procs.c:348 #, c-format msgid "%d warn out of " msgstr "%d avertissements sur" -#: plugins/check_procs.c:345 +#: plugins/check_procs.c:353 #, c-format msgid "%d crit, %d warn out of " msgstr "%d crit, %d alertes sur " -#: plugins/check_procs.c:351 +#: plugins/check_procs.c:359 #, c-format msgid " with %s" msgstr " avec %s" -#: plugins/check_procs.c:445 +#: plugins/check_procs.c:453 msgid "Parent Process ID must be an integer!" msgstr "L'identifiant du processus parent doit être un entier!" -#: plugins/check_procs.c:451 plugins/check_procs.c:578 +#: plugins/check_procs.c:459 plugins/check_procs.c:586 #, c-format msgid "%s%sSTATE = %s" msgstr "%s%sETAT = %s" -#: plugins/check_procs.c:460 +#: plugins/check_procs.c:468 msgid "UID was not found" msgstr "L'UID n'a pas été trouvé" -#: plugins/check_procs.c:466 +#: plugins/check_procs.c:474 msgid "User name was not found" msgstr "L'utilisateur n'a pas été trouvé" -#: plugins/check_procs.c:481 +#: plugins/check_procs.c:489 #, c-format msgid "%s%scommand name '%s'" msgstr "%s%snom de la commande '%s'" -#: plugins/check_procs.c:516 +#: plugins/check_procs.c:524 msgid "RSS must be an integer!" msgstr "RSS doit être un entier!" -#: plugins/check_procs.c:523 +#: plugins/check_procs.c:531 msgid "VSZ must be an integer!" msgstr "VSZ doit être un entier!" -#: plugins/check_procs.c:531 +#: plugins/check_procs.c:539 msgid "PCPU must be a float!" msgstr "PCPU doit être un nombre en virgule flottante!" -#: plugins/check_procs.c:555 +#: plugins/check_procs.c:563 msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!" msgstr "Metric doit être l'un des PROCS, VSZ, RSS, CPU, ELAPSED!" -#: plugins/check_procs.c:686 +#: plugins/check_procs.c:694 msgid "" "Checks all processes and generates WARNING or CRITICAL states if the " "specified" msgstr "" -#: plugins/check_procs.c:687 +#: plugins/check_procs.c:695 msgid "" "metric is outside the required threshold ranges. The metric defaults to " "number" msgstr "" -#: plugins/check_procs.c:688 +#: plugins/check_procs.c:696 msgid "" "of processes. Search filters can be applied to limit the processes to check." msgstr "" -#: plugins/check_procs.c:697 +#: plugins/check_procs.c:705 msgid "Generate warning state if metric is outside this range" msgstr "" -#: plugins/check_procs.c:699 +#: plugins/check_procs.c:707 msgid "Generate critical state if metric is outside this range" msgstr "" -#: plugins/check_procs.c:701 +#: plugins/check_procs.c:709 msgid "Check thresholds against metric. Valid types:" msgstr "" -#: plugins/check_procs.c:702 +#: plugins/check_procs.c:710 msgid "PROCS - number of processes (default)" msgstr "PROCS - nombre de processus (défaut)" -#: plugins/check_procs.c:703 +#: plugins/check_procs.c:711 msgid "VSZ - virtual memory size" msgstr "VSZ - taille mémoire virtuelle" -#: plugins/check_procs.c:704 +#: plugins/check_procs.c:712 msgid "RSS - resident set memory size" msgstr "" -#: plugins/check_procs.c:705 +#: plugins/check_procs.c:713 msgid "CPU - percentage CPU" msgstr "CPU - pourcentage du processeur" -#: plugins/check_procs.c:708 +#: plugins/check_procs.c:716 msgid "ELAPSED - time elapsed in seconds" msgstr "ELAPSED - temps écoulé en secondes" -#: plugins/check_procs.c:713 +#: plugins/check_procs.c:721 msgid "Extra information. Up to 3 verbosity levels" msgstr "informations supplémentaires. Jusqu'à 3 niveaux de verbosité" -#: plugins/check_procs.c:716 +#: plugins/check_procs.c:724 msgid "Filter own process the traditional way by PID instead of /proc/pid/exe" msgstr "" -#: plugins/check_procs.c:721 +#: plugins/check_procs.c:729 msgid "Only scan for processes that have, in the output of `ps`, one or" msgstr "" -#: plugins/check_procs.c:722 +#: plugins/check_procs.c:730 msgid "more of the status flags you specify (for example R, Z, S, RS," msgstr "" -#: plugins/check_procs.c:723 +#: plugins/check_procs.c:731 msgid "RSZDT, plus others based on the output of your 'ps' command)." msgstr "" -#: plugins/check_procs.c:725 +#: plugins/check_procs.c:733 msgid "Only scan for children of the parent process ID indicated." msgstr "" -#: plugins/check_procs.c:727 +#: plugins/check_procs.c:735 msgid "Only scan for processes with VSZ higher than indicated." msgstr "" -#: plugins/check_procs.c:729 +#: plugins/check_procs.c:737 msgid "Only scan for processes with RSS higher than indicated." msgstr "" -#: plugins/check_procs.c:731 +#: plugins/check_procs.c:739 msgid "Only scan for processes with PCPU higher than indicated." msgstr "" -#: plugins/check_procs.c:733 +#: plugins/check_procs.c:741 msgid "Only scan for processes with user name or ID indicated." msgstr "" -#: plugins/check_procs.c:735 +#: plugins/check_procs.c:743 msgid "Only scan for processes with args that contain STRING." msgstr "" -#: plugins/check_procs.c:737 +#: plugins/check_procs.c:745 msgid "Only scan for processes with args that contain the regex STRING." msgstr "" -#: plugins/check_procs.c:739 +#: plugins/check_procs.c:747 msgid "Only scan for exact matches of COMMAND (without path)." msgstr "" -#: plugins/check_procs.c:741 +#: plugins/check_procs.c:749 msgid "Only scan for non kernel threads (works on Linux only)." msgstr "" -#: plugins/check_procs.c:743 +#: plugins/check_procs.c:751 #, c-format msgid "" "\n" @@ -4127,7 +4147,7 @@ msgstr "" "est à l'intérieur du seuil\n" "\n" -#: plugins/check_procs.c:748 +#: plugins/check_procs.c:756 #, c-format msgid "" "This plugin checks the number of currently running processes and\n" @@ -4144,165 +4164,176 @@ msgstr "" "état actuel (ex: 'Z'), ou par le nombre de processus en cours d'exécution\n" "\n" -#: plugins/check_procs.c:757 +#: plugins/check_procs.c:765 msgid "Warning if not two processes with command name portsentry." msgstr "" -#: plugins/check_procs.c:758 +#: plugins/check_procs.c:766 msgid "Critical if < 2 or > 1024 processes" msgstr "" -#: plugins/check_procs.c:760 +#: plugins/check_procs.c:768 msgid "Warning alert if > 10 processes with command arguments containing" msgstr "" -#: plugins/check_procs.c:761 +#: plugins/check_procs.c:769 msgid "'/usr/local/bin/perl' and owned by root" msgstr "" -#: plugins/check_procs.c:763 +#: plugins/check_procs.c:771 msgid "Alert if VSZ of any processes over 50K or 100K" msgstr "" -#: plugins/check_procs.c:765 +#: plugins/check_procs.c:773 #, c-format msgid "Alert if CPU of any processes over 10%% or 20%%" msgstr "" -#: plugins/check_radius.c:165 -msgid "Config file error" +#: plugins/check_radius.c:172 +#, fuzzy +msgid "Config file error\n" msgstr "Erreur dans le fichier de configuration" -#: plugins/check_radius.c:174 -msgid "Out of Memory?" +#: plugins/check_radius.c:181 +#, fuzzy +msgid "Out of Memory?\n" msgstr "Manque de Mémoire?" -#: plugins/check_radius.c:178 -msgid "Invalid NAS-Identifier" +#: plugins/check_radius.c:185 +#, fuzzy +msgid "Invalid NAS-Identifier\n" msgstr "NAS-Identifier invalide" -#: plugins/check_radius.c:183 plugins/check_radius.c:185 -#: plugins/check_radius.c:191 -msgid "Invalid NAS-IP-Address" +#: plugins/check_radius.c:190 plugins/check_radius.c:192 +#: plugins/check_radius.c:198 +#, fuzzy +msgid "Invalid NAS-IP-Address\n" msgstr "NAS-IP-Address invalide" -#: plugins/check_radius.c:188 -msgid "Can't find local IP for NAS-IP-Address" +#: plugins/check_radius.c:195 +#, fuzzy +msgid "Can't find local IP for NAS-IP-Address\n" msgstr "Impossible de trouver une addresse IP locale pour le NAS-IP-Address" -#: plugins/check_radius.c:202 -msgid "Timeout" +#: plugins/check_radius.c:209 +#, fuzzy +msgid "Timeout\n" msgstr "Temps dépassé" -#: plugins/check_radius.c:204 -msgid "Auth Error" +#: plugins/check_radius.c:211 +#, fuzzy +msgid "Auth Error\n" msgstr "Erreur d'authentification" -#: plugins/check_radius.c:206 -msgid "Auth Failed" +#: plugins/check_radius.c:213 +#, fuzzy +msgid "Auth Failed\n" msgstr "L'authentification à échoué" -#: plugins/check_radius.c:208 -msgid "Bad Response" +#: plugins/check_radius.c:215 +#, fuzzy +msgid "Bad Response\n" msgstr "Réponse invalide" -#: plugins/check_radius.c:212 -msgid "Auth OK" +#: plugins/check_radius.c:219 +#, fuzzy +msgid "Auth OK\n" msgstr "L'authentification à réussi" -#: plugins/check_radius.c:213 +#: plugins/check_radius.c:220 #, c-format msgid "Unexpected result code %d" msgstr "Résultat inattendu: %d" -#: plugins/check_radius.c:302 +#: plugins/check_radius.c:309 msgid "Number of retries must be a positive integer" msgstr "Le nombre d'essai doit être un entier positif" -#: plugins/check_radius.c:316 +#: plugins/check_radius.c:323 msgid "User not specified" msgstr "L'utilisateur n'a pas été spécifié" -#: plugins/check_radius.c:318 +#: plugins/check_radius.c:325 msgid "Password not specified" msgstr "Le mot de passe n'a pas été spécifié" -#: plugins/check_radius.c:320 +#: plugins/check_radius.c:327 msgid "Configuration file not specified" msgstr "Le fichier de configuration n'a pas été spécifié" -#: plugins/check_radius.c:338 +#: plugins/check_radius.c:345 msgid "Tests to see if a RADIUS server is accepting connections." msgstr "Teste si un serveur RADIUS accepte les connections." -#: plugins/check_radius.c:350 +#: plugins/check_radius.c:357 msgid "The user to authenticate" msgstr "" -#: plugins/check_radius.c:352 +#: plugins/check_radius.c:359 msgid "Password for autentication (SECURITY RISK)" msgstr "" -#: plugins/check_radius.c:354 +#: plugins/check_radius.c:361 msgid "NAS identifier" msgstr "" -#: plugins/check_radius.c:356 +#: plugins/check_radius.c:363 msgid "NAS IP Address" msgstr "Adresse IP NAS" -#: plugins/check_radius.c:358 +#: plugins/check_radius.c:365 msgid "Configuration file" msgstr "Fichier de configuration" -#: plugins/check_radius.c:360 +#: plugins/check_radius.c:367 msgid "Response string to expect from the server" msgstr "" -#: plugins/check_radius.c:362 +#: plugins/check_radius.c:369 msgid "Number of times to retry a failed connection" msgstr "" -#: plugins/check_radius.c:367 +#: plugins/check_radius.c:374 msgid "" "This plugin tests a RADIUS server to see if it is accepting connections." msgstr "" "Ce plugin teste un serveur RADIUS afin de vérifier si il accepte les " "connections." -#: plugins/check_radius.c:368 +#: plugins/check_radius.c:375 msgid "" "The server to test must be specified in the invocation, as well as a user" msgstr "" -#: plugins/check_radius.c:369 +#: plugins/check_radius.c:376 msgid "" "name and password. A configuration file may also be present. The format of" msgstr "" -#: plugins/check_radius.c:370 +#: plugins/check_radius.c:377 msgid "" "the configuration file is described in the radiusclient library sources." msgstr "" -#: plugins/check_radius.c:371 +#: plugins/check_radius.c:378 msgid "The password option presents a substantial security issue because the" msgstr "" -#: plugins/check_radius.c:372 +#: plugins/check_radius.c:379 msgid "" "password can possibly be determined by careful watching of the command line" msgstr "" -#: plugins/check_radius.c:373 -msgid "in a process listing. This risk is exacerbated because nagios will" +#: plugins/check_radius.c:380 +msgid "in a process listing. This risk is exacerbated because the plugin will" msgstr "" -#: plugins/check_radius.c:374 -msgid "run the plugin at regular predictable intervals. Please be sure that" +#: plugins/check_radius.c:381 +msgid "" +"typically be executed at regular predictable intervals. Please be sure that" msgstr "" -#: plugins/check_radius.c:375 +#: plugins/check_radius.c:382 msgid "the password used does not allow access to sensitive system resources." msgstr "" @@ -4316,74 +4347,74 @@ msgstr "Impossible de se connecter à %s sur le port %d\n" msgid "No data received from %s\n" msgstr "Pas de données reçues de %s\n" -#: plugins/check_real.c:118 plugins/check_real.c:191 +#: plugins/check_real.c:118 plugins/check_real.c:192 msgid "Invalid REAL response received from host" msgstr "Réponses REAL invalide reçue de l'hôte" -#: plugins/check_real.c:120 plugins/check_real.c:193 +#: plugins/check_real.c:120 plugins/check_real.c:194 #, c-format msgid "Invalid REAL response received from host on port %d\n" msgstr "Réponses REAL invalide reçue de l'hôte sur le port %d\n" -#: plugins/check_real.c:184 plugins/check_tcp.c:311 +#: plugins/check_real.c:185 plugins/check_tcp.c:310 #, c-format msgid "No data received from host\n" msgstr "Pas de données reçues de l'hôte\n" -#: plugins/check_real.c:247 +#: plugins/check_real.c:248 #, c-format msgid "REAL %s - %d second response time\n" msgstr "REAL %s - %d secondes de temps de réponse\n" -#: plugins/check_real.c:336 plugins/check_ups.c:536 +#: plugins/check_real.c:337 plugins/check_ups.c:536 msgid "Warning time must be a positive integer" msgstr "Le seuil d'avertissement doit être un entier positif" -#: plugins/check_real.c:345 plugins/check_ups.c:527 +#: plugins/check_real.c:346 plugins/check_ups.c:527 msgid "Critical time must be a positive integer" msgstr "Le seuil critique doit être un entier positif" -#: plugins/check_real.c:381 +#: plugins/check_real.c:382 msgid "You must provide a server to check" msgstr "Vous devez fournir un serveur à vérifier" -#: plugins/check_real.c:413 +#: plugins/check_real.c:414 msgid "This plugin tests the REAL service on the specified host." msgstr "Ce plugin teste le service REAL sur l'hôte spécifié." -#: plugins/check_real.c:425 +#: plugins/check_real.c:426 msgid "Connect to this url" msgstr "" -#: plugins/check_real.c:427 +#: plugins/check_real.c:428 #, c-format msgid "String to expect in first line of server response (default: %s)\n" msgstr "" "Texte attendu dans la première ligne de réponse du serveur (défaut: %s)\n" -#: plugins/check_real.c:437 +#: plugins/check_real.c:438 msgid "This plugin will attempt to open an RTSP connection with the host." msgstr "Ce plugin va essayer d'ouvrir un connexion RTSP avec l'hôte." -#: plugins/check_real.c:438 plugins/check_smtp.c:830 +#: plugins/check_real.c:439 plugins/check_smtp.c:830 msgid "Successul connects return STATE_OK, refusals and timeouts return" msgstr "" -#: plugins/check_real.c:439 -msgid "" -"STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful connects," -msgstr "" - #: plugins/check_real.c:440 msgid "" -"but incorrect reponse messages from the host result in STATE_WARNING return" +"STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful connects," msgstr "" #: plugins/check_real.c:441 +msgid "" +"but incorrect reponse messages from the host result in STATE_WARNING return" +msgstr "" + +#: plugins/check_real.c:442 msgid "values." msgstr "" -#: plugins/check_smtp.c:150 plugins/check_swap.c:265 plugins/check_swap.c:271 +#: plugins/check_smtp.c:150 plugins/check_swap.c:266 plugins/check_swap.c:272 #, c-format msgid "malloc() failed!\n" msgstr "l'allocation mémoire à échoué!\n" @@ -4565,7 +4596,7 @@ msgstr "" msgid "FQDN used for HELO" msgstr "" -#: plugins/check_smtp.c:809 plugins/check_tcp.c:665 +#: plugins/check_smtp.c:809 plugins/check_tcp.c:669 msgid "Minimum number of days a certificate has to be valid." msgstr "Nombre de jours minimum pour que le certificat soit valide." @@ -4672,404 +4703,439 @@ msgstr "Pas d'hôte spécifié\n" msgid "No OIDs specified\n" msgstr "Pas de compteur spécifié\n" -#: plugins/check_snmp.c:973 -msgid "Invalid seclevel" -msgstr "" - -#: plugins/check_snmp.c:980 plugins/check_snmp.c:983 plugins/check_snmp.c:1001 +#: plugins/check_snmp.c:967 plugins/check_snmp.c:985 plugins/check_snmp.c:1003 #, c-format msgid "Required parameter: %s\n" msgstr "" -#: plugins/check_snmp.c:1022 +#: plugins/check_snmp.c:978 +msgid "Invalid seclevel" +msgstr "" + +#: plugins/check_snmp.c:1024 msgid "Invalid SNMP version" msgstr "Version de SNMP invalide" -#: plugins/check_snmp.c:1039 +#: plugins/check_snmp.c:1041 msgid "Unbalanced quotes\n" msgstr "Guillemets manquants\n" -#: plugins/check_snmp.c:1088 +#: plugins/check_snmp.c:1090 msgid "Check status of remote machines and obtain system information via SNMP" msgstr "" "Vérifie l'état des machines distantes et obtient l'information système via " "SNMP" -#: plugins/check_snmp.c:1101 +#: plugins/check_snmp.c:1103 msgid "Use SNMP GETNEXT instead of SNMP GET" msgstr "Utiliser SNMP GETNEXT au lieu de SNMP GET" -#: plugins/check_snmp.c:1103 +#: plugins/check_snmp.c:1105 msgid "SNMP protocol version" msgstr "Version du protocole SNMP" -#: plugins/check_snmp.c:1105 +#: plugins/check_snmp.c:1107 msgid "SNMPv3 securityLevel" msgstr "Niveau de sécurité SNMPv3 (securityLevel)" -#: plugins/check_snmp.c:1107 +#: plugins/check_snmp.c:1109 msgid "SNMPv3 auth proto" msgstr "Protocole d'authentification SNMPv3" -#: plugins/check_snmp.c:1109 +#: plugins/check_snmp.c:1111 msgid "SNMPv3 priv proto (default DES)" msgstr "" -#: plugins/check_snmp.c:1113 +#: plugins/check_snmp.c:1115 msgid "Optional community string for SNMP communication" msgstr "Communauté optionnelle pour la communication SNMP" -#: plugins/check_snmp.c:1114 +#: plugins/check_snmp.c:1116 msgid "default is" msgstr "défaut:" -#: plugins/check_snmp.c:1116 +#: plugins/check_snmp.c:1118 msgid "SNMPv3 username" msgstr "Nom d'utilisateur SNMPv3" -#: plugins/check_snmp.c:1118 +#: plugins/check_snmp.c:1120 msgid "SNMPv3 authentication password" msgstr "Mot de passe d'authentification SNMPv3" -#: plugins/check_snmp.c:1120 +#: plugins/check_snmp.c:1122 msgid "SNMPv3 privacy password" msgstr "Mot de passe de confidentialité SNMPv3" -#: plugins/check_snmp.c:1124 +#: plugins/check_snmp.c:1126 msgid "Object identifier(s) or SNMP variables whose value you wish to query" msgstr "" -#: plugins/check_snmp.c:1126 +#: plugins/check_snmp.c:1128 msgid "" "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'" msgstr "" -#: plugins/check_snmp.c:1127 +#: plugins/check_snmp.c:1129 msgid "for symbolic OIDs.)" msgstr "" -#: plugins/check_snmp.c:1129 +#: plugins/check_snmp.c:1131 msgid "Delimiter to use when parsing returned data. Default is" msgstr "" -#: plugins/check_snmp.c:1130 +#: plugins/check_snmp.c:1132 msgid "Any data on the right hand side of the delimiter is considered" msgstr "" -#: plugins/check_snmp.c:1131 +#: plugins/check_snmp.c:1133 msgid "to be the data that should be used in the evaluation." msgstr "" -#: plugins/check_snmp.c:1135 +#: plugins/check_snmp.c:1137 msgid "Warning threshold range(s)" msgstr "Valeurs pour le seuil d'avertissement" -#: plugins/check_snmp.c:1137 +#: plugins/check_snmp.c:1139 msgid "Critical threshold range(s)" msgstr "Valeurs pour le seuil critique" -#: plugins/check_snmp.c:1139 +#: plugins/check_snmp.c:1141 msgid "Enable rate calculation. See 'Rate Calculation' below" msgstr "" -#: plugins/check_snmp.c:1141 +#: plugins/check_snmp.c:1143 msgid "" "Converts rate per second. For example, set to 60 to convert to per minute" msgstr "" -#: plugins/check_snmp.c:1143 +#: plugins/check_snmp.c:1145 msgid "Add/substract the specified OFFSET to numeric sensor data" msgstr "" -#: plugins/check_snmp.c:1147 -msgid "Return OK state (for that OID) if STRING is an exact match" -msgstr "" - #: plugins/check_snmp.c:1149 -msgid "" -"Return OK state (for that OID) if extended regular expression REGEX matches" +msgid "Return OK state (for that OID) if STRING is an exact match" msgstr "" #: plugins/check_snmp.c:1151 msgid "" -"Return OK state (for that OID) if case-insensitive extended REGEX matches" +"Return OK state (for that OID) if extended regular expression REGEX matches" msgstr "" #: plugins/check_snmp.c:1153 +msgid "" +"Return OK state (for that OID) if case-insensitive extended REGEX matches" +msgstr "" + +#: plugins/check_snmp.c:1155 msgid "Invert search result (CRITICAL if found)" msgstr "" -#: plugins/check_snmp.c:1157 +#: plugins/check_snmp.c:1159 msgid "Prefix label for output from plugin" msgstr "" -#: plugins/check_snmp.c:1159 +#: plugins/check_snmp.c:1161 msgid "Units label(s) for output data (e.g., 'sec.')." msgstr "" -#: plugins/check_snmp.c:1161 +#: plugins/check_snmp.c:1163 msgid "Separates output on multiple OID requests" msgstr "" -#: plugins/check_snmp.c:1165 +#: plugins/check_snmp.c:1167 msgid "Number of retries to be used in the requests" msgstr "Le nombre d'essai pour les requêtes" -#: plugins/check_snmp.c:1168 +#: plugins/check_snmp.c:1170 msgid "Label performance data with OIDs instead of --label's" msgstr "" -#: plugins/check_snmp.c:1173 +#: plugins/check_snmp.c:1175 msgid "" "This plugin uses the 'snmpget' command included with the NET-SNMP package." msgstr "" -#: plugins/check_snmp.c:1174 +#: plugins/check_snmp.c:1176 msgid "" "if you don't have the package installed, you will need to download it from" msgstr "" "Si vous n'avez pas le programme installé, vous devrez le télécharger depuis" -#: plugins/check_snmp.c:1175 +#: plugins/check_snmp.c:1177 msgid "http://net-snmp.sourceforge.net before you can use this plugin." msgstr "http://net-snmp.sourceforge.net avant de pouvoir utiliser ce plugin." -#: plugins/check_snmp.c:1179 +#: plugins/check_snmp.c:1181 #, fuzzy msgid "" "- Multiple OIDs (and labels) may be indicated by a comma or space-delimited " msgstr "" "- Des OIDs multiples peuvent être séparées par des virgules ou des espaces" -#: plugins/check_snmp.c:1180 +#: plugins/check_snmp.c:1182 #, fuzzy msgid "list (lists with internal spaces must be quoted)." msgstr "(Les liste avec espaces doivent être entre guillemets). Max:" -#: plugins/check_snmp.c:1184 +#: plugins/check_snmp.c:1186 msgid "" "- When checking multiple OIDs, separate ranges by commas like '-w " "1:10,1:,:20'" msgstr "" -#: plugins/check_snmp.c:1185 +#: plugins/check_snmp.c:1187 msgid "- Note that only one string and one regex may be checked at present" msgstr "" -#: plugins/check_snmp.c:1186 +#: plugins/check_snmp.c:1188 msgid "" "- All evaluation methods other than PR, STR, and SUBSTR expect that the value" msgstr "" -#: plugins/check_snmp.c:1187 +#: plugins/check_snmp.c:1189 msgid "returned from the SNMP query is an unsigned integer." msgstr "" -#: plugins/check_snmp.c:1190 +#: plugins/check_snmp.c:1192 msgid "Rate Calculation:" msgstr "" -#: plugins/check_snmp.c:1191 +#: plugins/check_snmp.c:1193 msgid "In many places, SNMP returns counters that are only meaningful when" msgstr "" -#: plugins/check_snmp.c:1192 +#: plugins/check_snmp.c:1194 msgid "calculating the counter difference since the last check. check_snmp" msgstr "" -#: plugins/check_snmp.c:1193 +#: plugins/check_snmp.c:1195 msgid "saves the last state information in a file so that the rate per second" msgstr "" -#: plugins/check_snmp.c:1194 +#: plugins/check_snmp.c:1196 msgid "can be calculated. Use the --rate option to save state information." msgstr "" -#: plugins/check_snmp.c:1195 +#: plugins/check_snmp.c:1197 msgid "" "On the first run, there will be no prior state - this will return with OK." msgstr "" -#: plugins/check_snmp.c:1196 +#: plugins/check_snmp.c:1198 msgid "The state is uniquely determined by the arguments to the plugin, so" msgstr "" -#: plugins/check_snmp.c:1197 +#: plugins/check_snmp.c:1199 msgid "changing the arguments will create a new state file." msgstr "" -#: plugins/check_ssh.c:165 +#: plugins/check_ssh.c:170 msgid "Port number must be a positive integer" msgstr "Le numéro du port doit être un nombre entier positif" -#: plugins/check_ssh.c:232 +#: plugins/check_ssh.c:237 #, c-format msgid "Server answer: %s" msgstr "Réponse du serveur: %s" -#: plugins/check_ssh.c:251 +#: plugins/check_ssh.c:256 #, c-format msgid "SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n" msgstr "" "SSH AVERTISSEMENT - %s (protocole %s) différence de version, attendu'%s'\n" -#: plugins/check_ssh.c:260 +#: plugins/check_ssh.c:264 +#, fuzzy, c-format +msgid "" +"SSH WARNING - %s (protocol %s) protocol version mismatch, expected '%s'\n" +msgstr "" +"SSH AVERTISSEMENT - %s (protocole %s) différence de version, attendu'%s'\n" + +#: plugins/check_ssh.c:273 #, fuzzy, c-format msgid "SSH OK - %s (protocol %s) | %s\n" msgstr "SSH OK - %s (protocole %s)\n" -#: plugins/check_ssh.c:281 +#: plugins/check_ssh.c:294 msgid "Try to connect to an SSH server at specified server and port" msgstr "Essaye de se connecter à un serveur SSH précisé à un port précis" -#: plugins/check_ssh.c:297 +#: plugins/check_ssh.c:310 msgid "" "Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)" msgstr "" "AVERTISSEMENT si la chaîne ne correspond pas à la version précisée (ex: " "OpenSSH_3.9p1)" -#: plugins/check_swap.c:169 +#: plugins/check_ssh.c:313 +#, fuzzy +msgid "Warn if protocol doesn't match expected protocol version (ex: 2.0)" +msgstr "" +"AVERTISSEMENT si la chaîne ne correspond pas à la version précisée (ex: " +"OpenSSH_3.9p1)" + +#: plugins/check_swap.c:170 #, c-format msgid "Command: %s\n" msgstr "Commande: %s\n" -#: plugins/check_swap.c:171 +#: plugins/check_swap.c:172 #, c-format msgid "Format: %s\n" msgstr "Format: %s\n" -#: plugins/check_swap.c:207 +#: plugins/check_swap.c:208 #, c-format msgid "total=%.0f, used=%.0f, free=%.0f\n" msgstr "total=%.0f, utilisé=%.0f, libre=%.0ff\n" -#: plugins/check_swap.c:221 +#: plugins/check_swap.c:222 #, c-format msgid "total=%.0f, free=%.0f\n" msgstr "total=%.0f, libre=%.0f\n" -#: plugins/check_swap.c:253 +#: plugins/check_swap.c:254 msgid "Error getting swap devices\n" msgstr "" -#: plugins/check_swap.c:256 +#: plugins/check_swap.c:257 msgid "SWAP OK: No swap devices defined\n" msgstr "SWAP OK: Pas de périphériques swap définis\n" -#: plugins/check_swap.c:277 plugins/check_swap.c:319 +#: plugins/check_swap.c:278 plugins/check_swap.c:320 msgid "swapctl failed: " msgstr "swapctl à échoué:" -#: plugins/check_swap.c:278 plugins/check_swap.c:320 +#: plugins/check_swap.c:279 plugins/check_swap.c:321 msgid "Error in swapctl call\n" msgstr "" -#: plugins/check_swap.c:357 +#: plugins/check_swap.c:358 #, c-format msgid "SWAP %s - %d%% free (%d MB out of %d MB) %s|" msgstr "SWAP %s - %d%% libre (%d MB sur un total de %d MB) %s|" -#: plugins/check_swap.c:435 +#: plugins/check_swap.c:440 msgid "Warning threshold must be integer or percentage!" msgstr "Le seuil d'avertissement doit être un entier ou un pourcentage!" -#: plugins/check_swap.c:453 +#: plugins/check_swap.c:458 msgid "Critical threshold must be integer or percentage!" msgstr "Le seuil critique doit être un entier ou un pourcentage!" -#: plugins/check_swap.c:507 +#: plugins/check_swap.c:465 +#, fuzzy +msgid "" +"no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " +"or integer (0-3)." +msgstr "" +"Le résultat de temps dépassé doit être un nom d'état valide (OK, WARNING, " +"CRITICAL, UNKNOWN) ou un nombre entier (0-3)." + +#: plugins/check_swap.c:516 msgid "Warning percentage should be more than critical percentage" msgstr "" "Le pourcentage d'avertissement doit être plus important que le pourcentage " "critique" -#: plugins/check_swap.c:511 +#: plugins/check_swap.c:520 msgid "Warning free space should be more than critical free space" msgstr "" "Le seuil d'avertissement pour la place libre doit être plus grand que le " "seuil critique" -#: plugins/check_swap.c:525 +#: plugins/check_swap.c:534 msgid "Check swap space on local machine." msgstr "Vérifie l'espace swap sur la machine locale." -#: plugins/check_swap.c:535 +#: plugins/check_swap.c:544 msgid "" "Exit with WARNING status if less than INTEGER bytes of swap space are free" msgstr "" "Sortir avec un résultat AVERTISSEMENT si moins de X octets de mémoire " "virtuelle sont libres" -#: plugins/check_swap.c:537 +#: plugins/check_swap.c:546 msgid "Exit with WARNING status if less than PERCENT of swap space is free" msgstr "" "Sortir avec un résultat AVERTISSEMENT si moins de X pour cent de mémoire " "virtuelle est libre" -#: plugins/check_swap.c:539 +#: plugins/check_swap.c:548 msgid "" "Exit with CRITICAL status if less than INTEGER bytes of swap space are free" msgstr "" "Sortir avec un résultat CRITIQUE si moins de X octets de mémoire virtuelle " "sont libres" -#: plugins/check_swap.c:541 -msgid "Exit with CRITCAL status if less than PERCENT of swap space is free" +#: plugins/check_swap.c:550 +#, fuzzy +msgid "Exit with CRITICAL status if less than PERCENT of swap space is free" msgstr "" "Sortir avec un résultat CRITIQUE si moins de X pour cent de mémoire " "virtuelle est libre" -#: plugins/check_swap.c:543 +#: plugins/check_swap.c:552 msgid "Conduct comparisons for all swap partitions, one by one" msgstr "Vérifier chacune des partitions de mémoire virtuelle séparément" -#: plugins/check_swap.c:548 +#: plugins/check_swap.c:554 +msgid "" +"Resulting state when there is no swap regardless of thresholds. Default:" +msgstr "" + +#: plugins/check_swap.c:559 +#, fuzzy +msgid "" +"Both INTEGER and PERCENT thresholds can be specified, they are all checked." +msgstr "Les seuils d'alerte et critiques peuvent être spécifiés avec -w et -c." + +#: plugins/check_swap.c:560 msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s." msgstr "" "Sur AIX, si -a est spécifié, le plugin utilise lsps -a, sinon il utilise " "lsps -s." -#: plugins/check_tcp.c:206 +#: plugins/check_tcp.c:205 msgid "CRITICAL - Generic check_tcp called with unknown service\n" msgstr "" "CRITIQUE -check_tcp version générique utilisé avec un service inconnu\n" -#: plugins/check_tcp.c:230 +#: plugins/check_tcp.c:229 msgid "With UDP checks, a send/expect string must be specified." msgstr "" "Avec la surveillance UDP, une chaîne d'envoi et un chaîne de réponse doit " "être spécifiée." -#: plugins/check_tcp.c:431 +#: plugins/check_tcp.c:435 msgid "No arguments found" msgstr "Pas de paramètres" -#: plugins/check_tcp.c:534 +#: plugins/check_tcp.c:538 msgid "Maxbytes must be a positive integer" msgstr "Maxbytes doit être un entier positif" -#: plugins/check_tcp.c:552 +#: plugins/check_tcp.c:556 msgid "Refuse must be one of ok, warn, crit" msgstr "Refuse doit être parmis ok, warn, crit" -#: plugins/check_tcp.c:562 +#: plugins/check_tcp.c:566 msgid "Mismatch must be one of ok, warn, crit" msgstr "Mismatch doit être parmis ok, warn, crit" -#: plugins/check_tcp.c:568 +#: plugins/check_tcp.c:572 msgid "Delay must be a positive integer" msgstr "Delay doit être un entier positif" -#: plugins/check_tcp.c:613 +#: plugins/check_tcp.c:617 msgid "You must provide a server address" msgstr "Vous devez fournir une adresse serveur" -#: plugins/check_tcp.c:615 +#: plugins/check_tcp.c:619 msgid "Invalid hostname, address or socket" msgstr "Adresse/Nom/Socket invalide" -#: plugins/check_tcp.c:629 +#: plugins/check_tcp.c:633 #, c-format msgid "" "This plugin tests %s connections with the specified host (or unix socket).\n" @@ -5078,7 +5144,7 @@ msgstr "" "Ce plugin teste %s connections avec l'hôte spécifié (ou socket unix).\n" "\n" -#: plugins/check_tcp.c:642 +#: plugins/check_tcp.c:646 msgid "" "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or " "quit option" @@ -5086,59 +5152,59 @@ msgstr "" "Permet d'utiliser \\n, \\r, \\t ou \\ dans la chaîne de caractères send ou " "quit. Doit être placé avant ces dernières." -#: plugins/check_tcp.c:643 +#: plugins/check_tcp.c:647 msgid "Default: nothing added to send, \\r\\n added to end of quit" msgstr "" "Par défaut: Rien n'est ajouté à send, \\r\\n est ajouté à la fin de quit" -#: plugins/check_tcp.c:645 +#: plugins/check_tcp.c:649 msgid "String to send to the server" msgstr "Chaîne de caractères à envoyer au serveur" -#: plugins/check_tcp.c:647 +#: plugins/check_tcp.c:651 msgid "String to expect in server response" msgstr "Chaîne de caractères à attendre en réponse" -#: plugins/check_tcp.c:647 +#: plugins/check_tcp.c:651 msgid "(may be repeated)" msgstr "(peut être utilisé plusieurs fois)" -#: plugins/check_tcp.c:649 +#: plugins/check_tcp.c:653 msgid "All expect strings need to occur in server response. Default is any" msgstr "" "Toutes les chaînes attendus (expect) doivent être repérés dans la réponse. " "Par défaut, n'importe laquelle suffit." -#: plugins/check_tcp.c:651 +#: plugins/check_tcp.c:655 msgid "String to send server to initiate a clean close of the connection" msgstr "Chaîne de caractères à envoyer pour fermer gracieusement la connection" -#: plugins/check_tcp.c:653 +#: plugins/check_tcp.c:657 msgid "Accept TCP refusals with states ok, warn, crit (default: crit)" msgstr "" -#: plugins/check_tcp.c:655 +#: plugins/check_tcp.c:659 msgid "" "Accept expected string mismatches with states ok, warn, crit (default: warn)" msgstr "" -#: plugins/check_tcp.c:657 +#: plugins/check_tcp.c:661 msgid "Hide output from TCP socket" msgstr "Cacher la réponse provenant du socket TCP" -#: plugins/check_tcp.c:659 +#: plugins/check_tcp.c:663 msgid "Close connection once more than this number of bytes are received" msgstr "" -#: plugins/check_tcp.c:661 +#: plugins/check_tcp.c:665 msgid "Seconds to wait between sending string and polling for response" msgstr "" -#: plugins/check_tcp.c:666 +#: plugins/check_tcp.c:670 msgid "1st is #days for warning, 2nd is critical (if not specified - 0)." msgstr "" -#: plugins/check_tcp.c:668 +#: plugins/check_tcp.c:672 msgid "Use SSL for the connection." msgstr "" @@ -5370,108 +5436,143 @@ msgstr "" msgid "http://www.networkupstools.org" msgstr "" -#: plugins/check_users.c:110 +#: plugins/check_users.c:93 +#, fuzzy, c-format +msgid "Could not enumerate RD sessions: %d\n" +msgstr "Impossible d'utiliser le protocole version %d\n" + +#: plugins/check_users.c:148 #, c-format msgid "# users=%d" msgstr "# utilisateurs=%d" -#: plugins/check_users.c:133 +#: plugins/check_users.c:171 msgid "Unable to read output" msgstr "Impossible de lire les données en entrée" -#: plugins/check_users.c:140 +#: plugins/check_users.c:178 #, c-format msgid "USERS %s - %d users currently logged in |%s\n" msgstr "UTILISATEURS %s - %d utilisateurs actuellement connectés sur |%s\n" -#: plugins/check_users.c:219 +#: plugins/check_users.c:257 msgid "This plugin checks the number of users currently logged in on the local" msgstr "" "Ce plugin vérifie le nombre d'utilisateurs actuellement connecté sur le " "système local" -#: plugins/check_users.c:220 +#: plugins/check_users.c:258 msgid "" "system and generates an error if the number exceeds the thresholds specified." msgstr "et génère une erreur si le nombre excède le seuil spécifié." -#: plugins/check_users.c:230 +#: plugins/check_users.c:268 msgid "Set WARNING status if more than INTEGER users are logged in" msgstr "" "Sortir avec un résultat AVERTISSEMENT si plus de INTEGER utilisateurs sont " "connectés" -#: plugins/check_users.c:232 +#: plugins/check_users.c:270 msgid "Set CRITICAL status if more than INTEGER users are logged in" msgstr "" "Sortir avec un résultat CRITIQUE si plus de INTEGER utilisateurs sont " "connectés" -#: plugins/check_ide_smart.c:256 +#: plugins/check_ide_smart.c:219 +msgid "" +"DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"." +msgstr "" + +#: plugins/check_ide_smart.c:220 +msgid "Nagios-compatible output is now always returned." +msgstr "" + +#: plugins/check_ide_smart.c:225 +msgid "SMART commands are broken and have been disabled (See Notes in --help)." +msgstr "" + +#: plugins/check_ide_smart.c:229 +msgid "" +"DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the" +msgstr "" + +#: plugins/check_ide_smart.c:230 +#, fuzzy +msgid "default and will be removed from future releases." +msgstr "" +"Note: nslookup est obsolète et pourra être retiré dans les prochaines " +"versions." + +#: plugins/check_ide_smart.c:258 #, c-format msgid "CRITICAL - Couldn't open device %s: %s\n" msgstr "Critique - Impossible d'ouvrir le périphérique %s: %s\n" -#: plugins/check_ide_smart.c:261 +#: plugins/check_ide_smart.c:263 #, c-format msgid "CRITICAL - SMART_CMD_ENABLE\n" msgstr "CRITIQUE - SMART_CMD_ENABLE\n" -#: plugins/check_ide_smart.c:323 plugins/check_ide_smart.c:350 +#: plugins/check_ide_smart.c:304 plugins/check_ide_smart.c:331 #, c-format msgid "CRITICAL - SMART_READ_VALUES: %s\n" msgstr "CRITIQUE - SMART_READ_VALUES: %s\n" -#: plugins/check_ide_smart.c:421 +#: plugins/check_ide_smart.c:402 #, c-format msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n" msgstr "" "CRITIQUE - %d État de pré-panne %c Détecté! %d/%d les tests on échoués.\n" -#: plugins/check_ide_smart.c:429 +#: plugins/check_ide_smart.c:410 #, c-format msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n" msgstr "" "AVERTISSEMENT - %d État de pré-panne %s Détecté! %d/%d les tests on " "échoués.\n" -#: plugins/check_ide_smart.c:437 +#: plugins/check_ide_smart.c:418 #, c-format msgid "OK - Operational (%d/%d tests passed)\n" msgstr "OK - En fonctionnement (%d/%d les tests on été réussi)\n" -#: plugins/check_ide_smart.c:441 +#: plugins/check_ide_smart.c:422 #, c-format -msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n" +msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n" msgstr "ERREUR - État '%d' inconnu. %d/%d les tests on réussi\n" -#: plugins/check_ide_smart.c:474 +#: plugins/check_ide_smart.c:455 #, c-format msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n" msgstr "" "Etat Hors Ligne=%d {%s}, Hors Ligne Auto=%s, Temps avant arrêt=%d minutes\n" -#: plugins/check_ide_smart.c:480 +#: plugins/check_ide_smart.c:461 #, c-format msgid "OffLineCapability=%d {%s %s %s}\n" msgstr "Capacité Hors Ligne=%d {%s %s %s}\n" -#: plugins/check_ide_smart.c:486 +#: plugins/check_ide_smart.c:467 #, c-format msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n" msgstr "Révision Smart=%d, Somme de contrôle=%d, Capacité Smart=%d {%s %s}\n" -#: plugins/check_ide_smart.c:508 plugins/check_ide_smart.c:532 +#: plugins/check_ide_smart.c:489 plugins/check_ide_smart.c:518 #, c-format msgid "CRITICAL - %s: %s\n" msgstr "CRITIQUE - %s: %s\n" -#: plugins/check_ide_smart.c:553 plugins/check_ide_smart.c:580 +#: plugins/check_ide_smart.c:493 plugins/check_ide_smart.c:522 +#, fuzzy, c-format +msgid "OK - Command sent (%s)\n" +msgstr "Commande: %s\n" + +#: plugins/check_ide_smart.c:543 plugins/check_ide_smart.c:570 #, c-format msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n" msgstr "CRITIQUE - SMART_READ_THRESHOLDS: %s\n" -#: plugins/check_ide_smart.c:599 +#: plugins/check_ide_smart.c:589 #, c-format msgid "" "This plugin checks a local hard drive with the (Linux specific) SMART " @@ -5480,41 +5581,50 @@ msgstr "" "Ce plugin vérifie un disque dur local à l'aide de l'interface SMART (pour " "Linux) [http://smartlinux.sourceforge.net/smart/index.php]." -#: plugins/check_ide_smart.c:609 +#: plugins/check_ide_smart.c:599 msgid "Select device DEVICE" msgstr "" -#: plugins/check_ide_smart.c:610 +#: plugins/check_ide_smart.c:600 msgid "" -"Note: if the device is selected with this option, _no_ other options are " -"accepted" +"Note: if the device is specified without this option, any further option will" +msgstr "" + +#: plugins/check_ide_smart.c:601 +msgid "be ignored." +msgstr "" + +#: plugins/check_ide_smart.c:607 +msgid "" +"The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were" +msgstr "" + +#: plugins/check_ide_smart.c:608 +msgid "" +"broken in an underhand manner and have been disabled. You can use smartctl" +msgstr "" + +#: plugins/check_ide_smart.c:609 +msgid "instead:" +msgstr "" + +#: plugins/check_ide_smart.c:610 +msgid "-0/--auto-off: use \"smartctl --offlineauto=off\"" +msgstr "" + +#: plugins/check_ide_smart.c:611 +msgid "-1/--auto-on: use \"smartctl --offlineauto=on\"" msgstr "" #: plugins/check_ide_smart.c:612 -msgid "Perform immediately offline tests" +msgid "-i/--immediate: use \"smartctl --test=offline\"" msgstr "" -#: plugins/check_ide_smart.c:614 -msgid "Returns the number of failed tests" -msgstr "" - -#: plugins/check_ide_smart.c:616 -msgid "Turn on automatic offline tests" -msgstr "" - -#: plugins/check_ide_smart.c:618 -msgid "Turn off automatic offline tests" -msgstr "" - -#: plugins/check_ide_smart.c:620 -msgid "Output suitable for Nagios" -msgstr "" - -#: plugins/negate.c:99 +#: plugins/negate.c:98 msgid "No data returned from command\n" msgstr "Pas de données reçues de la commande\n" -#: plugins/negate.c:170 +#: plugins/negate.c:168 msgid "" "Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " "or integer (0-3)." @@ -5522,7 +5632,7 @@ msgstr "" "Le résultat de temps dépassé doit être un nom d'état valide (OK, WARNING, " "CRITICAL, UNKNOWN) ou un nombre entier (0-3)." -#: plugins/negate.c:174 +#: plugins/negate.c:172 msgid "" "Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer " "(0-3)." @@ -5530,7 +5640,7 @@ msgstr "" "Ok doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou un " "nombre entier (0-3)." -#: plugins/negate.c:180 +#: plugins/negate.c:178 msgid "" "Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " "integer (0-3)." @@ -5538,7 +5648,7 @@ msgstr "" "Warning doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou " "un nombre entier (0-3)." -#: plugins/negate.c:185 +#: plugins/negate.c:183 msgid "" "Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " "integer (0-3)." @@ -5546,7 +5656,7 @@ msgstr "" "Critical doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou " "un nombre entier (0-3)." -#: plugins/negate.c:190 +#: plugins/negate.c:188 msgid "" "Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " "integer (0-3)." @@ -5554,33 +5664,33 @@ msgstr "" "Unknown doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou " "un nombre entier (0-3)." -#: plugins/negate.c:217 +#: plugins/negate.c:215 msgid "Require path to command" msgstr "Chemin vers la commande requis" -#: plugins/negate.c:246 +#: plugins/negate.c:226 msgid "" "Negates the status of a plugin (returns OK for CRITICAL and vice-versa)." msgstr "" "Inverse le statut d'un plugin (retourne OK pour CRITIQUE et vice-versa)." -#: plugins/negate.c:247 +#: plugins/negate.c:227 msgid "Additional switches can be used to control which state becomes what." msgstr "" "Des options additionnelles peuvent être utilisées pour contrôler quel état " "devient quoi." -#: plugins/negate.c:256 +#: plugins/negate.c:236 msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status." msgstr "" "Utilisez un délai de réponse plus long que celui du plugin afin de conserver " "les résultats CRITIQUE" -#: plugins/negate.c:258 +#: plugins/negate.c:238 msgid "Custom result on Negate timeouts; see below for STATUS definition\n" msgstr "" -#: plugins/negate.c:264 +#: plugins/negate.c:244 #, c-format msgid "" " STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n" @@ -5588,63 +5698,63 @@ msgstr "" " STATUS peut être 'OK', 'WARNING', 'CRITICAL' ou 'UNKNOWN' sans les " "simple\n" -#: plugins/negate.c:265 +#: plugins/negate.c:245 #, c-format msgid "" " quotes. Numeric values are accepted. If nothing is specified, permutes\n" msgstr " quotes. Les valeurs numériques sont acceptées. Si rien n'est\n" -#: plugins/negate.c:266 +#: plugins/negate.c:246 #, c-format msgid " OK and CRITICAL.\n" msgstr " spécifié, inverse OK et CRITIQUE.\n" -#: plugins/negate.c:268 +#: plugins/negate.c:248 #, c-format msgid "" " Substitute output text as well. Will only substitute text in CAPITALS\n" msgstr "" -#: plugins/negate.c:273 +#: plugins/negate.c:253 msgid "Run check_ping and invert result. Must use full path to plugin" msgstr "" "Execute check_ping et inverse le résultat. Le chemin complet du plug-in doit " "être spécifié" -#: plugins/negate.c:275 +#: plugins/negate.c:255 msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL" msgstr "" "Ceci retournera OK au lieu de AVERTISSEMENT et INCONNU au lieu de CRITIQUE" -#: plugins/negate.c:278 +#: plugins/negate.c:258 msgid "" "This plugin is a wrapper to take the output of another plugin and invert it." msgstr "" "Ce plugin est un adaptateur qui prends l'état d'un autre plug-in et " "l'inverse." -#: plugins/negate.c:279 +#: plugins/negate.c:259 msgid "The full path of the plugin must be provided." msgstr "Le chemin complet du plugin doit être spécifié." -#: plugins/negate.c:280 +#: plugins/negate.c:260 msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL." msgstr "Si le plugin executé retourne OK, l'adaptateur retournera CRITIQUE." -#: plugins/negate.c:281 +#: plugins/negate.c:261 msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK." msgstr "Si le plugin executé retourne CRITIQUE, l'adaptateur retournera OK." -#: plugins/negate.c:282 +#: plugins/negate.c:262 msgid "Otherwise, the output state of the wrapped plugin is unchanged." msgstr "Autrement, l'état du plugin executé reste inchangé." -#: plugins/negate.c:284 +#: plugins/negate.c:264 msgid "" "Using timeout-result, it is possible to override the timeout behaviour or a" msgstr "" -#: plugins/negate.c:285 +#: plugins/negate.c:265 msgid "plugin by setting the negate timeout a bit lower." msgstr "" @@ -5678,7 +5788,7 @@ msgstr "Le chemin fourni est trop long pour un socket unix" msgid "Receive failed" msgstr "La réception à échoué" -#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1342 +#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1339 #, c-format msgid "Invalid hostname/address - %s" msgstr "Adresse/Nom invalide - %s" @@ -5710,7 +5820,7 @@ msgstr "" msgid "sysconf error for _SC_OPEN_MAX" msgstr "" -#: plugins/urlize.c:130 +#: plugins/urlize.c:129 #, c-format msgid "" "%s UNKNOWN - No data received from host\n" @@ -5719,48 +5829,52 @@ msgstr "" "%s INCONNU - Pas de données reçues de l'hôte\n" "Commande: %s\n" +#: plugins/urlize.c:168 +#, fuzzy +msgid "" +"This plugin wraps the text output of another command (plugin) in HTML " +msgstr "" +"Ce plugin est un adaptateur qui prends l'état d'un autre plug-in et " +"l'inverse." + #: plugins/urlize.c:169 -msgid "This plugin wraps the text output of another command (plugin)" +msgid "" +"tags, thus displaying the child plugin's output as a clickable link in " +"compatible" msgstr "" #: plugins/urlize.c:170 msgid "" -"in HTML tags, thus displaying the child plugin's output as a clickable " -"link in" -msgstr "" - -#: plugins/urlize.c:171 -msgid "" -"the Nagios status screen. This plugin returns the status of the invoked " +"monitoring status screen. This plugin returns the status of the invoked " "plugin." msgstr "" -#: plugins/urlize.c:181 +#: plugins/urlize.c:180 msgid "" "Pay close attention to quoting to ensure that the shell passes the expected" msgstr "" -#: plugins/urlize.c:182 +#: plugins/urlize.c:181 msgid "data to the plugin. For example, in:" msgstr "" -#: plugins/urlize.c:183 +#: plugins/urlize.c:182 msgid "urlize http://example.com/ check_http -H example.com -r 'two words'" msgstr "" -#: plugins/urlize.c:184 +#: plugins/urlize.c:183 msgid "the shell will remove the single quotes and urlize will see:" msgstr "" -#: plugins/urlize.c:185 +#: plugins/urlize.c:184 msgid "urlize http://example.com/ check_http -H example.com -r two words" msgstr "" -#: plugins/urlize.c:186 +#: plugins/urlize.c:185 msgid "You probably want:" msgstr "" -#: plugins/urlize.c:187 +#: plugins/urlize.c:186 msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" msgstr "" @@ -5833,15 +5947,17 @@ msgstr "" " Utiliser une connection IPv6\n" #: plugins/utils.h:160 +#, fuzzy msgid "" " -v, --verbose\n" -" Show details for command-line debugging (Nagios may truncate output)\n" +" Show details for command-line debugging (output may be truncated by\n" +" the monitoring system)\n" msgstr "" " -v, --verbose\n" " Affiche les informations de déboguage en ligne de commande (Nagios peut " "tronquer la sortie)\n" -#: plugins/utils.h:164 +#: plugins/utils.h:165 msgid "" " -w, --warning=DOUBLE\n" " Response time to result in warning status (seconds)\n" @@ -5853,7 +5969,7 @@ msgstr "" " -c, --critical=DOUBLE\n" " Temps de réponse résultant en un état critique (secondes)\n" -#: plugins/utils.h:170 +#: plugins/utils.h:171 msgid "" " -w, --warning=RANGE\n" " Warning range (format: start:end). Alert if outside this range\n" @@ -5866,7 +5982,7 @@ msgstr "" " -c, --critical=RANGE\n" " Seuil critique\n" -#: plugins/utils.h:176 +#: plugins/utils.h:177 #, c-format msgid "" " -t, --timeout=INTEGER\n" @@ -5876,48 +5992,61 @@ msgstr "" " Délais de connection en secondes (défaut: %d)\n" #: plugins/utils.h:181 +#, fuzzy, c-format +msgid "" +" -t, --timeout=INTEGER\n" +" Seconds before plugin times out (default: %d)\n" +msgstr "" +" -t, --timeout=INTEGER\n" +" Délais de connection en secondes (défaut: %d)\n" + +#: plugins/utils.h:186 +#, fuzzy msgid "" " --extra-opts=[section][@file]\n" -" Read options from an ini file. See http://nagiosplugins.org/extra-opts\n" +" Read options from an ini file. See\n" +" https://www.monitoring-plugins.org/doc/extra-opts.html\n" " for usage and examples.\n" msgstr "" " --extra-opts=[section][@file]\n" -" Lire les options d'un fichier ini. Voir http://nagiosplugins.org/extra-" -"opts\n" +" Lire les options d'un fichier ini. Voir\n" +" https://www.monitoring-plugins.org/doc/extra-opts.html\n" " pour les instructions et examples.\n" -#: plugins/utils.h:189 +#: plugins/utils.h:195 +#, fuzzy msgid "" " See:\n" -" http://nagiosplug.sourceforge.net/developer-guidelines." -"html#THRESHOLDFORMAT\n" +" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" " for THRESHOLD format and examples.\n" msgstr "" " Voir:\n" -" http://nagiosplug.sourceforge.net/developer-guidelines." +" https://www.monitoring-plugins.org/doc/guidelines.html." "html#THRESHOLDFORMAT\n" " pour le format et examples des seuils (THRESHOLD).\n" -#: plugins/utils.h:194 +#: plugins/utils.h:200 +#, fuzzy msgid "" "\n" -"Send email to nagios-users@lists.sourceforge.net if you have questions\n" -"regarding use of this software. To submit patches or suggest improvements,\n" -"send email to nagiosplug-devel@lists.sourceforge.net\n" +"Send email to help@monitoring-plugins.org if you have questions regarding\n" +"use of this software. To submit patches or suggest improvements, send email\n" +"to devel@monitoring-plugins.org\n" "\n" msgstr "" "\n" -"Envoyez un email à nagios-users@lists.sourceforge.net si vous avez des " -"questions\n" +"Envoyez un email à help@monitoring-plugins.org si vous avez des questions\n" "reliées à l'utilisation de ce logiciel. Pour envoyer des patches ou suggérer " "des\n" -"améliorations, envoyez un email à nagiosplug-devel@lists.sourceforge.net\n" +"améliorations, envoyez un email à devel@monitoring-plugins.org\n" "\n" -#: plugins/utils.h:199 +#: plugins/utils.h:205 +#, fuzzy msgid "" "\n" -"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n" +"The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may " +"redistribute\n" "copies of the plugins under the terms of the GNU General Public License.\n" "For more information about these matters, see the file named COPYING.\n" msgstr "" @@ -5926,25 +6055,25 @@ msgstr "" "des copies des plugins selon les termes de la GNU General Public License.\n" "Pour de plus ample informations, voir le fichier COPYING.\n" -#: plugins-root/check_dhcp.c:320 +#: plugins-root/check_dhcp.c:317 #, c-format msgid "Error: Could not get hardware address of interface '%s'\n" msgstr "" "Erreur: Impossible d'obtenir l'adresse matérielle pour l'interface '%s'\n" -#: plugins-root/check_dhcp.c:342 +#: plugins-root/check_dhcp.c:339 #, c-format msgid "Error: if_nametoindex error - %s.\n" msgstr "Erreur: if_nametoindex erreur - %s.\n" -#: plugins-root/check_dhcp.c:347 +#: plugins-root/check_dhcp.c:344 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n" msgstr "" "Erreur: Impossible d'obtenir l'adresse matérielle depuis %s. erreur sysctl 1 " "- %s.\n" -#: plugins-root/check_dhcp.c:352 +#: plugins-root/check_dhcp.c:349 #, c-format msgid "" "Error: Couldn't get hardware address from interface %s. malloc error - %s.\n" @@ -5952,14 +6081,14 @@ msgstr "" "Erreur: Impossible d'obtenir l'adresse matérielle depuis l'interface %s\n" " erreur malloc - %s.\n" -#: plugins-root/check_dhcp.c:357 +#: plugins-root/check_dhcp.c:354 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n" msgstr "" "Erreur: Impossible d'obtenir l'adresse matérielle depuis %s erreur sysctl 2 " "- %s.\n" -#: plugins-root/check_dhcp.c:388 +#: plugins-root/check_dhcp.c:385 #, c-format msgid "" "Error: can't find unit number in interface_name (%s) - expecting TypeNumber " @@ -5968,7 +6097,7 @@ msgstr "" "Erreur: impossible de trouver le numéro dans le nom de l'interface (%s).\n" "J'attendais le nom suivi du type ex lnc0.\n" -#: plugins-root/check_dhcp.c:393 plugins-root/check_dhcp.c:405 +#: plugins-root/check_dhcp.c:390 plugins-root/check_dhcp.c:402 #, c-format msgid "" "Error: can't read MAC address from DLPI streams interface for device %s unit " @@ -5977,7 +6106,7 @@ msgstr "" "Erreur: impossible de lire l'adresse MAC depuis l'interface DLPI pour le \n" "périphérique %s numéro %d.\n" -#: plugins-root/check_dhcp.c:411 +#: plugins-root/check_dhcp.c:408 #, c-format msgid "" "Error: can't get MAC address for this architecture. Use the --mac option.\n" @@ -5985,47 +6114,47 @@ msgstr "" "Erreur: impossible d'obtenir l'adresse MAC sur cette architecture. Utilisez " "l'option --mac.\n" -#: plugins-root/check_dhcp.c:430 +#: plugins-root/check_dhcp.c:427 #, c-format msgid "Error: Cannot determine IP address of interface %s\n" msgstr "Erreur: Impossible d'obtenir l'adresse IP de l'interface %s\n" -#: plugins-root/check_dhcp.c:438 +#: plugins-root/check_dhcp.c:435 #, c-format msgid "Error: Cannot get interface IP address on this platform.\n" msgstr "Erreur: Impossible d'obtenir l'adresse IP sur cette architecture.\n" -#: plugins-root/check_dhcp.c:443 +#: plugins-root/check_dhcp.c:440 #, c-format msgid "Pretending to be relay client %s\n" msgstr "" -#: plugins-root/check_dhcp.c:528 +#: plugins-root/check_dhcp.c:525 #, c-format msgid "DHCPDISCOVER to %s port %d\n" msgstr "DHCPDISCOVER vers %s port %d\n" -#: plugins-root/check_dhcp.c:580 +#: plugins-root/check_dhcp.c:577 #, c-format msgid "Result=ERROR\n" msgstr "Résultat=ERREUR\n" -#: plugins-root/check_dhcp.c:586 +#: plugins-root/check_dhcp.c:583 #, c-format msgid "Result=OK\n" msgstr "Résultat=OK\n" -#: plugins-root/check_dhcp.c:596 +#: plugins-root/check_dhcp.c:593 #, c-format msgid "DHCPOFFER from IP address %s" msgstr "DHCPOFFER depuis l'adresse IP %s" -#: plugins-root/check_dhcp.c:597 +#: plugins-root/check_dhcp.c:594 #, c-format msgid " via %s\n" msgstr " depuis %s\n" -#: plugins-root/check_dhcp.c:604 +#: plugins-root/check_dhcp.c:601 #, c-format msgid "" "DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n" @@ -6033,67 +6162,67 @@ msgstr "" "DHCPOFFER XID (%u) ne correspond pas au DHCPDISCOVER XID (%u) - paquet " "ignoré\n" -#: plugins-root/check_dhcp.c:626 +#: plugins-root/check_dhcp.c:623 #, c-format msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n" msgstr "" "l'adresse matérielle du DHCPOFFER ne correspond pas à la notre paquet " "ignoré\n" -#: plugins-root/check_dhcp.c:644 +#: plugins-root/check_dhcp.c:641 #, c-format msgid "Total responses seen on the wire: %d\n" msgstr "Nombre total de réponses vues: %d\n" -#: plugins-root/check_dhcp.c:645 +#: plugins-root/check_dhcp.c:642 #, c-format msgid "Valid responses for this machine: %d\n" msgstr "Nombre de réponse valides pour cette machine: %d\n" -#: plugins-root/check_dhcp.c:660 +#: plugins-root/check_dhcp.c:657 #, c-format msgid "send_dhcp_packet result: %d\n" msgstr "résultat de send_dchp_packet: %d\n" -#: plugins-root/check_dhcp.c:693 +#: plugins-root/check_dhcp.c:690 #, c-format msgid "No (more) data received (nfound: %d)\n" msgstr "Plus de données reçues (nfound: %d)\n" -#: plugins-root/check_dhcp.c:712 +#: plugins-root/check_dhcp.c:709 #, c-format msgid "recvfrom() failed, " msgstr "recvfrom() a échoué, " -#: plugins-root/check_dhcp.c:719 +#: plugins-root/check_dhcp.c:716 #, c-format msgid "receive_dhcp_packet() result: %d\n" msgstr "résultat de receive_dchp_packet(): %d\n" -#: plugins-root/check_dhcp.c:720 +#: plugins-root/check_dhcp.c:717 #, c-format msgid "receive_dhcp_packet() source: %s\n" msgstr "source de receive_dchp_packet(): %s\n" -#: plugins-root/check_dhcp.c:750 +#: plugins-root/check_dhcp.c:747 #, c-format msgid "Error: Could not create socket!\n" msgstr "Erreur: Impossible de créer un socket!\n" -#: plugins-root/check_dhcp.c:760 +#: plugins-root/check_dhcp.c:757 #, c-format msgid "Error: Could not set reuse address option on DHCP socket!\n" msgstr "" "Erreur: Impossible de configurer l'option de réutilisation de l'adresse sur\n" "le socket DHCP!\n" -#: plugins-root/check_dhcp.c:766 +#: plugins-root/check_dhcp.c:763 #, c-format msgid "Error: Could not set broadcast option on DHCP socket!\n" msgstr "" "Erreur: Impossible de configurer l'option broadcast sur le socket DHCP!\n" -#: plugins-root/check_dhcp.c:775 +#: plugins-root/check_dhcp.c:772 #, c-format msgid "" "Error: Could not bind socket to interface %s. Check your privileges...\n" @@ -6101,7 +6230,7 @@ msgstr "" "Erreur: Impossible de connecter le socket à l'interface %s.\n" "Vérifiez vos droits...\n" -#: plugins-root/check_dhcp.c:786 +#: plugins-root/check_dhcp.c:783 #, c-format msgid "" "Error: Could not bind to DHCP socket (port %d)! Check your privileges...\n" @@ -6109,125 +6238,125 @@ msgstr "" "Erreur: Impossible de se connecter au socket (port %d)! Vérifiez vos " "droits..\n" -#: plugins-root/check_dhcp.c:820 +#: plugins-root/check_dhcp.c:817 #, c-format msgid "Requested server address: %s\n" msgstr "Adresse serveur demandée: %s\n" -#: plugins-root/check_dhcp.c:882 +#: plugins-root/check_dhcp.c:879 #, c-format msgid "Lease Time: Infinite\n" msgstr "Durée du Bail: Infini\n" -#: plugins-root/check_dhcp.c:884 +#: plugins-root/check_dhcp.c:881 #, c-format msgid "Lease Time: %lu seconds\n" msgstr "Durée du Bail: %lu secondes\n" -#: plugins-root/check_dhcp.c:886 +#: plugins-root/check_dhcp.c:883 #, c-format msgid "Renewal Time: Infinite\n" msgstr "Renouvellement du bail: Infini\n" -#: plugins-root/check_dhcp.c:888 +#: plugins-root/check_dhcp.c:885 #, c-format msgid "Renewal Time: %lu seconds\n" msgstr "Durée du renouvellement = %lu secondes\n" -#: plugins-root/check_dhcp.c:890 +#: plugins-root/check_dhcp.c:887 #, c-format msgid "Rebinding Time: Infinite\n" msgstr "Délai de nouvelle demande: Infini\n" -#: plugins-root/check_dhcp.c:891 +#: plugins-root/check_dhcp.c:888 #, c-format msgid "Rebinding Time: %lu seconds\n" msgstr "Délai de nouvelle demande: %lu secondes\n" -#: plugins-root/check_dhcp.c:919 +#: plugins-root/check_dhcp.c:916 #, c-format msgid "Added offer from server @ %s" msgstr "Rajouté offre du serveur @ %s" -#: plugins-root/check_dhcp.c:920 +#: plugins-root/check_dhcp.c:917 #, c-format msgid " of IP address %s\n" msgstr "de l'adresse IP %s\n" -#: plugins-root/check_dhcp.c:987 +#: plugins-root/check_dhcp.c:984 #, c-format msgid "DHCP Server Match: Offerer=%s" msgstr "Correspondance du serveur DHCP: Offrant=%s" -#: plugins-root/check_dhcp.c:988 +#: plugins-root/check_dhcp.c:985 #, c-format msgid " Requested=%s" msgstr " Demandé=%s" -#: plugins-root/check_dhcp.c:990 +#: plugins-root/check_dhcp.c:987 #, c-format msgid " (duplicate)" msgstr "" -#: plugins-root/check_dhcp.c:991 +#: plugins-root/check_dhcp.c:988 #, c-format msgid "\n" msgstr "" -#: plugins-root/check_dhcp.c:1039 +#: plugins-root/check_dhcp.c:1036 #, c-format msgid "No DHCPOFFERs were received.\n" msgstr "Pas de DHCPOFFERs reçus.\n" -#: plugins-root/check_dhcp.c:1043 +#: plugins-root/check_dhcp.c:1040 #, c-format msgid "Received %d DHCPOFFER(s)" msgstr "Reçu %d DHCPOFFER(s)" -#: plugins-root/check_dhcp.c:1046 +#: plugins-root/check_dhcp.c:1043 #, c-format msgid ", %s%d of %d requested servers responded" msgstr ", %s%d de %d serveurs ont répondus" -#: plugins-root/check_dhcp.c:1049 +#: plugins-root/check_dhcp.c:1046 #, c-format msgid ", requested address (%s) was %soffered" msgstr ", l'adresse demandée (%s) %s été offerte" -#: plugins-root/check_dhcp.c:1049 +#: plugins-root/check_dhcp.c:1046 msgid "not " msgstr "n'as pas" -#: plugins-root/check_dhcp.c:1051 +#: plugins-root/check_dhcp.c:1048 #, c-format msgid ", max lease time = " msgstr ", bail maximum = " -#: plugins-root/check_dhcp.c:1053 +#: plugins-root/check_dhcp.c:1050 #, c-format msgid "Infinity" msgstr "Infini" -#: plugins-root/check_dhcp.c:1234 +#: plugins-root/check_dhcp.c:1231 #, c-format msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n" msgstr "" "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans check_ctrl: %s.\n" -#: plugins-root/check_dhcp.c:1246 +#: plugins-root/check_dhcp.c:1243 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n" msgstr "" "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans put_ctrl/putmsg(): " "%s.\n" -#: plugins-root/check_dhcp.c:1259 +#: plugins-root/check_dhcp.c:1256 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n" msgstr "" "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans put_both/putmsg().\n" -#: plugins-root/check_dhcp.c:1271 +#: plugins-root/check_dhcp.c:1268 #, c-format msgid "" "Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n" @@ -6235,125 +6364,128 @@ msgstr "" "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_attach_req/open" "(%s..): %s.\n" -#: plugins-root/check_dhcp.c:1295 +#: plugins-root/check_dhcp.c:1292 #, c-format msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n" msgstr "" "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_bind/check_ctrl" "(): %s.\n" -#: plugins-root/check_dhcp.c:1374 +#: plugins-root/check_dhcp.c:1371 #, c-format msgid "Hardware address: " msgstr "Adresse matérielle: " -#: plugins-root/check_dhcp.c:1390 +#: plugins-root/check_dhcp.c:1387 msgid "This plugin tests the availability of DHCP servers on a network." msgstr "Ce plugin teste la disponibilité de serveurs DHCP dans un réseau." -#: plugins-root/check_dhcp.c:1402 +#: plugins-root/check_dhcp.c:1399 msgid "IP address of DHCP server that we must hear from" msgstr "" -#: plugins-root/check_dhcp.c:1404 +#: plugins-root/check_dhcp.c:1401 msgid "IP address that should be offered by at least one DHCP server" msgstr "" -#: plugins-root/check_dhcp.c:1406 +#: plugins-root/check_dhcp.c:1403 msgid "Seconds to wait for DHCPOFFER before timeout occurs" msgstr "" -#: plugins-root/check_dhcp.c:1408 +#: plugins-root/check_dhcp.c:1405 msgid "Interface to to use for listening (i.e. eth0)" msgstr "" -#: plugins-root/check_dhcp.c:1410 +#: plugins-root/check_dhcp.c:1407 msgid "MAC address to use in the DHCP request" msgstr "" -#: plugins-root/check_dhcp.c:1412 +#: plugins-root/check_dhcp.c:1409 msgid "Unicast testing: mimic a DHCP relay, requires -s" msgstr "" -#: plugins-root/check_icmp.c:1295 +#: plugins-root/check_icmp.c:1292 msgid "specify a target" msgstr "" -#: plugins-root/check_icmp.c:1297 +#: plugins-root/check_icmp.c:1294 msgid "warning threshold (currently " msgstr "Valeurs pour le seuil d'avertissement (actuellement " -#: plugins-root/check_icmp.c:1300 +#: plugins-root/check_icmp.c:1297 msgid "critical threshold (currently " msgstr "Valeurs pour le seuil critique (actuellement " -#: plugins-root/check_icmp.c:1303 +#: plugins-root/check_icmp.c:1300 msgid "specify a source IP address or device name" msgstr "spécifiez une adresse ou un nom d'hôte" -#: plugins-root/check_icmp.c:1305 +#: plugins-root/check_icmp.c:1302 msgid "number of packets to send (currently " msgstr "nombre de paquets à envoyer (actuellement " -#: plugins-root/check_icmp.c:1308 +#: plugins-root/check_icmp.c:1305 msgid "max packet interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1311 +#: plugins-root/check_icmp.c:1308 msgid "max target interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1314 +#: plugins-root/check_icmp.c:1311 msgid "number of alive hosts required for success" msgstr "nombre d'hôtes vivants requis pour réussite" -#: plugins-root/check_icmp.c:1317 +#: plugins-root/check_icmp.c:1314 msgid "TTL on outgoing packets (currently " msgstr "" -#: plugins-root/check_icmp.c:1320 +#: plugins-root/check_icmp.c:1317 msgid "timeout value (seconds, currently " msgstr "" -#: plugins-root/check_icmp.c:1323 +#: plugins-root/check_icmp.c:1320 msgid "Number of icmp data bytes to send" msgstr "Nombre de paquets ICMP à envoyer" -#: plugins-root/check_icmp.c:1324 +#: plugins-root/check_icmp.c:1321 msgid "Packet size will be data bytes + icmp header (currently" msgstr "" -#: plugins-root/check_icmp.c:1326 +#: plugins-root/check_icmp.c:1323 msgid "verbose" msgstr "" -#: plugins-root/check_icmp.c:1330 +#: plugins-root/check_icmp.c:1327 msgid "The -H switch is optional. Naming a host (or several) to check is not." msgstr "" -#: plugins-root/check_icmp.c:1332 +#: plugins-root/check_icmp.c:1329 msgid "" "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" msgstr "" -#: plugins-root/check_icmp.c:1333 +#: plugins-root/check_icmp.c:1330 msgid "packet loss. The default values should work well for most users." msgstr "" -#: plugins-root/check_icmp.c:1334 +#: plugins-root/check_icmp.c:1331 msgid "" "You can specify different RTA factors using the standardized abbreviations" msgstr "" -#: plugins-root/check_icmp.c:1335 +#: plugins-root/check_icmp.c:1332 msgid "" "us (microseconds), ms (milliseconds, default) or just plain s for seconds." msgstr "" -#: plugins-root/check_icmp.c:1341 +#: plugins-root/check_icmp.c:1338 msgid "The -v switch can be specified several times for increased verbosity." msgstr "" +#~ msgid "Path or partition (may be repeated)" +#~ msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" + #~ msgid "Critical threshold must be integer" #~ msgstr "le seuil critique doit être un entier positif" diff --git a/po/nagios-plugins.pot b/po/monitoring-plugins.pot similarity index 84% rename from po/nagios-plugins.pot rename to po/monitoring-plugins.pot index 4273c85..92bb3e3 100644 --- a/po/nagios-plugins.pot +++ b/po/monitoring-plugins.pot @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Nagios Plugin Development Group +# Copyright (C) YEAR Monitoring Plugins Development Team # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-10-02 17:27+0200\n" +"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" +"POT-Creation-Date: 2014-07-11 17:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,25 +18,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:88 -#: plugins/check_disk.c:194 plugins/check_dns.c:102 plugins/check_dummy.c:52 +#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:91 +#: plugins/check_disk.c:203 plugins/check_dns.c:102 plugins/check_dummy.c:52 #: plugins/check_fping.c:93 plugins/check_game.c:82 plugins/check_hpjd.c:103 #: plugins/check_http.c:167 plugins/check_ldap.c:109 plugins/check_load.c:122 #: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:122 -#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:770 -#: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:552 +#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:781 +#: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:554 #: plugins/check_nwstat.c:173 plugins/check_overcr.c:102 -#: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:171 -#: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:144 -#: plugins/check_snmp.c:240 plugins/check_ssh.c:73 plugins/check_swap.c:110 -#: plugins/check_tcp.c:218 plugins/check_time.c:78 plugins/check_ups.c:122 -#: plugins/check_users.c:77 plugins/negate.c:214 plugins-root/check_dhcp.c:270 +#: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:172 +#: plugins/check_radius.c:167 plugins/check_real.c:80 plugins/check_smtp.c:144 +#: plugins/check_snmp.c:240 plugins/check_ssh.c:74 plugins/check_swap.c:111 +#: plugins/check_tcp.c:217 plugins/check_time.c:78 plugins/check_ups.c:122 +#: plugins/check_users.c:86 plugins/negate.c:212 plugins-root/check_dhcp.c:270 msgid "Could not parse arguments" msgstr "" -#: plugins/check_by_ssh.c:90 plugins/check_dig.c:82 plugins/check_dns.c:95 +#: plugins/check_by_ssh.c:90 plugins/check_dig.c:85 plugins/check_dns.c:95 #: plugins/check_nagios.c:95 plugins/check_pgsql.c:178 plugins/check_ping.c:99 -#: plugins/check_procs.c:186 plugins/check_snmp.c:336 plugins/negate.c:79 +#: plugins/check_procs.c:188 plugins/check_snmp.c:336 plugins/negate.c:78 msgid "Cannot catch SIGALRM" msgstr "" @@ -60,18 +60,18 @@ msgstr "" msgid "%s: Error parsing output\n" msgstr "" -#: plugins/check_by_ssh.c:220 plugins/check_disk.c:476 +#: plugins/check_by_ssh.c:220 plugins/check_disk.c:491 #: plugins/check_http.c:278 plugins/check_ldap.c:293 plugins/check_pgsql.c:311 -#: plugins/check_procs.c:429 plugins/check_radius.c:308 -#: plugins/check_real.c:356 plugins/check_smtp.c:581 plugins/check_snmp.c:736 -#: plugins/check_ssh.c:138 plugins/check_tcp.c:505 plugins/check_time.c:302 -#: plugins/check_ups.c:556 plugins/negate.c:164 +#: plugins/check_procs.c:437 plugins/check_radius.c:315 +#: plugins/check_real.c:357 plugins/check_smtp.c:581 plugins/check_snmp.c:736 +#: plugins/check_ssh.c:140 plugins/check_tcp.c:509 plugins/check_time.c:302 +#: plugins/check_ups.c:556 plugins/negate.c:162 msgid "Timeout interval must be a positive integer" msgstr "" #: plugins/check_by_ssh.c:230 plugins/check_pgsql.c:341 -#: plugins/check_radius.c:272 plugins/check_real.c:327 -#: plugins/check_smtp.c:506 plugins/check_tcp.c:511 plugins/check_time.c:296 +#: plugins/check_radius.c:279 plugins/check_real.c:328 +#: plugins/check_smtp.c:506 plugins/check_tcp.c:515 plugins/check_time.c:296 #: plugins/check_ups.c:518 msgid "Port must be a positive integer" msgstr "" @@ -111,8 +111,8 @@ msgstr "" #: plugins/check_by_ssh.c:374 #, c-format msgid "" -"%s: In passive mode, you must provide the host short name from the nagios " -"configs.\n" +"%s: In passive mode, you must provide the host short name from the " +"monitoring configs.\n" msgstr "" #: plugins/check_by_ssh.c:388 @@ -155,15 +155,15 @@ msgid "identity of an authorized key [optional]" msgstr "" #: plugins/check_by_ssh.c:419 -msgid "external command file for nagios [optional]" +msgid "external command file for monitoring [optional]" msgstr "" #: plugins/check_by_ssh.c:421 -msgid "list of nagios service names, separated by ':' [optional]" +msgid "list of monitoring service names, separated by ':' [optional]" msgstr "" #: plugins/check_by_ssh.c:423 -msgid "short name of host in nagios configuration [optional]" +msgid "short name of host in the monitoring configuration [optional]" msgstr "" #: plugins/check_by_ssh.c:425 @@ -216,35 +216,35 @@ msgid "" msgstr "" #: plugins/check_by_ssh.c:445 plugins/check_cluster.c:261 -#: plugins/check_dig.c:355 plugins/check_disk.c:924 plugins/check_http.c:1560 -#: plugins/check_nagios.c:312 plugins/check_ntp.c:869 -#: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:633 -#: plugins/check_procs.c:755 plugins/negate.c:271 plugins/urlize.c:180 +#: plugins/check_dig.c:361 plugins/check_disk.c:939 plugins/check_http.c:1562 +#: plugins/check_nagios.c:312 plugins/check_ntp.c:880 +#: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:635 +#: plugins/check_procs.c:763 plugins/negate.c:251 plugins/urlize.c:179 msgid "Examples:" msgstr "" #: plugins/check_by_ssh.c:460 plugins/check_cluster.c:274 -#: plugins/check_dig.c:367 plugins/check_disk.c:941 plugins/check_dns.c:486 +#: plugins/check_dig.c:373 plugins/check_disk.c:956 plugins/check_dns.c:502 #: plugins/check_dummy.c:122 plugins/check_fping.c:505 -#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1590 +#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1592 #: plugins/check_ldap.c:451 plugins/check_load.c:334 plugins/check_mrtg.c:382 -#: plugins/check_mysql.c:569 plugins/check_nagios.c:323 plugins/check_nt.c:774 -#: plugins/check_ntp.c:888 plugins/check_ntp_peer.c:725 -#: plugins/check_ntp_time.c:642 plugins/check_nwstat.c:1685 +#: plugins/check_mysql.c:563 plugins/check_nagios.c:323 plugins/check_nt.c:774 +#: plugins/check_ntp.c:899 plugins/check_ntp_peer.c:725 +#: plugins/check_ntp_time.c:644 plugins/check_nwstat.c:1685 #: plugins/check_overcr.c:467 plugins/check_pgsql.c:578 -#: plugins/check_ping.c:603 plugins/check_procs.c:773 -#: plugins/check_radius.c:385 plugins/check_real.c:451 -#: plugins/check_smtp.c:843 plugins/check_snmp.c:1207 plugins/check_ssh.c:309 -#: plugins/check_swap.c:558 plugins/check_tcp.c:684 plugins/check_time.c:371 -#: plugins/check_ups.c:660 plugins/check_users.c:240 -#: plugins/check_ide_smart.c:640 plugins/negate.c:295 plugins/urlize.c:197 -#: plugins-root/check_dhcp.c:1422 plugins-root/check_icmp.c:1354 +#: plugins/check_ping.c:610 plugins/check_procs.c:781 +#: plugins/check_radius.c:392 plugins/check_real.c:452 +#: plugins/check_smtp.c:843 plugins/check_snmp.c:1209 plugins/check_ssh.c:325 +#: plugins/check_swap.c:570 plugins/check_tcp.c:688 plugins/check_time.c:371 +#: plugins/check_ups.c:660 plugins/check_users.c:278 +#: plugins/check_ide_smart.c:632 plugins/negate.c:275 plugins/urlize.c:196 +#: plugins-root/check_dhcp.c:1419 plugins-root/check_icmp.c:1351 msgid "Usage:" msgstr "" #: plugins/check_cluster.c:230 #, c-format -msgid "Host/Service Cluster Plugin for Nagios 2" +msgid "Host/Service Cluster Plugin for Monitoring" msgstr "" #: plugins/check_cluster.c:236 plugins/check_nt.c:676 @@ -284,13 +284,14 @@ msgid "commas" msgstr "" #: plugins/check_cluster.c:257 plugins/check_game.c:318 -#: plugins/check_http.c:1542 plugins/check_ldap.c:438 plugins/check_mrtg.c:363 -#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:558 -#: plugins/check_nt.c:758 plugins/check_ntp.c:865 plugins/check_ntp_peer.c:696 -#: plugins/check_ntp_time.c:626 plugins/check_nwstat.c:1670 -#: plugins/check_overcr.c:456 plugins/check_snmp.c:1178 -#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:277 -#: plugins-root/check_icmp.c:1329 +#: plugins/check_http.c:1544 plugins/check_ldap.c:438 plugins/check_mrtg.c:363 +#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:552 +#: plugins/check_nt.c:758 plugins/check_ntp.c:876 plugins/check_ntp_peer.c:696 +#: plugins/check_ntp_time.c:628 plugins/check_nwstat.c:1670 +#: plugins/check_overcr.c:456 plugins/check_snmp.c:1180 +#: plugins/check_swap.c:558 plugins/check_ups.c:642 +#: plugins/check_ide_smart.c:606 plugins/negate.c:257 +#: plugins-root/check_icmp.c:1326 msgid "Notes:" msgstr "" @@ -303,307 +304,309 @@ msgstr "" msgid "state." msgstr "" -#: plugins/check_dig.c:100 plugins/check_dig.c:102 +#: plugins/check_dig.c:106 plugins/check_dig.c:108 #, c-format msgid "Looking for: '%s'\n" msgstr "" -#: plugins/check_dig.c:109 +#: plugins/check_dig.c:115 msgid "dig returned an error status" msgstr "" -#: plugins/check_dig.c:134 +#: plugins/check_dig.c:140 msgid "Server not found in ANSWER SECTION" msgstr "" -#: plugins/check_dig.c:144 +#: plugins/check_dig.c:150 msgid "No ANSWER SECTION found" msgstr "" -#: plugins/check_dig.c:171 +#: plugins/check_dig.c:177 msgid "Probably a non-existent host/domain" msgstr "" -#: plugins/check_dig.c:233 +#: plugins/check_dig.c:239 #, c-format msgid "Port must be a positive integer - %s" msgstr "" -#: plugins/check_dig.c:244 +#: plugins/check_dig.c:250 #, c-format msgid "Warning interval must be a positive integer - %s" msgstr "" -#: plugins/check_dig.c:252 +#: plugins/check_dig.c:258 #, c-format msgid "Critical interval must be a positive integer - %s" msgstr "" -#: plugins/check_dig.c:260 +#: plugins/check_dig.c:266 #, c-format msgid "Timeout interval must be a positive integer - %s" msgstr "" -#: plugins/check_dig.c:325 +#: plugins/check_dig.c:331 #, c-format msgid "This plugin test the DNS service on the specified host using dig" msgstr "" -#: plugins/check_dig.c:338 +#: plugins/check_dig.c:344 msgid "Force dig to only use IPv4 query transport" msgstr "" -#: plugins/check_dig.c:340 +#: plugins/check_dig.c:346 msgid "Force dig to only use IPv6 query transport" msgstr "" -#: plugins/check_dig.c:342 +#: plugins/check_dig.c:348 msgid "Machine name to lookup" msgstr "" -#: plugins/check_dig.c:344 +#: plugins/check_dig.c:350 msgid "Record type to lookup (default: A)" msgstr "" -#: plugins/check_dig.c:346 +#: plugins/check_dig.c:352 msgid "" "An address expected to be in the answer section. If not set, uses whatever" msgstr "" -#: plugins/check_dig.c:347 +#: plugins/check_dig.c:353 msgid "was in -l" msgstr "" -#: plugins/check_dig.c:349 +#: plugins/check_dig.c:355 msgid "Pass STRING as argument(s) to dig" msgstr "" -#: plugins/check_disk.c:216 +#: plugins/check_disk.c:225 #, c-format msgid "DISK %s: %s not found\n" msgstr "" -#: plugins/check_disk.c:216 plugins/check_disk.c:956 plugins/check_dns.c:241 +#: plugins/check_disk.c:225 plugins/check_disk.c:971 plugins/check_dns.c:241 #: plugins/check_dummy.c:74 plugins/check_mysql.c:299 #: plugins/check_nagios.c:104 plugins/check_nagios.c:168 #: plugins/check_nagios.c:172 plugins/check_pgsql.c:601 #: plugins/check_pgsql.c:618 plugins/check_pgsql.c:627 -#: plugins/check_pgsql.c:642 plugins/check_procs.c:343 +#: plugins/check_pgsql.c:642 plugins/check_procs.c:351 #, c-format msgid "CRITICAL" msgstr "" -#: plugins/check_disk.c:550 +#: plugins/check_disk.c:565 #, c-format msgid "unit type %s not known\n" msgstr "" -#: plugins/check_disk.c:553 +#: plugins/check_disk.c:568 #, c-format msgid "failed allocating storage for '%s'\n" msgstr "" -#: plugins/check_disk.c:577 plugins/check_disk.c:618 plugins/check_disk.c:626 -#: plugins/check_disk.c:633 plugins/check_disk.c:637 plugins/check_disk.c:677 -#: plugins/check_disk.c:683 plugins/check_disk.c:702 plugins/check_dummy.c:77 +#: plugins/check_disk.c:592 plugins/check_disk.c:633 plugins/check_disk.c:641 +#: plugins/check_disk.c:648 plugins/check_disk.c:652 plugins/check_disk.c:692 +#: plugins/check_disk.c:698 plugins/check_disk.c:717 plugins/check_dummy.c:77 #: plugins/check_dummy.c:80 plugins/check_pgsql.c:643 -#: plugins/check_procs.c:498 +#: plugins/check_procs.c:506 #, c-format msgid "UNKNOWN" msgstr "" -#: plugins/check_disk.c:577 +#: plugins/check_disk.c:592 msgid "Must set a threshold value before using -p\n" msgstr "" -#: plugins/check_disk.c:618 +#: plugins/check_disk.c:633 msgid "Must set -E before selecting paths\n" msgstr "" -#: plugins/check_disk.c:626 +#: plugins/check_disk.c:641 msgid "Must set group value before selecting paths\n" msgstr "" -#: plugins/check_disk.c:633 +#: plugins/check_disk.c:648 msgid "" "Paths need to be selected before using -i/-I. Use -A to select all paths " "explicitly" msgstr "" -#: plugins/check_disk.c:637 plugins/check_disk.c:683 plugins/check_procs.c:498 +#: plugins/check_disk.c:652 plugins/check_disk.c:698 plugins/check_procs.c:506 msgid "Could not compile regular expression" msgstr "" -#: plugins/check_disk.c:677 +#: plugins/check_disk.c:692 msgid "Must set a threshold value before using -r/-R\n" msgstr "" -#: plugins/check_disk.c:703 +#: plugins/check_disk.c:718 msgid "Regular expression did not match any path or disk" msgstr "" -#: plugins/check_disk.c:749 +#: plugins/check_disk.c:764 msgid "Unknown argument" msgstr "" -#: plugins/check_disk.c:783 +#: plugins/check_disk.c:798 #, c-format msgid " for %s\n" msgstr "" -#: plugins/check_disk.c:857 +#: plugins/check_disk.c:872 msgid "" "This plugin checks the amount of used disk space on a mounted file system" msgstr "" -#: plugins/check_disk.c:858 +#: plugins/check_disk.c:873 msgid "" "and generates an alert if free space is less than one of the threshold values" msgstr "" -#: plugins/check_disk.c:868 +#: plugins/check_disk.c:883 msgid "Exit with WARNING status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:870 +#: plugins/check_disk.c:885 msgid "Exit with WARNING status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:872 +#: plugins/check_disk.c:887 msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:874 +#: plugins/check_disk.c:889 msgid "Exit with CRITICAL status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:876 +#: plugins/check_disk.c:891 msgid "Exit with WARNING status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:878 +#: plugins/check_disk.c:893 msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:880 -msgid "Path or partition (may be repeated)" +#: plugins/check_disk.c:895 +msgid "" +"Mount point or block device as emitted by the mount(8) command (may be " +"repeated)" msgstr "" -#: plugins/check_disk.c:882 +#: plugins/check_disk.c:897 msgid "Ignore device (only works if -p unspecified)" msgstr "" -#: plugins/check_disk.c:884 +#: plugins/check_disk.c:899 msgid "Clear thresholds" msgstr "" -#: plugins/check_disk.c:886 +#: plugins/check_disk.c:901 msgid "For paths or partitions specified with -p, only check for exact paths" msgstr "" -#: plugins/check_disk.c:888 +#: plugins/check_disk.c:903 msgid "Display only devices/mountpoints with errors" msgstr "" -#: plugins/check_disk.c:890 +#: plugins/check_disk.c:905 msgid "Don't account root-reserved blocks into freespace in perfdata" msgstr "" -#: plugins/check_disk.c:892 +#: plugins/check_disk.c:907 msgid "" "Group paths. Thresholds apply to (free-)space of all partitions together" msgstr "" -#: plugins/check_disk.c:894 +#: plugins/check_disk.c:909 msgid "Same as '--units kB'" msgstr "" -#: plugins/check_disk.c:896 +#: plugins/check_disk.c:911 msgid "Only check local filesystems" msgstr "" -#: plugins/check_disk.c:898 +#: plugins/check_disk.c:913 msgid "" "Only check local filesystems against thresholds. Yet call stat on remote " "filesystems" msgstr "" -#: plugins/check_disk.c:899 +#: plugins/check_disk.c:914 msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)" msgstr "" -#: plugins/check_disk.c:901 +#: plugins/check_disk.c:916 msgid "Display the mountpoint instead of the partition" msgstr "" -#: plugins/check_disk.c:903 +#: plugins/check_disk.c:918 msgid "Same as '--units MB'" msgstr "" -#: plugins/check_disk.c:905 +#: plugins/check_disk.c:920 msgid "Explicitly select all paths. This is equivalent to -R '.*'" msgstr "" -#: plugins/check_disk.c:907 +#: plugins/check_disk.c:922 msgid "" "Case insensitive regular expression for path/partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:909 +#: plugins/check_disk.c:924 msgid "Regular expression for path or partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:911 +#: plugins/check_disk.c:926 msgid "" "Regular expression to ignore selected path/partition (case insensitive) (may " "be repeated)" msgstr "" -#: plugins/check_disk.c:913 +#: plugins/check_disk.c:928 msgid "" "Regular expression to ignore selected path or partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:916 +#: plugins/check_disk.c:931 msgid "Choose bytes, kB, MB, GB, TB (default: MB)" msgstr "" -#: plugins/check_disk.c:919 +#: plugins/check_disk.c:934 msgid "Ignore all filesystems of indicated type (may be repeated)" msgstr "" -#: plugins/check_disk.c:921 +#: plugins/check_disk.c:936 msgid "Check only filesystems of indicated type (may be repeated)" msgstr "" -#: plugins/check_disk.c:926 +#: plugins/check_disk.c:941 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" msgstr "" -#: plugins/check_disk.c:928 +#: plugins/check_disk.c:943 msgid "" "Checks all filesystems not matching -r at 100M and 50M. The fs matching the -" "r regex" msgstr "" -#: plugins/check_disk.c:929 +#: plugins/check_disk.c:944 msgid "" "are grouped which means the freespace thresholds are applied to all disks " "together" msgstr "" -#: plugins/check_disk.c:931 +#: plugins/check_disk.c:946 msgid "" "Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use " "100M/50M" msgstr "" -#: plugins/check_disk.c:957 +#: plugins/check_disk.c:972 #, c-format msgid "%s %s: %s\n" msgstr "" -#: plugins/check_disk.c:957 +#: plugins/check_disk.c:972 msgid "is not accessible" msgstr "" @@ -640,7 +643,7 @@ msgid "server %s is not authoritative for %s" msgstr "" #: plugins/check_dns.c:237 plugins/check_dummy.c:68 plugins/check_nagios.c:182 -#: plugins/check_pgsql.c:638 plugins/check_procs.c:336 +#: plugins/check_pgsql.c:638 plugins/check_procs.c:344 #, c-format msgid "OK" msgstr "" @@ -648,7 +651,7 @@ msgstr "" #: plugins/check_dns.c:239 plugins/check_dummy.c:71 plugins/check_mysql.c:296 #: plugins/check_nagios.c:182 plugins/check_pgsql.c:607 #: plugins/check_pgsql.c:612 plugins/check_pgsql.c:640 -#: plugins/check_procs.c:338 +#: plugins/check_procs.c:346 #, c-format msgid "WARNING" msgstr "" @@ -665,135 +668,135 @@ msgstr[1] "" msgid ". %s returns %s" msgstr "" -#: plugins/check_dns.c:248 +#: plugins/check_dns.c:264 #, c-format msgid "DNS WARNING - %s\n" msgstr "" -#: plugins/check_dns.c:249 plugins/check_dns.c:252 plugins/check_dns.c:255 +#: plugins/check_dns.c:265 plugins/check_dns.c:268 plugins/check_dns.c:271 msgid " Probably a non-existent host/domain" msgstr "" -#: plugins/check_dns.c:251 +#: plugins/check_dns.c:267 #, c-format msgid "DNS CRITICAL - %s\n" msgstr "" -#: plugins/check_dns.c:254 +#: plugins/check_dns.c:270 #, c-format msgid "DNS UNKNOWN - %s\n" msgstr "" -#: plugins/check_dns.c:267 +#: plugins/check_dns.c:283 msgid "Note: nslookup is deprecated and may be removed from future releases." msgstr "" -#: plugins/check_dns.c:268 +#: plugins/check_dns.c:284 msgid "Consider using the `dig' or `host' programs instead. Run nslookup with" msgstr "" -#: plugins/check_dns.c:269 +#: plugins/check_dns.c:285 msgid "the `-sil[ent]' option to prevent this message from appearing." msgstr "" -#: plugins/check_dns.c:274 -#, c-format -msgid "No response from DNS %s\n" -msgstr "" - -#: plugins/check_dns.c:278 -#, c-format -msgid "DNS %s has no records\n" -msgstr "" - -#: plugins/check_dns.c:286 -#, c-format -msgid "Connection to DNS %s was refused\n" -msgstr "" - #: plugins/check_dns.c:290 #, c-format -msgid "Query was refused by DNS server at %s\n" +msgid "No response from DNS %s\n" msgstr "" #: plugins/check_dns.c:294 #, c-format +msgid "DNS %s has no records\n" +msgstr "" + +#: plugins/check_dns.c:302 +#, c-format +msgid "Connection to DNS %s was refused\n" +msgstr "" + +#: plugins/check_dns.c:306 +#, c-format +msgid "Query was refused by DNS server at %s\n" +msgstr "" + +#: plugins/check_dns.c:310 +#, c-format msgid "No information returned by DNS server at %s\n" msgstr "" -#: plugins/check_dns.c:300 +#: plugins/check_dns.c:316 #, c-format msgid "Domain %s was not found by the server\n" msgstr "" -#: plugins/check_dns.c:304 +#: plugins/check_dns.c:320 msgid "Network is unreachable\n" msgstr "" -#: plugins/check_dns.c:308 +#: plugins/check_dns.c:324 #, c-format msgid "DNS failure for %s\n" msgstr "" -#: plugins/check_dns.c:372 plugins/check_dns.c:380 plugins/check_dns.c:387 -#: plugins/check_dns.c:392 plugins/check_dns.c:414 plugins/check_dns.c:422 +#: plugins/check_dns.c:388 plugins/check_dns.c:396 plugins/check_dns.c:403 +#: plugins/check_dns.c:408 plugins/check_dns.c:430 plugins/check_dns.c:438 #: plugins/check_game.c:211 plugins/check_game.c:219 msgid "Input buffer overflow\n" msgstr "" -#: plugins/check_dns.c:450 +#: plugins/check_dns.c:466 msgid "" "This plugin uses the nslookup program to obtain the IP address for the given " "host/domain query." msgstr "" -#: plugins/check_dns.c:451 +#: plugins/check_dns.c:467 msgid "An optional DNS server to use may be specified." msgstr "" -#: plugins/check_dns.c:452 +#: plugins/check_dns.c:468 msgid "" "If no DNS server is specified, the default server(s) specified in /etc/" "resolv.conf will be used." msgstr "" -#: plugins/check_dns.c:462 +#: plugins/check_dns.c:478 msgid "The name or address you want to query" msgstr "" -#: plugins/check_dns.c:464 +#: plugins/check_dns.c:480 msgid "Optional DNS server you want to use for the lookup" msgstr "" -#: plugins/check_dns.c:466 +#: plugins/check_dns.c:482 msgid "" "Optional IP-ADDRESS you expect the DNS server to return. HOST must end with" msgstr "" -#: plugins/check_dns.c:467 +#: plugins/check_dns.c:483 msgid "" "a dot (.). This option can be repeated multiple times (Returns OK if any" msgstr "" -#: plugins/check_dns.c:468 +#: plugins/check_dns.c:484 msgid "" "value match). If multiple addresses are returned at once, you have to match" msgstr "" -#: plugins/check_dns.c:469 +#: plugins/check_dns.c:485 msgid "" "the whole string of addresses separated with commas (sorted alphabetically)." msgstr "" -#: plugins/check_dns.c:471 +#: plugins/check_dns.c:487 msgid "Optionally expect the DNS server to be authoritative for the lookup" msgstr "" -#: plugins/check_dns.c:473 +#: plugins/check_dns.c:489 msgid "Return warning if elapsed time exceeds value. Default off" msgstr "" -#: plugins/check_dns.c:475 +#: plugins/check_dns.c:491 msgid "Return critical if elapsed time exceeds value. Default off" msgstr "" @@ -816,13 +819,13 @@ msgid "of the argument with optional text" msgstr "" #: plugins/check_fping.c:125 plugins/check_hpjd.c:128 plugins/check_ping.c:438 -#: plugins/check_swap.c:175 plugins/check_users.c:94 plugins/urlize.c:110 +#: plugins/check_swap.c:176 plugins/check_users.c:132 plugins/urlize.c:109 #, c-format msgid "Could not open pipe: %s\n" msgstr "" #: plugins/check_fping.c:131 plugins/check_hpjd.c:134 plugins/check_load.c:153 -#: plugins/check_swap.c:181 plugins/check_users.c:100 plugins/urlize.c:116 +#: plugins/check_swap.c:182 plugins/check_users.c:138 plugins/urlize.c:115 #, c-format msgid "Could not open stderr for %s\n" msgstr "" @@ -871,12 +874,12 @@ msgstr "" #: plugins/check_fping.c:326 plugins/check_fping.c:332 #: plugins/check_hpjd.c:338 plugins/check_hpjd.c:361 plugins/check_mysql.c:371 -#: plugins/check_mysql.c:455 plugins/check_ntp.c:709 -#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:496 +#: plugins/check_mysql.c:455 plugins/check_ntp.c:720 +#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:498 #: plugins/check_pgsql.c:335 plugins/check_ping.c:295 plugins/check_ping.c:418 -#: plugins/check_radius.c:264 plugins/check_real.c:314 -#: plugins/check_real.c:376 plugins/check_smtp.c:499 plugins/check_smtp.c:641 -#: plugins/check_ssh.c:157 plugins/check_time.c:240 plugins/check_time.c:315 +#: plugins/check_radius.c:271 plugins/check_real.c:315 +#: plugins/check_real.c:377 plugins/check_smtp.c:499 plugins/check_smtp.c:641 +#: plugins/check_ssh.c:162 plugins/check_time.c:240 plugins/check_time.c:315 #: plugins/check_ups.c:504 plugins/check_ups.c:573 msgid "Invalid hostname/address" msgstr "" @@ -901,9 +904,9 @@ msgstr "" msgid "Interval must be a positive integer" msgstr "" -#: plugins/check_fping.c:402 plugins/check_ntp.c:733 -#: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:523 -#: plugins/check_radius.c:314 plugins/check_time.c:319 +#: plugins/check_fping.c:402 plugins/check_ntp.c:744 +#: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:525 +#: plugins/check_radius.c:321 plugins/check_time.c:319 msgid "Hostname was not supplied" msgstr "" @@ -933,11 +936,11 @@ msgid "" "reducing system load)" msgstr "" -#: plugins/check_fping.c:474 plugins/check_ping.c:575 +#: plugins/check_fping.c:474 plugins/check_ping.c:582 msgid "warning threshold pair" msgstr "" -#: plugins/check_fping.c:476 plugins/check_ping.c:577 +#: plugins/check_fping.c:476 plugins/check_ping.c:584 msgid "critical threshold pair" msgstr "" @@ -1114,8 +1117,8 @@ msgid "file does not exist or is not readable" msgstr "" #: plugins/check_http.c:310 plugins/check_http.c:315 plugins/check_http.c:321 -#: plugins/check_smtp.c:600 plugins/check_tcp.c:576 plugins/check_tcp.c:580 -#: plugins/check_tcp.c:586 +#: plugins/check_smtp.c:600 plugins/check_tcp.c:580 plugins/check_tcp.c:584 +#: plugins/check_tcp.c:590 msgid "Invalid certificate expiration period" msgstr "" @@ -1125,7 +1128,7 @@ msgid "" "(SSLv3)" msgstr "" -#: plugins/check_http.c:354 plugins/check_tcp.c:599 +#: plugins/check_http.c:354 plugins/check_tcp.c:603 msgid "Invalid option - SSL is not available" msgstr "" @@ -1147,9 +1150,9 @@ msgstr "" msgid "Could Not Compile Regular Expression: %s" msgstr "" -#: plugins/check_http.c:464 plugins/check_ntp.c:722 -#: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:512 -#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:477 +#: plugins/check_http.c:464 plugins/check_ntp.c:733 +#: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:514 +#: plugins/check_smtp.c:621 plugins/check_ssh.c:151 plugins/check_tcp.c:481 msgid "IPv6 support not available" msgstr "" @@ -1293,332 +1296,332 @@ msgstr "" msgid "HTTP UNKNOWN - Could not allocate addr\n" msgstr "" -#: plugins/check_http.c:1248 plugins/check_http.c:1279 +#: plugins/check_http.c:1249 plugins/check_http.c:1280 msgid "HTTP UNKNOWN - Could not allocate URL\n" msgstr "" -#: plugins/check_http.c:1257 +#: plugins/check_http.c:1258 #, c-format msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1272 +#: plugins/check_http.c:1273 #, c-format msgid "HTTP UNKNOWN - Empty redirect location%s\n" msgstr "" -#: plugins/check_http.c:1322 +#: plugins/check_http.c:1323 #, c-format msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1332 +#: plugins/check_http.c:1333 #, c-format msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" msgstr "" -#: plugins/check_http.c:1340 +#: plugins/check_http.c:1341 #, c-format msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" msgstr "" -#: plugins/check_http.c:1361 +#: plugins/check_http.c:1362 #, c-format msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" msgstr "" -#: plugins/check_http.c:1366 +#: plugins/check_http.c:1367 #, c-format msgid "Redirection to %s://%s:%d%s\n" msgstr "" -#: plugins/check_http.c:1440 +#: plugins/check_http.c:1442 msgid "This plugin tests the HTTP service on the specified host. It can test" msgstr "" -#: plugins/check_http.c:1441 +#: plugins/check_http.c:1443 msgid "normal (http) and secure (https) servers, follow redirects, search for" msgstr "" -#: plugins/check_http.c:1442 +#: plugins/check_http.c:1444 msgid "strings and regular expressions, check connection times, and report on" msgstr "" -#: plugins/check_http.c:1443 +#: plugins/check_http.c:1445 msgid "certificate expiration times." msgstr "" -#: plugins/check_http.c:1449 +#: plugins/check_http.c:1451 #, c-format msgid "NOTE: One or both of -H and -I must be specified" msgstr "" -#: plugins/check_http.c:1457 +#: plugins/check_http.c:1459 msgid "Host name argument for servers using host headers (virtual host)" msgstr "" -#: plugins/check_http.c:1458 +#: plugins/check_http.c:1460 msgid "Append a port to include it in the header (eg: example.com:5000)" msgstr "" -#: plugins/check_http.c:1460 +#: plugins/check_http.c:1462 msgid "" "IP address or name (use numeric address if possible to bypass DNS lookup)." msgstr "" -#: plugins/check_http.c:1462 +#: plugins/check_http.c:1464 msgid "Port number (default: " msgstr "" -#: plugins/check_http.c:1469 +#: plugins/check_http.c:1471 msgid "" "Connect via SSL. Port defaults to 443. VERSION is optional, and prevents" msgstr "" -#: plugins/check_http.c:1470 +#: plugins/check_http.c:1472 msgid "auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)." msgstr "" -#: plugins/check_http.c:1472 +#: plugins/check_http.c:1474 msgid "Enable SSL/TLS hostname extension support (SNI)" msgstr "" -#: plugins/check_http.c:1474 +#: plugins/check_http.c:1476 msgid "" "Minimum number of days a certificate has to be valid. Port defaults to 443" msgstr "" -#: plugins/check_http.c:1475 +#: plugins/check_http.c:1477 msgid "(when this option is used the URL is not checked.)" msgstr "" -#: plugins/check_http.c:1477 +#: plugins/check_http.c:1479 msgid "Name of file that contains the client certificate (PEM format)" msgstr "" -#: plugins/check_http.c:1478 +#: plugins/check_http.c:1480 msgid "to be used in establishing the SSL session" msgstr "" -#: plugins/check_http.c:1480 +#: plugins/check_http.c:1482 msgid "Name of file containing the private key (PEM format)" msgstr "" -#: plugins/check_http.c:1481 +#: plugins/check_http.c:1483 msgid "matching the client certificate" msgstr "" -#: plugins/check_http.c:1485 +#: plugins/check_http.c:1487 msgid "Comma-delimited list of strings, at least one of them is expected in" msgstr "" -#: plugins/check_http.c:1486 +#: plugins/check_http.c:1488 msgid "the first (status) line of the server response (default: " msgstr "" -#: plugins/check_http.c:1488 +#: plugins/check_http.c:1490 msgid "" "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" msgstr "" -#: plugins/check_http.c:1490 +#: plugins/check_http.c:1492 msgid "String to expect in the response headers" msgstr "" -#: plugins/check_http.c:1492 +#: plugins/check_http.c:1494 msgid "String to expect in the content" msgstr "" -#: plugins/check_http.c:1494 +#: plugins/check_http.c:1496 msgid "URL to GET or POST (default: /)" msgstr "" -#: plugins/check_http.c:1496 +#: plugins/check_http.c:1498 msgid "URL encoded http POST data" msgstr "" -#: plugins/check_http.c:1498 +#: plugins/check_http.c:1500 msgid "Set HTTP method." msgstr "" -#: plugins/check_http.c:1500 +#: plugins/check_http.c:1502 msgid "Don't wait for document body: stop reading after headers." msgstr "" -#: plugins/check_http.c:1501 +#: plugins/check_http.c:1503 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" msgstr "" -#: plugins/check_http.c:1503 +#: plugins/check_http.c:1505 msgid "Warn if document is more than SECONDS old. the number can also be of" msgstr "" -#: plugins/check_http.c:1504 +#: plugins/check_http.c:1506 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." msgstr "" -#: plugins/check_http.c:1506 +#: plugins/check_http.c:1508 msgid "specify Content-Type header media type when POSTing\n" msgstr "" -#: plugins/check_http.c:1509 +#: plugins/check_http.c:1511 msgid "Allow regex to span newlines (must precede -r or -R)" msgstr "" -#: plugins/check_http.c:1511 +#: plugins/check_http.c:1513 msgid "Search page for regex STRING" msgstr "" -#: plugins/check_http.c:1513 +#: plugins/check_http.c:1515 msgid "Search page for case-insensitive regex STRING" msgstr "" -#: plugins/check_http.c:1515 +#: plugins/check_http.c:1517 msgid "Return CRITICAL if found, OK if not\n" msgstr "" -#: plugins/check_http.c:1518 +#: plugins/check_http.c:1520 msgid "Username:password on sites with basic authentication" msgstr "" -#: plugins/check_http.c:1520 +#: plugins/check_http.c:1522 msgid "Username:password on proxy-servers with basic authentication" msgstr "" -#: plugins/check_http.c:1522 +#: plugins/check_http.c:1524 msgid "String to be sent in http header as \"User Agent\"" msgstr "" -#: plugins/check_http.c:1524 +#: plugins/check_http.c:1526 msgid "" "Any other tags to be sent in http header. Use multiple times for additional " "headers" msgstr "" -#: plugins/check_http.c:1526 +#: plugins/check_http.c:1528 msgid "Print additional performance data" msgstr "" -#: plugins/check_http.c:1528 +#: plugins/check_http.c:1530 msgid "Wrap output in HTML link (obsoleted by urlize)" msgstr "" -#: plugins/check_http.c:1530 +#: plugins/check_http.c:1532 msgid "How to handle redirected pages. sticky is like follow but stick to the" msgstr "" -#: plugins/check_http.c:1531 +#: plugins/check_http.c:1533 msgid "specified IP address. stickyport also ensures port stays the same." msgstr "" -#: plugins/check_http.c:1533 +#: plugins/check_http.c:1535 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" msgstr "" -#: plugins/check_http.c:1543 +#: plugins/check_http.c:1545 msgid "This plugin will attempt to open an HTTP connection with the host." msgstr "" -#: plugins/check_http.c:1544 +#: plugins/check_http.c:1546 msgid "" "Successful connects return STATE_OK, refusals and timeouts return " "STATE_CRITICAL" msgstr "" -#: plugins/check_http.c:1545 +#: plugins/check_http.c:1547 msgid "" "other errors return STATE_UNKNOWN. Successful connects, but incorrect " "reponse" msgstr "" -#: plugins/check_http.c:1546 +#: plugins/check_http.c:1548 msgid "" "messages from the host result in STATE_WARNING return values. If you are" msgstr "" -#: plugins/check_http.c:1547 +#: plugins/check_http.c:1549 msgid "" "checking a virtual server that uses 'host headers' you must supply the FQDN" msgstr "" -#: plugins/check_http.c:1548 +#: plugins/check_http.c:1550 msgid "(fully qualified domain name) as the [host_name] argument." msgstr "" -#: plugins/check_http.c:1552 +#: plugins/check_http.c:1554 msgid "This plugin can also check whether an SSL enabled web server is able to" msgstr "" -#: plugins/check_http.c:1553 +#: plugins/check_http.c:1555 msgid "serve content (optionally within a specified time) or whether the X509 " msgstr "" -#: plugins/check_http.c:1554 +#: plugins/check_http.c:1556 msgid "certificate is still valid for the specified number of days." msgstr "" -#: plugins/check_http.c:1556 +#: plugins/check_http.c:1558 msgid "Please note that this plugin does not check if the presented server" msgstr "" -#: plugins/check_http.c:1557 +#: plugins/check_http.c:1559 msgid "certificate matches the hostname of the server, or if the certificate" msgstr "" -#: plugins/check_http.c:1558 +#: plugins/check_http.c:1560 msgid "has a valid chain of trust to one of the locally installed CAs." msgstr "" -#: plugins/check_http.c:1562 +#: plugins/check_http.c:1564 msgid "" "When the 'www.verisign.com' server returns its content within 5 seconds," msgstr "" -#: plugins/check_http.c:1563 +#: plugins/check_http.c:1565 msgid "" "a STATE_OK will be returned. When the server returns its content but exceeds" msgstr "" -#: plugins/check_http.c:1564 +#: plugins/check_http.c:1566 msgid "" "the 5-second threshold, a STATE_WARNING will be returned. When an error " "occurs," msgstr "" -#: plugins/check_http.c:1565 +#: plugins/check_http.c:1567 msgid "a STATE_CRITICAL will be returned." msgstr "" -#: plugins/check_http.c:1568 +#: plugins/check_http.c:1570 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 14 days," msgstr "" -#: plugins/check_http.c:1569 plugins/check_http.c:1575 +#: plugins/check_http.c:1571 plugins/check_http.c:1577 msgid "" "a STATE_OK is returned. When the certificate is still valid, but for less " "than" msgstr "" -#: plugins/check_http.c:1570 +#: plugins/check_http.c:1572 msgid "" "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" msgstr "" -#: plugins/check_http.c:1571 +#: plugins/check_http.c:1573 msgid "the certificate is expired." msgstr "" -#: plugins/check_http.c:1574 +#: plugins/check_http.c:1576 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 30 days," msgstr "" -#: plugins/check_http.c:1576 +#: plugins/check_http.c:1578 msgid "30 days, but more than 14 days, a STATE_WARNING is returned." msgstr "" -#: plugins/check_http.c:1577 +#: plugins/check_http.c:1579 msgid "" "A STATE_CRITICAL will be returned when certificate expires in less than 14 " "days" @@ -1944,7 +1947,7 @@ msgstr "" #: plugins/check_mrtg.c:359 msgid "" -"packets/sec, etc. I use MRTG in conjuction with the Novell NLM that allows" +"packets/sec, etc. I use MRTG in conjunction with the Novell NLM that allows" msgstr "" #: plugins/check_mrtg.c:360 @@ -2101,101 +2104,101 @@ msgstr "" msgid "Slave running: %s" msgstr "" -#: plugins/check_mysql.c:505 +#: plugins/check_mysql.c:499 msgid "This program tests connections to a MySQL server" msgstr "" -#: plugins/check_mysql.c:516 +#: plugins/check_mysql.c:510 msgid "Use the specified socket (has no effect if -H is used)" msgstr "" -#: plugins/check_mysql.c:519 +#: plugins/check_mysql.c:513 msgid "Check database with indicated name" msgstr "" -#: plugins/check_mysql.c:521 +#: plugins/check_mysql.c:515 msgid "Read from the specified client options file" msgstr "" -#: plugins/check_mysql.c:523 +#: plugins/check_mysql.c:517 msgid "Use a client options group" msgstr "" -#: plugins/check_mysql.c:525 +#: plugins/check_mysql.c:519 msgid "Connect using the indicated username" msgstr "" -#: plugins/check_mysql.c:527 +#: plugins/check_mysql.c:521 msgid "Use the indicated password to authenticate the connection" msgstr "" -#: plugins/check_mysql.c:528 +#: plugins/check_mysql.c:522 msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!" msgstr "" -#: plugins/check_mysql.c:529 +#: plugins/check_mysql.c:523 msgid "Your clear-text password could be visible as a process table entry" msgstr "" -#: plugins/check_mysql.c:531 +#: plugins/check_mysql.c:525 msgid "Check if the slave thread is running properly." msgstr "" -#: plugins/check_mysql.c:533 +#: plugins/check_mysql.c:527 msgid "Exit with WARNING status if slave server is more than INTEGER seconds" msgstr "" -#: plugins/check_mysql.c:534 plugins/check_mysql.c:537 +#: plugins/check_mysql.c:528 plugins/check_mysql.c:531 msgid "behind master" msgstr "" -#: plugins/check_mysql.c:536 +#: plugins/check_mysql.c:530 msgid "Exit with CRITICAL status if slave server is more then INTEGER seconds" msgstr "" -#: plugins/check_mysql.c:539 +#: plugins/check_mysql.c:533 msgid "Use ssl encryptation" msgstr "" -#: plugins/check_mysql.c:541 +#: plugins/check_mysql.c:535 msgid "Path to CA signing the cert" msgstr "" -#: plugins/check_mysql.c:543 +#: plugins/check_mysql.c:537 msgid "Path to SSL certificate" msgstr "" -#: plugins/check_mysql.c:545 +#: plugins/check_mysql.c:539 msgid "Path to private SSL key" msgstr "" -#: plugins/check_mysql.c:547 +#: plugins/check_mysql.c:541 msgid "Path to CA directory" msgstr "" -#: plugins/check_mysql.c:549 +#: plugins/check_mysql.c:543 msgid "List of valid SSL ciphers" msgstr "" -#: plugins/check_mysql.c:553 +#: plugins/check_mysql.c:547 msgid "" "There are no required arguments. By default, the local database is checked" msgstr "" -#: plugins/check_mysql.c:554 +#: plugins/check_mysql.c:548 msgid "" "using the default unix socket. You can force TCP on localhost by using an" msgstr "" -#: plugins/check_mysql.c:555 +#: plugins/check_mysql.c:549 msgid "IP address or FQDN ('localhost' will use the socket as well)." msgstr "" -#: plugins/check_mysql.c:559 +#: plugins/check_mysql.c:553 msgid "You must specify -p with an empty string to force an empty password," msgstr "" -#: plugins/check_mysql.c:560 +#: plugins/check_mysql.c:554 msgid "overriding any my.cnf settings." msgstr "" @@ -2216,7 +2219,7 @@ msgstr "" msgid "Cannot parse Nagios log file for valid time" msgstr "" -#: plugins/check_nagios.c:183 plugins/check_procs.c:348 +#: plugins/check_nagios.c:183 plugins/check_procs.c:356 #, c-format msgid "%d process" msgid_plural "%d processes" @@ -2314,7 +2317,7 @@ msgstr "" #: plugins/check_nt.c:206 #, c-format -msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)" +msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)|uptime=%lu" msgstr "" #: plugins/check_nt.c:220 @@ -2347,12 +2350,12 @@ msgstr "" #: plugins/check_nt.c:296 #, c-format msgid "" -"Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)" +"Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)" msgstr "" #: plugins/check_nt.c:299 #, c-format -msgid "'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f" +msgid "'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f" msgstr "" #: plugins/check_nt.c:335 plugins/check_nt.c:420 plugins/check_nt.c:450 @@ -2596,7 +2599,9 @@ msgid " to run Perfmon directly." msgstr "" #: plugins/check_nt.c:753 -msgid "It can also be used in scripts that automatically create Nagios service" +msgid "" +"It can also be used in scripts that automatically create the monitoring " +"service" msgstr "" #: plugins/check_nt.c:754 @@ -2633,76 +2638,87 @@ msgstr "" msgid "and on the client service it's connecting to." msgstr "" -#: plugins/check_ntp.c:807 plugins/check_ntp_peer.c:612 -#: plugins/check_ntp_time.c:571 +#: plugins/check_ntp.c:615 +#, c-format +msgid "Cannot read from socket: %s" +msgstr "" + +#: plugins/check_ntp.c:617 +#, c-format +msgid "" +"Invalid NTP response: %d bytes read does not equal %d plus %d data segment" +msgstr "" + +#: plugins/check_ntp.c:818 plugins/check_ntp_peer.c:612 +#: plugins/check_ntp_time.c:573 msgid "NTP CRITICAL:" msgstr "" -#: plugins/check_ntp.c:810 plugins/check_ntp_peer.c:615 -#: plugins/check_ntp_time.c:574 +#: plugins/check_ntp.c:821 plugins/check_ntp_peer.c:615 +#: plugins/check_ntp_time.c:576 msgid "NTP WARNING:" msgstr "" -#: plugins/check_ntp.c:813 plugins/check_ntp_peer.c:618 -#: plugins/check_ntp_time.c:577 +#: plugins/check_ntp.c:824 plugins/check_ntp_peer.c:618 +#: plugins/check_ntp_time.c:579 msgid "NTP OK:" msgstr "" -#: plugins/check_ntp.c:816 plugins/check_ntp_peer.c:621 -#: plugins/check_ntp_time.c:580 +#: plugins/check_ntp.c:827 plugins/check_ntp_peer.c:621 +#: plugins/check_ntp_time.c:582 msgid "NTP UNKNOWN:" msgstr "" -#: plugins/check_ntp.c:820 plugins/check_ntp_peer.c:630 -#: plugins/check_ntp_time.c:584 +#: plugins/check_ntp.c:831 plugins/check_ntp_peer.c:630 +#: plugins/check_ntp_time.c:586 msgid "Offset unknown" msgstr "" -#: plugins/check_ntp.c:823 plugins/check_ntp_peer.c:633 -#: plugins/check_ntp_time.c:587 +#: plugins/check_ntp.c:834 plugins/check_ntp_peer.c:633 +#: plugins/check_ntp_time.c:589 msgid "Offset" msgstr "" -#: plugins/check_ntp.c:844 plugins/check_ntp_peer.c:662 +#: plugins/check_ntp.c:855 plugins/check_ntp_peer.c:662 msgid "This plugin checks the selected ntp server" msgstr "" -#: plugins/check_ntp.c:854 plugins/check_ntp_peer.c:674 -#: plugins/check_ntp_time.c:614 +#: plugins/check_ntp.c:865 plugins/check_ntp_peer.c:674 +#: plugins/check_ntp_time.c:616 msgid "Offset to result in warning status (seconds)" msgstr "" -#: plugins/check_ntp.c:856 plugins/check_ntp_peer.c:676 -#: plugins/check_ntp_time.c:616 +#: plugins/check_ntp.c:867 plugins/check_ntp_peer.c:676 +#: plugins/check_ntp_time.c:618 msgid "Offset to result in critical status (seconds)" msgstr "" -#: plugins/check_ntp.c:858 plugins/check_ntp_peer.c:682 +#: plugins/check_ntp.c:869 plugins/check_ntp_peer.c:682 msgid "Warning threshold for jitter" msgstr "" -#: plugins/check_ntp.c:860 plugins/check_ntp_peer.c:684 +#: plugins/check_ntp.c:871 plugins/check_ntp_peer.c:684 msgid "Critical threshold for jitter" msgstr "" -#: plugins/check_ntp.c:870 +#: plugins/check_ntp.c:881 msgid "Normal offset check:" msgstr "" -#: plugins/check_ntp.c:873 plugins/check_ntp_peer.c:709 +#: plugins/check_ntp.c:884 plugins/check_ntp_peer.c:709 msgid "" "Check jitter too, avoiding critical notifications if jitter isn't available" msgstr "" -#: plugins/check_ntp.c:874 plugins/check_ntp_peer.c:710 +#: plugins/check_ntp.c:885 plugins/check_ntp_peer.c:710 msgid "(See Notes above for more details on thresholds formats):" msgstr "" -#: plugins/check_ntp.c:879 plugins/check_ntp.c:886 +#: plugins/check_ntp.c:890 plugins/check_ntp.c:897 msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or" msgstr "" -#: plugins/check_ntp.c:880 plugins/check_ntp.c:887 +#: plugins/check_ntp.c:891 plugins/check_ntp.c:898 msgid "check_ntp_time instead." msgstr "" @@ -2771,31 +2787,31 @@ msgstr "" msgid "Check only stratum:" msgstr "" -#: plugins/check_ntp_time.c:602 +#: plugins/check_ntp_time.c:604 msgid "This plugin checks the clock offset with the ntp server" msgstr "" -#: plugins/check_ntp_time.c:612 +#: plugins/check_ntp_time.c:614 msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found" msgstr "" -#: plugins/check_ntp_time.c:621 +#: plugins/check_ntp_time.c:623 msgid "This plugin checks the clock offset between the local host and a" msgstr "" -#: plugins/check_ntp_time.c:622 +#: plugins/check_ntp_time.c:624 msgid "remote NTP server. It is independent of any commandline programs or" msgstr "" -#: plugins/check_ntp_time.c:623 +#: plugins/check_ntp_time.c:625 msgid "external libraries." msgstr "" -#: plugins/check_ntp_time.c:627 +#: plugins/check_ntp_time.c:629 msgid "If you'd rather want to monitor an NTP server, please use" msgstr "" -#: plugins/check_ntp_time.c:628 +#: plugins/check_ntp_time.c:630 msgid "check_ntp_peer." msgstr "" @@ -3376,13 +3392,13 @@ msgid " %s - database %s (%f sec.)|%s\n" msgstr "" #: plugins/check_pgsql.c:317 plugins/check_time.c:277 plugins/check_time.c:289 -#: plugins/check_users.c:181 +#: plugins/check_users.c:219 msgid "Critical threshold must be a positive integer" msgstr "" #: plugins/check_pgsql.c:323 plugins/check_time.c:258 plugins/check_time.c:282 -#: plugins/check_users.c:187 plugins/check_users.c:197 -#: plugins/check_users.c:203 +#: plugins/check_users.c:225 plugins/check_users.c:235 +#: plugins/check_users.c:241 msgid "Warning threshold must be a positive integer" msgstr "" @@ -3405,7 +3421,7 @@ msgstr "" #: plugins/check_pgsql.c:517 #, c-format -msgid "(default: %s)" +msgid "(default: %s)\n" msgstr "" #: plugins/check_pgsql.c:519 @@ -3534,7 +3550,8 @@ msgstr "" #: plugins/check_pgsql.c:566 msgid "" -"Typically, the nagios user (unless the --logname option is used) should be" +"Typically, the monitoring user (unless the --logname option is used) should " +"be" msgstr "" #: plugins/check_pgsql.c:567 @@ -3661,296 +3678,296 @@ msgstr "" msgid "Cannot open stderr for %s\n" msgstr "" -#: plugins/check_ping.c:492 plugins/check_ping.c:494 +#: plugins/check_ping.c:499 plugins/check_ping.c:501 msgid "System call sent warnings to stderr " msgstr "" -#: plugins/check_ping.c:519 +#: plugins/check_ping.c:526 #, c-format msgid "CRITICAL - Network Unreachable (%s)\n" msgstr "" -#: plugins/check_ping.c:521 +#: plugins/check_ping.c:528 #, c-format msgid "CRITICAL - Host Unreachable (%s)\n" msgstr "" -#: plugins/check_ping.c:523 +#: plugins/check_ping.c:530 #, c-format msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n" msgstr "" -#: plugins/check_ping.c:525 +#: plugins/check_ping.c:532 #, c-format msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n" msgstr "" -#: plugins/check_ping.c:527 +#: plugins/check_ping.c:534 #, c-format msgid "CRITICAL - Network Prohibited (%s)\n" msgstr "" -#: plugins/check_ping.c:529 +#: plugins/check_ping.c:536 #, c-format msgid "CRITICAL - Host Prohibited (%s)\n" msgstr "" -#: plugins/check_ping.c:531 +#: plugins/check_ping.c:538 #, c-format msgid "CRITICAL - Packet Filtered (%s)\n" msgstr "" -#: plugins/check_ping.c:533 +#: plugins/check_ping.c:540 #, c-format msgid "CRITICAL - Host not found (%s)\n" msgstr "" -#: plugins/check_ping.c:535 +#: plugins/check_ping.c:542 #, c-format msgid "CRITICAL - Time to live exceeded (%s)\n" msgstr "" -#: plugins/check_ping.c:537 +#: plugins/check_ping.c:544 #, c-format msgid "CRITICAL - Destination Unreachable (%s)\n" msgstr "" -#: plugins/check_ping.c:544 +#: plugins/check_ping.c:551 msgid "Unable to realloc warn_text\n" msgstr "" -#: plugins/check_ping.c:561 +#: plugins/check_ping.c:568 #, c-format msgid "Use ping to check connection statistics for a remote host." msgstr "" -#: plugins/check_ping.c:573 +#: plugins/check_ping.c:580 msgid "host to ping" msgstr "" -#: plugins/check_ping.c:579 +#: plugins/check_ping.c:586 msgid "number of ICMP ECHO packets to send" msgstr "" -#: plugins/check_ping.c:580 +#: plugins/check_ping.c:587 #, c-format msgid "(Default: %d)\n" msgstr "" -#: plugins/check_ping.c:582 +#: plugins/check_ping.c:589 msgid "show HTML in the plugin output (obsoleted by urlize)" msgstr "" -#: plugins/check_ping.c:587 +#: plugins/check_ping.c:594 msgid "THRESHOLD is ,% where is the round trip average travel" msgstr "" -#: plugins/check_ping.c:588 +#: plugins/check_ping.c:595 msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the" msgstr "" -#: plugins/check_ping.c:589 +#: plugins/check_ping.c:596 msgid "percentage of packet loss to trigger an alarm state." msgstr "" -#: plugins/check_ping.c:592 +#: plugins/check_ping.c:599 msgid "" "This plugin uses the ping command to probe the specified host for packet loss" msgstr "" -#: plugins/check_ping.c:593 +#: plugins/check_ping.c:600 msgid "" "(percentage) and round trip average (milliseconds). It can produce HTML " "output" msgstr "" -#: plugins/check_ping.c:594 +#: plugins/check_ping.c:601 msgid "" "linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in" msgstr "" -#: plugins/check_ping.c:595 +#: plugins/check_ping.c:602 msgid "the contrib area of the downloads section at http://www.nagios.org/" msgstr "" -#: plugins/check_procs.c:191 +#: plugins/check_procs.c:193 #, c-format msgid "CMD: %s\n" msgstr "" -#: plugins/check_procs.c:196 +#: plugins/check_procs.c:198 msgid "System call sent warnings to stderr" msgstr "" -#: plugins/check_procs.c:318 +#: plugins/check_procs.c:326 #, c-format msgid "Not parseable: %s" msgstr "" -#: plugins/check_procs.c:323 +#: plugins/check_procs.c:331 #, c-format msgid "Unable to read output\n" msgstr "" -#: plugins/check_procs.c:340 +#: plugins/check_procs.c:348 #, c-format msgid "%d warn out of " msgstr "" -#: plugins/check_procs.c:345 +#: plugins/check_procs.c:353 #, c-format msgid "%d crit, %d warn out of " msgstr "" -#: plugins/check_procs.c:351 +#: plugins/check_procs.c:359 #, c-format msgid " with %s" msgstr "" -#: plugins/check_procs.c:445 +#: plugins/check_procs.c:453 msgid "Parent Process ID must be an integer!" msgstr "" -#: plugins/check_procs.c:451 plugins/check_procs.c:578 +#: plugins/check_procs.c:459 plugins/check_procs.c:586 #, c-format msgid "%s%sSTATE = %s" msgstr "" -#: plugins/check_procs.c:460 +#: plugins/check_procs.c:468 msgid "UID was not found" msgstr "" -#: plugins/check_procs.c:466 +#: plugins/check_procs.c:474 msgid "User name was not found" msgstr "" -#: plugins/check_procs.c:481 +#: plugins/check_procs.c:489 #, c-format msgid "%s%scommand name '%s'" msgstr "" -#: plugins/check_procs.c:516 +#: plugins/check_procs.c:524 msgid "RSS must be an integer!" msgstr "" -#: plugins/check_procs.c:523 +#: plugins/check_procs.c:531 msgid "VSZ must be an integer!" msgstr "" -#: plugins/check_procs.c:531 +#: plugins/check_procs.c:539 msgid "PCPU must be a float!" msgstr "" -#: plugins/check_procs.c:555 +#: plugins/check_procs.c:563 msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!" msgstr "" -#: plugins/check_procs.c:686 +#: plugins/check_procs.c:694 msgid "" "Checks all processes and generates WARNING or CRITICAL states if the " "specified" msgstr "" -#: plugins/check_procs.c:687 +#: plugins/check_procs.c:695 msgid "" "metric is outside the required threshold ranges. The metric defaults to " "number" msgstr "" -#: plugins/check_procs.c:688 +#: plugins/check_procs.c:696 msgid "" "of processes. Search filters can be applied to limit the processes to check." msgstr "" -#: plugins/check_procs.c:697 +#: plugins/check_procs.c:705 msgid "Generate warning state if metric is outside this range" msgstr "" -#: plugins/check_procs.c:699 +#: plugins/check_procs.c:707 msgid "Generate critical state if metric is outside this range" msgstr "" -#: plugins/check_procs.c:701 +#: plugins/check_procs.c:709 msgid "Check thresholds against metric. Valid types:" msgstr "" -#: plugins/check_procs.c:702 +#: plugins/check_procs.c:710 msgid "PROCS - number of processes (default)" msgstr "" -#: plugins/check_procs.c:703 +#: plugins/check_procs.c:711 msgid "VSZ - virtual memory size" msgstr "" -#: plugins/check_procs.c:704 +#: plugins/check_procs.c:712 msgid "RSS - resident set memory size" msgstr "" -#: plugins/check_procs.c:705 +#: plugins/check_procs.c:713 msgid "CPU - percentage CPU" msgstr "" -#: plugins/check_procs.c:708 +#: plugins/check_procs.c:716 msgid "ELAPSED - time elapsed in seconds" msgstr "" -#: plugins/check_procs.c:713 +#: plugins/check_procs.c:721 msgid "Extra information. Up to 3 verbosity levels" msgstr "" -#: plugins/check_procs.c:716 +#: plugins/check_procs.c:724 msgid "Filter own process the traditional way by PID instead of /proc/pid/exe" msgstr "" -#: plugins/check_procs.c:721 +#: plugins/check_procs.c:729 msgid "Only scan for processes that have, in the output of `ps`, one or" msgstr "" -#: plugins/check_procs.c:722 +#: plugins/check_procs.c:730 msgid "more of the status flags you specify (for example R, Z, S, RS," msgstr "" -#: plugins/check_procs.c:723 +#: plugins/check_procs.c:731 msgid "RSZDT, plus others based on the output of your 'ps' command)." msgstr "" -#: plugins/check_procs.c:725 +#: plugins/check_procs.c:733 msgid "Only scan for children of the parent process ID indicated." msgstr "" -#: plugins/check_procs.c:727 +#: plugins/check_procs.c:735 msgid "Only scan for processes with VSZ higher than indicated." msgstr "" -#: plugins/check_procs.c:729 +#: plugins/check_procs.c:737 msgid "Only scan for processes with RSS higher than indicated." msgstr "" -#: plugins/check_procs.c:731 +#: plugins/check_procs.c:739 msgid "Only scan for processes with PCPU higher than indicated." msgstr "" -#: plugins/check_procs.c:733 +#: plugins/check_procs.c:741 msgid "Only scan for processes with user name or ID indicated." msgstr "" -#: plugins/check_procs.c:735 +#: plugins/check_procs.c:743 msgid "Only scan for processes with args that contain STRING." msgstr "" -#: plugins/check_procs.c:737 +#: plugins/check_procs.c:745 msgid "Only scan for processes with args that contain the regex STRING." msgstr "" -#: plugins/check_procs.c:739 +#: plugins/check_procs.c:747 msgid "Only scan for exact matches of COMMAND (without path)." msgstr "" -#: plugins/check_procs.c:741 +#: plugins/check_procs.c:749 msgid "Only scan for non kernel threads (works on Linux only)." msgstr "" -#: plugins/check_procs.c:743 +#: plugins/check_procs.c:751 #, c-format msgid "" "\n" @@ -3960,7 +3977,7 @@ msgid "" "\n" msgstr "" -#: plugins/check_procs.c:748 +#: plugins/check_procs.c:756 #, c-format msgid "" "This plugin checks the number of currently running processes and\n" @@ -3971,163 +3988,164 @@ msgid "" "\n" msgstr "" -#: plugins/check_procs.c:757 +#: plugins/check_procs.c:765 msgid "Warning if not two processes with command name portsentry." msgstr "" -#: plugins/check_procs.c:758 +#: plugins/check_procs.c:766 msgid "Critical if < 2 or > 1024 processes" msgstr "" -#: plugins/check_procs.c:760 +#: plugins/check_procs.c:768 msgid "Warning alert if > 10 processes with command arguments containing" msgstr "" -#: plugins/check_procs.c:761 +#: plugins/check_procs.c:769 msgid "'/usr/local/bin/perl' and owned by root" msgstr "" -#: plugins/check_procs.c:763 +#: plugins/check_procs.c:771 msgid "Alert if VSZ of any processes over 50K or 100K" msgstr "" -#: plugins/check_procs.c:765 +#: plugins/check_procs.c:773 #, c-format msgid "Alert if CPU of any processes over 10%% or 20%%" msgstr "" -#: plugins/check_radius.c:165 -msgid "Config file error" +#: plugins/check_radius.c:172 +msgid "Config file error\n" msgstr "" -#: plugins/check_radius.c:174 -msgid "Out of Memory?" +#: plugins/check_radius.c:181 +msgid "Out of Memory?\n" msgstr "" -#: plugins/check_radius.c:178 -msgid "Invalid NAS-Identifier" +#: plugins/check_radius.c:185 +msgid "Invalid NAS-Identifier\n" msgstr "" -#: plugins/check_radius.c:183 plugins/check_radius.c:185 -#: plugins/check_radius.c:191 -msgid "Invalid NAS-IP-Address" +#: plugins/check_radius.c:190 plugins/check_radius.c:192 +#: plugins/check_radius.c:198 +msgid "Invalid NAS-IP-Address\n" msgstr "" -#: plugins/check_radius.c:188 -msgid "Can't find local IP for NAS-IP-Address" +#: plugins/check_radius.c:195 +msgid "Can't find local IP for NAS-IP-Address\n" msgstr "" -#: plugins/check_radius.c:202 -msgid "Timeout" +#: plugins/check_radius.c:209 +msgid "Timeout\n" msgstr "" -#: plugins/check_radius.c:204 -msgid "Auth Error" -msgstr "" - -#: plugins/check_radius.c:206 -msgid "Auth Failed" -msgstr "" - -#: plugins/check_radius.c:208 -msgid "Bad Response" -msgstr "" - -#: plugins/check_radius.c:212 -msgid "Auth OK" +#: plugins/check_radius.c:211 +msgid "Auth Error\n" msgstr "" #: plugins/check_radius.c:213 +msgid "Auth Failed\n" +msgstr "" + +#: plugins/check_radius.c:215 +msgid "Bad Response\n" +msgstr "" + +#: plugins/check_radius.c:219 +msgid "Auth OK\n" +msgstr "" + +#: plugins/check_radius.c:220 #, c-format msgid "Unexpected result code %d" msgstr "" -#: plugins/check_radius.c:302 +#: plugins/check_radius.c:309 msgid "Number of retries must be a positive integer" msgstr "" -#: plugins/check_radius.c:316 +#: plugins/check_radius.c:323 msgid "User not specified" msgstr "" -#: plugins/check_radius.c:318 +#: plugins/check_radius.c:325 msgid "Password not specified" msgstr "" -#: plugins/check_radius.c:320 +#: plugins/check_radius.c:327 msgid "Configuration file not specified" msgstr "" -#: plugins/check_radius.c:338 +#: plugins/check_radius.c:345 msgid "Tests to see if a RADIUS server is accepting connections." msgstr "" -#: plugins/check_radius.c:350 +#: plugins/check_radius.c:357 msgid "The user to authenticate" msgstr "" -#: plugins/check_radius.c:352 +#: plugins/check_radius.c:359 msgid "Password for autentication (SECURITY RISK)" msgstr "" -#: plugins/check_radius.c:354 +#: plugins/check_radius.c:361 msgid "NAS identifier" msgstr "" -#: plugins/check_radius.c:356 +#: plugins/check_radius.c:363 msgid "NAS IP Address" msgstr "" -#: plugins/check_radius.c:358 +#: plugins/check_radius.c:365 msgid "Configuration file" msgstr "" -#: plugins/check_radius.c:360 +#: plugins/check_radius.c:367 msgid "Response string to expect from the server" msgstr "" -#: plugins/check_radius.c:362 +#: plugins/check_radius.c:369 msgid "Number of times to retry a failed connection" msgstr "" -#: plugins/check_radius.c:367 +#: plugins/check_radius.c:374 msgid "" "This plugin tests a RADIUS server to see if it is accepting connections." msgstr "" -#: plugins/check_radius.c:368 +#: plugins/check_radius.c:375 msgid "" "The server to test must be specified in the invocation, as well as a user" msgstr "" -#: plugins/check_radius.c:369 +#: plugins/check_radius.c:376 msgid "" "name and password. A configuration file may also be present. The format of" msgstr "" -#: plugins/check_radius.c:370 +#: plugins/check_radius.c:377 msgid "" "the configuration file is described in the radiusclient library sources." msgstr "" -#: plugins/check_radius.c:371 +#: plugins/check_radius.c:378 msgid "The password option presents a substantial security issue because the" msgstr "" -#: plugins/check_radius.c:372 +#: plugins/check_radius.c:379 msgid "" "password can possibly be determined by careful watching of the command line" msgstr "" -#: plugins/check_radius.c:373 -msgid "in a process listing. This risk is exacerbated because nagios will" +#: plugins/check_radius.c:380 +msgid "in a process listing. This risk is exacerbated because the plugin will" msgstr "" -#: plugins/check_radius.c:374 -msgid "run the plugin at regular predictable intervals. Please be sure that" +#: plugins/check_radius.c:381 +msgid "" +"typically be executed at regular predictable intervals. Please be sure that" msgstr "" -#: plugins/check_radius.c:375 +#: plugins/check_radius.c:382 msgid "the password used does not allow access to sensitive system resources." msgstr "" @@ -4141,73 +4159,73 @@ msgstr "" msgid "No data received from %s\n" msgstr "" -#: plugins/check_real.c:118 plugins/check_real.c:191 +#: plugins/check_real.c:118 plugins/check_real.c:192 msgid "Invalid REAL response received from host" msgstr "" -#: plugins/check_real.c:120 plugins/check_real.c:193 +#: plugins/check_real.c:120 plugins/check_real.c:194 #, c-format msgid "Invalid REAL response received from host on port %d\n" msgstr "" -#: plugins/check_real.c:184 plugins/check_tcp.c:311 +#: plugins/check_real.c:185 plugins/check_tcp.c:310 #, c-format msgid "No data received from host\n" msgstr "" -#: plugins/check_real.c:247 +#: plugins/check_real.c:248 #, c-format msgid "REAL %s - %d second response time\n" msgstr "" -#: plugins/check_real.c:336 plugins/check_ups.c:536 +#: plugins/check_real.c:337 plugins/check_ups.c:536 msgid "Warning time must be a positive integer" msgstr "" -#: plugins/check_real.c:345 plugins/check_ups.c:527 +#: plugins/check_real.c:346 plugins/check_ups.c:527 msgid "Critical time must be a positive integer" msgstr "" -#: plugins/check_real.c:381 +#: plugins/check_real.c:382 msgid "You must provide a server to check" msgstr "" -#: plugins/check_real.c:413 +#: plugins/check_real.c:414 msgid "This plugin tests the REAL service on the specified host." msgstr "" -#: plugins/check_real.c:425 +#: plugins/check_real.c:426 msgid "Connect to this url" msgstr "" -#: plugins/check_real.c:427 +#: plugins/check_real.c:428 #, c-format msgid "String to expect in first line of server response (default: %s)\n" msgstr "" -#: plugins/check_real.c:437 +#: plugins/check_real.c:438 msgid "This plugin will attempt to open an RTSP connection with the host." msgstr "" -#: plugins/check_real.c:438 plugins/check_smtp.c:830 +#: plugins/check_real.c:439 plugins/check_smtp.c:830 msgid "Successul connects return STATE_OK, refusals and timeouts return" msgstr "" -#: plugins/check_real.c:439 -msgid "" -"STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful connects," -msgstr "" - #: plugins/check_real.c:440 msgid "" -"but incorrect reponse messages from the host result in STATE_WARNING return" +"STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful connects," msgstr "" #: plugins/check_real.c:441 +msgid "" +"but incorrect reponse messages from the host result in STATE_WARNING return" +msgstr "" + +#: plugins/check_real.c:442 msgid "values." msgstr "" -#: plugins/check_smtp.c:150 plugins/check_swap.c:265 plugins/check_swap.c:271 +#: plugins/check_smtp.c:150 plugins/check_swap.c:266 plugins/check_swap.c:272 #, c-format msgid "malloc() failed!\n" msgstr "" @@ -4385,7 +4403,7 @@ msgstr "" msgid "FQDN used for HELO" msgstr "" -#: plugins/check_smtp.c:809 plugins/check_tcp.c:665 +#: plugins/check_smtp.c:809 plugins/check_tcp.c:669 msgid "Minimum number of days a certificate has to be valid." msgstr "" @@ -4490,440 +4508,466 @@ msgstr "" msgid "No OIDs specified\n" msgstr "" -#: plugins/check_snmp.c:973 -msgid "Invalid seclevel" -msgstr "" - -#: plugins/check_snmp.c:980 plugins/check_snmp.c:983 plugins/check_snmp.c:1001 +#: plugins/check_snmp.c:967 plugins/check_snmp.c:985 plugins/check_snmp.c:1003 #, c-format msgid "Required parameter: %s\n" msgstr "" -#: plugins/check_snmp.c:1022 +#: plugins/check_snmp.c:978 +msgid "Invalid seclevel" +msgstr "" + +#: plugins/check_snmp.c:1024 msgid "Invalid SNMP version" msgstr "" -#: plugins/check_snmp.c:1039 +#: plugins/check_snmp.c:1041 msgid "Unbalanced quotes\n" msgstr "" -#: plugins/check_snmp.c:1088 +#: plugins/check_snmp.c:1090 msgid "Check status of remote machines and obtain system information via SNMP" msgstr "" -#: plugins/check_snmp.c:1101 +#: plugins/check_snmp.c:1103 msgid "Use SNMP GETNEXT instead of SNMP GET" msgstr "" -#: plugins/check_snmp.c:1103 +#: plugins/check_snmp.c:1105 msgid "SNMP protocol version" msgstr "" -#: plugins/check_snmp.c:1105 +#: plugins/check_snmp.c:1107 msgid "SNMPv3 securityLevel" msgstr "" -#: plugins/check_snmp.c:1107 +#: plugins/check_snmp.c:1109 msgid "SNMPv3 auth proto" msgstr "" -#: plugins/check_snmp.c:1109 +#: plugins/check_snmp.c:1111 msgid "SNMPv3 priv proto (default DES)" msgstr "" -#: plugins/check_snmp.c:1113 +#: plugins/check_snmp.c:1115 msgid "Optional community string for SNMP communication" msgstr "" -#: plugins/check_snmp.c:1114 +#: plugins/check_snmp.c:1116 msgid "default is" msgstr "" -#: plugins/check_snmp.c:1116 +#: plugins/check_snmp.c:1118 msgid "SNMPv3 username" msgstr "" -#: plugins/check_snmp.c:1118 +#: plugins/check_snmp.c:1120 msgid "SNMPv3 authentication password" msgstr "" -#: plugins/check_snmp.c:1120 +#: plugins/check_snmp.c:1122 msgid "SNMPv3 privacy password" msgstr "" -#: plugins/check_snmp.c:1124 +#: plugins/check_snmp.c:1126 msgid "Object identifier(s) or SNMP variables whose value you wish to query" msgstr "" -#: plugins/check_snmp.c:1126 +#: plugins/check_snmp.c:1128 msgid "" "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'" msgstr "" -#: plugins/check_snmp.c:1127 +#: plugins/check_snmp.c:1129 msgid "for symbolic OIDs.)" msgstr "" -#: plugins/check_snmp.c:1129 +#: plugins/check_snmp.c:1131 msgid "Delimiter to use when parsing returned data. Default is" msgstr "" -#: plugins/check_snmp.c:1130 +#: plugins/check_snmp.c:1132 msgid "Any data on the right hand side of the delimiter is considered" msgstr "" -#: plugins/check_snmp.c:1131 +#: plugins/check_snmp.c:1133 msgid "to be the data that should be used in the evaluation." msgstr "" -#: plugins/check_snmp.c:1135 +#: plugins/check_snmp.c:1137 msgid "Warning threshold range(s)" msgstr "" -#: plugins/check_snmp.c:1137 +#: plugins/check_snmp.c:1139 msgid "Critical threshold range(s)" msgstr "" -#: plugins/check_snmp.c:1139 +#: plugins/check_snmp.c:1141 msgid "Enable rate calculation. See 'Rate Calculation' below" msgstr "" -#: plugins/check_snmp.c:1141 +#: plugins/check_snmp.c:1143 msgid "" "Converts rate per second. For example, set to 60 to convert to per minute" msgstr "" -#: plugins/check_snmp.c:1143 +#: plugins/check_snmp.c:1145 msgid "Add/substract the specified OFFSET to numeric sensor data" msgstr "" -#: plugins/check_snmp.c:1147 -msgid "Return OK state (for that OID) if STRING is an exact match" -msgstr "" - #: plugins/check_snmp.c:1149 -msgid "" -"Return OK state (for that OID) if extended regular expression REGEX matches" +msgid "Return OK state (for that OID) if STRING is an exact match" msgstr "" #: plugins/check_snmp.c:1151 msgid "" -"Return OK state (for that OID) if case-insensitive extended REGEX matches" +"Return OK state (for that OID) if extended regular expression REGEX matches" msgstr "" #: plugins/check_snmp.c:1153 +msgid "" +"Return OK state (for that OID) if case-insensitive extended REGEX matches" +msgstr "" + +#: plugins/check_snmp.c:1155 msgid "Invert search result (CRITICAL if found)" msgstr "" -#: plugins/check_snmp.c:1157 +#: plugins/check_snmp.c:1159 msgid "Prefix label for output from plugin" msgstr "" -#: plugins/check_snmp.c:1159 +#: plugins/check_snmp.c:1161 msgid "Units label(s) for output data (e.g., 'sec.')." msgstr "" -#: plugins/check_snmp.c:1161 +#: plugins/check_snmp.c:1163 msgid "Separates output on multiple OID requests" msgstr "" -#: plugins/check_snmp.c:1165 +#: plugins/check_snmp.c:1167 msgid "Number of retries to be used in the requests" msgstr "" -#: plugins/check_snmp.c:1168 +#: plugins/check_snmp.c:1170 msgid "Label performance data with OIDs instead of --label's" msgstr "" -#: plugins/check_snmp.c:1173 +#: plugins/check_snmp.c:1175 msgid "" "This plugin uses the 'snmpget' command included with the NET-SNMP package." msgstr "" -#: plugins/check_snmp.c:1174 +#: plugins/check_snmp.c:1176 msgid "" "if you don't have the package installed, you will need to download it from" msgstr "" -#: plugins/check_snmp.c:1175 +#: plugins/check_snmp.c:1177 msgid "http://net-snmp.sourceforge.net before you can use this plugin." msgstr "" -#: plugins/check_snmp.c:1179 +#: plugins/check_snmp.c:1181 msgid "" "- Multiple OIDs (and labels) may be indicated by a comma or space-delimited " msgstr "" -#: plugins/check_snmp.c:1180 +#: plugins/check_snmp.c:1182 msgid "list (lists with internal spaces must be quoted)." msgstr "" -#: plugins/check_snmp.c:1184 +#: plugins/check_snmp.c:1186 msgid "" "- When checking multiple OIDs, separate ranges by commas like '-w " "1:10,1:,:20'" msgstr "" -#: plugins/check_snmp.c:1185 +#: plugins/check_snmp.c:1187 msgid "- Note that only one string and one regex may be checked at present" msgstr "" -#: plugins/check_snmp.c:1186 +#: plugins/check_snmp.c:1188 msgid "" "- All evaluation methods other than PR, STR, and SUBSTR expect that the value" msgstr "" -#: plugins/check_snmp.c:1187 +#: plugins/check_snmp.c:1189 msgid "returned from the SNMP query is an unsigned integer." msgstr "" -#: plugins/check_snmp.c:1190 +#: plugins/check_snmp.c:1192 msgid "Rate Calculation:" msgstr "" -#: plugins/check_snmp.c:1191 +#: plugins/check_snmp.c:1193 msgid "In many places, SNMP returns counters that are only meaningful when" msgstr "" -#: plugins/check_snmp.c:1192 +#: plugins/check_snmp.c:1194 msgid "calculating the counter difference since the last check. check_snmp" msgstr "" -#: plugins/check_snmp.c:1193 +#: plugins/check_snmp.c:1195 msgid "saves the last state information in a file so that the rate per second" msgstr "" -#: plugins/check_snmp.c:1194 +#: plugins/check_snmp.c:1196 msgid "can be calculated. Use the --rate option to save state information." msgstr "" -#: plugins/check_snmp.c:1195 +#: plugins/check_snmp.c:1197 msgid "" "On the first run, there will be no prior state - this will return with OK." msgstr "" -#: plugins/check_snmp.c:1196 +#: plugins/check_snmp.c:1198 msgid "The state is uniquely determined by the arguments to the plugin, so" msgstr "" -#: plugins/check_snmp.c:1197 +#: plugins/check_snmp.c:1199 msgid "changing the arguments will create a new state file." msgstr "" -#: plugins/check_ssh.c:165 +#: plugins/check_ssh.c:170 msgid "Port number must be a positive integer" msgstr "" -#: plugins/check_ssh.c:232 +#: plugins/check_ssh.c:237 #, c-format msgid "Server answer: %s" msgstr "" -#: plugins/check_ssh.c:251 +#: plugins/check_ssh.c:256 #, c-format msgid "SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n" msgstr "" -#: plugins/check_ssh.c:260 +#: plugins/check_ssh.c:264 +#, c-format +msgid "" +"SSH WARNING - %s (protocol %s) protocol version mismatch, expected '%s'\n" +msgstr "" + +#: plugins/check_ssh.c:273 #, c-format msgid "SSH OK - %s (protocol %s) | %s\n" msgstr "" -#: plugins/check_ssh.c:281 +#: plugins/check_ssh.c:294 msgid "Try to connect to an SSH server at specified server and port" msgstr "" -#: plugins/check_ssh.c:297 +#: plugins/check_ssh.c:310 msgid "" "Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)" msgstr "" -#: plugins/check_swap.c:169 +#: plugins/check_ssh.c:313 +msgid "Warn if protocol doesn't match expected protocol version (ex: 2.0)" +msgstr "" + +#: plugins/check_swap.c:170 #, c-format msgid "Command: %s\n" msgstr "" -#: plugins/check_swap.c:171 +#: plugins/check_swap.c:172 #, c-format msgid "Format: %s\n" msgstr "" -#: plugins/check_swap.c:207 +#: plugins/check_swap.c:208 #, c-format msgid "total=%.0f, used=%.0f, free=%.0f\n" msgstr "" -#: plugins/check_swap.c:221 +#: plugins/check_swap.c:222 #, c-format msgid "total=%.0f, free=%.0f\n" msgstr "" -#: plugins/check_swap.c:253 +#: plugins/check_swap.c:254 msgid "Error getting swap devices\n" msgstr "" -#: plugins/check_swap.c:256 +#: plugins/check_swap.c:257 msgid "SWAP OK: No swap devices defined\n" msgstr "" -#: plugins/check_swap.c:277 plugins/check_swap.c:319 +#: plugins/check_swap.c:278 plugins/check_swap.c:320 msgid "swapctl failed: " msgstr "" -#: plugins/check_swap.c:278 plugins/check_swap.c:320 +#: plugins/check_swap.c:279 plugins/check_swap.c:321 msgid "Error in swapctl call\n" msgstr "" -#: plugins/check_swap.c:357 +#: plugins/check_swap.c:358 #, c-format msgid "SWAP %s - %d%% free (%d MB out of %d MB) %s|" msgstr "" -#: plugins/check_swap.c:435 +#: plugins/check_swap.c:440 msgid "Warning threshold must be integer or percentage!" msgstr "" -#: plugins/check_swap.c:453 +#: plugins/check_swap.c:458 msgid "Critical threshold must be integer or percentage!" msgstr "" -#: plugins/check_swap.c:507 +#: plugins/check_swap.c:465 +msgid "" +"no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " +"or integer (0-3)." +msgstr "" + +#: plugins/check_swap.c:516 msgid "Warning percentage should be more than critical percentage" msgstr "" -#: plugins/check_swap.c:511 +#: plugins/check_swap.c:520 msgid "Warning free space should be more than critical free space" msgstr "" -#: plugins/check_swap.c:525 +#: plugins/check_swap.c:534 msgid "Check swap space on local machine." msgstr "" -#: plugins/check_swap.c:535 +#: plugins/check_swap.c:544 msgid "" "Exit with WARNING status if less than INTEGER bytes of swap space are free" msgstr "" -#: plugins/check_swap.c:537 +#: plugins/check_swap.c:546 msgid "Exit with WARNING status if less than PERCENT of swap space is free" msgstr "" -#: plugins/check_swap.c:539 +#: plugins/check_swap.c:548 msgid "" "Exit with CRITICAL status if less than INTEGER bytes of swap space are free" msgstr "" -#: plugins/check_swap.c:541 -msgid "Exit with CRITCAL status if less than PERCENT of swap space is free" +#: plugins/check_swap.c:550 +msgid "Exit with CRITICAL status if less than PERCENT of swap space is free" msgstr "" -#: plugins/check_swap.c:543 +#: plugins/check_swap.c:552 msgid "Conduct comparisons for all swap partitions, one by one" msgstr "" -#: plugins/check_swap.c:548 +#: plugins/check_swap.c:554 +msgid "" +"Resulting state when there is no swap regardless of thresholds. Default:" +msgstr "" + +#: plugins/check_swap.c:559 +msgid "" +"Both INTEGER and PERCENT thresholds can be specified, they are all checked." +msgstr "" + +#: plugins/check_swap.c:560 msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s." msgstr "" -#: plugins/check_tcp.c:206 +#: plugins/check_tcp.c:205 msgid "CRITICAL - Generic check_tcp called with unknown service\n" msgstr "" -#: plugins/check_tcp.c:230 +#: plugins/check_tcp.c:229 msgid "With UDP checks, a send/expect string must be specified." msgstr "" -#: plugins/check_tcp.c:431 +#: plugins/check_tcp.c:435 msgid "No arguments found" msgstr "" -#: plugins/check_tcp.c:534 +#: plugins/check_tcp.c:538 msgid "Maxbytes must be a positive integer" msgstr "" -#: plugins/check_tcp.c:552 +#: plugins/check_tcp.c:556 msgid "Refuse must be one of ok, warn, crit" msgstr "" -#: plugins/check_tcp.c:562 +#: plugins/check_tcp.c:566 msgid "Mismatch must be one of ok, warn, crit" msgstr "" -#: plugins/check_tcp.c:568 +#: plugins/check_tcp.c:572 msgid "Delay must be a positive integer" msgstr "" -#: plugins/check_tcp.c:613 +#: plugins/check_tcp.c:617 msgid "You must provide a server address" msgstr "" -#: plugins/check_tcp.c:615 +#: plugins/check_tcp.c:619 msgid "Invalid hostname, address or socket" msgstr "" -#: plugins/check_tcp.c:629 +#: plugins/check_tcp.c:633 #, c-format msgid "" "This plugin tests %s connections with the specified host (or unix socket).\n" "\n" msgstr "" -#: plugins/check_tcp.c:642 +#: plugins/check_tcp.c:646 msgid "" "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or " "quit option" msgstr "" -#: plugins/check_tcp.c:643 +#: plugins/check_tcp.c:647 msgid "Default: nothing added to send, \\r\\n added to end of quit" msgstr "" -#: plugins/check_tcp.c:645 +#: plugins/check_tcp.c:649 msgid "String to send to the server" msgstr "" -#: plugins/check_tcp.c:647 +#: plugins/check_tcp.c:651 msgid "String to expect in server response" msgstr "" -#: plugins/check_tcp.c:647 +#: plugins/check_tcp.c:651 msgid "(may be repeated)" msgstr "" -#: plugins/check_tcp.c:649 +#: plugins/check_tcp.c:653 msgid "All expect strings need to occur in server response. Default is any" msgstr "" -#: plugins/check_tcp.c:651 +#: plugins/check_tcp.c:655 msgid "String to send server to initiate a clean close of the connection" msgstr "" -#: plugins/check_tcp.c:653 +#: plugins/check_tcp.c:657 msgid "Accept TCP refusals with states ok, warn, crit (default: crit)" msgstr "" -#: plugins/check_tcp.c:655 +#: plugins/check_tcp.c:659 msgid "" "Accept expected string mismatches with states ok, warn, crit (default: warn)" msgstr "" -#: plugins/check_tcp.c:657 +#: plugins/check_tcp.c:661 msgid "Hide output from TCP socket" msgstr "" -#: plugins/check_tcp.c:659 +#: plugins/check_tcp.c:663 msgid "Close connection once more than this number of bytes are received" msgstr "" -#: plugins/check_tcp.c:661 +#: plugins/check_tcp.c:665 msgid "Seconds to wait between sending string and polling for response" msgstr "" -#: plugins/check_tcp.c:666 +#: plugins/check_tcp.c:670 msgid "1st is #days for warning, 2nd is critical (if not specified - 0)." msgstr "" -#: plugins/check_tcp.c:668 +#: plugins/check_tcp.c:672 msgid "Use SSL for the connection." msgstr "" @@ -5151,247 +5195,288 @@ msgstr "" msgid "http://www.networkupstools.org" msgstr "" -#: plugins/check_users.c:110 +#: plugins/check_users.c:93 +#, c-format +msgid "Could not enumerate RD sessions: %d\n" +msgstr "" + +#: plugins/check_users.c:148 #, c-format msgid "# users=%d" msgstr "" -#: plugins/check_users.c:133 +#: plugins/check_users.c:171 msgid "Unable to read output" msgstr "" -#: plugins/check_users.c:140 +#: plugins/check_users.c:178 #, c-format msgid "USERS %s - %d users currently logged in |%s\n" msgstr "" -#: plugins/check_users.c:219 +#: plugins/check_users.c:257 msgid "This plugin checks the number of users currently logged in on the local" msgstr "" -#: plugins/check_users.c:220 +#: plugins/check_users.c:258 msgid "" "system and generates an error if the number exceeds the thresholds specified." msgstr "" -#: plugins/check_users.c:230 +#: plugins/check_users.c:268 msgid "Set WARNING status if more than INTEGER users are logged in" msgstr "" -#: plugins/check_users.c:232 +#: plugins/check_users.c:270 msgid "Set CRITICAL status if more than INTEGER users are logged in" msgstr "" -#: plugins/check_ide_smart.c:256 +#: plugins/check_ide_smart.c:219 +msgid "" +"DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"." +msgstr "" + +#: plugins/check_ide_smart.c:220 +msgid "Nagios-compatible output is now always returned." +msgstr "" + +#: plugins/check_ide_smart.c:225 +msgid "SMART commands are broken and have been disabled (See Notes in --help)." +msgstr "" + +#: plugins/check_ide_smart.c:229 +msgid "" +"DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the" +msgstr "" + +#: plugins/check_ide_smart.c:230 +msgid "default and will be removed from future releases." +msgstr "" + +#: plugins/check_ide_smart.c:258 #, c-format msgid "CRITICAL - Couldn't open device %s: %s\n" msgstr "" -#: plugins/check_ide_smart.c:261 +#: plugins/check_ide_smart.c:263 #, c-format msgid "CRITICAL - SMART_CMD_ENABLE\n" msgstr "" -#: plugins/check_ide_smart.c:323 plugins/check_ide_smart.c:350 +#: plugins/check_ide_smart.c:304 plugins/check_ide_smart.c:331 #, c-format msgid "CRITICAL - SMART_READ_VALUES: %s\n" msgstr "" -#: plugins/check_ide_smart.c:421 +#: plugins/check_ide_smart.c:402 #, c-format msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n" msgstr "" -#: plugins/check_ide_smart.c:429 +#: plugins/check_ide_smart.c:410 #, c-format msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n" msgstr "" -#: plugins/check_ide_smart.c:437 +#: plugins/check_ide_smart.c:418 #, c-format msgid "OK - Operational (%d/%d tests passed)\n" msgstr "" -#: plugins/check_ide_smart.c:441 +#: plugins/check_ide_smart.c:422 #, c-format -msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n" +msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n" msgstr "" -#: plugins/check_ide_smart.c:474 +#: plugins/check_ide_smart.c:455 #, c-format msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n" msgstr "" -#: plugins/check_ide_smart.c:480 +#: plugins/check_ide_smart.c:461 #, c-format msgid "OffLineCapability=%d {%s %s %s}\n" msgstr "" -#: plugins/check_ide_smart.c:486 +#: plugins/check_ide_smart.c:467 #, c-format msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n" msgstr "" -#: plugins/check_ide_smart.c:508 plugins/check_ide_smart.c:532 +#: plugins/check_ide_smart.c:489 plugins/check_ide_smart.c:518 #, c-format msgid "CRITICAL - %s: %s\n" msgstr "" -#: plugins/check_ide_smart.c:553 plugins/check_ide_smart.c:580 +#: plugins/check_ide_smart.c:493 plugins/check_ide_smart.c:522 +#, c-format +msgid "OK - Command sent (%s)\n" +msgstr "" + +#: plugins/check_ide_smart.c:543 plugins/check_ide_smart.c:570 #, c-format msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n" msgstr "" -#: plugins/check_ide_smart.c:599 +#: plugins/check_ide_smart.c:589 #, c-format msgid "" "This plugin checks a local hard drive with the (Linux specific) SMART " "interface [http://smartlinux.sourceforge.net/smart/index.php]." msgstr "" -#: plugins/check_ide_smart.c:609 +#: plugins/check_ide_smart.c:599 msgid "Select device DEVICE" msgstr "" -#: plugins/check_ide_smart.c:610 +#: plugins/check_ide_smart.c:600 msgid "" -"Note: if the device is selected with this option, _no_ other options are " -"accepted" +"Note: if the device is specified without this option, any further option will" +msgstr "" + +#: plugins/check_ide_smart.c:601 +msgid "be ignored." +msgstr "" + +#: plugins/check_ide_smart.c:607 +msgid "" +"The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were" +msgstr "" + +#: plugins/check_ide_smart.c:608 +msgid "" +"broken in an underhand manner and have been disabled. You can use smartctl" +msgstr "" + +#: plugins/check_ide_smart.c:609 +msgid "instead:" +msgstr "" + +#: plugins/check_ide_smart.c:610 +msgid "-0/--auto-off: use \"smartctl --offlineauto=off\"" +msgstr "" + +#: plugins/check_ide_smart.c:611 +msgid "-1/--auto-on: use \"smartctl --offlineauto=on\"" msgstr "" #: plugins/check_ide_smart.c:612 -msgid "Perform immediately offline tests" +msgid "-i/--immediate: use \"smartctl --test=offline\"" msgstr "" -#: plugins/check_ide_smart.c:614 -msgid "Returns the number of failed tests" -msgstr "" - -#: plugins/check_ide_smart.c:616 -msgid "Turn on automatic offline tests" -msgstr "" - -#: plugins/check_ide_smart.c:618 -msgid "Turn off automatic offline tests" -msgstr "" - -#: plugins/check_ide_smart.c:620 -msgid "Output suitable for Nagios" -msgstr "" - -#: plugins/negate.c:99 +#: plugins/negate.c:98 msgid "No data returned from command\n" msgstr "" -#: plugins/negate.c:170 +#: plugins/negate.c:168 msgid "" "Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " "or integer (0-3)." msgstr "" -#: plugins/negate.c:174 +#: plugins/negate.c:172 msgid "" "Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer " "(0-3)." msgstr "" -#: plugins/negate.c:180 +#: plugins/negate.c:178 msgid "" "Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " "integer (0-3)." msgstr "" -#: plugins/negate.c:185 +#: plugins/negate.c:183 msgid "" "Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " "integer (0-3)." msgstr "" -#: plugins/negate.c:190 +#: plugins/negate.c:188 msgid "" "Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " "integer (0-3)." msgstr "" -#: plugins/negate.c:217 +#: plugins/negate.c:215 msgid "Require path to command" msgstr "" -#: plugins/negate.c:246 +#: plugins/negate.c:226 msgid "" "Negates the status of a plugin (returns OK for CRITICAL and vice-versa)." msgstr "" -#: plugins/negate.c:247 +#: plugins/negate.c:227 msgid "Additional switches can be used to control which state becomes what." msgstr "" -#: plugins/negate.c:256 +#: plugins/negate.c:236 msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status." msgstr "" -#: plugins/negate.c:258 +#: plugins/negate.c:238 msgid "Custom result on Negate timeouts; see below for STATUS definition\n" msgstr "" -#: plugins/negate.c:264 +#: plugins/negate.c:244 #, c-format msgid "" " STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n" msgstr "" -#: plugins/negate.c:265 +#: plugins/negate.c:245 #, c-format msgid "" " quotes. Numeric values are accepted. If nothing is specified, permutes\n" msgstr "" -#: plugins/negate.c:266 +#: plugins/negate.c:246 #, c-format msgid " OK and CRITICAL.\n" msgstr "" -#: plugins/negate.c:268 +#: plugins/negate.c:248 #, c-format msgid "" " Substitute output text as well. Will only substitute text in CAPITALS\n" msgstr "" -#: plugins/negate.c:273 +#: plugins/negate.c:253 msgid "Run check_ping and invert result. Must use full path to plugin" msgstr "" -#: plugins/negate.c:275 +#: plugins/negate.c:255 msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL" msgstr "" -#: plugins/negate.c:278 +#: plugins/negate.c:258 msgid "" "This plugin is a wrapper to take the output of another plugin and invert it." msgstr "" -#: plugins/negate.c:279 +#: plugins/negate.c:259 msgid "The full path of the plugin must be provided." msgstr "" -#: plugins/negate.c:280 +#: plugins/negate.c:260 msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL." msgstr "" -#: plugins/negate.c:281 +#: plugins/negate.c:261 msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK." msgstr "" -#: plugins/negate.c:282 +#: plugins/negate.c:262 msgid "Otherwise, the output state of the wrapped plugin is unchanged." msgstr "" -#: plugins/negate.c:284 +#: plugins/negate.c:264 msgid "" "Using timeout-result, it is possible to override the timeout behaviour or a" msgstr "" -#: plugins/negate.c:285 +#: plugins/negate.c:265 msgid "plugin by setting the negate timeout a bit lower." msgstr "" @@ -5425,7 +5510,7 @@ msgstr "" msgid "Receive failed" msgstr "" -#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1342 +#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1339 #, c-format msgid "Invalid hostname/address - %s" msgstr "" @@ -5455,55 +5540,56 @@ msgstr "" msgid "sysconf error for _SC_OPEN_MAX" msgstr "" -#: plugins/urlize.c:130 +#: plugins/urlize.c:129 #, c-format msgid "" "%s UNKNOWN - No data received from host\n" "CMD: %s\n" msgstr "" +#: plugins/urlize.c:168 +msgid "" +"This plugin wraps the text output of another command (plugin) in HTML " +msgstr "" + #: plugins/urlize.c:169 -msgid "This plugin wraps the text output of another command (plugin)" +msgid "" +"tags, thus displaying the child plugin's output as a clickable link in " +"compatible" msgstr "" #: plugins/urlize.c:170 msgid "" -"in HTML tags, thus displaying the child plugin's output as a clickable " -"link in" -msgstr "" - -#: plugins/urlize.c:171 -msgid "" -"the Nagios status screen. This plugin returns the status of the invoked " +"monitoring status screen. This plugin returns the status of the invoked " "plugin." msgstr "" -#: plugins/urlize.c:181 +#: plugins/urlize.c:180 msgid "" "Pay close attention to quoting to ensure that the shell passes the expected" msgstr "" -#: plugins/urlize.c:182 +#: plugins/urlize.c:181 msgid "data to the plugin. For example, in:" msgstr "" -#: plugins/urlize.c:183 +#: plugins/urlize.c:182 msgid "urlize http://example.com/ check_http -H example.com -r 'two words'" msgstr "" -#: plugins/urlize.c:184 +#: plugins/urlize.c:183 msgid "the shell will remove the single quotes and urlize will see:" msgstr "" -#: plugins/urlize.c:185 +#: plugins/urlize.c:184 msgid "urlize http://example.com/ check_http -H example.com -r two words" msgstr "" -#: plugins/urlize.c:186 +#: plugins/urlize.c:185 msgid "You probably want:" msgstr "" -#: plugins/urlize.c:187 +#: plugins/urlize.c:186 msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" msgstr "" @@ -5561,10 +5647,11 @@ msgstr "" #: plugins/utils.h:160 msgid "" " -v, --verbose\n" -" Show details for command-line debugging (Nagios may truncate output)\n" +" Show details for command-line debugging (output may be truncated by\n" +" the monitoring system)\n" msgstr "" -#: plugins/utils.h:164 +#: plugins/utils.h:165 msgid "" " -w, --warning=DOUBLE\n" " Response time to result in warning status (seconds)\n" @@ -5572,7 +5659,7 @@ msgid "" " Response time to result in critical status (seconds)\n" msgstr "" -#: plugins/utils.h:170 +#: plugins/utils.h:171 msgid "" " -w, --warning=RANGE\n" " Warning range (format: start:end). Alert if outside this range\n" @@ -5580,7 +5667,7 @@ msgid "" " Critical range\n" msgstr "" -#: plugins/utils.h:176 +#: plugins/utils.h:177 #, c-format msgid "" " -t, --timeout=INTEGER\n" @@ -5588,429 +5675,437 @@ msgid "" msgstr "" #: plugins/utils.h:181 +#, c-format +msgid "" +" -t, --timeout=INTEGER\n" +" Seconds before plugin times out (default: %d)\n" +msgstr "" + +#: plugins/utils.h:186 msgid "" " --extra-opts=[section][@file]\n" -" Read options from an ini file. See http://nagiosplugins.org/extra-opts\n" +" Read options from an ini file. See\n" +" https://www.monitoring-plugins.org/doc/extra-opts.html\n" " for usage and examples.\n" msgstr "" -#: plugins/utils.h:189 +#: plugins/utils.h:195 msgid "" " See:\n" -" http://nagiosplug.sourceforge.net/developer-guidelines." -"html#THRESHOLDFORMAT\n" +" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" " for THRESHOLD format and examples.\n" msgstr "" -#: plugins/utils.h:194 +#: plugins/utils.h:200 msgid "" "\n" -"Send email to nagios-users@lists.sourceforge.net if you have questions\n" -"regarding use of this software. To submit patches or suggest improvements,\n" -"send email to nagiosplug-devel@lists.sourceforge.net\n" +"Send email to help@monitoring-plugins.org if you have questions regarding\n" +"use of this software. To submit patches or suggest improvements, send email\n" +"to devel@monitoring-plugins.org\n" "\n" msgstr "" -#: plugins/utils.h:199 +#: plugins/utils.h:205 msgid "" "\n" -"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n" +"The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may " +"redistribute\n" "copies of the plugins under the terms of the GNU General Public License.\n" "For more information about these matters, see the file named COPYING.\n" msgstr "" -#: plugins-root/check_dhcp.c:320 +#: plugins-root/check_dhcp.c:317 #, c-format msgid "Error: Could not get hardware address of interface '%s'\n" msgstr "" -#: plugins-root/check_dhcp.c:342 +#: plugins-root/check_dhcp.c:339 #, c-format msgid "Error: if_nametoindex error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:347 +#: plugins-root/check_dhcp.c:344 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:352 +#: plugins-root/check_dhcp.c:349 #, c-format msgid "" "Error: Couldn't get hardware address from interface %s. malloc error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:357 +#: plugins-root/check_dhcp.c:354 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:388 +#: plugins-root/check_dhcp.c:385 #, c-format msgid "" "Error: can't find unit number in interface_name (%s) - expecting TypeNumber " "eg lnc0.\n" msgstr "" -#: plugins-root/check_dhcp.c:393 plugins-root/check_dhcp.c:405 +#: plugins-root/check_dhcp.c:390 plugins-root/check_dhcp.c:402 #, c-format msgid "" "Error: can't read MAC address from DLPI streams interface for device %s unit " "%d.\n" msgstr "" -#: plugins-root/check_dhcp.c:411 +#: plugins-root/check_dhcp.c:408 #, c-format msgid "" "Error: can't get MAC address for this architecture. Use the --mac option.\n" msgstr "" -#: plugins-root/check_dhcp.c:430 +#: plugins-root/check_dhcp.c:427 #, c-format msgid "Error: Cannot determine IP address of interface %s\n" msgstr "" -#: plugins-root/check_dhcp.c:438 +#: plugins-root/check_dhcp.c:435 #, c-format msgid "Error: Cannot get interface IP address on this platform.\n" msgstr "" -#: plugins-root/check_dhcp.c:443 +#: plugins-root/check_dhcp.c:440 #, c-format msgid "Pretending to be relay client %s\n" msgstr "" -#: plugins-root/check_dhcp.c:528 +#: plugins-root/check_dhcp.c:525 #, c-format msgid "DHCPDISCOVER to %s port %d\n" msgstr "" -#: plugins-root/check_dhcp.c:580 +#: plugins-root/check_dhcp.c:577 #, c-format msgid "Result=ERROR\n" msgstr "" -#: plugins-root/check_dhcp.c:586 +#: plugins-root/check_dhcp.c:583 #, c-format msgid "Result=OK\n" msgstr "" -#: plugins-root/check_dhcp.c:596 +#: plugins-root/check_dhcp.c:593 #, c-format msgid "DHCPOFFER from IP address %s" msgstr "" -#: plugins-root/check_dhcp.c:597 +#: plugins-root/check_dhcp.c:594 #, c-format msgid " via %s\n" msgstr "" -#: plugins-root/check_dhcp.c:604 +#: plugins-root/check_dhcp.c:601 #, c-format msgid "" "DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n" msgstr "" -#: plugins-root/check_dhcp.c:626 +#: plugins-root/check_dhcp.c:623 #, c-format msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n" msgstr "" -#: plugins-root/check_dhcp.c:644 +#: plugins-root/check_dhcp.c:641 #, c-format msgid "Total responses seen on the wire: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:645 +#: plugins-root/check_dhcp.c:642 #, c-format msgid "Valid responses for this machine: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:660 +#: plugins-root/check_dhcp.c:657 #, c-format msgid "send_dhcp_packet result: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:693 +#: plugins-root/check_dhcp.c:690 #, c-format msgid "No (more) data received (nfound: %d)\n" msgstr "" -#: plugins-root/check_dhcp.c:712 +#: plugins-root/check_dhcp.c:709 #, c-format msgid "recvfrom() failed, " msgstr "" -#: plugins-root/check_dhcp.c:719 +#: plugins-root/check_dhcp.c:716 #, c-format msgid "receive_dhcp_packet() result: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:720 +#: plugins-root/check_dhcp.c:717 #, c-format msgid "receive_dhcp_packet() source: %s\n" msgstr "" -#: plugins-root/check_dhcp.c:750 +#: plugins-root/check_dhcp.c:747 #, c-format msgid "Error: Could not create socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:760 +#: plugins-root/check_dhcp.c:757 #, c-format msgid "Error: Could not set reuse address option on DHCP socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:766 +#: plugins-root/check_dhcp.c:763 #, c-format msgid "Error: Could not set broadcast option on DHCP socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:775 +#: plugins-root/check_dhcp.c:772 #, c-format msgid "" "Error: Could not bind socket to interface %s. Check your privileges...\n" msgstr "" -#: plugins-root/check_dhcp.c:786 +#: plugins-root/check_dhcp.c:783 #, c-format msgid "" "Error: Could not bind to DHCP socket (port %d)! Check your privileges...\n" msgstr "" -#: plugins-root/check_dhcp.c:820 +#: plugins-root/check_dhcp.c:817 #, c-format msgid "Requested server address: %s\n" msgstr "" -#: plugins-root/check_dhcp.c:882 +#: plugins-root/check_dhcp.c:879 #, c-format msgid "Lease Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:884 +#: plugins-root/check_dhcp.c:881 #, c-format msgid "Lease Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:886 +#: plugins-root/check_dhcp.c:883 #, c-format msgid "Renewal Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:888 +#: plugins-root/check_dhcp.c:885 #, c-format msgid "Renewal Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:890 +#: plugins-root/check_dhcp.c:887 #, c-format msgid "Rebinding Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:891 +#: plugins-root/check_dhcp.c:888 #, c-format msgid "Rebinding Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:919 +#: plugins-root/check_dhcp.c:916 #, c-format msgid "Added offer from server @ %s" msgstr "" -#: plugins-root/check_dhcp.c:920 +#: plugins-root/check_dhcp.c:917 #, c-format msgid " of IP address %s\n" msgstr "" -#: plugins-root/check_dhcp.c:987 +#: plugins-root/check_dhcp.c:984 #, c-format msgid "DHCP Server Match: Offerer=%s" msgstr "" -#: plugins-root/check_dhcp.c:988 +#: plugins-root/check_dhcp.c:985 #, c-format msgid " Requested=%s" msgstr "" -#: plugins-root/check_dhcp.c:990 +#: plugins-root/check_dhcp.c:987 #, c-format msgid " (duplicate)" msgstr "" -#: plugins-root/check_dhcp.c:991 +#: plugins-root/check_dhcp.c:988 #, c-format msgid "\n" msgstr "" -#: plugins-root/check_dhcp.c:1039 +#: plugins-root/check_dhcp.c:1036 #, c-format msgid "No DHCPOFFERs were received.\n" msgstr "" -#: plugins-root/check_dhcp.c:1043 +#: plugins-root/check_dhcp.c:1040 #, c-format msgid "Received %d DHCPOFFER(s)" msgstr "" -#: plugins-root/check_dhcp.c:1046 +#: plugins-root/check_dhcp.c:1043 #, c-format msgid ", %s%d of %d requested servers responded" msgstr "" -#: plugins-root/check_dhcp.c:1049 +#: plugins-root/check_dhcp.c:1046 #, c-format msgid ", requested address (%s) was %soffered" msgstr "" -#: plugins-root/check_dhcp.c:1049 +#: plugins-root/check_dhcp.c:1046 msgid "not " msgstr "" -#: plugins-root/check_dhcp.c:1051 +#: plugins-root/check_dhcp.c:1048 #, c-format msgid ", max lease time = " msgstr "" -#: plugins-root/check_dhcp.c:1053 +#: plugins-root/check_dhcp.c:1050 #, c-format msgid "Infinity" msgstr "" -#: plugins-root/check_dhcp.c:1234 +#: plugins-root/check_dhcp.c:1231 #, c-format msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1246 +#: plugins-root/check_dhcp.c:1243 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1259 +#: plugins-root/check_dhcp.c:1256 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n" msgstr "" -#: plugins-root/check_dhcp.c:1271 +#: plugins-root/check_dhcp.c:1268 #, c-format msgid "" "Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1295 +#: plugins-root/check_dhcp.c:1292 #, c-format msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1374 +#: plugins-root/check_dhcp.c:1371 #, c-format msgid "Hardware address: " msgstr "" -#: plugins-root/check_dhcp.c:1390 +#: plugins-root/check_dhcp.c:1387 msgid "This plugin tests the availability of DHCP servers on a network." msgstr "" -#: plugins-root/check_dhcp.c:1402 +#: plugins-root/check_dhcp.c:1399 msgid "IP address of DHCP server that we must hear from" msgstr "" -#: plugins-root/check_dhcp.c:1404 +#: plugins-root/check_dhcp.c:1401 msgid "IP address that should be offered by at least one DHCP server" msgstr "" -#: plugins-root/check_dhcp.c:1406 +#: plugins-root/check_dhcp.c:1403 msgid "Seconds to wait for DHCPOFFER before timeout occurs" msgstr "" -#: plugins-root/check_dhcp.c:1408 +#: plugins-root/check_dhcp.c:1405 msgid "Interface to to use for listening (i.e. eth0)" msgstr "" -#: plugins-root/check_dhcp.c:1410 +#: plugins-root/check_dhcp.c:1407 msgid "MAC address to use in the DHCP request" msgstr "" -#: plugins-root/check_dhcp.c:1412 +#: plugins-root/check_dhcp.c:1409 msgid "Unicast testing: mimic a DHCP relay, requires -s" msgstr "" -#: plugins-root/check_icmp.c:1295 +#: plugins-root/check_icmp.c:1292 msgid "specify a target" msgstr "" -#: plugins-root/check_icmp.c:1297 +#: plugins-root/check_icmp.c:1294 msgid "warning threshold (currently " msgstr "" -#: plugins-root/check_icmp.c:1300 +#: plugins-root/check_icmp.c:1297 msgid "critical threshold (currently " msgstr "" -#: plugins-root/check_icmp.c:1303 +#: plugins-root/check_icmp.c:1300 msgid "specify a source IP address or device name" msgstr "" -#: plugins-root/check_icmp.c:1305 +#: plugins-root/check_icmp.c:1302 msgid "number of packets to send (currently " msgstr "" -#: plugins-root/check_icmp.c:1308 +#: plugins-root/check_icmp.c:1305 msgid "max packet interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1311 +#: plugins-root/check_icmp.c:1308 msgid "max target interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1314 +#: plugins-root/check_icmp.c:1311 msgid "number of alive hosts required for success" msgstr "" -#: plugins-root/check_icmp.c:1317 +#: plugins-root/check_icmp.c:1314 msgid "TTL on outgoing packets (currently " msgstr "" -#: plugins-root/check_icmp.c:1320 +#: plugins-root/check_icmp.c:1317 msgid "timeout value (seconds, currently " msgstr "" -#: plugins-root/check_icmp.c:1323 +#: plugins-root/check_icmp.c:1320 msgid "Number of icmp data bytes to send" msgstr "" -#: plugins-root/check_icmp.c:1324 +#: plugins-root/check_icmp.c:1321 msgid "Packet size will be data bytes + icmp header (currently" msgstr "" -#: plugins-root/check_icmp.c:1326 +#: plugins-root/check_icmp.c:1323 msgid "verbose" msgstr "" -#: plugins-root/check_icmp.c:1330 +#: plugins-root/check_icmp.c:1327 msgid "The -H switch is optional. Naming a host (or several) to check is not." msgstr "" -#: plugins-root/check_icmp.c:1332 +#: plugins-root/check_icmp.c:1329 msgid "" "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" msgstr "" -#: plugins-root/check_icmp.c:1333 +#: plugins-root/check_icmp.c:1330 msgid "packet loss. The default values should work well for most users." msgstr "" -#: plugins-root/check_icmp.c:1334 +#: plugins-root/check_icmp.c:1331 msgid "" "You can specify different RTA factors using the standardized abbreviations" msgstr "" -#: plugins-root/check_icmp.c:1335 +#: plugins-root/check_icmp.c:1332 msgid "" "us (microseconds), ms (milliseconds, default) or just plain s for seconds." msgstr "" -#: plugins-root/check_icmp.c:1341 +#: plugins-root/check_icmp.c:1338 msgid "The -v switch can be specified several times for increased verbosity." msgstr "" diff --git a/release b/release index c239c60..cd5ac03 100644 --- a/release +++ b/release @@ -1 +1 @@ -1.5 +2.0 diff --git a/tap/Makefile.in b/tap/Makefile.in index a2b9dfd..be90dc4 100644 --- a/tap/Makefile.in +++ b/tap/Makefile.in @@ -83,6 +83,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/gnulib-common.m4 \ $(top_srcdir)/gl/m4/gnulib-comp.m4 \ $(top_srcdir)/gl/m4/hostent.m4 $(top_srcdir)/gl/m4/iconv.m4 \ + $(top_srcdir)/gl/m4/idpriv.m4 \ $(top_srcdir)/gl/m4/include_next.m4 \ $(top_srcdir)/gl/m4/inet_ntop.m4 \ $(top_srcdir)/gl/m4/intlmacosx.m4 \ @@ -132,11 +133,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdbool.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ - $(top_srcdir)/gl/m4/stdlib_h.m4 \ + $(top_srcdir)/gl/m4/stdlib_h.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ - $(top_srcdir)/gl/m4/string_h.m4 $(top_srcdir)/gl/m4/strndup.m4 \ - $(top_srcdir)/gl/m4/strnlen.m4 $(top_srcdir)/gl/m4/strsep.m4 \ - $(top_srcdir)/gl/m4/strstr.m4 \ + $(top_srcdir)/gl/m4/string_h.m4 \ + $(top_srcdir)/gl/m4/strings_h.m4 \ + $(top_srcdir)/gl/m4/strndup.m4 $(top_srcdir)/gl/m4/strnlen.m4 \ + $(top_srcdir)/gl/m4/strsep.m4 $(top_srcdir)/gl/m4/strstr.m4 \ $(top_srcdir)/gl/m4/sys_socket_h.m4 \ $(top_srcdir)/gl/m4/sys_types_h.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ @@ -151,7 +153,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/gl/m4/wcrtomb.m4 $(top_srcdir)/gl/m4/wctype_h.m4 \ $(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/xalloc.m4 \ $(top_srcdir)/gl/m4/xsize.m4 $(top_srcdir)/gl/m4/xstrndup.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs @@ -329,6 +331,7 @@ GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ +GNULIB_FFS = @GNULIB_FFS@ GNULIB_FFSL = @GNULIB_FFSL@ GNULIB_FFSLL = @GNULIB_FFSLL@ GNULIB_FGETC = @GNULIB_FGETC@ @@ -694,6 +697,7 @@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ +HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ @@ -723,6 +727,7 @@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FEATURES_H = @HAVE_FEATURES_H@ +HAVE_FFS = @HAVE_FFS@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FMA = @HAVE_FMA@ @@ -834,8 +839,10 @@ HAVE_SQRTL = @HAVE_SQRTL@ HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ +HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRINGS_H = @HAVE_STRINGS_H@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -926,7 +933,6 @@ LD = @LD@ LDAPINCLUDE = @LDAPINCLUDE@ LDAPLIBS = @LDAPLIBS@ LDFLAGS = @LDFLAGS@ -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ LIBICONV = @LIBICONV@ @@ -952,6 +958,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MATHLIBS = @MATHLIBS@ @@ -977,6 +984,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ +NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ @@ -997,6 +1005,7 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_STDINT_H = @NEXT_STDINT_H@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ +NEXT_STRINGS_H = @NEXT_STRINGS_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ @@ -1056,7 +1065,6 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PST3CFLAGS = @PST3CFLAGS@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -PYTHON = @PYTHON@ RADIUSLIBS = @RADIUSLIBS@ RANLIB = @RANLIB@ RELEASE = @RELEASE@ @@ -1248,7 +1256,6 @@ SCRIPT_TEST = @SCRIPT_TEST@ SED = @SED@ SERVENT_LIB = @SERVENT_LIB@ SET_MAKE = @SET_MAKE@ -SH = @SH@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ @@ -1272,6 +1279,7 @@ WARRANTY = @WARRANTY@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ +WTSAPI32LIBS = @WTSAPI32LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -1343,7 +1351,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1368,9 +1376,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): diff --git a/test.pl.in b/test.pl.in index 85ac19d..01a97ec 100755 --- a/test.pl.in +++ b/test.pl.in @@ -9,9 +9,9 @@ use Getopt::Long; use NPTest qw(DetermineTestHarnessDirectory TestsFrom); -my $tstdir; +my @tstdir; -if ( ! GetOptions( "testdir:s" => \$tstdir ) ) +if ( ! GetOptions( "testdir:s" => \@tstdir ) ) { print "Usage: ${0} [--testdir=] [ ...]\n"; exit 1; @@ -25,15 +25,18 @@ if ( scalar( @ARGV ) ) } else { - my $directory = DetermineTestHarnessDirectory( $tstdir ); + my @directory = DetermineTestHarnessDirectory( @tstdir ); - if ( !defined( $directory ) ) + if ( @directory == 0 ) { print STDERR "$0: Unable to determine the test harness directory - ABORTING\n"; exit 2; } - @tests = TestsFrom( $directory, 1 ); + for my $d ( @directory ) + { + push (@tests, TestsFrom( $d, 1 )); + } } if ( ! scalar( @tests ) ) 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 @@ #!/usr/bin/perl # tinderbox_build.pl -# This script builds the nagiosplugins and then sends +# This script builds the monitoringplugins and then sends # logs back to the master tinderbox server # # This script is based on mozilla-unix.pl which comes with tinderbox2 @@ -34,7 +34,7 @@ my $ReportStatus = 0; # Do not send results to server my $Tinderbox_server = '-p 1022 -o StrictHostKeyChecking=no tinderbox2@tinderbox.opsera.com'; # These shouldn't really need to be changed -my $BuildTree = 'nagiosplug'; +my $BuildTree = 'monitoringplug'; my $BuildName = ''; my $ConfigureArgs = $ENV{CONFIGURE_ARGS}; @@ -81,7 +81,7 @@ sub BuildIt { chdir("$StartDir"); my $StartTime = time; - if (-e (my $file = "nagios-plugins.spec")) { + if (-e (my $file = "monitoring-plugins.spec")) { open F, $file; while () { if (/^Version: trunk-(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {