Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Nagios core: Fix creating default hostgroup if needed

by Lars Michelsen

Module: check_mk Branch: master Commit: bcc473cda542e83507776a5bb498deec3f930962 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcc473cda542e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 24 18:00:38 2019 +0200 Nagios core: Fix creating default hostgroup if needed Change-Id: I3ce0e84497827ac5bdbce2da1815d6d714959c1d --- cmk_base/core_nagios.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 6130c95..e5f1fbe 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -210,7 +210,7 @@ def _create_nagios_host_spec(cfg, config_cache, hostname, attrs): host_spec["check_command"] = command hostgroups = host_config.hostgroups - if config.define_hostgroups: + if config.define_hostgroups or hostgroups == [config.default_host_group]: cfg.hostgroups_to_define.update(hostgroups) host_spec["hostgroups"] = ",".join(hostgroups)

5 years, 2 months

Minor comment cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 3bc0ce415ddd09bf5f4886bae737825e91df1e29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bc0ce415ddd09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 24 16:49:08 2019 +0200 Minor comment cleanup Change-Id: I67303ed4d099de68877d0b2a987f6186d5a8f353 --- cmk_base/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 6e3fed6..16de0f8 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2584,7 +2584,7 @@ class HostConfig(object): """Returns the list of hostgroups of this host If the host has no hostgroups it will be added to the default hostgroup - (Nagios requires each host to be member of at least on group.""" + (Nagios requires each host to be member of at least on group).""" groups = self._config_cache.host_extra_conf(self.hostname, host_groups) if not groups: return [default_host_group]

5 years, 2 months

Cleanup agent related top level functions

by Lars Michelsen

Module: check_mk Branch: master Commit: e9fd427e531ccdd0af7adee251f77a113d204a0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9fd427e531ccd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 22 18:30:28 2019 +0200 Cleanup agent related top level functions CMK-2030 Change-Id: I32abec5279cacaff07aa56b9c34f921221b0141e --- cmk_base/config.py | 94 +++++++++++++++++++------------------- cmk_base/data_sources/tcp.py | 10 ++-- tests/unit/cmk_base/test_config.py | 62 +++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 52 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 2d08c49..fdb5c31 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -777,53 +777,6 @@ def management_credentials_of(hostname): # -# Agent communication -# - - -def agent_port_of(hostname): - ports = get_config_cache().host_extra_conf(hostname, agent_ports) - if len(ports) == 0: - return agent_port - - return ports[0] - - -def tcp_connect_timeout_of(hostname): - timeouts = get_config_cache().host_extra_conf(hostname, tcp_connect_timeouts) - if len(timeouts) == 0: - return tcp_connect_timeout - - return timeouts[0] - - -def agent_encryption_of(hostname): - settings = get_config_cache().host_extra_conf(hostname, agent_encryption) - if settings: - return settings[0] - - return {'use_regular': 'disable', 'use_realtime': 'enforce'} - - -def agent_target_version(hostname): - agent_target_versions = get_config_cache().host_extra_conf(hostname, - check_mk_agent_target_versions) - if agent_target_versions: - spec = agent_target_versions[0] - if spec == "ignore": - return None - elif spec == "site": - return cmk.__version__ - elif isinstance(spec, str): - # Compatibility to old value specification format (a single version string) - return spec - elif spec[0] == 'specific': - return spec[1] - - return spec # return the whole spec in case of an "at least version" config - - -# # Explicit custom variables # def get_explicit_service_custom_variables(hostname, description): @@ -2648,6 +2601,53 @@ class HostConfig(object): of this site""" return self.hostname in self._config_cache.all_configured_clusters() + @property + def agent_port(self): + # type: () -> int + ports = self._config_cache.host_extra_conf(self.hostname, agent_ports) + if not ports: + return agent_port + + return ports[0] + + @property + def tcp_connect_timeout(self): + # type: () -> float + timeouts = self._config_cache.host_extra_conf(self.hostname, tcp_connect_timeouts) + if not timeouts: + return tcp_connect_timeout + + return timeouts[0] + + @property + def agent_encryption(self): + # type: () -> Dict[str, str] + settings = self._config_cache.host_extra_conf(self.hostname, agent_encryption) + if not settings: + return {'use_regular': 'disable', 'use_realtime': 'enforce'} + return settings[0] + + @property + def agent_target_version(self): + # type: () -> Union[None, str, Tuple[str, str]] + agent_target_versions = self._config_cache.host_extra_conf(self.hostname, + check_mk_agent_target_versions) + if not agent_target_versions: + return None + + spec = agent_target_versions[0] + if spec == "ignore": + return None + elif spec == "site": + return cmk.__version__ + elif isinstance(spec, str): + # Compatibility to old value specification format (a single version string) + return spec + elif spec[0] == 'specific': + return spec[1] + + return spec # return the whole spec in case of an "at least version" config + #. # .--Configuration Cache-------------------------------------------------. diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index e64218d..676aa22 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -87,7 +87,7 @@ class TCPDataSource(CheckMKAgentDataSource): if self._port is not None: return self._port - return config.agent_port_of(self._hostname) + return self._host_config.agent_port def set_timeout(self, timeout): self._timeout = timeout @@ -96,7 +96,7 @@ class TCPDataSource(CheckMKAgentDataSource): if self._timeout: return self._timeout - return config.tcp_connect_timeout_of(self._hostname) + return self._host_config.tcp_connect_timeout def _execute(self): if self._use_only_cache: @@ -107,7 +107,7 @@ class TCPDataSource(CheckMKAgentDataSource): port = self._get_port() - encryption_settings = config.agent_encryption_of(self._hostname) + encryption_settings = self._host_config.agent_encryption socktype = (socket.AF_INET6 if self._host_config.is_ipv6_primary else socket.AF_INET) s = socket.socket(socktype, socket.SOCK_STREAM) @@ -174,7 +174,7 @@ class TCPDataSource(CheckMKAgentDataSource): def _sub_result_version(self, agent_info): agent_version = agent_info["version"] - expected_version = config.agent_target_version(self._hostname) + expected_version = self._host_config.agent_target_version if expected_version and agent_version \ and not self._is_expected_agent_version(agent_version, expected_version): @@ -313,7 +313,7 @@ class TCPDataSource(CheckMKAgentDataSource): def describe(self): """Return a short textual description of the agent""" - return "TCP: %s:%d" % (self._ipaddress, config.agent_port_of(self._hostname)) + return "TCP: %s:%d" % (self._ipaddress, self._host_config.agent_port) @classmethod def use_only_cache(cls): diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index d1bed27..0047cb4 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -5,6 +5,7 @@ import pytest # type: ignore from testlib.base import Scenario from cmk.utils.rulesets.ruleset_matcher import RulesetMatchObject +import cmk import cmk.utils.paths import cmk_base.config as config import cmk_base.piggyback as piggyback @@ -263,6 +264,67 @@ def test_prepare_check_command_not_existing_password(capsys): assert "The stored password \"pw-id\" used by service \"blub\" on host \"bla\"" in stderr +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", 6556), + ("testhost2", 1337), +]) +def test_host_config_agent_port(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("agent_ports", [ + (1337, [], ["testhost2"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).agent_port == result + + +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", 5.0), + ("testhost2", 12.0), +]) +def test_host_config_tcp_connect_timeout(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("tcp_connect_timeouts", [ + (12.0, [], ["testhost2"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).tcp_connect_timeout == result + + +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", { + 'use_regular': 'disable', + 'use_realtime': 'enforce' + }), + ("testhost2", { + 'use_regular': 'enforce', + 'use_realtime': 'disable' + }), +]) +def test_host_config_agent_encryption(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("agent_encryption", [ + ({ + 'use_regular': 'enforce', + 'use_realtime': 'disable' + }, [], ["testhost2"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).agent_encryption == result + + +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", None), + ("testhost2", cmk.__version__), +]) +def test_host_config_agent_target_version(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("check_mk_agent_target_versions", [ + ("site", [], ["testhost2"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).agent_target_version == result + + def test_http_proxies(): assert config.http_proxies == {}

