Commit graph

1484 commits

Author SHA1 Message Date
Jan Wagner
93071168df Merge branch 'maint'
Conflicts:
	NEWS
	THANKS.in
2014-10-06 10:25:31 +02:00
Holger Weiss
013ca2c508 Fix check_jabber to work with Openfire servers
The plugin expected:

	<?xml version='1.0'?>

But Openfire sends:

	<?xml version='1.0' encoding='UTF-8'?>
2014-09-16 12:28:51 +02:00
Sven Nierlein
57fb03cea5 check_by_ssh: added --hostname support
just like the guidelines and the help already suggests.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2014-08-06 15:51:18 +02:00
Sven Nierlein
a5b6d94fc6 tests: skip extented snmp tests if snmpd has no perl support
solaris snmpd has no perl support by default, so this test will fail.

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2014-07-31 21:07:18 +02:00
Sven Nierlein
8e8d2d4243 tests: negate test fails when not run from plugins folder
Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2014-07-31 14:56:16 +02:00
Sven Nierlein
559d11b1fb tests: get current directory the perl way
instead of hoping to have it in the environment. This at
least broke tests on solaris.

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2014-07-31 13:47:19 +02:00
Sven Nierlein
18a9562dae check_dns: unified check output
this also allows us to make tests against "critical" in the output.

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2014-07-31 12:13:52 +02:00
Sven Nierlein
df08974bf0 check_ntp_peer: do not use uninitialized results for max state
s/t/jresult are not initialized if there is no corresponding threshold
supplied. So we shouldn't use them for calculating our result.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2014-07-31 11:28:30 +02:00
Jan Wagner
8775edcb10 Merge pull request #1164 from waja/github981 2014-07-30 23:33:57 +02:00
Jan Wagner
b7ce241ba6 check_dns: Use strchr instead of index 2014-07-30 23:30:59 +02:00
Jan Wagner
fe066559f2 Merge pull request #1182 from waja/github984 2014-07-30 21:36:19 +02:00
Alexander Wittig
8d50765653 check_dig: takes into account the -4 and -6 switch
Fix automatic DNS server name detection to honor -4 and -6 switches
(default to 127.0.0.1 or ::1 respectively, i.e. if -6 is given ::1
is used instead of 127.0.0.1)
2014-07-30 15:25:20 +02:00
Alexander Wittig
8c623b1a43 check_dig: Fix to work with dig and drill tool
FreeBSD starting with version 10 is shipped with ldns instead of bind as
resolver. Consequently the dig tool in base is replaced by drill. While dig can
still be installed as a third party application, it would be nice to make do
with the tools available in the system already.
This patch rearranges the command line used to invoke dig slightly so that it
can be used with both dig and drill (tested with dig 9.8.3-P1 and 9.9.4 as well
as drill 1.6.16). It would be really neat if the configure script could be
changed to automatically pick up drill when dig is not available (or the other
way around), but my autotools-foo is not good enough for that.
This part of the patch is an extended version of the locally maintained patch
currently deployed in the FreeBSD ports tree by Dmitry Sivachenko.
2014-07-30 15:22:33 +02:00
Jan Wagner
d0da78ced1 check_dns: returns incorrect state when specifying server
This patch verifies if the response is returned by the dns server we
are trying to check
---
Closes #981
Closes #982
Closes #1164
2014-07-30 13:16:37 +02:00
Sven Nierlein
2acf9a63d3 check_dns: added test for nonresponsive dns server (#982)
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2014-07-30 11:49:50 +02:00
Jan Wagner
cbb507c89f check_disk: show troubled partition in verbose mode
I'm submitting a small patch to check_disk that will show which partitions are
actually causing the error state. This helps the human operator to quickly
identify the exact issue. I made it so a single -v flag is required so it
doesn't harm legacy code that may be parsing the original style of output.

Thanks to Jason Benguerel.
---
Closes #984
Closes #1182
2014-07-29 22:06:25 +02:00
abrist
6f3d5825b2 check_ntp_time.c - Cleaned up usage and added a note
Closes #907
Closes #1184
2014-07-29 14:24:21 +02:00
Jan Wagner
a941219b41 check_ntp_time: adding offset option
Not sure if this is of use or not - we have a strange requirement to run
certain servers 5 minutes fast. I've added a switch to the check_ntp_time
to allow for this offset.

Thanks to Patrick McAndrew.
2014-07-29 14:23:17 +02:00
abrist
fc2c099d58 netutils.c - A few more changes
Changed bool to short.

Removed first instance of is_socket to avoid
redeclaration error.

Changed 'socket' to 'file socket' for verbosity.
2014-07-29 11:09:43 +02:00
Davide Madrisan
e85fcbd571 This patch will add the IP and port, or socket name, to the error message and
thus simplify the problem debugging: no need to check for this information in
the Nagios configuration.
This function is only used by 'check_tcp.c'.

Without the patch:

$ ./plugins/check_tcp -H 127.0.0.1 -p 21
Connection refused
$ ./plugins/check_tcp -H /var/spool/nagios/cmd/nagios.cmd
Permission denied

With the patch:

$ ./plugins/check_tcp -H 127.0.0.1 -p 21
connect to address 127.0.0.1 and port 21: Connection refused
$ ./plugins/check_tcp -H /var/spool/nagios/cmd/nagios.cmd
connect to socket /var/spool/nagios/cmd/nagios.cmd: Permission denied

Thanks to Davide Madrisan.
---
Closes  #1277
2014-07-29 11:08:44 +02:00
Jan Wagner
2e8d440e73 check_mysql: ignore authentication failure
This patch allows checking if MySQL server is running without providing valid
username and password. Similar to check_ssh plugin it returns MySQL server
version string and protocol number.

Example:
check_mysql -n -H aaa.bbb.ccc.ddd
MySQL OK - Version: 5.0.51a-24+lenny5 (protocol 10)

This is useful for monitoring servers where one does not have administrator
privileges or does not want to grant any privileges for the monitoring station.

To enable this functionality new option --ignore-auth (-n) is added to
check_mysql plugin.

Thanks to Julius Kriukas

Closes #1020
Closes #1178
2014-07-28 22:13:02 +02:00
Holger Weiss
b785a770e4 plugins/tests/check_http.t: Adjust date strings
Adjust the expected date strings to the now-localized output produced by
plugins/sslutils.c.

Closes #1275.
2014-07-21 21:52:33 +02:00
Holger Weiss
c5a64eeef8 plugins/t/check_dns.t: Fix Perl warning
Perl said: "Unrecognized escape \d passed through at ./t/check_dns.t
line 57."
2014-07-21 13:59:22 +02:00
Jan Wagner
3bf812beae sslutils: expire time in local timezone format
sshutils prints the expiry time of certificates in US format
this patch uses the strftime %c, I don't know how portable that is

Thanks to Neil Prockter.

Closes #1188
Closes #1161
Closes #977
Closes #976
Closes #975
Closes #840
Closes #382
2014-07-21 13:32:20 +02:00
Jan Wagner
71063655e5 travis-ci: Adding ports for check_hpjd 2014-07-20 23:36:18 +02:00
abrist
479509ad59 added tests for check_hpjd port options
---
Closes #1160 and #973
2014-07-20 23:36:05 +02:00
abrist
8e187dfefe Added check_hpjd port option to news and clarified the port usage error. 2014-07-20 23:35:54 +02:00
abrist
3c7d24478c check_hpjd - Added a switch for port specification. Defaults to 161. 2014-07-20 23:35:41 +02:00
abrist
78d00d338a check_ntp.t - fixed tests for new status output
closes #1236 and #1239
2014-07-20 23:35:03 +02:00
abrist
495cf3b2f8 check_ntp_peer - Added specific state output for each metric. It now should be easy to see which check caused the alert. 2014-07-20 23:34:41 +02:00
Mikael Falkvidd
f54d10fe9b 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 <mfalkvidd@op5.com>
2014-07-10 21:10:48 +02:00
Holger Weiss
a2505f049d 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-07 11:33:39 +02:00
Jan Wagner
b62f2c14fb Merge PR #1265 from waja/check_tcp_server_addr 2014-06-30 15:13:39 +02:00
abrist
4277f47bff check_jabber.t - fixed tests for new status output including hostname 2014-06-30 13:55:42 +02:00
Sven Nierlein
ed914472e9 Merge pull request #1190 from waja/github780
check_ssh: check protocol
2014-06-30 13:42:02 +02:00
Sven Nierlein
2438931a3f Merge pull request #1262 from waja/fix_aix
Include common.h before any system headers.
2014-06-28 22:24:52 +02:00
Sven Nierlein
8d6c183347 Merge pull request #1264 from waja/check_nt_units
check_nt.c - Changed 'Mb' to 'MB' in MEMUSE.
2014-06-28 22:23:03 +02:00
Sven Nierlein
ea8ab2002c Merge pull request #1263 from waja/coverity_fixes
Serveral coverity fixes from nagios-plugins
2014-06-28 22:14:02 +02:00
Sven Nierlein
e566021a54 tests: added check_dns performance data test
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2014-06-28 22:05:25 +02:00
abrist
e49973493c check_dns.c Added a bit more logic to thresholds
Added two if elses to cover when only one threshold is set.
2014-06-28 22:01:16 +02:00
Jean-Claude Computing
79ba1f90db check_dns: add warning and critical thresholds to perfdata 2014-06-28 22:01:16 +02:00
abrist
b5d78f9556 Cleaned up status output of check_tcp changes 2014-06-28 21:08:55 +02:00
Davide Madrisan
4231415878 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 <davide.madrisan@gmail.com>
2014-06-28 20:47:51 +02:00
abrist
6e12805fa4 check_nt.c - Changed 'Mb' to 'MB' in MEMUSE. 2014-06-28 20:13:50 +02:00
Spenser Reinhardt
aa16beb971 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.
2014-06-28 18:24:08 +02:00
Spenser Reinhardt
88472d1804 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
2014-06-28 18:23:09 +02:00
Spenser Reinhardt
5866cb0a09 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
2014-06-28 18:21:26 +02:00
Spenser Reinhardt
a04df3e1b6 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-28 18:18:28 +02:00
Spenser Reinhardt
b61f51ad02 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.
2014-06-28 18:17:48 +02:00
Spenser Reinhardt
9ce73696b0 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-28 18:16:59 +02:00