Commit graph

1581 commits

Author SHA1 Message Date
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
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
b59ac4e615 Typo in check_ldap.c usage 2015-11-02 18:14:09 +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
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
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