5 years, 2 months

Cleanup config mangement board related functions

by Lars Michelsen

Module: check_mk Branch: master Commit: c4d96eaf49f06929680ac26d73616c382fc152b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4d96eaf49f069… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 08:11:55 2019 +0200 Cleanup config mangement board related functions CMK-2030 Change-Id: Ief8b8139a65ed6b65ade1a9ef852185e7ccbe1fe --- cmk_base/config.py | 76 +++++++++++++-------------- cmk_base/data_sources/abstract.py | 8 +-- tests/integration/cmk_base/test_mgmt_board.py | 40 +++++++------- tests/unit/cmk_base/test_config.py | 12 ++--- tests/unit/cmk_base/test_data_sources_unit.py | 7 ++- 5 files changed, 72 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c4d96eaf49…

5 years, 2 months

Cleanup config.host_of_clustered_service

by Lars Michelsen

Module: check_mk Branch: master Commit: 0d37950a37a3441cdca52c424f07893e8cc75822 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d37950a37a344… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 22 18:14:27 2019 +0200 Cleanup config.host_of_clustered_service CMK-2030 Change-Id: Icf17e71397f04c15ba22d1e8cccf31e4606b0572 --- cmk_base/config.py | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 633c0de..2d08c49 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -917,29 +917,6 @@ def check_interval_of(hostname, section_name): #. -# .--Cluster-------------------------------------------------------------. -# | ____ _ _ | -# | / ___| |_ _ ___| |_ ___ _ __ | -# | | | | | | | / __| __/ _ \ '__| | -# | | |___| | |_| \__ \ || __/ | | -# | \____|_|\__,_|___/\__\___|_| | -# | | -# +----------------------------------------------------------------------+ -# | Code dealing with clusters (virtual hosts that are used to deal with | -# | services that can move between physical nodes. | -# '----------------------------------------------------------------------' - - -# Determine weather a service (found on a physical host) is a clustered -# service and - if yes - return the cluster host of the service. If -# no, returns the hostname of the physical host. -# TODO: Clean this up! -def host_of_clustered_service(hostname, servicedesc, part_of_clusters=None): - return get_config_cache().host_of_clustered_service( - hostname, servicedesc, part_of_clusters=part_of_clusters) - - -#. # .--Services------------------------------------------------------------. # | ____ _ | # | / ___| ___ _ ____ _(_) ___ ___ ___ | @@ -3313,10 +3290,12 @@ class ConfigCache(object): # type: () -> Set[str] return set(strip_tags(clusters.keys())) - # Determine weather a service (found on a physical host) is a clustered - # service and - if yes - return the cluster host of the service. If - # no, returns the hostname of the physical host. def host_of_clustered_service(self, hostname, servicedesc, part_of_clusters=None): + # type: (str, Text, Optional[List[str]]) -> str + """Return hostname to assign the service to + Determine weather a service (found on a physical host) is a clustered + service and - if yes - return the cluster host of the service. If no, + returns the hostname of the physical host.""" if part_of_clusters: the_clusters = part_of_clusters else:

5 years, 2 months

Cleanup config.hostgroups_of

by Lars Michelsen

Module: check_mk Branch: master Commit: 52b4c1e29734760faf7735ed662bf87b6b9053b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52b4c1e2973476… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 22 18:34:50 2019 +0200 Cleanup config.hostgroups_of Centralized fallback to the default hostgroup "check_mk" on the way and added tests for HostConfig.hostgroups. CMK-2030 Change-Id: I2420d215e95f685a13171fa7a2c5674aec54a93e --- cmk_base/config.py | 16 ++++++++++++---- cmk_base/core_nagios.py | 15 ++++----------- cmk_base/dump_host.py | 2 +- cmk_base/modes/check_mk.py | 3 ++- tests/unit/cmk_base/test_config.py | 13 +++++++++++++ 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index fdb5c31..ce049a9 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -791,10 +791,6 @@ def get_explicit_service_custom_variables(hostname, description): # -def hostgroups_of(hostname): - return get_config_cache().host_extra_conf(hostname, host_groups) - - def contactgroups_of(hostname): cgrs = [] @@ -2648,6 +2644,18 @@ class HostConfig(object): return spec # return the whole spec in case of an "at least version" config + @property + def hostgroups(self): + # type: () -> List[str] + """Returns the list of hostgroups of this host + + If the host has no hostgroups it will be added to the default hostgroup + (Nagios requires each host to be member of at least on group.""" + groups = self._config_cache.host_extra_conf(self.hostname, host_groups) + if not groups: + return [default_host_group] + return groups + #. # .--Configuration Cache-------------------------------------------------. diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index adfc8a9..b2ab1b4 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -209,17 +209,10 @@ def _create_nagios_host_spec(cfg, config_cache, hostname, attrs): if command: host_spec["check_command"] = command - # Host groups: If the host has no hostgroups it gets the default - # hostgroup (Nagios requires each host to be member of at least on - # group. - hgs = config.hostgroups_of(hostname) - hostgroups = ",".join(hgs) - if len(hgs) == 0: - hostgroups = config.default_host_group - cfg.hostgroups_to_define.add(config.default_host_group) - elif config.define_hostgroups: - cfg.hostgroups_to_define.update(hgs) - host_spec["hostgroups"] = hostgroups + hostgroups = host_config.hostgroups + if config.define_hostgroups: + cfg.hostgroups_to_define.update(hostgroups) + host_spec["hostgroups"] = ",".join(hostgroups) # Contact groups cgrs = config.contactgroups_of(hostname) diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py index 4cb81f3..1c4980e 100644 --- a/cmk_base/dump_host.py +++ b/cmk_base/dump_host.py @@ -90,7 +90,7 @@ def dump_host(hostname): console.output(tty.yellow + "Parents: " + tty.normal + ", ".join(parents_list) + "\n") console.output(tty.yellow + "Host groups: " + tty.normal + - cmk_base.utils.make_utf8(", ".join(config.hostgroups_of(hostname))) + "\n") + cmk_base.utils.make_utf8(", ".join(host_config.hostgroups)) + "\n") console.output(tty.yellow + "Contact groups: " + tty.normal + cmk_base.utils.make_utf8(", ".join(config.contactgroups_of(hostname))) + "\n") diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 0c521d4..8c0052e 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -233,7 +233,8 @@ def _list_all_hosts(hostgroups, options): hostlist = [] for hn in hostnames: - for hg in config.hostgroups_of(hn): + host_config = config_cache.get_host_config(hn) + for hg in host_config.hostgroups: if hg in hostgroups: hostlist.append(hn) break diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 0047cb4..472b03b 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -325,6 +325,19 @@ def test_host_config_agent_target_version(monkeypatch, hostname, result): assert config_cache.get_host_config(hostname).agent_target_version == result +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", ["check_mk"]), + ("testhost2", ["dingdong"]), +]) +def test_host_config_hostgroups(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("host_groups", [ + ("dingdong", [], ["testhost2"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).hostgroups == result + + def test_http_proxies(): assert config.http_proxies == {}

