Commit graph

1253 commits

Author SHA1 Message Date
Sven Nierlein
bb3bf05856 Merge pull request #54 from g0hl1n/check_apt_-_run_update_upgrade_return_fix
check_apt now correctly exits when apt-get return != 0
2013-08-15 02:26:08 -07:00
Sven Nierlein
2e6a0138de corrected http test
multiple headers have to be set by multiple -k switches. Seperating them
by semicolons is not longer supported as semicolons are valid characters in
http headers.
2013-08-15 11:10:04 +02:00
Sven Nierlein
5815864e6c Merge pull request #52 from g0hl1n/sf_3571331_check_http_-_removed_semicolon_delimiter_in_-k
Fixed SF.net bug #3571331, check_http converts semicolon to newline in -k
2013-08-15 01:57:11 -07:00
Jan Wagner
b6f0e755fd Fixed SF.net bug 2555775, threshold can be double for check_smtp
Thanks to Roman Fiedler for reporting the issue and providing a fix
2013-08-06 10:55:49 +02:00
Jan Wagner
bfe68d84f7 check_nt: Fixes NULL pointer dereference
Thanks to Vaclav Ovsik for reporting the issue and providing a fix
2013-07-08 18:52:50 +02:00
Holger Weiss
9dad98f33e check_ntp_peer: Verify type of response packets
The check_ntp_peer plugin now ignores response packets with an
unexpected "Operation Code" and/or "Sequence" number (cf. RFC 1305,
Appendix B).  This fixes an issue where the check_ntp_peer requests got
duplicated on their way to the server (due to some network switch bug),
and the server therefore sent multiple responses per request.

Thanks to Marc Haber for reporting the issue.
2013-06-30 16:05:48 +02:00
Jan Wagner
91b2514358 Fixed SF.net bug 1614553, Debian bug #708343, Adding performace data 2013-06-25 15:20:39 +02:00
Richard Leitner
9be408511c check_apt now correctly exits when apt-get return != 0
This commit fixes an issue with check_apt where check_apt doesn't exit
with the appropriate return code when apt-get returned a non-zero value.
2013-05-30 00:05:17 +02:00
Richard Leitner
14225eb464 Fixed SF.net bug #3571331, check_http converts semicolon to newline in -k
This commit fixes sourceforge.net bug id 3571331.
The semicolon was defined as input delimiter for multiple values in the -k arguments.
Due to the fact the semicolon is a valid character for HTTP header fields this input delimiter function was removed.
It is still possible to pass multiple header fields via multiple -k (like described in helptext).
2013-05-29 15:02:15 +02:00
Diego Elio Pettenò
eeca6e0f05 build: fix building with parallel make.
By using a more automake-style handling of dependencies and a single
convenience library, it's tremendously easy to build in parallel.

Note that since the linking happens with the static archives, the
unused objects are discarded and provide no overhead whatsoever.
2013-05-12 14:15:13 +02:00
Diego Elio Pettenò
332c6ef2c7 plugins: rename runcmd's signal handler.
The previous name would collide with popen's. Even if the two are
never used together, it's still a good idea not to have the same
symbol in multiple object files.
2013-05-12 14:15:13 +02:00
Richard Leitner
10a4de3c4c Fixed SF.net bug 3560976, added --include-type/-N option 2013-03-25 23:47:12 +01:00
Richard Leitner
fe5fa2a480 Fixed SF.net bug 3602586, added timeout option for check_nagios 2013-03-25 23:35:13 +01:00
Richard Leitner
6b208a6f31 Fixed SF.net bug 3539317, typo in --help of check_apt 2013-03-25 23:26:29 +01:00
Joerg Linge
e0eb2ebca3 Update plugins/check_procs.c
added missing longopt --user
2013-02-27 23:18:14 +01:00
Sven Nierlein
5fce5ceaeb check_tcp: don't ignore trailing options
"./check_tcp -6 -p 80 host" leads to an error:
TCP CRITICAL - Invalid hostname, address or socket: 127.0.0.1
because 127.0.0.1 is the fallback host, the tailing hostname
was ignored.
2013-02-10 23:09:49 +01:00
Daniël van Eeden
e396a54274 Apply my patch from:
http://sourceforge.net/tracker/index.php?func=detail&aid=3269273&group_id=29880&atid=397597
2013-01-24 08:56:19 +01:00
Sven Nierlein
307da669ee Merge pull request #20 from abradley/aptcritical
Fixes for check_apt handling of -i/-e/-c regexps and SECURITY_RE, plus tests
2013-01-23 11:43:26 -08:00
Sven Nierlein
596af9df57 updated check dig tests
nagios.com seems to have changed their ip address. Also added tests
about -4/-6 option.
2013-01-23 20:26:41 +01:00
Ville Mattila
261ad18670 check_dig: query transport selection support
Add command line options -4 and -6 (--use-ipv4 and
--use-ipv6) to check_dig.

