Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

Move long output log ruleset processing to HostConfig/ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: 1198587a3fda6a3cf477b2d6dedffbaa2c99a89f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1198587a3fda6a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 26 08:04:01 2019 +0200 Move long output log ruleset processing to HostConfig/ConfigCache CMK-2030 Change-Id: I61fdb1ac87d5892bfa21120debd6de36705033d0 --- cmk_base/config.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index 2294a81..943dd7c 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3635,6 +3635,14 @@ class CEEConfigCache(ConfigCache): return values[0] + def log_long_output_of_service(self, hostname, description): + # type: (str, Text) -> bool + entries = self.service_extra_conf(hostname, description, + cmc_service_long_output_in_monitoring_history) + if not entries: + return False + return entries[0] + # TODO: Find a clean way to move this to cmk_base.cee. This will be possible once the # configuration settings are not held in cmk_base.config namespace anymore. @@ -3662,3 +3670,12 @@ class CEEHostConfig(HostConfig): return cmc_flap_settings return values[0] + + @property + def log_long_output(self): + # type: () -> bool + entries = self._config_cache.host_extra_conf(self.hostname, + cmc_host_long_output_in_monitoring_history) + if not entries: + return False + return entries[0]

5 years, 1 month

Move recurring downtime ruleset processing to HostConfig/ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: 98f61c8869705a5240bbb22e3a3c6e4013fc2344 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98f61c8869705a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 25 21:43:54 2019 +0200 Move recurring downtime ruleset processing to HostConfig/ConfigCache CMK-2030 Change-Id: I3399712fa3de91b6a28d17675777628683a4067c --- cmk_base/config.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index 92681db..3af05ac 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2875,6 +2875,8 @@ class HostConfig(object): # +----------------------------------------------------------------------+ +# TODO: Shouldn't we find a better place for the *_of_service() methods? +# Wouldn't it be better to make them part of HostConfig? class ConfigCache(object): def __init__(self): super(ConfigCache, self).__init__() @@ -3621,6 +3623,10 @@ class CEEConfigCache(ConfigCache): return rrdconf[0] + def recurring_downtimes_of_service(self, hostname, description): + # type: (str, Text) -> List[Dict[str, Union[int, str]]] + return self.service_extra_conf(hostname, description, service_recurring_downtimes) + # TODO: Find a clean way to move this to cmk_base.cee. This will be possible once the # configuration settings are not held in cmk_base.config namespace anymore. @@ -3634,3 +3640,8 @@ class CEEHostConfig(HostConfig): if not entries: return None return entries[0] + + @property + def recurring_downtimes(self): + # type: () -> List[Dict[str, Union[int, str]]] + return self._config_cache.host_extra_conf(self.hostname, host_recurring_downtimes)

5 years, 1 month

Move config.service_groups processing to ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: 21d45dbddf34fbbb0b367c1cb876826c753c690d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21d45dbddf34fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 09:24:21 2019 +0200 Move config.service_groups processing to ConfigCache CMK-2030 Change-Id: Iaafa295e80e40d089477fd3b676947d0bae2b844 --- cmk_base/config.py | 5 +++++ cmk_base/core_nagios.py | 4 ++-- cmk_base/dump_host.py | 3 +-- tests/unit/cmk_base/test_config.py | 13 +++++++++++++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 76764fc..0c19a08 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3059,6 +3059,11 @@ class ConfigCache(object): return list(actions) + def servicegroups_of_service(self, hostname, description): + # type: (str, Text) -> List[str] + """Returns the list of servicegroups of this services""" + return self.service_extra_conf(hostname, description, service_groups) + def get_explicit_service_custom_variables(self, hostname, description): # type: (str, Text) -> Dict[str, str] try: diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 9865bc1..65ddf06 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -835,8 +835,8 @@ def _extra_service_conf_of(cfg, config_cache, hostname, description): sercgr.append("check-mk-notify") # not nessary if not explicit groups defined service_spec["contact_groups"] = ",".join(sercgr) - sergr = config_cache.service_extra_conf(hostname, description, config.service_groups) - if len(sergr) > 0: + sergr = config_cache.servicegroups_of_service(hostname, description) + if sergr: service_spec["service_groups"] = ",".join(sergr) if config.define_servicegroups: cfg.servicegroups_to_define.update(sergr) diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py index 1df425e..342cb69 100644 --- a/cmk_base/dump_host.py +++ b/cmk_base/dump_host.py @@ -127,8 +127,7 @@ def dump_host(hostname): _evaluate_params(params), cmk_base.utils.make_utf8(description), cmk_base.utils.make_utf8(",".join( - config_cache.service_extra_conf(hostname, description, config.service_groups))), - ",".join(deps) + config_cache.servicegroups_of_service(hostname, description))), ",".join(deps) ] for checktype, item, params, description, deps in check_items], " ") diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 29f8a9d..4f6faa9 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1068,6 +1068,19 @@ def test_config_cache_icons_and_actions(monkeypatch, hostname, result): {})) == sorted(result) +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", []), + ("testhost2", ["dingdong"]), +]) +def test_config_cache_servicegroups_of_service(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("service_groups", [ + ("dingdong", [], ["testhost2"], "CPU load$", {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.servicegroups_of_service(hostname, "CPU load") == result + + @pytest.mark.parametrize("edition_short,expected_cache_class_name,expected_host_class_name", [ ("cme", "CEEConfigCache", "CEEHostConfig"), ("cee", "CEEConfigCache", "CEEHostConfig"),