5 years, 2 months

Cleanup config.contactgroups_of

by Lars Michelsen

Module: check_mk Branch: master Commit: dafa2c64e1fae89f050ed01e9d75014bad649ae7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dafa2c64e1fae8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 22 18:45:10 2019 +0200 Cleanup config.contactgroups_of CMK-2030 Change-Id: Ica112b6bb0b8af42627fdc71091e49e97165bf97 --- cmk_base/config.py | 48 +++++++++++++++++--------------------- cmk_base/core_nagios.py | 8 +++---- cmk_base/dump_host.py | 2 +- tests/unit/cmk_base/test_config.py | 13 +++++++++++ 4 files changed, 40 insertions(+), 31 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index ce049a9..99c57ad 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -787,32 +787,6 @@ def get_explicit_service_custom_variables(hostname, description): # -# Groups -# - - -def contactgroups_of(hostname): - cgrs = [] - - # host_contactgroups may take single values as well as - # lists as item value. Of all list entries only the first - # one is used. The single-contact-groups entries are all - # recognized. - first_list = True - for entry in get_config_cache().host_extra_conf(hostname, host_contactgroups): - if isinstance(entry, list) and first_list: - cgrs += entry - first_list = False - else: - cgrs.append(entry) - - if monitoring_core == "nagios" and enable_rulebased_notifications: - cgrs.append("check-mk-notify") - - return list(set(cgrs)) - - -# # Misc # @@ -2656,6 +2630,28 @@ class HostConfig(object): return [default_host_group] return groups + @property + def contactgroups(self): + # type: () -> List[str] + """Returns the list of contactgroups of this host""" + cgrs = [] # type: List[str] + + # host_contactgroups may take single values as well as lists as item + # value. Of all list entries only the first one is used. The + # single-contact-groups entries are all recognized. + first_list = True + for entry in self._config_cache.host_extra_conf(self.hostname, host_contactgroups): + if isinstance(entry, list) and first_list: + cgrs += entry + first_list = False + else: + cgrs.append(entry) + + if monitoring_core == "nagios" and enable_rulebased_notifications: + cgrs.append("check-mk-notify") + + return list(set(cgrs)) + #. # .--Configuration Cache-------------------------------------------------. diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index b2ab1b4..6130c95 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -215,10 +215,10 @@ def _create_nagios_host_spec(cfg, config_cache, hostname, attrs): host_spec["hostgroups"] = ",".join(hostgroups) # Contact groups - cgrs = config.contactgroups_of(hostname) - if len(cgrs) > 0: - host_spec["contact_groups"] = ",".join(cgrs) - cfg.contactgroups_to_define.update(cgrs) + contactgroups = host_config.contactgroups + if contactgroups: + host_spec["contact_groups"] = ",".join(contactgroups) + cfg.contactgroups_to_define.update(contactgroups) if not host_config.is_cluster: # Parents for non-clusters diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py index 1c4980e..1df425e 100644 --- a/cmk_base/dump_host.py +++ b/cmk_base/dump_host.py @@ -92,7 +92,7 @@ def dump_host(hostname): console.output(tty.yellow + "Host groups: " + tty.normal + cmk_base.utils.make_utf8(", ".join(host_config.hostgroups)) + "\n") console.output(tty.yellow + "Contact groups: " + tty.normal + - cmk_base.utils.make_utf8(", ".join(config.contactgroups_of(hostname))) + "\n") + cmk_base.utils.make_utf8(", ".join(host_config.contactgroups)) + "\n") agenttypes = [] sources = data_sources.DataSources(hostname, ipaddress) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 472b03b..1bdf6da 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -338,6 +338,19 @@ def test_host_config_hostgroups(monkeypatch, hostname, result): assert config_cache.get_host_config(hostname).hostgroups == result +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", []), + ("testhost2", ["dingdong"]), +]) +def test_host_config_contactgroups(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("host_contactgroups", [ + ("dingdong", [], ["testhost2"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).contactgroups == result + + def test_http_proxies(): assert config.http_proxies == {}