Effectively this adds no new functionality, just a
shortcut for:
  check_dig -A "-4"
  check_dig -A "-6"

Needed for using check_dig with the check_v46 wrapper
(see e.g.
https://gitorious.org/nagios-monitoring-tools/nagios-monitoring-tools/blobs/master/check_v46)
which requires -4/-6 command line option support.
2013-01-23 20:04:04 +01:00
Robin Sonefors
77eba26361 check_snmp: Don't thrash memory when using multiple label/unit argument
The memory allocation mixed up number of bytes with number of pointers,
meaning as soon as we'd reach (on 64 bit systems) the second argument,
we'd start writing it outside of our allocated memory.

Normally, this isn't too visible, but as soon as you (again, on my 64
bit system) reach argument number 8, you get a segfault. It is easily
reproducible with:
check_snmp -o '' -l '' -o '' -l '' -o '' -l '' -o '' -l '' \
           -o '' -l '' -o '' -l '' -o '' -l '' -o '' -l ''

This patch allocates the proper amount of memory, to fix the issue.

Signed-off-by: Robin Sonefors <robin.sonefors@op5.com>
2013-01-23 19:52:24 +01:00
Sven Nierlein
6fde27e478 check_ntp(_time): don't die on connect errors
connect errors may happen if clients check agains dual
stacked ipv4/6 ntp servers.
2012-11-28 13:51:16 +01:00
Sven Nierlein
24772e755e unified ipv4/6 usage and help text 2012-11-28 11:03:11 +01:00
Holger Weiss
92b937e49e check_procs: Remove superfluous newline character 2012-11-14 20:53:47 +01:00
Sebastian Harl
e683a8dce5 check_procs: Added performance data to plugin output. 2012-11-14 20:45:44 +01:00
Sebastian Harl
2bac48c027 check_procs: Use the range/threshold support functions from libnagiosplug.
This adds support for @<range> and makes stuff a bit simpler by removing code
duplications.

Note: Previously, the compatibility code for 'check_procs <warn> <max>'
accepted something like 'check_procs -w 10:-1 -c 10:-1 20 50' as well
(treating it as if '-w 10:20 -c 10:50' was specified). This is no longer the
case ... additional arguments are only used as warn/crit thresholds in case
-w/-c is not specified at all.
2012-11-14 20:45:44 +01:00
Andreas Ericsson
c537d71a3a plugins/check_snmp: Show snmp error when we fail to parse its output
Dying without a hint of what went wrong is just plain annoying. With
this patch we at least get a hint.

While at it, we fix the string offset so the output we're interested
in doesn't keep the equal sign that snmpget prints.

Signed-off-by: Andreas Ericsson <ae@op5.se>
2012-11-02 22:25:37 -04:00
Andreas Ericsson
bd78299056 Make check_snmp backwards compatible in how it parses thresholds
Once upon a time, check_snmp used to accept inverse ranges in the
format of '2:1' to mean "alert if value is inside this range".

Since commit 7cb3ae0933, ranges such
as those have instead triggered the error "Range format incorrect"
and resulted in an UNKNOWN warning state. This patch attempts to
fix the situation so that the old-style ranges continues to mean
exactly what the once did and people with lots of snmp checks can
avoid a bazillion false positives from their environments.

Signed-off-by: Andreas Ericsson <ae@op5.se>
2012-11-02 22:25:37 -04:00
Holger Weiss
b74543a612 Allow for configuring OpenSSL
Let OpenSSL load its configuration file.  See the OPENSSL_config(3) man
page for details.

(Suggested by Max Kosmach in Debian bug report #689960, forwarded by Jan
Wagner.)
2012-10-09 09:44:48 +02:00
Alex Bradley
13e85a0f4f Tests for check_apt
Add a hidden "--input-file" option to check_apt (modelled on
check_procs) so that it can take files with sample apt output as input.

Add tests for my SECURITY_RE fix (debian3) and for the include, exclude
and critical options.
2012-10-03 15:54:24 -07:00
Alex Bradley
09c25be0d1 Fix SourceForge bug 1904965 - check_apt: SECURITY_RE is not correct
For the default security upgrade detection regular expression, match
"Debian-Security" in package description when it's anywhere after the
first parenthesis (not just the second space-delimited word). For
example:

... (4.0.1-5.4 Debian:6.0.6/stable, Debian-Security:6.0/stable ...
2012-10-03 15:25:51 -07:00
Alex Bradley
7918f5868c Don't prepend "^Inst" or append a space to the "include", "exclude", or
"critical" regular expressions. Instead, check for lines beginning
with "Inst" using strncmp and apply the regular expressions only when
such lines are found.

Fixes Debian bug #522812, along the lines suggested by the bug
submitter, Justin T Pryzby.
2012-10-02 23:22:54 -07:00
Gianluca Varisco
2672e95bca Update plugins/check_disk.c
CRITCAL -> CRITICAL typo
2012-09-25 17:45:12 +03:00
Holger Weiss
4cdda35b6c check_http: Update description of -C option
Mention that the -C option now accepts two comma-separated values.
2012-08-10 13:07:44 +02:00
Holger Weiss
d3c9728ebf check_http: Add missing newline to --help output 2012-08-10 13:05:31 +02:00
William Leibzon
6b844aea9f fixing bug in certificate experiation patch checking for bad warning threshold data 2012-08-10 13:03:00 +02:00
Holger Weiss
66003414af tests/check_http.t: Fix whitespace issues
In tests/check_http.t, tabs are used for indentation.

While at it, apply another few cosmetic changes.
2012-08-10 12:49:30 +02:00
Holger Weiss
3f944a50b7 tests/check_http.t: Update the number of SSL tests 2012-08-10 12:41:41 +02:00
Holger Weiss
62d01df1fd tests/check_http.t: Fix test case
Fix the test case which is meant to make sure that

	check_http -C <n>,<m> [...]

returns a CRITICAL state if <m> is large enough.
2012-08-10 12:35:16 +02:00
Holger Weiss
cc04d9f188 check_ntp_peer: Fix --help output for -m and -n
Fix the threshold specifications in the example for checking the number
of truechimers.

Reported by Marc Haber on the "nagios-users" mailing list (Message-ID:
<20120722142840.GA6931@torres.zugschlus.de>).
2012-08-06 21:03:06 +02:00
Holger Weiss
48b83c45af check_ntp_peer: Fix --help output for -W and -C
Mention that the check_ntp_peer plugin checks the stratum of the
synchronization peer, not the stratum of the monitored server itself.

Thanks to Marc Haber for bringing this up on the "nagios-users" mailing
list (Message-ID: <20120722142840.GA6931@torres.zugschlus.de>).
2012-08-06 20:37:43 +02:00
Holger Weiss
3c10d84ea2 check_http: Fix whitespace issues
In check_http.c, tabs aren't used for indentation.
2012-07-18 23:39:05 +02:00
Holger Weiss
ea595f1371 check_http: Fix compilation without SSL support
The "ssl_version" variable was undeclared when the plugins were compiled
--without-openssl and --without-gnutls.

Bug reported by Michael LaCorte on the "nagiosplug-help" mailing list
(Message-ID: <CCD30C91-A2A8-463A-82A9-F99B54F741D3@gmail.com>).
2012-07-18 23:31:17 +02:00
Holger Weiss
800a868713 Merge remote-tracking branch 'github/tokkee/sh/check_dbi' 2012-07-04 23:50:48 +02:00
Eric Stanley
49df5964eb Re-added missing variable declarations to check_smtp.c
A recent update removed the declarations for a couple variables in
check_smtp.c that are still being used, which caused a failure
in the compilation of check_smtp.c. This commit restores those variable
declarations so the check_smtp.c will again compile.
2012-07-04 12:48:07 -05:00
Holger Weiss
b57aeb1e5f check_smtp: Remove a comment regarding MAIL FROM
Earlier versions of check_smtp generated an (invalid) "MAIL FROM"
command without arguments by default.  These days, a "MAIL FROM" command
is only sent if the --from option is specified.

This commit removes a comment which explains the old behaviour, and it
updates a variable name accordingly.
2012-06-29 15:09:34 +02:00
Holger Weiss
973d147cef check_smtp: Fix help and usage output regarding -R 2012-06-29 14:25:40 +02:00
Anders Kaseorg
638b596992 check_smtp: Fix strcat overflows
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2012-06-29 13:39:11 +02:00
Anders Kaseorg
028d50d6f9 Die when asprintf fails
Fixes many instances of
warning: ignoring return value of 'asprintf', declared with attribute warn_unused_result [-Wunused-result]

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2012-06-29 13:39:11 +02:00
Anders Kaseorg
9976876584 check_smtp: Strip angle brackets from -f argument, if provided
Apparently some people used -f '<nagios@example.com>' to work around
the bug I just fixed in the MAIL FROM: command generation.  Although
the resulting command wasn't RFC-compliant, it was working with some
MTAs, so let's continue to support this syntax now that we generate
RFC-compliant commands.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2012-06-29 13:39:11 +02:00