Module: check_mk
Branch: master
Commit: 6302c59e3fb1d5e5d474caa04ba9cc938fa7bc1d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6302c59e3fb1d5…
Author: Sven Rueß <sr(a)mathias-kettner.de>
Date: Sat Jan 28 12:30:05 2017 +0100
4332 check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option
The new released monitoring plugins version 2.2 offer new parameters for check_http. The
new SSL options 1.1 for TLSv1.1 and 1.2 for TLSv1.2 were added to support this new
protocol
version.
Change-Id: I590596edd4f3ae59251c95e4320e2a998b04363b
---
.werks/4332 | 12 ++++++++++++
ChangeLog | 1 +
web/plugins/wato/active_checks.py | 2 ++
3 files changed, 15 insertions(+)
diff --git a/.werks/4332 b/.werks/4332
new file mode 100644
index 0000000..86cc517
--- /dev/null
+++ b/.werks/4332
@@ -0,0 +1,12 @@
+Title: check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.4.0i4
+Date: 1485602837
+Class: feature
+
+The new released monitoring plugins version 2.2 offer new parameters for check_http. The
+new SSL options 1.1 for TLSv1.1 and 1.2 for TLSv1.2 were added to support this new
protocol
+version.
+
diff --git a/ChangeLog b/ChangeLog
index 4fba649..87b0c5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
* 4293 wut_webtherm: now detects devices which support WebGraphThermoBaro-MIB
* 4296 mssql_databases: new check which monitors the auto close and shrink state of
MSSQL databases...
* 4215 hp_webmgmt_status: Now also displays device model and serial number
+ * 4332 check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option...
* 4171 FIX: perle_psmu: fixed value error...
* 4172 FIX: smart.temp: fixed discovery and check function...
* 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch
ports' rule which are only used for interface grouping
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index f71f205..0c15d14 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -825,6 +825,8 @@ register_rule(group,
title = _("Use SSL/HTTPS for the
connection"),
choices = [
("auto", _("Use SSL with auto
negotiation")),
+ ("1.2", _("Use SSL, enforce
TLSv1.2")),
+ ("1.1", _("Use SSL, enforce
TLSv1.1")),
("1", _("Use SSL, enforce
TLSv1")),
("2", _("Use SSL, enforce
SSLv2")),
("3", _("Use SSL, enforce
SSLv3")),