Commit graph

2925 commits

Author SHA1 Message Date
Holger Weiss
d1fbd4aa29 doc/developer-guidelines.sgml: Add missing tag 2015-10-08 12:52:19 +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
Holger Weiss
934fa89f46 Merge branch 'pr/1379'
* pr/1379:
  check_smtp.c: modified SSL check for use with -e
2015-10-08 10:24: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
Jan Wagner
dbd38bf7ec plugins-scripts/Makefile.am: Testing shell scripts with 'sh -n' 2015-10-05 11:07:19 +02:00
Jan Wagner
2369338191 plugins-scripts/Makefile.am: Cosmetical changes 2015-10-05 09:59:50 +02:00
Holger Weiss
8b2a2b1f4a Merge branch 'pr/1364'
* pr/1364:
  check_ntp.pl: Droping this superseded plugin

Conflicts:
	NEWS
	plugins-scripts/check_ntp.pl
2015-10-04 23:48:28 +02:00
Holger Weiss
da3327fead NEWS: Fix typos 2015-10-04 23:44:35 +02:00
Holger Weiss
3f17f18416 Merge branch 'pr/1363'
* pr/1363:
  use unknown exit code for help/version in plugins-root as well
  use unknown exit code for help/version in plugins
  change exit code to unknown on help and version info
  use exit code 3 for version and help
2015-10-04 23:42:41 +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
Jan Wagner
8832694161 check_ntp.pl: Droping this superseded plugin 2015-10-04 21:17:48 +02:00
Jan Wagner
5ca1bff80c check_netdns.pl: Prototyping functions 2015-10-04 19:50:18 +02:00
Sven Nierlein
bebf1cd050 use unknown exit code for help/version in plugins-root as well
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2015-10-04 19:24:30 +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
Sven Nierlein
d6baf9dbce change exit code to unknown on help and version info
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2015-10-04 19:24:30 +02:00
Sven Nierlein
741710c27c use exit code 3 for version and help
Plugins which use OK state for help or version information may run
unnoticed in that modes without doing any check. So its good
style to let version and help exit with Unknown state.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2015-10-04 19:04:46 +02:00
Jan Wagner
20d223119e check_ntp.pl: Using FindBin 2015-10-04 18:38:25 +02:00
Jan Wagner
2f5d0b105c travis-ci: Add dependencies to run 'perl -wc' 2015-10-04 17:38:01 +02:00
Jan Wagner
c0b4f41899 plugins-scripts/Makefile.am: Testing scripts with 'perl -wc' 2015-10-04 17:37:52 +02:00
Sven Nierlein
5a9ca0590f Merge pull request #1362 from waja/sslutils_remove_superfluous_parenthesis
sslutils: remove superfluous parenthesis
2015-10-04 15:26:13 +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
ccae9fea1d update thanks file 2015-10-02 15:58:01 +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
Elan Ruusamäe
a9b02e7aff also update check_rpc.pl and check_wave.pl 2015-10-02 14:39:25 +02:00
Elan Ruusamäe
8079ead7fa drop superfluous libexecdir
utils.pm locate is already convered by FindBin
2015-10-02 13:58:43 +02:00
Sven Nierlein
f693f2c0bf install snmpd on travis tests
because its required for ./plugins/tests/check_snmp.t

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2015-10-02 13:55:41 +02:00
Sven Nierlein
9e49f7e656 enable libtab on travis builds
to enable some more tests

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2015-10-02 13:55:31 +02:00
Sven Nierlein
f3bf672ebb add perl snmp to travis dependencies
it is required for the check_snmp tests

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2015-10-02 13:55:18 +02:00
Holger Weiss
63f8441b84 NEWS: Mention check_ups performance data fix 2015-10-02 13:29:28 +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
Holger Weiss
466cb79e52 check_dhcp: Fix option parsing
The call_getopt() function didn't always return the correct number of
processed arguments.  However, since check_dhcp doesn't support
non-option arguments, the caller doesn't need this number anyway.

Closes #1345.
2015-10-02 12:18:13 +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
Jan Wagner
6a939fa1ba Fixes segfaults when running via monitoring worker
(off-by-one)

Grabed from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198318
2015-10-02 10:32:00 +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