Commit graph

1315 commits

Author SHA1 Message Date
Holger Weiss
461cea4261 check_snmp: Fix support for inverse thresholds
Commit bd78299056 reintroduced support for
inverse threshold ranges such as "2:1", but it broke standard thresholds
such as "1:2" (by converting this range into "1") or "1:" (by converting
this range into "@:2").  This commit fixes those two bugs, plus an
off-by-one error while computing the number of bytes to allocate when
handling inverse thresholds (two additional bytes were allocated where
three were required to hold '@' and ':' and '\0').  While at it, we also
check whether malloc(3) succeeded.
2013-08-21 15:00:27 +02:00
Holger Weiss
f4b90cabc0 Set SSL_MODE_AUTO_RETRY flag
We use OpenSSL (or GnuTLS) with blocking semantics, and we don't want
SSL_read(3) or SSL_write(3) calls to return SSL_ERROR_WANT_READ or
SSL_ERROR_WANT_WRITE (see #3614716).
2013-08-20 23:17:23 +02:00
Holger Weiss
92849a1a87 check_users: Use utmpx(5) only if available
For systems that don't provide an utmpx(5) interface, restore the code
that was replaced in commit 3e622f3a47.
2013-08-20 21:13:25 +02:00
Sven Nierlein
4083622f86 added missing header to fix build on freebsd 2013-08-20 17:02:02 +02:00
Holger Weiss
8135f66739 check_ide_smart: "__linux__" instead of "linux"
C compilers in standards compliance mode will not define "linux", as it
doesn't begin with an underscore.
2013-08-20 00:55:43 +02:00
Holger Weiss
36a9b52cae check_ide_smart: Add support for NetBSD
Thanks to Emmanuel Dreyfus for providing the patch.
2013-08-20 00:41:16 +02:00
Holger Weiss
5f79e3e9f6 Clean up check for _SC_NPROCESSORS_ONLN
Closes #62.
2013-08-19 22:47:36 +02:00
Holger Weiss
a064001173 Merge branch 'master' of https://github.com/bbense/nagios-plugins
* 'master' of https://github.com/bbense/nagios-plugins:
  Bug fix for ncpus if hyperthreading turned off in linux
2013-08-19 22:47:00 +02:00
Booker C. Bense
f12edfd073 Bug fix for ncpus if hyperthreading turned off in linux 2013-08-19 11:14:05 -07:00
Holger Weiss
30aa7a63f1 check_http: Document the new -E option
Mention the -E/--extended-perfdata flag in the --help output.
2013-08-18 23:18:18 +02:00
Holger Weiss
64b4d1fb66 Abbreviate function name
Make a very long function name at least a little bit shorter.
2013-08-18 23:11:11 +02:00
Holger Weiss
8e444095e8 Merge branch 'master' of https://github.com/cern-mig/nagios-plugins
* 'master' of https://github.com/cern-mig/nagios-plugins:
  added support for client authentication via SSL

Conflicts:
	plugins/check_http.c
2013-08-18 23:10:31 +02:00
Holger Weiss
b5ac0d16b2 check_mysql: Don't accept new positional arguments
Do not also accept the new -f/--file and -g/--group options as
positional arguments (especially not prior to "db_pass" and "db", as
that would break backward compatibility).
2013-08-18 22:30:30 +02:00
Holger Weiss
779b91e48f check_mysql: Use xasprintf instead of asprintf 2013-08-18 22:29:31 +02:00
Holger Weiss
584555098d check_mysql: Fix copy'n'pasted comments 2013-08-18 22:28:18 +02:00
Holger Weiss
14bc7af323 Merge branch 'master' of https://github.com/jonmilby/nagios-plugins
* 'master' of https://github.com/jonmilby/nagios-plugins:
  Updated check_mysql.c to take client options file and group parameters

Conflicts:
	plugins/check_mysql.c
2013-08-18 22:25:08 +02:00
Holger Weiss
6d6f090eaa Merge branch 'fping' of https://github.com/lairsdragon/nagios-plugins
* 'fping' of https://github.com/lairsdragon/nagios-plugins:
  check_fping error handling enhanced, generates UNKNOWN on fping parameter error (i.e. wrong interface, missing perms ..)

Closes #61.
2013-08-18 20:36:42 +02:00
Steve Weinreich
96ec686004 check_fping error handling enhanced, generates UNKNOWN on
fping parameter error (i.e. wrong interface, missing perms ..)
2013-08-18 19:43:39 +02:00
Holger Weiss
c7c1102fcb NEWS: Mention the new "check_snmp --offset" option
... and apply two small cosmetic changes to check_snmp.c.

Closes #59.
2013-08-18 19:38:57 +02:00
Simon Kainz
dc1d1c46d6 added --offset option to allow adjustment of sensor data 2013-08-18 19:35:18 +02:00
Holger Weiss
22519bced6 check_http: Use xasprintf instead of asprintf 2013-08-18 19:16:00 +02:00
Holger Weiss
ebb5572af3 check_http: s/--header_string/--header-string/
The name of the new option is "--header-string".
2013-08-18 19:14:22 +02:00
Holger Weiss
e6bcf11653 check_snmp: Allocate space for the new -Le option
Closes #41.
2013-08-18 19:08:04 +02:00
Mark Keisler
37cf5e3cd5 Add -Le option to snmpcmd to avoid error message of 'No Log Handling Enabled...' 2013-08-18 19:07:24 +02:00
Tim Laszlo
b2568b85af check_mysql: Connections should have been defined as a counter 2013-08-18 18:38:10 +02:00
Tim Laszlo
7bbd155a72 Counter increments were incorrect; remove the leading space from perfdata 2013-08-18 18:38:10 +02:00
Tim Laszlo
c8d8b58447 check_mysql: add perfromance metrics for all checks 2013-08-18 18:38:10 +02:00
Tim Laszlo
1627cdb46a check_mysql: when checking slave thread add performance data for seconds behind master 2013-08-18 18:38:10 +02:00
Holger Weiss
717b0e8d9c Fix the "check_http -d" tests 2013-08-18 18:31:59 +02:00
linkslice
2a8eab6b31 added ability to check regex against http headers. booyah! 2013-08-18 18:23:11 +02:00
Sebastian Schmidt
2f79329c41 check_procs: clarify debug message 2013-08-18 12:59:57 +02:00
Sebastian Schmidt
0efedfb77c check_procs: Assume we have stat()
stat() is in gnulib anyway, so we can safely depend on it.
2013-08-18 12:59:57 +02:00
Sebastian Schmidt
0f686d436e check_procs: Get rid of HAVE_PROC_PID_EXE
Don't check for /proc/pid/exe at compile time, it could be gone in a
build chroot or the like. Checking at runtime (once) is sufficient.
2013-08-18 12:59:57 +02:00
Sebastian Schmidt
d5677d9b42 check_procs: Ignore ENOENT when checking for myself
Previously, when a process exited between the call to /bin/ps and
stat("/proc/his/exe") was exiting it was not considered as possible
instance of check_procs. This commit makes check_procs ignore all
processes where /proc/pid/exe does not exist.
2013-08-18 12:59:57 +02:00
Sebastian Schmidt
274f3ddee2 check_procs: fix typo
Fix a typo in previous commit where st_ was missing in the mock
struct_stat_t, causing check_procs.c to not compile without sys/stat.h.
2013-08-18 12:59:57 +02:00
Sebastian Schmidt
ce7a99789d check_procs: filter out self by /proc/pid/exe
Make check_procs filter out itself in the process list by comparing the
file pointed to by /proc/pid/exe. On platforms where this is not
available or when check_procs is passed the -T flag, the old behaviour
(check whether PID equals getpid()) is retained.

This fixes some false alarms when e.g. Nagios has, for whatever reasons,
some backlog of checks to run and check_procs with -a is called more
than once in a short time, matching its sister process.
2013-08-18 12:59:57 +02:00
Holger Weiss
36c2e50837 check_mysql: Cosmetic changes to SSL support
Use (slightly) more intuitive option names etc.
2013-08-18 01:47:32 +02:00
Juan Carlos Fernandez
8e66a58d41 Added ssl support to check_myslq 2013-08-18 01:28:13 +02:00
Richard Leitner
3931bd9500 Fixed SF.net bug #3552839, check_procs: added -k option to ignore kernel threads
This commit fixes sourceforge.net bug #3552839.
It adds a -k|--no-kthreads option to ignore kernel thread processes.
Please note: currently this feature only works for GNU/Linux systems (due to the fact I have no other systems to test/develop on)
Sorry for that, but I'm sure this can be accomplished by somebody else ;-)
2013-08-18 00:55:34 +02:00
Holger Weiss
108baecaec check_fping: Use fping6(8) only if available
Let check_fping use IPv6 only if

- the operating system supports IPv6,
- the user didn't specify --without-ipv6, and
- the "configure" script found the fping6(8) binary.
2013-08-18 00:30:58 +02:00
Holger Weiss
e4ccd85c50 Merge remote-tracking branch 'github/villemattila/check_fping_ipv6'
* github/villemattila/check_fping_ipv6:
  check_fping: IPv6 support

Conflicts:
	plugins/check_fping.c
2013-08-18 00:02:32 +02:00
Holger Weiss
baa388e6fa check_fping: Remove unused printf(3) arguments 2013-08-17 23:18:57 +02:00
Steve Weinreich
c9169d1256 Added -S und -I parameter to match fping -S and -I parameters.
-S allows to specify the source ip for ICMP pakets
-I allows to specify a interface to bind to
2013-08-17 23:15:59 +02:00
Holger Weiss
b62f0fb444 check_pgsql: Add missing printf(3) argument 2013-08-17 23:06:16 +02:00
Holger Weiss
329f843ef6 check_pgsql: Remove -4/-6 flags from help output
The -4/-6 options are currently not supported.
2013-08-17 22:33:43 +02:00
Holger Weiss
e47a06f77d Merge remote-tracking branch 'github/tokkee/sh/check_pgsql'
* github/tokkee/sh/check_pgsql:
  check_pgsql: Determine connection time in µs-resolution.
  check_pgsql: Leave 'min' value in query perfdata empty.
  check_pgsql: Updated copyright.
  check_pgsql: Added support for the -o command line option.
  check_pgsql: Removed -4/-6 flags from help output.
  check_pgsql: Allow UNIX socket directories as hostname as well.
  check_pgsql: Use PQconnectdb() rather than PQsetdbLogin().
  check_pgsql: Fixed query perfdata output for empty warn/crit ranges.
  check_pgsql: Added support for executing queries.

Conflicts:
	plugins/check_pgsql.c
2013-08-17 22:28:38 +02:00
Holger Weiss
4a3901ec70 plugins/t/check_procs.t: Expect performance data
The check_procs plugin now emits performance data, fix the test(s)
accordingly.
2013-08-17 21:59:45 +02:00
Holger Weiss
29b2dfab4f plugins/t/check_apt.t: Expect performance data
The check_apt plugin now emits performance data, fix the test(s)
accordingly.
2013-08-17 21:52:50 +02:00
Sven Nierlein
ec537bc463 cleanup after check_http patch (fixes #50)
- cleanup whitespace
  - added test cases
  - print time_ssl only if ssl is in use
  - updated news and thanks file
2013-08-15 17:28:49 +02:00
Sebastian Nohn
ee3c4014d5 log more perfdata in check_http 2013-08-15 17:03:31 +02:00