Commit graph

1892 commits

Author SHA1 Message Date
Andreas Baumann
2da7575196 preparing for certificate checks (non-OpenSSL version) 2018-10-22 16:30:31 +02:00
Andreas Baumann
f4a7a3b3e7 small cleanup 2018-10-22 16:30:31 +02:00
Andreas Baumann
c0be97f154 probing for SSL library used by libcurl and started improving the certificate check -C 2018-10-22 16:30:31 +02:00
Andreas Baumann
995ab6572f using curl_getdate instead of local parse_time_string, added verbose debug code for -M<d> 2018-10-22 16:30:31 +02:00
Andreas Baumann
e65cf6a32f small fixes and cleanups around SSL, be more tolerant to -S<x> options 2018-10-22 16:30:31 +02:00
Andreas Baumann
f99b9352d4 for now we set LIBCURL_USES_OPENSSL always 2018-10-22 16:30:31 +02:00
Andreas Baumann
260291c08b made check_curl compile also if we have openssl disabled 2018-10-22 16:30:31 +02:00
Andreas Baumann
88f566adf5 fixed some libcurl checks and minimal versions 2018-10-22 16:30:31 +02:00
Andreas Baumann
55e8d89b0a some work on certificate checking for non-OpenSSL libraries 2018-10-22 16:30:31 +02:00
Andreas Baumann
cee5f2777d small fix and we see CURLOPT_SSL_CTX_FUNCTION does not work on Centos 6? 2018-10-22 16:30:31 +02:00
Andreas Baumann
304e04a384 some cleanup and added error handling around curl_easy_getinfo/curl_easy_setopt 2018-10-22 16:30:31 +02:00
Andreas Baumann
54c8f76c72 fixed test outputs for status line checks
handling empty data in POST and PUT
handling data upload (from -P <postdata>) also in PUT
2018-10-22 16:30:31 +02:00
Andreas Baumann
3c681a2ec5 added -n and more display_html stuff 2018-10-22 16:30:31 +02:00
Andreas Baumann
f4a49a8b34 added -L option 2018-10-22 16:30:31 +02:00
Andreas Baumann
d5d71dde61 fixed non-C99-ism in get_header_value 2018-10-22 16:30:31 +02:00
Andreas Baumann
9960c56e5e added -M<m> age option for document age, using picohttpparser from h2o (maybe handy
later to make a more robust header condition checker?)
2018-10-22 16:30:31 +02:00
Andreas Baumann
bbec77c7ec made check_curl tests copies of check_http tests because they will differ slightly 2018-10-22 16:30:31 +02:00
Andreas Baumann
f890d271fd added POST support (-P/-T options) 2018-10-22 16:30:31 +02:00
Andreas Baumann
3299fbe3c1 fixed handling of SSL/TLS protocol versions 2018-10-22 16:30:31 +02:00
Andreas Baumann
6575340888 added -l option, fixed some usage/help 2018-10-22 16:30:31 +02:00
Andreas Baumann
f67f05c450 added -d/--header-string option 2018-10-22 16:30:31 +02:00
Sven Nierlein
c6c90a5bfa check_curl: implement -e/--expect 2018-10-22 16:30:31 +02:00
Sven Nierlein
a793540bbb check_curl: support check_http arguments for backwards compatibility 2018-10-22 16:30:31 +02:00
Sven Nierlein
5f9e8fa1e7 check_curl: adopt output format from check_http 2018-10-22 16:30:31 +02:00
Sven Nierlein
e9239b556a check_curl: make check_curl use the same tests as check_http 2018-10-22 16:30:31 +02:00
Andreas Baumann
dee8f760d3 added -4/-6 option 2018-10-22 16:28:51 +02:00
Andreas Baumann
a478dfe512 added -m/--pagesize option 2018-10-22 16:28:51 +02:00
Andreas Baumann
6e52b870f6 added help for --invert-regex 2018-10-22 16:28:51 +02:00
Andreas Baumann
2678d7fabc added -R/-ereg/-eregi 2018-10-22 16:28:51 +02:00
Andreas Baumann
50577bf9b1 added -N/--no-body option 2018-10-22 16:28:51 +02:00
Andreas Baumann
ec8de89a44 added usage and help for -E/--extended-perfdata 2018-10-22 16:28:51 +02:00
Andreas Baumann
4dc982097e reverted double header in longopts 2018-10-22 16:28:51 +02:00
Andreas Baumann
5d2fa85f1e added help/usage and getopt long struct member for -k/--header option 2018-10-22 16:28:51 +02:00
Andreas Baumann
20fd1ade91 fixed a missing else before curl_easy_setopt CURLOPT_CUSTOMREQUEST 2018-10-22 16:28:51 +02:00
Sven Nierlein
afa52eb834 add check_curl test
just a copy of check_http for now...

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2018-10-22 16:28:51 +02:00
Sven Nierlein
e57c8a9d96 check_curl: set correct host header
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2018-10-22 16:28:51 +02:00
Sven Nierlein
b5fd0d1a17 check_curl: implement extended performance data
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2018-10-22 16:28:51 +02:00
Sven Nierlein
16121a9b55 check_curl: implement certificate checks
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2018-10-22 16:28:51 +02:00
Sven Nierlein
c6c4890702 check_curl: implement optional http headers
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2018-10-22 16:28:51 +02:00
Andreas Baumann
d74e9569b9 added HTTP method handling 2018-10-22 16:28:51 +02:00
Andreas Baumann
83ae37dc7e forgot declaration of INVERT_REGEX in getopt otions 2018-10-22 16:28:51 +02:00
Andreas Baumann
c9a94ffd44 added some casts for curl write functions 2018-10-22 16:28:51 +02:00
Andreas Baumann
ad9233ce1c added -r and --invert-regex 2018-10-22 16:28:51 +02:00
Andreas Baumann
556924316a added -ca-file option 2018-10-22 16:28:51 +02:00
Andreas Baumann
035fe1eb79 handling last HTTP header correctly in HTTP line parser (added a strrstr replacement) 2018-10-22 16:28:51 +02:00
Andreas Baumann
cefe325e94 some comment cleanup 2018-10-22 16:28:51 +02:00
Andreas Baumann
2b8f17e577 adapted to style, using header file shims instead of HAVE_XXX by hand 2018-10-22 16:28:51 +02:00
Andreas Baumann
c3bf9bd675 fixed curl error message 2018-10-22 16:28:51 +02:00
Andreas Baumann
67967df159 added -s option 2018-10-22 16:28:51 +02:00
Andreas Baumann
2a9812ee43 added most options from nagios-curl-plugin 2018-10-22 16:28:51 +02:00
Andreas Baumann
0b85260bd2 added autoconf stuff for curl plugin, created empty plugin 2018-10-22 16:28:51 +02:00
Stefan Bethke
22c00bbe47 Docs check_http: make -C obvious
You need to read the docs carefully to realize that check_http has two 
modes of operation: the regular HTTP checks, and a TLS certificate 
check. Only one of these can be run in a single invocation.