5 years, 1 month

Move config.extra_service_conf processing to ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: b5840731a87ee45771af5e81ede38fe0b2ea882a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5840731a87ee4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 08:06:08 2019 +0200 Move config.extra_service_conf processing to ConfigCache CMK-2030 Change-Id: I5dc4ae6aa9291be335e240b6ffd3645afa5a0f0b --- cmk_base/config.py | 13 +++++++++++++ cmk_base/core_config.py | 7 +------ tests/unit/cmk_base/test_config.py | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index c269c36..56a8571 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3032,6 +3032,19 @@ class ConfigCache(object): }) return labels + def get_extra_attributes_of_service(self, hostname, description): + # type: (str, Text) -> Dict[str, str] + attrs = {} + for key, conflist in extra_service_conf.items(): + values = self.service_extra_conf(hostname, description, conflist) + if values: + if key[0] == "_": + key = key.upper() + + if values[0] is not None: + attrs[key] = values[0] + return attrs + def get_explicit_service_custom_variables(self, hostname, description): # type: (str, Text) -> Dict[str, str] try: diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 88e3458..7057e5c 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -326,12 +326,7 @@ def _extra_service_attributes(hostname, description, config_cache, checkname, pa description).iteritems(): attrs["_%s" % varname.upper()] = value - for key, conflist in config.extra_service_conf.items(): - values = config_cache.service_extra_conf(hostname, description, conflist) - if values: - if key[0] == "_": - key = key.upper() - attrs[key] = values[0] + attrs.update(config_cache.get_extra_attributes_of_service(hostname, description)) # Add explicit custom_variables for varname, value in config_cache.get_explicit_service_custom_variables( diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 455680e..92d6923 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1019,6 +1019,38 @@ def test_labels_of_service(monkeypatch): } +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", {}), + ("testhost2", { + '_CUSTOM': ['value1'], + 'dingdong': ['value1'] + }), +]) +def test_config_cache_extra_attributes_of_service(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_option( + "extra_service_conf", { + "dingdong": [ + ([ + "value1", + ], [], ["testhost2"], "CPU load$", {}), + ([ + "value2", + ], [], ["testhost2"], "CPU load$", {}), + ], + "_custom": [ + ([ + "value1", + ], [], ["testhost2"], "CPU load$", {}), + ([ + "value2", + ], [], ["testhost2"], "CPU load$", {}), + ], + }) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_extra_attributes_of_service(hostname, "CPU load") == result + + @pytest.mark.parametrize("edition_short,expected_cache_class_name,expected_host_class_name", [ ("cme", "CEEConfigCache", "CEEHostConfig"), ("cee", "CEEConfigCache", "CEEHostConfig"),

5 years, 1 month

Move config.service_icons_and_actions processing to ConfigCache

by Lars Michelsen

