[checkmk-commits] Rename docker_system_df to docker_node_disk_usage

Module: check_mk Branch: master Commit: 5269adb04f4fa631461d3688d6528eff8a5dd9d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5269adb04f4fa6… Author: Tom Baerwinkel &lt;tb(a)mathias-kettner.de&gt; Date: Tue Apr 10 10:35:42 2018 +0200 Rename docker_system_df to docker_node_disk_usage Change-Id: I89817c498de06eddb4b693d335013b6b57a45fed --- agents/check_mk_agent.linux | 2 +- checkman/{docker_system_df => docker_node_disk_usage} | 4 ++-- checks/{docker_system_df => docker_node_disk_usage} | 16 ++++++++-------- web/plugins/metrics/check_mk.py | 2 +- web/plugins/wato/check_parameters.py | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 43e5d70..4a1350f 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -967,7 +967,7 @@ if type docker > /dev/null 2>&1 ; then echo "<<<docker_node_info>>>" docker info --format "{{json .}}" 2>&1 - echo "<<<docker_system_df:sep(44)>>>" + echo "<<<docker_node_disk_usage:sep(44)>>>" docker system df --format "{{json .}}" 2>&1 echo "<<<docker_node_images>>>" diff --git a/checkman/docker_system_df b/checkman/docker_node_disk_usage similarity index 65% rename from checkman/docker_system_df rename to checkman/docker_node_disk_usage index 38365f7..bb6dc2c 100644 --- a/checkman/docker_system_df +++ b/checkman/docker_node_disk_usage @@ -1,10 +1,10 @@ -title: Docker disk usage +title: Docker node disk usage agents: linux catalog: app/docker license: GPL distribution: check_mk description: - This check monitors the absolute total and active number as well as the size and + This check monitors the total and active number as well as the size and reclaimable size of containers, images, local volumes, and build cache. inventory: diff --git a/checks/docker_system_df b/checks/docker_node_disk_usage similarity index 88% rename from checks/docker_system_df rename to checks/docker_node_disk_usage index 44be036..edc0cbd 100644 --- a/checks/docker_system_df +++ b/checks/docker_node_disk_usage @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. -def parse_docker_system_df(info): +def parse_docker_node_disk_usage(info): import json parsed = {} @@ -45,12 +45,12 @@ def parse_docker_system_df(info): return parsed -def inventory_docker_system_df(parsed): +def inventory_docker_node_disk_usage(parsed): for item in parsed: yield item, {} -def check_docker_system_df(item, params, parsed): +def check_docker_node_disk_usage(item, params, parsed): data = parsed.get(item) if data is None: yield 3, "no data" @@ -77,12 +77,12 @@ def check_docker_system_df(item, params, parsed): yield status, infotext, perfdata -check_info["docker_system_df"] = { - "parse_function": parse_docker_system_df, - "inventory_function": inventory_docker_system_df, - "check_function": check_docker_system_df, +check_info["docker_node_disk_usage"] = { + "parse_function": parse_docker_node_disk_usage, + "inventory_function": inventory_docker_node_disk_usage, + "check_function": check_docker_node_disk_usage, "service_description": "Docker disk usage - %s", "includes": ["docker.include"], "has_perfdata": True, - "group": "docker_system_df", + "group": "docker_node_disk_usage", } diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index f4a8b87..493ffb2 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4796,7 +4796,7 @@ check_metrics["check_mk-docker_node_info.containers"] = { "stopped" : { "name" : "docker_stopped_containers" }, } -check_metrics["check_mk-docker_system_df"] = { +check_metrics["check_mk-docker_node_disk_usage"] = { "count" : { "name" : "docker_count" }, "active" : { "name" : "docker_active" }, "size" : { "name" : "docker_size" }, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6fb5094..4107a7e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -15436,7 +15436,7 @@ register_check_parameters( register_check_parameters( subgroup_applications, - "docker_system_df", + "docker_node_disk_usage", _("Docker node disk usage"), Dictionary( help = _("Allows to define levels for the counts and size of Docker Containers, Images, Local Volumes, and the Build Cache."),