Commit graph

1510 commits

Author SHA1 Message Date
Sven Nierlein
d309b1d2e9 add check_ldap test
install openldap on travis and grep base dn from slapcat.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2015-04-22 12:51:29 +02:00
Gerhard Lausser
003103c09d add counting of entries to check_ldap 2015-04-21 19:11:57 +02:00
Gerhard Lausser
81be2afd95 add sperfdata function which can handle threshold ranges 2015-04-21 19:11:56 +02:00
Andrew Widdersheim
500f8aec81 Readability fix 2015-04-13 14:16:34 +02:00
Sven Nierlein
75d884ed1e fix snmp test for included threshold
since 6623a1 check_snmp prints the thresholds along the performance data.
This adjust our test cases accordingly.

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2015-04-12 14:29:05 +02:00
Holger Weiss
04e0a182ae Merge branch 'handle-hanging-nfs'
* handle-hanging-nfs:
  NEWS: Mention check_disk enhancement
  Cosmetic change: s/THRLIBS/THREADLIBS/
  configure.ac: Don't let pthread check depend on OS
  check_disk: Seperate declarations from code
  check_disk: Remove unused status variable
  check_disk: Fix pthread start routine type
  Don't let check_disk hang on hanging file systems
2014-12-02 13:22:17 +01:00
Holger Weiss
cf3d149652 Cosmetic change: s/THRLIBS/THREADLIBS/
Use a more intuitive variable name.
2014-12-02 12:37:59 +01:00
Holger Weiss
ff542df44c Merge branch 'maint'
* maint:
  NEWS: Modify list of changes for 2.1.1 release
  Prepare release
  THANKS.in: Add new authors
  NEWS: Updating all the fixes
  check_tcp: fix help description regarding escape option
  check_ntp: Nul-terminate jitter data
  Revert "plugins/check_ntp.c - Verify struct from response"
  check_real: fix null termination
  check_ntp: fix null termination
  check_apt: fix memset

Conflicts:
	NEWS
2014-12-02 10:54:55 +01:00
Sebastian Herbszt
22dfca20fd check_tcp: fix help description regarding escape option
The help description should print '\\' for backslash not just '\'.

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2014-12-01 01:08:58 +01:00
Holger Weiss
99b3bfe488 check_ntp: Nul-terminate jitter data
Make sure the jitter response is nul-terminated before parsing the data
using string functions.
2014-12-01 01:07:53 +01:00
Holger Weiss
5871123e0a Revert "plugins/check_ntp.c - Verify struct from response"
This reverts commit a04df3e1b6.  The "fix"
was bogus in many ways and broke jitter checking.

Conflicts:
	plugins/check_ntp.c
2014-11-30 23:39:59 +01:00
Holger Weiss
0d14645cb0 check_disk: Seperate declarations from code 2014-11-30 11:33:20 +01:00
Holger Weiss
c0e6a6935b check_disk: Remove unused status variable
We didn't actually use the exit status provided by pthread_join(3) for
anything.
2014-11-30 11:30:36 +01:00
Holger Weiss
66f43f9934 check_disk: Fix pthread start routine type
The function pointer passed as third argument to pthread_create(3) must
be of type void *(*)(void *).
2014-11-28 23:55:03 +01:00
Gerhard Lausser
6986aa1d0a Don't let check_disk hang on hanging file systems 2014-11-28 22:08:08 +01:00
Andrew Berglund
94c1a4a433 Added missing CR in DESCRIBE request. 2014-11-28 16:24:33 +01:00
Sven Nierlein
a7d7992777 check_ssh: change warning to critical for protocal/version errors
It makes more sense to exit critical if a explicit version/protocol is requested. This
would also be more consistent with other plugins. Other string matching plugins like
check_snmp or check_http exit critical if the result does not match.

Signed-off-by: Sven Nierlein <sven@nierlein.de>

Closes #1268
2014-11-28 14:35:03 +01:00
Andy Brist
c59ee0036f Added perfdata to check_nt. New -l options - seconds|minutes|hours|days. 2014-11-28 13:22:20 +01:00
Johannes Engel
7a33e28e4e Introduce support for SNMPv3 context in check_snmp
snmpget already supports using SNMPv3 contexts using the option "-n".
Thus all we need to do is introduce a new argument to check_snmp and
pass the argument on to snmpget using snmpget's option "-n".
Since "-n" is already in use for check_snmp for a different purpose,
we use "-N" instead.
2014-11-28 13:05:16 +01:00
Andreas Seemueller
6623a1c787 check_snmp: Add thresholds to performance data 2014-11-28 12:56:07 +01:00
Sebastian Herbszt
30f0eeed57 check_real: fix null termination
Fix null termination introduced by commit b61f51a ("plugins/check_real.c - recv string null terminate").

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2014-11-27 00:51:46 +01:00
Sebastian Herbszt
a4a1b37be0 check_ntp: fix null termination
Fix null termination introduced by commit a04df3e ("plugins/check_ntp.c - Verify struct from response").

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2014-11-27 00:03:32 +01:00
Sebastian Herbszt
b7fc2eb15a check_apt: fix memset
Fix memset introduced by commit 9ce7369 ("plugins/check_apt.c - Print uninitialized ereg").

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2014-11-26 23:57:25 +01:00
Adrian Murphy
51604a1019 Fix perfdata to comply with perfdata UOM definition 2014-11-03 13:54:54 +01:00
Jan Wagner
40c870ed3a Improving output when swap space has zero size 2014-10-19 23:24:12 +02:00
Davide Madrisan
bd56c4a2d0 check_swap - fix comment
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
2014-10-19 14:54:57 +02:00
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