5 years, 2 months

Moved special AWS agent tests to own folder

by Simon Betz

Module: check_mk Branch: master Commit: 3775f4aa9b4ab83287f1fd545570d242d3ab38fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3775f4aa9b4ab8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 23 12:06:03 2019 +0200 Moved special AWS agent tests to own folder Change-Id: I1a5214d97d9984755e90db505e90e2a94c869851 --- .../unit/cmk/special_agents/{ => agent_aws}/test_agent_aws_cloudwatch.py | 0 .../cmk/special_agents/{ => agent_aws}/test_agent_aws_costs_and_usage.py | 0 tests/unit/cmk/special_agents/{ => agent_aws}/test_agent_aws_ec2.py | 0 tests/unit/cmk/special_agents/{ => agent_aws}/test_agent_aws_elb.py | 0 tests/unit/cmk/special_agents/{ => agent_aws}/test_agent_aws_rds.py | 0 tests/unit/cmk/special_agents/{ => agent_aws}/test_agent_aws_s3.py | 0 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/unit/cmk/special_agents/test_agent_aws_cloudwatch.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_cloudwatch.py similarity index 100% rename from tests/unit/cmk/special_agents/test_agent_aws_cloudwatch.py rename to tests/unit/cmk/special_agents/agent_aws/test_agent_aws_cloudwatch.py diff --git a/tests/unit/cmk/special_agents/test_agent_aws_costs_and_usage.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_costs_and_usage.py similarity index 100% rename from tests/unit/cmk/special_agents/test_agent_aws_costs_and_usage.py rename to tests/unit/cmk/special_agents/agent_aws/test_agent_aws_costs_and_usage.py diff --git a/tests/unit/cmk/special_agents/test_agent_aws_ec2.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_ec2.py similarity index 100% rename from tests/unit/cmk/special_agents/test_agent_aws_ec2.py rename to tests/unit/cmk/special_agents/agent_aws/test_agent_aws_ec2.py diff --git a/tests/unit/cmk/special_agents/test_agent_aws_elb.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py similarity index 100% rename from tests/unit/cmk/special_agents/test_agent_aws_elb.py rename to tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py diff --git a/tests/unit/cmk/special_agents/test_agent_aws_rds.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_rds.py similarity index 100% rename from tests/unit/cmk/special_agents/test_agent_aws_rds.py rename to tests/unit/cmk/special_agents/agent_aws/test_agent_aws_rds.py diff --git a/tests/unit/cmk/special_agents/test_agent_aws_s3.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_s3.py similarity index 100% rename from tests/unit/cmk/special_agents/test_agent_aws_s3.py rename to tests/unit/cmk/special_agents/agent_aws/test_agent_aws_s3.py

