Module: check_mk
Branch: master
Commit: cc8f5dfb380296611a2a2cf5f6c86b7dde1a79fd
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc8f5dfb380296…
Author: Moritz Kiemer <mo(a)mathias-kettner.de>
Date: Tue Feb 5 12:24:30 2019 +0100
mk_docker.py: prepare by renaming docker.include
Change-Id: I1c679ed1dd24c5443d4ae7692606c29690cb4cf7
---
checks/docker_node_disk_usage | 2 +-
checks/docker_node_info | 2 +-
checks/{docker.include => legacy_docker.include} | 0
inventory/docker_node_images | 4 ++--
inventory/docker_node_network | 2 +-
tests/unit/checks/test_docker_parse_helpers.py | 2 +-
tests/unit/checks/test_docker_parse_network_inspect.py | 2 +-
tests/unit/checks/test_docker_parse_node_images.py | 2 +-
tests/unit/checks/test_docker_parse_node_info.py | 2 +-
tests/unit/checks/test_docker_parse_subsection_image_inspect.py | 2 +-
tests/unit/checks/test_docker_parse_system_df.py | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/checks/docker_node_disk_usage b/checks/docker_node_disk_usage
index 716d2b8..6378ba5 100644
--- a/checks/docker_node_disk_usage
+++ b/checks/docker_node_disk_usage
@@ -62,7 +62,7 @@ check_info["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"],
+ "includes": ["legacy_docker.include"],
"has_perfdata": True,
"group": "docker_node_disk_usage",
}
diff --git a/checks/docker_node_info b/checks/docker_node_info
index 38c76c9..0a51008 100644
--- a/checks/docker_node_info
+++ b/checks/docker_node_info
@@ -39,7 +39,7 @@ def check_docker_node_info(item, params, parsed):
check_info['docker_node_info'] = {
- 'includes': ['docker.include'],
+ 'includes': ['legacy_docker.include'],
'parse_function': parse_docker_node_info,
'inventory_function': inventory_docker_node_info,
'check_function': check_docker_node_info,
diff --git a/checks/docker.include b/checks/legacy_docker.include
similarity index 100%
rename from checks/docker.include
rename to checks/legacy_docker.include
diff --git a/inventory/docker_node_images b/inventory/docker_node_images
index 80dab49..0825a7f 100644
--- a/inventory/docker_node_images
+++ b/inventory/docker_node_images
@@ -50,7 +50,7 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree):
inv_info['docker_node_images'] = {
- 'includes': ['docker.include'],
+ 'includes': ['legacy_docker.include'],
'inv_function': inv_docker_node_images,
'has_status_data': True,
}
@@ -83,7 +83,7 @@ def _format_labels(labels):
# 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'] = {
- 'includes': ['docker.include'],
+ 'includes': ['legacy_docker.include'],
'inv_function': inv_docker_node_images_containers,
'has_status_data': True,
}
diff --git a/inventory/docker_node_network b/inventory/docker_node_network
index fb6f972..7953e49 100644
--- a/inventory/docker_node_network
+++ b/inventory/docker_node_network
@@ -69,6 +69,6 @@ def inv_docker_node_network_networks(info, inventory_tree,
status_data_tree):
inv_info["docker_node_network.networks"] = {
- "includes": ["docker.include"],
+ "includes": ["legacy_docker.include"],
"inv_function": inv_docker_node_network_networks,
}
diff --git a/tests/unit/checks/test_docker_parse_helpers.py
b/tests/unit/checks/test_docker_parse_helpers.py
index 41d8d5b..8195a4a 100644
--- a/tests/unit/checks/test_docker_parse_helpers.py
+++ b/tests/unit/checks/test_docker_parse_helpers.py
@@ -3,7 +3,7 @@ import os
pytestmark = pytest.mark.checks
-execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/docker.include'))
+execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/legacy_docker.include'))
@pytest.mark.parametrize('indata,outdata', [
diff --git a/tests/unit/checks/test_docker_parse_network_inspect.py
b/tests/unit/checks/test_docker_parse_network_inspect.py
index a0ab810..6aec088 100644
--- a/tests/unit/checks/test_docker_parse_network_inspect.py
+++ b/tests/unit/checks/test_docker_parse_network_inspect.py
@@ -4,7 +4,7 @@ import re
pytestmark = pytest.mark.checks
-execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/docker.include'))
+execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/legacy_docker.include'))
regex = re.compile
diff --git a/tests/unit/checks/test_docker_parse_node_images.py
b/tests/unit/checks/test_docker_parse_node_images.py
index e40420c..a3d12d2 100644
--- a/tests/unit/checks/test_docker_parse_node_images.py
+++ b/tests/unit/checks/test_docker_parse_node_images.py
@@ -7,7 +7,7 @@ pytestmark = pytest.mark.checks
regex = re.compile
-execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/docker.include'))
+execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/legacy_docker.include'))
REQUIRED_IMAGE_KEYS = (
diff --git a/tests/unit/checks/test_docker_parse_node_info.py
b/tests/unit/checks/test_docker_parse_node_info.py
index 391ea7d..f7e6db0 100644
--- a/tests/unit/checks/test_docker_parse_node_info.py
+++ b/tests/unit/checks/test_docker_parse_node_info.py
@@ -3,7 +3,7 @@ import os
pytestmark = pytest.mark.checks
-execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/docker.include'))
+execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/legacy_docker.include'))
@pytest.mark.parametrize('indata,outdata_subset', [
diff --git a/tests/unit/checks/test_docker_parse_subsection_image_inspect.py
b/tests/unit/checks/test_docker_parse_subsection_image_inspect.py
index 0e508b4..c360288 100644
--- a/tests/unit/checks/test_docker_parse_subsection_image_inspect.py
+++ b/tests/unit/checks/test_docker_parse_subsection_image_inspect.py
@@ -4,7 +4,7 @@ import re
pytestmark = pytest.mark.checks
-execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/docker.include'))
+execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/legacy_docker.include'))
regex = re.compile
diff --git a/tests/unit/checks/test_docker_parse_system_df.py
b/tests/unit/checks/test_docker_parse_system_df.py
index a9dd43f..816ce10 100644
--- a/tests/unit/checks/test_docker_parse_system_df.py
+++ b/tests/unit/checks/test_docker_parse_system_df.py
@@ -4,7 +4,7 @@ import re
pytestmark = pytest.mark.checks
-execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/docker.include'))
+execfile(os.path.join(os.path.dirname(__file__),
'../../../checks/legacy_docker.include'))
regex = re.compile