Fixes #1553
2018-10-10 00:40:07 +02:00
Rolf Eike Beer
fd9a7d2e00 check_dns: allow forcing complete match of all addresses 2018-07-25 21:14:47 +02:00
Rolf Eike Beer
a03068743f check_dns: allow returned addresses to be in any order 2018-07-25 20:18:47 +02:00
Rolf Eike Beer
e60c6c04f0 check_dns: simplify loop 2018-07-25 19:05:16 +02:00
Sven Nierlein
b7de6ec8bd
Update check_snmp.c
remove unnecessary brackets in help text
2018-01-19 17:05:46 +01:00
Michael Kraus
9fa449119c check_snmp: make calcualtion of timeout value in help output more clear 2018-01-19 15:13:12 +01:00
Bernard Spil
399cc14152
Fix build issue with MariaDB 10.2
As of 10.2 MariaDB no longer defines MYSQL_PORT.
2017-11-06 17:31:44 +01:00
Rasp8e
09a2210c47 Adding Proxy-Authorization and extra headers in the case of connection through PROXY to HTTPS 2017-10-17 15:19:43 +02:00
Marc Sánchez
c03e1ad081 Only turn on ordering procs by CPU usage if PS_USES_PROCPCPU
Disable sorting of procs by CPU usage on check_load if procpcpu is not present on PS_VARLIST
2017-09-07 22:25:09 +02:00
Marc Sánchez
015a40e1b5 Using PS_COMMAND constant and ordering output by procpcpu 2017-09-07 20:55:34 +02:00
Marc Sánchez
0625fbb53d Making show top consuming processes option less complicated 2017-09-07 13:55:19 +02:00
Marc Sánchez
1410ffff28 Adding print top consuming processes option to check_load
-W, --print-top-warning
    Print top consuming processes on WARNING status
 -C, --print-top-critical
    Print top consuming processes on CRITICAL status
 -n, --procs-to-show=NUMBER_OF_PROCS
    Number of processes to show when printing top consuming
    processes. Not useful without -W or -C. Default value is 5
