Module: check_mk Branch: master Commit: 129459aa9b029b53c638a329cd4ac2fae1ace777 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=129459aa9b029b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Apr 29 19:52:00 2018 +0200 6047 FIX docker_node_info: Fix crash in case docker process is not running Change-Id: Id927a4cb7a000031037ebf49206effad985d1ddd --- .werks/6047 | 11 +++++++++++ inventory/docker_node_info | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/.werks/6047 b/.werks/6047 new file mode 100644 index 0000000..cb239cf --- /dev/null +++ b/.werks/6047 @@ -0,0 +1,11 @@ +Title: docker_node_info: Fix crash in case docker process is not running +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525024297 + + diff --git a/inventory/docker_node_info b/inventory/docker_node_info index 67c6cf5..cd26d49 100644 --- a/inventory/docker_node_info +++ b/inventory/docker_node_info @@ -27,6 +27,10 @@ def inv_docker_node_info(parsed, inventory_tree): + if not isinstance(parsed, dict): + # String with error message in case the daemon is not running + return + node = inventory_tree.get_dict("software.applications.docker.") node["version"] = parsed[u"ServerVersion"]