Module: check_mk Branch: master Commit: 087338802631cc7f424e9a359ada038d2c5a1e1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=087338802631cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 10:14:03 2018 +0200 docker_node_network: Changed HW/SW inventory data structure to workaround tree merge issues Change-Id: I9d457177e805e710501a3bfe5eed199d79d8b919 --- inventory/docker_node_network | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/inventory/docker_node_network b/inventory/docker_node_network index 0dba8d9..90e45f7 100644 --- a/inventory/docker_node_network +++ b/inventory/docker_node_network @@ -33,8 +33,8 @@ def _parse_docker_node_network(info): def inv_docker_node_network_networks(info, inventory_tree, status_data_tree): parsed = _parse_docker_node_network(info) - inventory_networks = inventory_tree.get_list("software.applications.docker.networks:") - status_networks = status_data_tree.get_list("software.applications.docker.networks:") + inventory_networks = inventory_tree.get_dict("software.applications.docker.networks.") + status_networks = status_data_tree.get_dict("software.applications.docker.networks.") for network in parsed: labels = sorted(["%s: %s" % (k,v) for k,v in network["Labels"].items()]) @@ -49,18 +49,18 @@ def inv_docker_node_network_networks(info, inventory_tree, status_data_tree): "mac_address" : container["MacAddress"], }) - status_networks.append({ + status_networks[network["Name"]] = { "name" : network["Name"], "containers" : containers, - }) + } - inventory_networks.append({ + inventory_networks[network["Name"]] = { "name" : network["Name"], "host_ifname" : network["Options"]["com.docker.network.bridge.name"], "labels" : ", ".join(labels), "network_id" : network["Id"][:12], "scope" : network["Scope"], - }) + } inv_info["docker_node_network.networks"] = {