Module: check_mk Branch: master Commit: ac910c9aaf963956a1dc5ad601f169c82076fbe7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac910c9aaf9639… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 08:27:48 2019 +0200 Move config.service_icons_and_actions processing to ConfigCache CMK-2030 Change-Id: I7372d9343dac471799ce09b457fc34df0796dd5b --- cmk_base/config.py | 14 ++++++++++++++ cmk_base/core_config.py | 20 +------------------- tests/unit/cmk_base/test_config.py | 17 +++++++++++++++++ 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 56a8571..76764fc 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3045,6 +3045,20 @@ class ConfigCache(object): attrs[key] = values[0] return attrs + def icons_and_actions_of_service(self, hostname, description, checkname, params): + # type: (str, Text, str, Dict) -> List[str] + actions = set(self.service_extra_conf(hostname, description, service_icons_and_actions)) + + # Some WATO rules might register icons on their own + if checkname: + checkgroup = check_info[checkname]["group"] + if checkgroup in ['ps', 'services'] and isinstance(params, dict): + icon = params.get('icon') + if icon: + actions.add(icon) + + return list(actions) + def get_explicit_service_custom_variables(self, hostname, description): # type: (str, Text) -> Dict[str, str] try: diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 7057e5c..f5b3ea3 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -334,9 +334,7 @@ def _extra_service_attributes(hostname, description, config_cache, checkname, pa attrs["_%s" % varname.upper()] = value # Add custom user icons and actions - host_config = config_cache.get_host_config(hostname) - actions = _icons_and_actions_of_service(config_cache, host_config, description, checkname, - params) + actions = config_cache.icons_and_actions_of_service(hostname, description, checkname, params) if actions: attrs["_ACTIONS"] = ','.join(actions) return attrs @@ -348,22 +346,6 @@ def _custom_service_attributes_of(config_cache, hostname, service_description): config.custom_service_attributes))) -def _icons_and_actions_of_service(config_cache, host_config, svcdesc, checkname, params): - actions = set( - config_cache.service_extra_conf(host_config.hostname, svcdesc, - config.service_icons_and_actions)) - - # Some WATO rules might register icons on their own - if checkname: - checkgroup = config.check_info[checkname]["group"] - if checkgroup in ['ps', 'services'] and isinstance(params, dict): - icon = params.get('icon') - if icon: - actions.add(icon) - - return list(actions) - - #. # .--HostAttributes------------------------------------------------------. # | _ _ _ _ _ _ _ _ _ | diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 92d6923..29f8a9d 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1051,6 +1051,23 @@ def test_config_cache_extra_attributes_of_service(monkeypatch, hostname, result) assert config_cache.get_extra_attributes_of_service(hostname, "CPU load") == result +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", []), + ("testhost2", ["icon1", "icon2"]), +]) +def test_config_cache_icons_and_actions(monkeypatch, hostname, result): + config.load_checks(check_api.get_check_api_context, ["checks/ps"]) + ts = Scenario().add_host(hostname) + ts.set_ruleset("service_icons_and_actions", [ + ("icon1", [], ["testhost2"], "CPU load$", {}), + ("icon1", [], ["testhost2"], "CPU load$", {}), + ("icon2", [], ["testhost2"], "CPU load$", {}), + ]) + config_cache = ts.apply(monkeypatch) + assert sorted(config_cache.icons_and_actions_of_service(hostname, "CPU load", "ps", + {})) == sorted(result) + + @pytest.mark.parametrize("edition_short,expected_cache_class_name,expected_host_class_name", [ ("cme", "CEEConfigCache", "CEEHostConfig"), ("cee", "CEEConfigCache", "CEEHostConfig"),

5 years, 1 month

Move linux remote alert handler ruleset processing to HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a189bb05aa15083d576c575cd78f3554bccdcd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a189bb05aa150… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 26 08:55:18 2019 +0200 Move linux remote alert handler ruleset processing to HostConfig CMK-2030 Change-Id: Ic0a577e5bc6c368f0d7a0afd348fa3f870709223 --- cmk_base/config.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index e872690..c269c36 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3706,3 +3706,9 @@ class CEEHostConfig(HostConfig): settings.update( self._config_cache.host_extra_conf_merged(self.hostname, cmc_smartping_settings)) return settings + + @property + def lnx_remote_alert_handlers(self): + # type: () -> List[Dict[str, str]] + return self._config_cache.host_extra_conf(self.hostname, + agent_config.get("lnx_remote_alert_handlers", []))