2017-09-07 13:31:01 +02:00
Marc Sánchez
9671399c00 Adding packages-warning option
This option specifies the minumum number of packages available for upgrade to return WARNING status. Default is 1 package.
2017-09-06 16:54:03 +02:00
Michael Kraus
6e67b638f8 Output plugin's stderr to stderr
Output plugin's stderr to stderr and do  not exit with WARNING in that case
2017-09-04 16:36:19 +02:00
Christopher Odenbach
6995b51075 repaired "-n" behaviour. If run with "-n ok" a host which ran
completely out of swap space would return "ok" which is
not desired. It should only return "ok" if there is no
swap space configured at all.
2017-05-31 14:15:47 +02:00
Sven Nierlein
b3d39e605e Merge pull request #1474 from odenbach/vport
Added tests for virtual port behaviour. Separated from all other test…
2017-05-04 23:19:51 +02:00
Karol Babioch
e0b8ebaa77 plugins: check_dig: Fix spelling 2017-04-21 01:38:39 +02:00
Christopher Odenbach
9326543c2e Added tests for virtual port behaviour. Separated from all other tests this time. 2017-03-26 22:36:58 +02:00
Sven Nierlein
77aa6d4ebf udp test: prefer nc over netcat syntax
sles 12 systems have netcat symlinked to nc and so expect nc syntax for netcat.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2017-03-12 22:55:52 +01:00
Sven Nierlein
e90c63712e check_disk test: increase assumed thresholds
The check_disk fails if the build system has more than 100GB of free disk
space. Lets make this 100TB and we are safe for a couple more years.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2017-03-12 22:55:52 +01:00
Sven Nierlein
0cff5f2d93 remove hardcoded verisign.com tests
and make it configurable

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2017-03-12 22:55:52 +01:00
Sven Nierlein
b3dee5c4bf make snmp tests more reliable
snmp tests fail if the snmp daemon runs systemd, then the process with 1 has arguments. Convert
the test into a regex which works for sysv and systemd.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2017-03-12 22:55:52 +01:00
Sven Nierlein
9daeceaed3 check_dns: fix error detection on sles nslookup
on sles (ex. 11sp1) systems the nslookup output for not found was not parsed correctly
and interpreted as ok when it should be critical:

./check_dns -H nosuchhost.nodomain -t 1 -vvv
/usr/bin/nslookup -sil nosuchhost.nodomain Server:         10.0.2.3
Address:        10.0.2.3#53
Non-authoritative answer:
*** Can't find nosuchhost.nodomain: No answer
DNS OK: 0.011 seconds response time. nosuchhost.nodomain returns |time=0.010892s;;;0.000000

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2017-03-12 21:02:58 +01:00
Gerhard Lausser
c85281d25b check_snmp: put the "c" (to mark a counter) after the perfdata value 2017-02-07 14:15:47 +01:00
Valentin Vidic
43ce70bcdb check_apt: Add -l/--list option to print packages 2017-01-16 17:54:00 +01:00
Jan Wagner
10fa79a97a Merge branch 'spell_fix' 2017-01-10 20:33:16 +01:00
Jan Wagner
3fc149f499 Merge remote-tracking branch 'upstream/pr/1457' 2017-01-04 14:53:16 +01:00
Christian Schmidt
bf18dc42dd Add --only-critical switch to check_apt 2016-12-31 12:00:46 +01:00
Nicolai
6a0f4fe275 check_dns: Small test cleanup 2016-12-23 22:59:42 +01:00
Nicolai
b9f00386a1 check_dns: Fix travis tests
(or try to fix it...)
2016-12-23 21:04:36 +01:00
Nicolai
ea756ac4ad check_dns: Tests and info 2016-12-23 20:44:45 +01:00
Nicolai Søborg
22e78763ea check_dns: Accept CIDR 2016-12-21 17:24:29 +01:00
Patrick Rauscher
f524b15e57 check_dns: allow for IPv6 RDNS 2016-12-20 21:59:58 +01:00
Jan Wagner
dbb92c347e Spelling fixes suggested by lintian 2016-12-01 12:49:40 +01:00
Holger Weiss
fae05eb178 check_radius: Make compiler happy 2016-11-21 14:49:03 +01:00
Oliver Skibbe
d03a2a82b3 Revert "check_disk - show all disks if state is ok and option error only is used" 2016-11-21 13:26:28 +01:00
Holger Weiss
8b727baec5 sslutils: Address compiler warning
SSLv23_client_method() and friends return a pointer to a const-qualified
SSL_METHOD.
2016-11-21 09:31:08 +01:00
Jan Wagner
6d0c111631 Creating and mounting randisk to make use of check_disk tests 2016-11-20 20:38:41 +01:00
Oliver Skibbe
6438fec788 Merge pull request #1382 from riskersen/smtp_tls_expec
check_smtp: extended support for expect option
2016-11-19 16:38:07 +01:00
Oliver Skibbe
6026ff5c18 Merge pull request #1374 from riskersen/check_http_perfdata_timeo
check_http: added timeout to perfdata as max val

Resolves #1350
2016-11-19 16:36:26 +01:00
Oliver Skibbe
4430b63b0f Merge pull request #1436 from riskersen/check_disk_iss1420
check_disk - show all disks if state is ok and option error only is used
2016-11-19 16:35:50 +01:00
Holger Weiss
303acfc64f Merge remote-tracking branch 'monitoring-plugins/pr/1443'
* monitoring-plugins/pr/1443:
  add openssl 1.1 support
2016-11-18 11:51:12 +01:00
Jan Wagner
1723a3c761 It's useful to use 'useful' instead of 'usefull' 2016-11-18 11:47:20 +01:00
Holger Weiss
487a9d0a8b check_radius: Replace functions removed in radcli
The radcli library no longer offers the rc_get_ipaddr(),
rc_good_ipaddr(), and rc_own_ipaddress() functions.
2016-11-17 17:22:37 +01:00
Holger Weiss
bfc745a79d check_radius: Fix rc_send_server() call for radcli
With radcli, the rc_send_server() function expects an additional
argument.
2016-11-17 00:03:50 +01:00
Holger Weiss
14929f2687 check_radius: Remove unused variable
The radcli library doesn't define the ENV type, and we don't use it
anyway.
2016-11-15 23:36:59 +01:00
Jan Wagner
2c898cf23f This patch adds support for using the readcli lib.
http://radcli.github.io/radcli/

