Module: check_mk
Branch: master
Commit: 9de0a5d7ca3634fd88664c608fb75fbe0b6d399b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9de0a5d7ca3634…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jun 20 16:58:58 2017 +0200
4890 FIX Fixed broken management board monitoring when using the Microcore
Instead of the configured management board address the host address was
contacted via SNMP which often lead to SNMP timeout messages.
Change-Id: Ic69f89c4e454fe8392ebbdb73c2f966be3c4622e
---
.werks/4890 | 12 ++++++++++++
modules/check_mk_base.py | 10 +++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/.werks/4890 b/.werks/4890
new file mode 100644
index 0000000..ba81380
--- /dev/null
+++ b/.werks/4890
@@ -0,0 +1,12 @@
+Title: Fixed broken management board monitoring when using the Microcore
+Level: 1
+Component: core
+Class: fix
+Compatible: compat
+Edition: cee
+State: unknown
+Version: 1.5.0i1
+Date: 1497970657
+
+Instead of the configured management board address the host address was
+contacted via SNMP which often lead to SNMP timeout messages.
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 90c0427..4698b0f 100644
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -1599,10 +1599,10 @@ def is_manual_check(hostname, check_type, item):
def initialize_check_type_caches():
- snmp_cache = cmk_base.config_cache.get_set("check_type_snmp")
+ snmp_cache = cmk_base.runtime_cache.get_set("check_type_snmp")
snmp_cache.update(snmp_info.keys())
- tcp_cache = cmk_base.config_cache.get_set("check_type_tcp")
+ tcp_cache = cmk_base.runtime_cache.get_set("check_type_tcp")
tcp_cache.update(check_info.keys())
@@ -1612,7 +1612,7 @@ def is_snmp_check(check_name):
try:
return cache[check_name]
except KeyError:
- snmp_checks = cmk_base.config_cache.get_set("check_type_snmp")
+ snmp_checks = cmk_base.runtime_cache.get_set("check_type_snmp")
result = check_name.split(".")[0] in snmp_checks
cache[check_name] = result
@@ -1625,8 +1625,8 @@ def is_tcp_check(check_name):
try:
return cache[check_name]
except KeyError:
- tcp_checks = cmk_base.config_cache.get_set("check_type_tcp")
- snmp_checks = cmk_base.config_cache.get_set("check_type_snmp")
+ tcp_checks = cmk_base.runtime_cache.get_set("check_type_tcp")
+ snmp_checks = cmk_base.runtime_cache.get_set("check_type_snmp")
result = check_name in tcp_checks \
and check_name.split(".")[0] not in snmp_checks # snmp check
basename