5 years, 1 month

agent AWS config: Corrected wording

by Simon Betz

Module: check_mk Branch: master Commit: a7c393b9ade3ecc5bae3979d9ef9e5bd92f6cb53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7c393b9ade3ec… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu May 2 08:50:51 2019 +0200 agent AWS config: Corrected wording Change-Id: I3f949a3742384bed52a2ff375c754f66fd662e7c --- cmk/gui/plugins/wato/datasource_programs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index 5b36345..83647e5 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -1945,13 +1945,13 @@ class RulespecSpecialAgentsAws(HostRulespec): elements=[ ("access_key_id", TextAscii( - title=_("The access key for your AWS account"), + title=_("The access key ID for your AWS account"), allow_empty=False, size=50, )), ("secret_access_key", IndividualOrStoredPassword( - title=_("The secret key for your AWS account"), + title=_("The secret access key for your AWS account"), allow_empty=False, )), ("global_services",

5 years, 1 month

Cleaned up AWS tests

by Simon Betz

Module: check_mk Branch: master Commit: a154fc8e9b397bcca4573b2eb641b974869789ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a154fc8e9b397b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 26 15:54:05 2019 +0200 Cleaned up AWS tests Change-Id: I7d259c23a2530eac2099566c7bb519105200f345 --- .../agent_aws/agent_aws_fake_clients.py | 17 +++++ .../agent_aws/test_agent_aws_costs_and_usage.py | 1 - .../special_agents/agent_aws/test_agent_aws_elb.py | 18 +---- .../special_agents/agent_aws/test_agent_aws_rds.py | 87 +--------------------- 4 files changed, 24 insertions(+), 99 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 681aa45..830f31f 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 @@ -566,6 +566,23 @@ class ELBDescribeInstanceHealthIB(InstanceBuilder): ] +class ELBDescribeAccountLimitsIB(InstanceBuilder): + def _fill_instance(self): + return [ + List( + 'Limits', + [ + Int('Max'), + ], + from_choice=Choice('Name', [ + "classic-load-balancers", + "classic-listeners", + "classic-registered-instances", + ]), + ), + ] + + #. # .--ELBv2---------------------------------------------------------------- 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 7c4f7c0..0b614e0 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 @@ -28,7 +28,6 @@ def test_agent_aws_costs_and_usage(): ce = CostsAndUsage(FakeCEClient(), region, config) ce_results = ce.run().results - #--CE------------------------------------------------------------------- assert ce.cache_interval == 86400 assert ce.name == "costs_and_usage" assert len(ce_results) == 1 diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py index 2cbe3c2..1208f9f 100644 --- a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py +++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py @@ -6,6 +6,7 @@ from agent_aws_fake_clients import ( ELBDescribeLoadBalancersIB, ELBDescribeTagsIB, ELBDescribeInstanceHealthIB, + ELBDescribeAccountLimitsIB, ) from cmk.special_agents.agent_aws import ( @@ -28,21 +29,8 @@ class FakeELBClient(object): def describe_account_limits(self): return { - 'Limits': [ - { - 'Name': 'classic-load-balancers', - 'Max': 10, - }, - { - 'Name': 'classic-listeners', - 'Max': 10, - }, - { - 'Name': 'classic-registered-instances', - 'Max': 10, - }, - ], - 'NextMarker': 'string' + 'Limits': ELBDescribeAccountLimitsIB.create_instances(amount=1)[0]['Limits'], + 'NextMarker': 'string', } def describe_tags(self, LoadBalancerNames=None): diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_rds.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_rds.py index a6cb1be..721dc3d 100644 --- a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_rds.py +++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_rds.py @@ -2,8 +2,9 @@ import pytest from agent_aws_fake_clients import ( - RDSDescribeDBInstancesIB, FakeCloudwatchClient, + RDSDescribeDBInstancesIB, + RDSDescribeAccountAttributesIB, ) from cmk.special_agents.agent_aws import ( @@ -18,88 +19,8 @@ from cmk.special_agents.agent_aws import ( class FakeRDSClient(object): def describe_account_attributes(self): return { - 'AccountQuotas': [ - { - 'AccountQuotaName': 'unused', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'DBClusters', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'DBClusterParameterGroups', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'DBInstances', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'EventSubscriptions', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'ManualSnapshots', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'OptionGroups', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'DBParameterGroups', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'ReadReplicasPerMaster', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'ReservedDBInstances', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'DBSecurityGroups', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'DBSubnetGroups', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'SubnetsPerDBSubnetGroup', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'AllocatedStorage', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'AuthorizationsPerDBSecurityGroup', - 'Used': 1, - 'Max': 2, - }, - { - 'AccountQuotaName': 'DBClusterRoles', - 'Used': 1, - 'Max': 2, - }, - ] + 'AccountQuotas': RDSDescribeAccountAttributesIB.create_instances(amount=1)[0] + ['AccountQuotas'], } def describe_db_instances(self, DBInstanceIdentifier=None, Filters=None):

5 years, 1 month

aws.include: Fixed load balancer summary check

by Simon Betz

Module: check_mk Branch: master Commit: 19cd2ee709da48a8ac96a4045c1ceb59b1cd2cf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19cd2ee709da48… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu May 2 13:14:30 2019 +0200 aws.include: Fixed load balancer summary check Change-Id: Ib5e1cc3840ad1fa387894443e244a90436adfe07 --- checks/aws.include | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/checks/aws.include b/checks/aws.include index d3a8d75..9323315 100644 --- a/checks/aws.include +++ b/checks/aws.include @@ -94,7 +94,17 @@ def check_aws_elb_summary_generic(item, params, load_balancers): balancer_name = row['LoadBalancerName'] avail_zones_txt = [] for avail_zone in row['AvailabilityZones']: - avail_zone_readable = "%s (%s)" % (AWSRegions[avail_zone[:-1]], avail_zone[-1]) + if isinstance(avail_zone, dict): + # elb vs. elbv2 + # elb provides a list of zones, elbv2 a list of dicts + # including zone name + avail_zone = avail_zone['ZoneName'] + + try: + avail_zone_readable = "%s (%s)" % (AWSRegions[avail_zone[:-1]], avail_zone[-1]) + except KeyError: + avail_zone_readable = 'unknown (%s)' % avail_zone + balancers_by_avail_zone.setdefault(avail_zone_readable, []).append(balancer_name) avail_zones_txt.append(avail_zone_readable) long_output.append("Balancer: %s, Availability zones: %s"\

5 years, 1 month

aws_elbv2_target_groups: Fixed unpacking target group descriptions

by Simon Betz

Module: check_mk Branch: master Commit: 4bb7106d03cd4411ba51b5143e68d8025e213224 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bb7106d03cd44… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu May 2 13:17:45 2019 +0200 aws_elbv2_target_groups: Fixed unpacking target group descriptions Change-Id: I2f86f31156e160872b7eb3b020b9b1854350d0e4 --- checks/aws_elbv2_target_groups | 6 ++++-- cmk/special_agents/agent_aws.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/checks/aws_elbv2_target_groups b/checks/aws_elbv2_target_groups index 0f58678..792e877 100644 --- a/checks/aws_elbv2_target_groups +++ b/checks/aws_elbv2_target_groups @@ -70,8 +70,10 @@ def parse_aws_elbv2_target_groups(info): def check_aws_elbv2_target_groups(item, params, target_groups): target_groups_by_state = {} for target_group in target_groups: - target_groups_by_state.setdefault( - target_group.get('TargetHealth', {}).get('State', 'unknown'), []).append(target_group) + for target_health in target_group.get('TargetHealthDescriptions', []): + target_groups_by_state.setdefault( + target_health.get('TargetHealth', {}).get('State', 'unknown'), + []).append(target_group) for state_readable, groups in target_groups_by_state.iteritems(): if state_readable in ['initial', 'healthy', 'unused', 'draining', 'unavailable']: diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 526bc0b..1bfb0c8 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -2278,7 +2278,7 @@ class ELBv2TargetGroups(AWSSectionGeneric): TargetGroupArn=target_group['TargetGroupArn']) target_group_health_descrs = self._get_response_content( response, 'TargetHealthDescriptions') - target_group['TargetHealth'] = target_group_health_descrs.get('TargetHealth', {}) + target_group['TargetHealthDescriptions'] = target_group_health_descrs load_balancers.setdefault(load_balancer_dns_name, []).append((load_balancer_type, target_groups))

5 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2019