5 years, 2 months

Cleaned up AWS CE test

by Simon Betz

Module: check_mk Branch: master Commit: 15dd9d3fd573d750ac42c7bbb18b957122782e00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15dd9d3fd573d7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 24 11:13:37 2019 +0200 Cleaned up AWS CE test Change-Id: Ia07d172b0f190352740958983e21cac00786fcd6 --- .../agent_aws/agent_aws_fake_clients.py | 29 +++++++++++++++ .../agent_aws/test_agent_aws_costs_and_usage.py | 41 ++-------------------- 2 files changed, 32 insertions(+), 38 deletions(-) diff --git a/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py b/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py index aff7c14..036ff69 100644 --- a/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py +++ b/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py @@ -271,3 +271,32 @@ class CloudwatchDescribeAlarmsInstanceCreator(InstanceCreator): Str('Label'), BoolChoice('ReturnData'), )) + + +#. +# .--CE------------------------------------------------------------------- + + +class CEGetCostsAndUsageInstanceCreator(InstanceCreator): + def _fill_instance(self): + self.add(Dict( + 'TimePeriod', + Str('Start'), + Str('End'), + )) + self.add(Dict('Total', Dict( + 'string', + Str('Amount'), + Str('Unit'), + ))) + self.add( + List( + 'Groups', + Enum('Keys'), + Dict('Metrics', Dict( + 'string', + Str('Amount'), + Str('Unit'), + )), + )) + self.add(BoolChoice('Estimated')) diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_costs_and_usage.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_costs_and_usage.py index b951188..7b1e487 100644 --- a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_costs_and_usage.py +++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_costs_and_usage.py @@ -1,23 +1,12 @@ # encoding: utf-8 -import pytest - +from agent_aws_fake_clients import ( + CEGetCostsAndUsageInstanceCreator,) from cmk.special_agents.agent_aws import ( AWSConfig, CostsAndUsage, ) -#TODO what about enums? - -# .--fake client---------------------------------------------------------. -# | __ _ _ _ _ | -# | / _| __ _| | _____ ___| (_) ___ _ __ | |_ | -# | | |_ / _` | |/ / _ \ / __| | |/ _ \ '_ \| __| | -# | | _| (_| | < __/ | (__| | | __/ | | | |_ | -# | |_| \__,_|_|\_\___| \___|_|_|\___|_| |_|\__| | -# | | -# '----------------------------------------------------------------------' - class FakeCEClient(object): def get_cost_and_usage(self, TimePeriod, Granularity, Metrics, GroupBy): @@ -27,34 +16,10 @@ class FakeCEClient(object): 'Type': "'DIMENSION' | 'TAG'", 'Key': 'string' },], - 'ResultsByTime': [{ - 'TimePeriod': { - 'Start': 'string', - 'End': 'string' - }, - 'Total': { - 'string': { - 'Amount': 'string', - 'Unit': 'string' - } - }, - 'Groups': [{ - 'Keys': ['string',], - 'Metrics': { - 'string': { - 'Amount': 'string', - 'Unit': 'string' - } - } - },], - 'Estimated': "True | False", - },] + 'ResultsByTime': CEGetCostsAndUsageInstanceCreator.create_instances(amount=1), } -#. - - def test_agent_aws_costs_and_usage(): region = 'us-east-1' config = AWSConfig('hostname', (None, None))

5 years, 2 months

Cleaned up AWS RDS test

by Simon Betz

Module: check_mk Branch: master Commit: 15a91ea3b5849b35c1ae96f5c71a4022dfd3e24a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15a91ea3b5849b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 24 12:14:34 2019 +0200 Cleaned up AWS RDS test Change-Id: I4bc80cc630fd4b091680b0f28ef8245497b99587 --- .../agent_aws/agent_aws_fake_clients.py | 223 +++++++++++++ .../special_agents/agent_aws/test_agent_aws_rds.py | 362 ++------------------- 2 files changed, 259 insertions(+), 326 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=15a91ea3b5…

5 years, 2 months

← Newer
1
...
6
7
8
9
10
11
12
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019