[checkmk-commits] docker: preparing for new plugin

Module: check_mk Branch: master Commit: f102cb7dc19b91bebccbae0f77b568abe0cd2065 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f102cb7dc19b91… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 7 13:47:31 2019 +0100 docker: preparing for new plugin Change-Id: I2deb08cd58ae504b4ae45898b74059bb4aaac157 --- inventory/docker_node_images | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/inventory/docker_node_images b/inventory/docker_node_images index 0825a7f..5e8bbb6 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -26,7 +26,8 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): - images = parse_docker_node_images(info).get("images", {}) + parsed = parse_docker_node_images(info) + images = parsed.get("images", {}) path = "software.applications.docker.images:" inv_node = inventory_tree.get_list(path) status_node = status_data_tree.get_list(path) @@ -48,16 +49,7 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): "amount_containers": image["amount_containers"], }) - -inv_info['docker_node_images'] = { - 'includes': ['legacy_docker.include'], - 'inv_function': inv_docker_node_images, - 'has_status_data': True, -} - - -def inv_docker_node_images_containers(info, inventory_tree, status_data_tree): - containers = parse_docker_node_images(info).get("containers", {}) + containers = parsed.get("containers", {}) status_node = status_data_tree.get_list("software.applications.docker.containers:") for container in sorted(containers.itervalues(), key=lambda c: c["ID"]): @@ -78,12 +70,8 @@ def _format_labels(labels): return ", ".join(["%s: %s" % item for item in labels]) -# TODO: This section contains also information about the containers. We should -# better split it into multiple sections and add them to the different plugins -# using the extra_sections feature. In case this is not possible for the inventory -# plugins at the moment we should make it possible. -inv_info['docker_node_images.containers'] = { +inv_info['docker_node_images'] = { 'includes': ['legacy_docker.include'], - 'inv_function': inv_docker_node_images_containers, + 'inv_function': inv_docker_node_images, 'has_status_data': True, }