(Closes #1437)
2016-11-15 23:21:40 +01:00
vagrant
fe1c4bb0e5 add openssl 1.1 support
changes:
  - CRYPTO_lock detection replaced in configure.ac. We don't use that
    function anywhere, so just replace it with the suggested one from
    https://wiki.openssl.org/index.php/Library_Initialization#Autoconf
  - OPENSSL_NO_SSL2 is no longer defined while ssl2 is not included.
    Set it ourself using the suggested openssl 1.1 version check from
    https://wiki.openssl.org/index.php/1.1_API_Changes#Backward_compatibility
  - openssl 1.1 sends a sigpipe if the connection is still open when
    calling SSL_shutdown(), so move the close before the shutdown.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2016-11-13 21:14:02 +00:00
Sven Nierlein
2f845e9ebc Merge pull request #1391 from lausser/patch-1
If a web page contains a nul character, check_http reads the complete page but --string does not search beyond this character.
2016-11-11 11:14:37 +01:00
Sven Nierlein
f938327b49 Revert "adopt http test to changed ssl expire date output"
This reverts commit 6cd50bc42c.
2016-11-11 10:52:36 +01:00
Sven Nierlein
3bdf392ae5 tests: make tests reliable for forcing the locale to C
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2016-11-11 10:52:19 +01:00
Sven Nierlein
9e02d0c3e6 check_http: add host header tests
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2016-11-11 10:32:19 +01:00
Sven Nierlein
6cd50bc42c adopt http test to changed ssl expire date output
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2016-11-11 09:43:13 +01:00
Christopher Odenbach
2233b7aa75 patch to support the concept of virtual ports 2016-11-11 09:33:37 +01:00
Sven Nierlein
9c7f34cb57 Merge pull request #1442 from waja/check_dig_use_retry_instead_tries
check_dig: use +retry instead of +tries
2016-11-08 10:30:06 +01:00
Christian Kujau
4195dc23d1 check_dig: use +retry instead of +tries
After upgrading from an Ubuntu/15.10 to 16.04 installation, I noticed that
check_dig is always returning a WARNING:

$ /usr/lib/nagios/plugins/check_dig -l localhost -v
/usr/bin/dig   -p 53 @127.0.0.1 localhost A +tries=3 +time=6
Looking for: 'localhost'
DNS WARNING - 0.008 seconds response time (dig returned an error status)|time=0.008274s;;;0.000000

The older Ubuntu installation got its check_dig from the
nagios-plugins-standard package[0] which did not include the +tries
option. The current Ubuntu version provides its check_dig from the
monitoring-plugins-standard package[1], which _does_ use the +tries
option that was introduced with df53473[2].

On my system, it so happens that /usr/bin/dig is provided not by the
(BIND) dnsutils package but by knot-dnsutils[3] from the Knot DNS project.
The Knot dig(1) command doesn't support the +tries option[4] but does
support +retry (which is also supported[5] by the BIND dig(1) command).

One way to fix that would be for me to install the BIND dnsutils package. But I did not
want to do that: it's so much larger in size and pulls in much more dependencies
than the knot-dnsutils package.

The patch below changes check_dig to use +retry instead of +tries. Both
options are similar, but not the same:

 +retry - Sets the number of times to retry UDP queries to server to T
          instead of the default, 2. Unlike +tries, this does not include
          the initial query

As number_tries seems to be hard coded to 3, I've lowered DEFAULT_TRIES to
2 so check_dig should behave as before (with +tries=3).

Thanks,
Christian.

[0] http://packages.ubuntu.com/wily/nagios-plugins-standard
[1] http://packages.ubuntu.com/xenial/monitoring-plugins-standard
[2] https://github.com/monitoring-plugins/monitoring-plugins/commit/df53473
[3] http://packages.ubuntu.com/xenial/knot-dnsutils
[4] https://www.knot-dns.cz/docs/2.x/html/man_kdig.html#notes
[5] https://ftp.isc.org/isc/bind9/cur/9.10/doc/arm/man.dig.html

Signed-off-by: Christian Kujau <lists@nerdbynature.de>
2016-11-08 09:54:46 +01:00
Sebastian Herbszt
2742e65798 check_ide_smart: remove unused function
Remove function unused since commit b5cc292.

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2016-11-08 09:52:04 +01:00
Sven Nierlein
85cfc7b1aa tests: enable snmp tests
Enabled snmp tests against snmpd on localhost. It was installed already
in the travis file, we just need to enable the tests by setting the
parameters in the answers file.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2016-11-08 00:50:03 +01:00
Sven Nierlein
b838b75366 check_snmp: fix number of tests skiped 2016-11-08 00:38:55 +01:00
Sven Nierlein
1d4874240a check_snmp: add testcase for no datatype
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2016-11-08 00:29:42 +01:00
Sven Nierlein
d9999194e6 Revert "check_snmp: fix push request 1173 for SNMP responses without datatype indicator"
This reverts commit 3178c8c0ff.
2016-11-08 00:23:28 +01:00
Thomas Kurschel
3178c8c0ff check_snmp: fix push request 1173 for SNMP responses without datatype indicator 2016-11-08 00:11:04 +01:00
Sven Nierlein
0dc6537612 fix superfluous argument to printf (#fixes 1308)
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2016-11-07 23:39:04 +01:00
Sven Nierlein
0bf64b356c Merge pull request #1311 from waja/check_ntp_remove_unused_variables
check_ntp: remove unused variables
2016-11-07 23:08:02 +01:00
Sven Nierlein
19972e99f8 Merge pull request #1309 from waja/negate_remove_unused_variables
negate: remove unused variables
2016-11-07 23:07:34 +01:00
Sven Nierlein
5ebc24d998 Merge pull request #1312 from waja/check_disk_remove_unused_variables
check_disk: remove unused variables
2016-11-07 23:07:16 +01:00
Sven Nierlein
06fdc55195 Merge pull request #1313 from waja/check_ntp_time_remove_unused_variables
check_ntp_time: remove unused variables
2016-11-07 23:06:38 +01:00
Sven Nierlein
28d4812860 Merge pull request #1307 from waja/check_dns_dead_code
check_dns: remove dead code
2016-11-07 23:05:26 +01:00
Sven Nierlein
948db2e3a2 tests: adjust check_http to new output format
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2016-11-07 22:46:06 +01:00
Peter (pir) Radcliffe
2f2b2f1987 GMT expiry display
Change solution to display GMT time in the local display format with
the offset number of hours from GMT to be clear about what timezone
this is if the local display format does not include offset.
2016-11-07 22:42:40 +01:00
Peter (pir) Radcliffe
06059ecd0e Revert "Fix check_http test time output"
This reverts commit 2d9e61a438.
2016-11-07 22:42:40 +01:00
Peter (pir) Radcliffe
2efad48e8c Fix check_http test time output
Tests need to match new output time and timezone.
2016-11-07 22:42:40 +01:00
Peter (pir) Radcliffe
a3a78795b2 Use GMT timezone in SSL certs
SSL certs are required to use times in GMT per
https://www.ietf.org/rfc/rfc5280.txt but the mktime() here assumes the
current timezone.

Fix the time_t conversion to be done assuming GMT with timegm() and
only do it once rather than twice.

Display the expiry date and time with ISO format years and give an
offset from GMT and a timezone to be very clear about exactly what time
is being displayed. Time given is correct and now in the machine’s
timezone.
2016-11-07 22:42:40 +01:00
abrist
7276ce77c7 check_snmp.c - Added IPv6 support
The "-6" optarg now prepends the server_address with "udp6:" for the
snmpget external command as per the net-snmp syntax at:
http://www.net-snmp.org/wiki/index.php/FAQ:Applications_28

Thanks to DrydenK (Roberto Greiner) for the heads up.
2016-11-07 22:13:07 +01:00
Sven Nierlein
aa7ed88c54 check_users: add new test cases
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2016-11-07 21:49:40 +01:00
Sven Nierlein
52cd7d7934 check_users: still allow zero thresholds
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2016-11-07 21:49:03 +01:00
John C. Frickson
a5983eda69 check_users not correctly detecting thresholds
Fix for issue https://github.com/nagios-plugins/nagios-plugins/issues/81

check_users now uses the standard warning and critical ranges parser and
a standard perdata output routine.
2016-11-07 21:36:25 +01:00
Oliver Skibbe
5663b03717 check_disk - show all disks if state is ok and option error only is used
This fix changes output of check_disk in case of --error-only/-e option
is used and state is ok

 - Old output: DISK OK
 - New output: DISK OK - free space: / 159731 MB (83% inode=61%);
   /dev/shm 2926 MB (100% inode=99%); /boot 58 MB (32% inode=99%);

Resolves: #1420
2016-11-04 11:35:12 +01:00
Sven Nierlein
3a12034805 check_by_ssh: print command output in verbose mode
right now it is not possible to print the command output of ssh. check_by_ssh
only prints the command itself. This patchs adds printing the output too. This
makes it possible to use ssh with verbose logging which helps debuging any
connection, key or other ssh problems.
Note: you must use -E,--skip-stderr=<high number>, otherwise check_by_ssh would
always exit with unknown state.

Example:

  ./check_by_ssh -H localhost -o LogLevel=DEBUG3 -C "sleep 1" -E 999 -v

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2016-09-17 07:45:08 +02:00
Holger Weiss
e16dc71d5c Merge branch 'pr/1386'
* pr/1386:
  check_dig: expected answer is now incasesensitive
2016-02-22 23:11:01 +01:00
Holger Weiss
0960239981 Let check_http test use HTTP/1.1 2016-02-22 21:59:58 +01:00
Sven Geggus
d44b8d70a4 DNS is case insensitive!
Thus recent Versions of bind will no longer change .IN-ADDR.ARPA to lowercase
as the uppercase version is also valid.

To have check_dns.c consider this fact change strstr to strcasestr
2016-02-22 17:14:27 +01:00
Gerhard Lausser
8727768834 Update check_http.c
If a web page contains a nul character, check_http reads the complete page but --expect does not search beyond this character.
2015-11-04 16:18:37 +01:00
Gerhard Lausser
b59ac4e615 Typo in check_ldap.c usage 2015-11-02 18:14:09 +01:00
Klaus Ethgen
23436a1851 Fixing the stuff that is broken on btrfs
(Closes #1357)
2015-10-28 00:39:24 +01:00
Daniel Stirnimann
24eea9fa34 check_dig: expected answer is now incasesensitive
check_dig was casesensitive if an expected answer is given.
  Switching strstr with strcasestr fixes this issue

  While testing i noticed a bug where expected is not an exact match
  New issue for that is opened #1385

  This fix closes #1233
2015-10-15 10:59:32 +02:00
Holger Weiss
11c5796d0a Revert "Don't let check_disk hang on hanging file systems"
This reverts commit 6986aa1d0a.  That
commit leads to issues on non-Linux systems, and it seems to not
(always) work as expected on Linux, either.

Conflicts:
	plugins/Makefile.am
	plugins/check_disk.c

Closes #1377 and closes #1329.
2015-10-12 11:07:02 +02:00
Holger Weiss
37928b52a5 Merge branch 'maint'
* maint:
  sslutils: Remove superfluous parenthesis for sslv3 function too
  sslutils: remove superfluous parenthesis
  check_snmp: modified tests
  check_snmp.c: switched DEFAULT_TIMEOUT to DEFAULT_SOCKET_TIMEOUT (provided by utils.h), already used by help description, see issue #1318
  install snmpd on travis tests
  enable libtab on travis builds
  add perl snmp to travis dependencies
  NEWS: Mention check_ups performance data fix
  Fix incorrect performance data thresholds
  check_dhcp: Fix option parsing
  Fixes segfaults when running via monitoring worker (off-by-one)
  travis: fix http test host
  sslutils: Check if OpenSSL supports SSLv3.

Conflicts:
	NEWS
	plugins/sslutils.c
2015-10-08 12:52:10 +02:00
Oliver Skibbe
6b8c0bdf11 check_smtp: extended support for expect option
expect option (-e) supported only first response, so checking for
  any other response like 250-xxx would never match. This fix stores
  return of relevant buffer

  closes #1381
2015-10-08 11:09:25 +02:00
Oliver Skibbe
b6de2341f8 check_smtp.c: modified SSL check for use with -e
- currently STARTTLS check does not work with -e if there's text
    like '220 hostname ESMTP*'. This is caused by SMTP answer from
    host. Postfix answer: 220 2.0.0 Ready to start TLS, Exchange
    2010: 220 2.0.0 SMTP server ready. This fix checks against 220

    closes #1093
2015-10-08 09:04:29 +02:00
Oliver Skibbe
d9d82309e2 * check_http: added timeout to perfdata as max val 2015-10-07 09:14:28 +02:00
Holger Weiss
dfe66c01c0 check_smtp: Let "-D" option imply "-S" 2015-10-06 23:28:24 +02:00
Holger Weiss
b317aaf32a check_smtp: QUIT SMTP connection when "-D" is used
Don't forget to issue an SMTP QUIT command when the -D/--certificate
option is specified.  This avoids undesired MTA log messages.
2015-10-06 23:21:17 +02:00
Holger Weiss
5029714a9d Merge branch 'pr/1373'
* pr/1373:
  check_http: Allow for requesting TLSv1.1/TLSv1.2
2015-10-06 12:57:29 +02:00
Holger Weiss
f43083c6a9 check_http: Allow for requesting TLSv1.1/TLSv1.2
check_http's -S/--ssl option now allows for requesting the TLSv1.1 and
TLSv1.2 protocols.  Apart from that, a '+' suffix can be appended in
oder to also accept newer protocols than the specified version.

Closes #1338, and closes #1354, and closes #1359.
2015-10-04 23:28:35 +02:00
Sven Nierlein
edca257e20 use unknown exit code for help/version in plugins
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2015-10-04 19:24:30 +02:00
Jan Wagner
8e661a3bd6 sslutils: Remove superfluous parenthesis for sslv3 function too 2015-10-04 15:16:15 +02:00
Sebastian Herbszt
0a406d8dce sslutils: remove superfluous parenthesis
Remove superfluous parenthesis.

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2015-10-04 15:09:36 +02:00
Oliver Skibbe
2d677b19ed check_snmp: modified tests
(Closes #1325)
2015-10-04 13:40:04 +02:00
Oliver Skibbe
6ba26122f4 check_snmp.c: switched DEFAULT_TIMEOUT to DEFAULT_SOCKET_TIMEOUT (provided by utils.h), already used by help description, see issue #1318 2015-10-04 13:20:32 +02:00
Laurent Licour
1861e6a2d9 plugins/check_http.c - fix regression introduced in commit 388ea928 (Host header) 2015-10-02 21:12:58 +02:00
LAURENT LICOUR
44ba1f7064 plugins/check_http.c - fix Host header if explicitly set with -k 2015-10-02 21:12:58 +02:00
Sven Nierlein
0be10c669e Merge pull request #1257 from gcoxmoz/master
check_tcp: Fixing to return desired exit code
2015-10-02 19:54:31 +02:00
Sven Nierlein
9c32acf5bb fix tests for certificates expire date with seconds 2015-10-02 16:27:12 +02:00
Sven Nierlein
13d9c31b17 Merge pull request #1315 from waja/utils_remove_unused_variable
utils: remove unused variable
2015-10-02 16:01:24 +02:00
Sven Nierlein
7811f31018 Merge pull request #1349 from waja/check_http_ssl_via_proxy
check_http: Adding support for checking SSL-Websites through Proxies
2015-10-02 16:00:09 +02:00
Sven Nierlein
1784b0ac0c add faketime based tests for check_http 2015-10-02 15:56:19 +02:00
Sven Nierlein
9eeb3e170f fix typo from #1336
if exactly one hour before the expire date, we would mixup
minutes and hours.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2015-10-02 15:56:19 +02:00
Matthias Hähnel
e1ed1d805e Update sslutils.c
Fixed Output if the expiration time is below one hour and code cleanup
2015-10-02 15:56:18 +02:00
Matthias Hähnel
2ce2296842 Update sslutils.c
optimize output if certificate expires in less then 24h
thx to axel.schmalowsky@sixt.com for this patch
2015-10-02 15:56:18 +02:00
Louis Sautier
0b80412264 Fix incorrect performance data thresholds
Closes #1330
2015-10-02 13:13:35 +02:00
Jan Wagner
96932fd7b7 check_snmp: small improvement by anonymous submission
- response should not start with the delimiter
- OID response value taken into account

Closes issue #1029
Closes push request #1173
2015-10-02 12:57:25 +02:00
Sven Nierlein
5818a3f24d Merge pull request #1343 from awiddersheim/ipv6/check_fping
check_fping: autodetect ipv6 addresses
2015-10-02 10:40:05 +02:00
Sven Nierlein
1c0ec88152 travis: fix http test host
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2015-10-02 10:30:01 +02:00
Michael Melcher
342dd1b97f check_http: Adding support for checking SSL-Websites through Proxies
Ported the fix from Frank4dd to the latest git version. See also http://nagios.frank4dd.com/howto/monitor-ssl-web
sites-through-proxy.htm
2015-10-01 17:20:01 +02:00
Sven Nierlein
d73c57aa06 travis: fix http test host
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2015-10-01 17:05:47 +02:00
Jérémie Courrèges-Anglas
4e786f83de sslutils: Check if OpenSSL supports SSLv3. 2015-08-26 11:36:03 +02:00
Andrew Widdersheim
6a682b379f Allow check_fping to autodetect ipv6 addresses
Stole the logic in check_ping that allows it to autodetect whether an
address is ipv6 or not. Now the user does not have to specify -6 when
using check_fping with ipv6 addresses.
2015-08-13 10:21:01 -04:00
Sven Nierlein
82e28411c8 check_ldap: fix number of skipable tests
Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2015-04-23 09:51:26 +02:00
Sven Nierlein
169fbdae7e check_ldap: fix entries threshold check
fix typo in threshold check. instead of setting the state always
to warning, use the result from the thresholds entry check.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2015-04-22 12:51:29 +02:00
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
Sebastian Herbszt
4383f39cd5 utils: remove unused variable
Remove unused variable.

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2014-12-27 15:30:18 +01:00
Sebastian Herbszt
2daf38b0aa check_ntp_time: remove unused variables
Remove unused variables.

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2014-12-27 15:28:12 +01:00
Sebastian Herbszt
fec3e01f89 check_ntp: remove unused variables
Remove unused variables.

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2014-12-27 15:22:15 +01:00
Sebastian Herbszt
81b33d4514 check_disk: remove unused variables
Remove unused variables.

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2014-12-27 15:20:57 +01:00
Sebastian Herbszt
0608d3f16a negate: remove unused variables
Remove unused variables.

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2014-12-15 19:42:33 +01:00
Sebastian Herbszt
193ea6b5d7 check_dns: remove dead code
Remove code dead since commit 4efa917.

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
2014-12-15 17:44:13 +01: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
nafets
bb16b73130 added option to exit with an warning, if there is output on STDERR 2014-11-17 23:00:45 +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
Greg Cox
4273dd06ff Merge remote-tracking branch 'upstream/master'
Conflicts:
	plugins/netutils.c
2014-07-29 18:52:12 -04: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