Module: check_mk
Branch: master
Commit: 1a934e20a71e6b5155e3bf5672b9d97824eadfb8
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a934e20a71e6b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Nov 8 15:43:04 2018 +0100
6853 FIX Fixed host diagnose not using SNMP retry of 0
Change-Id: I9b77dc60d580ebf61dea289b370ab8a133f3e2bf
---
.werks/6853 | 11 +++++++++++
cmk_base/automations/check_mk.py | 14 ++++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/.werks/6853 b/.werks/6853
new file mode 100644
index 0000000..895b61b
--- /dev/null
+++ b/.werks/6853
@@ -0,0 +1,11 @@
+Title: Fixed host diagnose not using SNMP retry of 0
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.6.0i1
+Date: 1541688153
+
+
diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py
index a7fadfb..11bcbaa 100644
--- a/cmk_base/automations/check_mk.py
+++ b/cmk_base/automations/check_mk.py
@@ -1171,14 +1171,12 @@ class AutomationDiagHost(Automation):
config.explicit_snmp_communities[hostname] = entry
break
- # Override timing settings if provided
- if snmp_timeout or snmp_retries:
- timing = {}
- if snmp_timeout:
- timing['timeout'] = snmp_timeout
- if snmp_retries:
- timing['retries'] = snmp_retries
- config.snmp_timing.insert(0, (timing, [], [hostname]))
+ # Enforce automation call timing settings
+ timing = {
+ 'timeout': snmp_timeout,
+ 'retries': snmp_retries,
+ }
+ config.snmp_timing.insert(0, (timing, [], [hostname]))
# SNMP versions
if test in ['snmpv2', 'snmpv3']: