summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-01-23Make check_ide_smart default to nagios outputThomas Guyot-Sionnest2-28/+38
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-22plugins/utils.h: avoiding warnings on empty printf statementsRicardo Maraschini1-1/+1
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 <ricardo.maraschini@gmail.com>
2014-01-22fix outdated Free Software Foundation addressLars Vogdt4-5/+6
2014-01-21README: Minor fixes regarding new project nameHolger Weiss1-10/+10
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.)
2014-01-21Capitalize "Monitoring Plugins"Holger Weiss11-12/+12
"Monitoring Plugins" is a name.
2014-01-21Merge branch 'maint'Holger Weiss13-55/+79
* maint: check_ssh: Get rid of sshd: Read from socket failed: Connection reset by peer fixed tests when there is no direct internet connection NEWS: Mention fix for check_http's -S option Fix for SSL Versioning when multiple options are used. Fix #1217 spec file fails to build due to duplicate files and unused files check_http: Don't let "-N" expect an argument README: Change GitHub URL README: Clarify license notice Update URLs and mailing list addresses Just using the posix conform extended regular expression grep 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) Update web site URLs Conflicts: FAQ NEWS README SUPPORT configure.in monitoring-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/monitoring-plugins.pot
2014-01-21Merge branch 'rename'Thomas Guyot-Sionnest117-3315/+4271
2014-01-21New default installation prefix: /usr/localHolger Weiss2-3/+1
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-21plugins/*.c: Non-network timeout changesSpenser Reinhardt4-4/+4
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
2014-01-21plugins/utils.h: Addition of plugin timeout msg.Spenser Reinhardt1-1/+5
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.
2014-01-21plugins/*.c: Alterations for timeout messages.Spenser Reinhardt26-26/+26
.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-21Revert renaming valueJan Wagner1-5/+5
As suggested by sreinhardt in 045d38a6 over there in nagios-plugins
2014-01-21Add performance data to check_mysql_query.c (Closes: #1202)awiddersheim1-4/+10
2014-01-20Fix NPTest.pm not asking for unconfigured variablesThomas Guyot-Sionnest1-1/+1
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-20updated perldod with a renamed pkgSven Nierlein2-0/+0
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2014-01-20Capitalize "Monitoring" when it's the first wordHolger Weiss41-41/+41
2014-01-20Minor fixes to be amended into "rename" commitHolger Weiss6-8/+7
2014-01-19Minor mailinglist corrections for frenchThomas Guyot-Sionnest1-3/+3
2014-01-19Reprocess L10n filesThomas Guyot-Sionnest4-2870/+3834
2014-01-19Project rename initial commit.Monitoring Plugins Development Team115-505/+500
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-13utils.sh: Don't define $ECHOHolger Weiss3-14/+8
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-10check_ssh: Get rid of sshd: Read from socket failed: Connection reset by peerJan Wagner1-0/+2
This fix was grabbed from FreeBSD downstream and provided by Dmitry Sivachenko. Fixes Debian Bug #734811
2014-01-10configure.in: Call AC_CONFIG_HEADERSHolger Weiss1-1/+1
AM_CONFIG_HEADER is deprecated.
2013-12-27fixed tests when there is no direct internet connectionSven Nierlein2-6/+14
- check http had wrong number of skipped tests - check tcp did not use the 'no internet' flag at all
2013-12-20NEWS: Mention fix for check_http's -S optionHolger Weiss1-0/+4
Closes #1220.
2013-12-20Fix for SSL Versioning when multiple options are used.Joseph Gooch1-4/+4
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-17Fix #1217 spec file fails to build due to duplicate files and unused filesDamian Myerscough1-2/+4
2013-12-05check_http: Don't let "-N" expect an argumentHolger Weiss1-1/+1
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-20make testing check_proc not rely on bashSven Nierlein1-6/+4
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-19NEWS: Add WARNING regarding the check_procs changeHolger Weiss1-0/+4
Closes #1205.
2013-11-19check_procs: ignore plugin parent processAnton Lofgren2-1/+16
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-05README: Change GitHub URLHolger Weiss1-1/+3
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.)
2013-11-05README: Clarify license noticeHolger Weiss1-6/+13
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-28Update URLs and mailing list addressesHolger Weiss56-84/+83
Now that we moved our infrastructure away from SourceForge, update the URLs and mailing list addresses accordingly.
2013-10-28developer-guidelines.sgml: Fix URLHolger Weiss1-1/+1
Fix the Test::Simple tutorial URL.
2013-10-28developer-guidelines.sgml: Remove Tinderbox linkHolger Weiss1-5/+0
We don't run a Tinderbox instance anymore. (Noted by "zathras" on IRC.)
2013-10-22Fix trusted pathrefs/pull/1212/headawiddersheim18-30/+38
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-22Merge branch 'github1207' of https://github.com/waja/nagios-plugins into ↵refs/pull/1210/headJan Wagner1-1/+1
github1207
2013-10-22Just using the posix conform extended regular expression greprefs/pull/1211/headJan Wagner1-2/+1
2013-10-22check_oracle: --db +ASM bad string matchingJan Wagner1-0/+1
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-08Update web site URLsHolger Weiss1-2/+3
The Nagios Plugin Development Guidelines and the Extra-Opts documentation were moved to our new project server.
2013-10-05Add additional usage data for new options in check_mysql_query.crefs/pull/1200/headawiddersheim1-1/+1
2013-10-05Add ability to read from options file to check_mysql_query.cawiddersheim1-2/+22
This is the same code that was added to check_mysql.c in 5ed7194.
2013-10-03NEWS: Mention "contrib" removalHolger Weiss1-0/+1
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-02Prepare for the 1.5 releaserelease-1.5Holger Weiß3-3/+3
2013-10-02FAQ: Update CVS referencesHolger Weiss1-5/+3
We moved from CVS to Git.
2013-10-02tools: Update CVS referencesJan Wagner3-5/+5
We moved our stuff from CVS/SourceForge to Git/GitHub.
2013-10-02doc: Updated CVS referencesJan Wagner2-8/+6
We moved our stuff from CVS/SourceForge to Git/GitHub.
2013-10-01README: Update URLsHolger Weiss1-2/+2
We moved the Nagios Plugins site from SourceForge to our project server.
2013-10-01SUPPORT: Update CVS/SourceForge referencesHolger Weiss1-7/+8
We moved our stuff from CVS/SourceForge to Git/GitHub.