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
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
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