[checkmk-commits] #3203 FIX Distributed WATO: Fixed exception in remote host service discovery

Module: check_mk Branch: master Commit: 80f9afc8afeaca34609217e347b662e1c7d0ee74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80f9afc8afeaca… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Feb 15 13:53:33 2016 +0100 #3203 FIX Distributed WATO: Fixed exception in remote host service discovery Fixed an exception which could occur during automation calls between distributed sites: 2016-02-15 13:49:14 [3] [13761] /heute/check_mk/wato.py Internal error: Traceback (most recent call last): File "/omd/sites/heute/share/check_mk/web/htdocs/index.py", line 131, in handler handler() File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 188, in page_handler result = modefunc("action") File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 15850, in <lambda> "inventory" : (["hosts"], lambda phase: mode_inventory(phase, False)), File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 2669, in mode_inventory check_mk_automation(host.site_id(), "set-autochecks", [hostname], active_checks) File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3878, in check_mk_automation return check_mk_remote_automation(siteid, command, args, indata, stdin_data, timeout) File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3072, in check_mk_remote_automation ("timeout", mk_repr(indata)), # The timeout File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3099, in do_remote_automation raise MKAutomationException("<pre>%s</pre>" % response) MKAutomationException: <pre>%d format: a number is required, not dictTraceback (most recent call last): File &quot;/omd/sites/slave/share/check_mk/web/htdocs/index.py&quot;, line 63, in handler handler() File &quot;/omd/sites/slave/share/check_mk/web/htdocs/wato.py&quot;, line 9515, in page_automation result = check_mk_local_automation(cmk_command, args, indata, stdin_data, timeout) File &quot;/omd/sites/slave/share/check_mk/web/htdocs/watolib.py&quot;, line 3883, in check_mk_local_automation args = [ &quot;--timeout&quot;, &quot;%d&quot; % timeout ] + args TypeError: %d format: a number is required, not dic --- .werks/3203 | 35 +++++++++++++++++++++++++++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 2 +- 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/.werks/3203 b/.werks/3203 new file mode 100644 index 0000000..f5724ed --- /dev/null +++ b/.werks/3203 @@ -0,0 +1,35 @@ +Title: Distributed WATO: Fixed exception in remote host service discovery +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455540745 + +Fixed an exception which could occur during automation calls between distributed +sites: + +2016-02-15 13:49:14 [3] [13761] /heute/check_mk/wato.py Internal error: Traceback (most recent call last): + File "/omd/sites/heute/share/check_mk/web/htdocs/index.py", line 131, in handler + handler() + File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 188, in page_handler + result = modefunc("action") + File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 15850, in <lambda> + "inventory" : (["hosts"], lambda phase: mode_inventory(phase, False)), + File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 2669, in mode_inventory + check_mk_automation(host.site_id(), "set-autochecks", [hostname], active_checks) + File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3878, in check_mk_automation + return check_mk_remote_automation(siteid, command, args, indata, stdin_data, timeout) + File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3072, in check_mk_remote_automation + ("timeout", mk_repr(indata)), # The timeout + File "/omd/sites/heute/share/check_mk/web/htdocs/watolib.py", line 3099, in do_remote_automation + raise MKAutomationException("<pre>%s</pre>" % response) +MKAutomationException: <pre>%d format: a number is required, not dictTraceback (most recent call last): + File &quot;/omd/sites/slave/share/check_mk/web/htdocs/index.py&quot;, line 63, in handler + handler() + File &quot;/omd/sites/slave/share/check_mk/web/htdocs/wato.py&quot;, line 9515, in page_automation + result = check_mk_local_automation(cmk_command, args, indata, stdin_data, timeout) + File &quot;/omd/sites/slave/share/check_mk/web/htdocs/watolib.py&quot;, line 3883, in check_mk_local_automation + args = [ &quot;--timeout&quot;, &quot;%d&quot; % timeout ] + args +TypeError: %d format: a number is required, not dic diff --git a/ChangeLog b/ChangeLog index 9330266..4caf501 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ WATO: * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control + * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index da601a7..d457d80 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3070,7 +3070,7 @@ def check_mk_remote_automation(siteid, command, args, indata, stdin_data=None, t ("arguments", mk_repr(args)), # The arguments for the command ("indata", mk_repr(indata)), # The input data ("stdin_data", mk_repr(stdin_data)), # The input data for stdin - ("timeout", mk_repr(indata)), # The timeout + ("timeout", mk_repr(timeout)), # The timeout ]) return response