Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Move config.cmc_*_rrd_config processing to HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 51ab70e6eb1c456a40249a861d29658f6608e1ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51ab70e6eb1c45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 25 07:58:31 2019 +0200 Move config.cmc_*_rrd_config processing to HostConfig CMK-2030 Change-Id: I610d354c4e727a8e8603bd32f9babb0325930e09 --- cmk_base/config.py | 16 +++++++++++++++ tests/unit/cmk_base/test_config.py | 40 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index 4c225c8..80469cc 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2686,6 +2686,14 @@ class HostConfig(object): return list(set(cgrs)) @property + def rrd_config(self): + # type: () -> Optional[Dict] + entries = self._config_cache.host_extra_conf(self.hostname, cmc_host_rrd_config) + if not entries: + return None + return entries[0] + + @property def management_address(self): # type: () -> Optional[str] attributes_of_host = host_attributes.get(self.hostname, {}) @@ -2989,6 +2997,14 @@ class ConfigCache(object): return match_object + def rrd_config_of_service(self, hostname, description): + # type: (str, Text) -> Optional[Dict] + rrdconf = self.service_extra_conf(hostname, description, cmc_service_rrd_config) + if not rrdconf: + return None + + return rrdconf[0] + def set_all_processed_hosts(self, all_processed_hosts): self._all_processed_hosts = set(all_processed_hosts) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 2485dc2..b8d8cbd 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -655,6 +655,26 @@ def test_host_config_contactgroups(monkeypatch, hostname, result): @pytest.mark.parametrize("hostname,result", [ + ("testhost1", None), + ("testhost2", { + "1": 1 + }), +]) +def test_host_config_rrd_config(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("cmc_host_rrd_config", [ + ({ + "1": 1 + }, [], ["testhost2"], {}), + ({ + "2": 2 + }, [], ["testhost2"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).rrd_config == result + + +(a)pytest.mark.parametrize("hostname,result", [ ("testhost1", {}), ("testhost2", { 'empty_output': 1 @@ -944,6 +964,26 @@ def test_labels_of_service(monkeypatch): } +(a)pytest.mark.parametrize("hostname,result", [ + ("testhost1", None), + ("testhost2", { + "1": 1 + }), +]) +def test_config_cache_rrd_config_of_service(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("cmc_service_rrd_config", [ + ({ + "1": 1 + }, [], ["testhost2"], ["CPU load$"], {}), + ({ + "2": 2 + }, [], ["testhost2"], ["CPU load$"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.rrd_config_of_service(hostname, "CPU load") == result + + def test_config_cache_get_host_config(): cache = config.ConfigCache() assert cache._host_configs == {}

5 years, 2 months

7342 FIX Removed legacy_checks configuration variable

by Lars Michelsen

Module: check_mk Branch: master Commit: d4f74b4870b20d6b7a1eb7ef4435c0914f2aca5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4f74b4870b20d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 24 19:23:14 2019 +0200 7342 FIX Removed legacy_checks configuration variable The long time deprecated configuration variable <tt>legacy_checks</tt> has been removed now. It was replaced by the <tt>custom_checks</tt> option which is working a bit different. In case you configured Check_MK only via WATO you will not be affected by this issue, since legacy_checks could only be configured directly in the configuration files. In case you need to migrate your configuration, you could move the configuration to the WATO ruleset "Classical Active and Passive Monitoring Checks". If you need to migrate the configuration by hand have a look at the CMC migration documentation (https://mathias-kettner.com/cms_cmc_migration.html#legacy_checks) which describes the steps. Change-Id: I6389bf68d8acba073ebd757f28f55cc078f02b32 --- .werks/7342 | 21 +++++++++++++++++++++ cmk/gui/wato/pages/services.py | 8 +++++++- cmk_base/config.py | 13 ++++++++++--- cmk_base/core_nagios.py | 42 +---------------------------------------- cmk_base/default_config/base.py | 2 +- cmk_base/discovery.py | 5 ----- 6 files changed, 40 insertions(+), 51 deletions(-) diff --git a/.werks/7342 b/.werks/7342 new file mode 100644 index 0000000..21657a2 --- /dev/null +++ b/.werks/7342 @@ -0,0 +1,21 @@ +Title: Removed legacy_checks configuration variable +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1556126309 +Class: fix + +The long time deprecated configuration variable <tt>legacy_checks</tt> has been +removed now. It was replaced by the <tt>custom_checks</tt> option which is working +a bit different. + +In case you configured Check_MK only via WATO you will not be affected by this issue, +since legacy_checks could only be configured directly in the configuration files. + +In case you need to migrate your configuration, you could move the configuration to +the WATO ruleset "Classical Active and Passive Monitoring Checks". If you need to +migrate the configuration by hand have a look at the CMC migration documentation +(https://mathias-kettner.com/cms_cmc_migration.html#legacy_checks) which describes +the steps. diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index 0fb5979..605cf60 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -95,13 +95,15 @@ class DiscoveryState(object): MANUAL = "manual" ACTIVE = "active" CUSTOM = "custom" - LEGACY = "legacy" CLUSTERED_OLD = "clustered_old" CLUSTERED_NEW = "clustered_new" CLUSTERED_VANISHED = "clustered_vanished" CLUSTERED_IGNORED = "clustered_ignored" ACTIVE_IGNORED = "active_ignored" CUSTOM_IGNORED = "custom_ignored" + # TODO: Were removed in 1.6 from base. Keeping this for + # compatibility with older remote sites. Remove with 1.7. + LEGACY = "legacy" LEGACY_IGNORED = "legacy_ignored" @classmethod @@ -1483,6 +1485,8 @@ class DiscoveryPageRenderer(object): "These services have not been found by the discovery but have been added " "manually by a rule in the WATO module Manual checks."), ), + # TODO: Were removed in 1.6 from base. Keeping this for + # compatibility with older remote sites. Remove with 1.7. TableGroupEntry( table_group=DiscoveryState.LEGACY, show_bulk_actions=False, @@ -1546,6 +1550,8 @@ class DiscoveryPageRenderer(object): "These services have been disabled by creating a rule in the rule set " "Disabled services oder Disabled checks."), ), + # TODO: Were removed in 1.6 from base. Keeping this for + # compatibility with older remote sites. Remove with 1.7. TableGroupEntry( table_group=DiscoveryState.LEGACY_IGNORED, show_bulk_actions=False, diff --git a/cmk_base/config.py b/cmk_base/config.py index a7fe904..e103ef2 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -166,7 +166,7 @@ def load(with_conf_d=True, validate_hosts=True, exclude_parents_mk=False): verify_non_invalid_variables(vars_before_config) _verify_no_deprecated_check_rulesets() - verify_snmp_communities_type() + _verify_no_deprecated_variables_used() def load_packed_config(): @@ -405,12 +405,19 @@ def verify_non_invalid_variables(vars_before_config): sys.exit(1) -def verify_snmp_communities_type(): - # Special handling for certain deprecated variables +def _verify_no_deprecated_variables_used(): if isinstance(snmp_communities, dict): console.error("ERROR: snmp_communities cannot be a dict any more.\n") sys.exit(1) + # Legacy checks have never been supported by CMC, were not configurable via WATO + # and have been removed with Check_MK 1.6 + if legacy_checks: + console.error( + "Check_MK does not support the configuration variable \"legacy_checks\" anymore. " + "Please use custom_checks or active_checks instead.\n") + sys.exit(1) + def _verify_no_deprecated_check_rulesets(): deprecated_rulesets = [ diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 71ae7c4..9b3f5fd 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -358,46 +358,6 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): service_spec.update(_extra_service_conf_of(cfg, config_cache, hostname, "Check_MK")) outfile.write(_format_nagios_object("service", service_spec).encode("utf-8")) - # legacy checks via legacy_checks - legchecks = config_cache.host_extra_conf(hostname, config.legacy_checks) - if len(legchecks) > 0: - outfile.write("\n\n# Legacy checks\n") - for command, description, has_perfdata in legchecks: - description = config.get_final_service_description(hostname, description) - if do_omit_service(hostname, description): - continue - - if description in used_descriptions: - cn, it = used_descriptions[description] - core_config.warning( - "ERROR: Duplicate service description (legacy check) '%s' for host '%s'!\n" - " - 1st occurrance: checktype = %s, item = %r\n" - " - 2nd occurrance: checktype = legacy(%s), item = None\n" % (description, hostname, - cn, it, command)) - continue - - else: - used_descriptions[description] = ("legacy(" + command + ")", description) - - if has_perfdata: - template = "check_mk_perf," - else: - template = "" - - service_spec = { - "use": "%scheck_mk_default" % template, - "host_name": hostname, - "service_description": description, - "check_command": _simulate_command(cfg, command), - "active_checks_enabled": 1, - } - service_spec.update(core_config.get_service_attributes(hostname, description, config_cache)) - service_spec.update(_extra_service_conf_of(cfg, config_cache, hostname, description)) - outfile.write(_format_nagios_object("service", service_spec).encode("utf-8")) - - # write service dependencies for legacy checks - outfile.write(get_dependencies(hostname, description).encode("utf-8")) - # legacy checks via active_checks actchecks = [] for plugin_name, entries in host_config.active_checks: @@ -576,7 +536,7 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): }).encode("utf-8")) # No check_mk service, no legacy service -> create PING service - if not have_at_least_one_service and not legchecks and not actchecks and not custchecks: + if not have_at_least_one_service and not actchecks and not custchecks: _add_ping_service(cfg, config_cache, host_config, host_attrs["address"], host_config.is_ipv6_primary and 6 or 4, "PING", host_attrs.get("_NODEIPS")) diff --git a/cmk_base/default_config/base.py b/cmk_base/default_config/base.py index ea13432..0124af4 100644 --- a/cmk_base/default_config/base.py +++ b/cmk_base/default_config/base.py @@ -134,7 +134,6 @@ static_checks = {} check_parameters = [] checkgroup_parameters = {} inv_parameters = {} # for HW/SW-Inventory -legacy_checks = [] # non-WATO variant of legacy checks active_checks = {} # WATO variant for fully formalized checks special_agents = {} # WATO variant for datasource_programs custom_checks = [] # WATO variant for free-form custom checks without formalization @@ -229,3 +228,4 @@ aggregate_check_mk = False aggregation_output_format = "multiline" # new in 1.1.6. Possible also: "multiline" aggr_summary_hostname = "%s-s" status_data_inventory = [] +legacy_checks = [] diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 89c9a85..e392eeb 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -936,7 +936,6 @@ DiscoveredServicesTable = Dict[Tuple[str, str], Tuple[str, str]] # "new" : Check is discovered but currently not yet monitored # "old" : Check is discovered and already monitored (most common) # "vanished" : Check had been discovered previously, but item has vanished -# "legacy" : Check is defined via legacy_checks # "active" : Check is defined via active_checks # "custom" : Check is defined via custom_checks # "manual" : Check is a manual Check_MK check without service discovery @@ -1022,10 +1021,6 @@ def _merge_manual_services(host_config, services, on_error): services[(check_plugin_name, item)] = ('manual', repr(params)) config_cache = config.get_config_cache() - # Add legacy checks -> "legacy" - legchecks = config_cache.host_extra_conf(hostname, config.legacy_checks) - for _unused_cmd, descr, _unused_perf in legchecks: - services[('legacy', descr)] = ('legacy', 'None') # Add custom checks -> "custom" custchecks = config_cache.host_extra_conf(hostname, config.custom_checks)

5 years, 2 months

Started AWS/EBS tests

by Simon Betz

Module: check_mk Branch: master Commit: a69a6edfcf34150a3deea7eb21144bce9bdaf280 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a69a6edfcf3415… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 24 16:31:30 2019 +0200 Started AWS/EBS tests Change-Id: I519069dae827458d95f299dc497b6fd705bd4cf3 --- .../agent_aws/agent_aws_fake_clients.py | 517 +++++++++++++++++++++ .../special_agents/agent_aws/test_agent_aws_ebs.py | 182 ++++++++ 2 files changed, 699 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a69a6edfcf…

5 years, 2 months

aws_ec2_limits: Ignore IF VPC security groups in perfdata

by Simon Betz

Module: check_mk Branch: master Commit: 4fa2b17aeb2d8468bf40777fba8f801aad6984f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fa2b17aeb2d84… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 26 08:29:47 2019 +0200 aws_ec2_limits: Ignore IF VPC security groups in perfdata Change-Id: I3c17b6a9237fd456bf9a61ad8bda5ae7ef5659d7 --- checks/aws.include | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/aws.include b/checks/aws.include index 6e4f4d3..d3a8d75 100644 --- a/checks/aws.include +++ b/checks/aws.include @@ -115,6 +115,7 @@ def check_aws_elb_summary_generic(item, params, load_balancers): _exclude_aws_limits_perf_vars = [ 'vpc_sec_group_rules', 'vpc_sec_groups', + "if_vpc_sec_group", ]

5 years, 2 months

Add AWS tests which do not regard related limits section

by Simon Betz

Module: check_mk Branch: master Commit: f7961781a03337ab46703b4b5a5a02137435a06d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7961781a03337… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 25 14:32:41 2019 +0200 Add AWS tests which do not regard related limits section Change-Id: I7099acdc5ac2cda2a5bd9e12712d6cc218dc029e --- cmk/special_agents/agent_aws.py | 13 ++- .../agent_aws/test_agent_aws_cloudwatch.py | 15 +++ .../special_agents/agent_aws/test_agent_aws_ebs.py | 55 +++++----- .../special_agents/agent_aws/test_agent_aws_elb.py | 117 ++++++++++++++++++--- .../special_agents/agent_aws/test_agent_aws_s3.py | 55 ++++++++++ 5 files changed, 209 insertions(+), 46 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f7961781a0…

5 years, 2 months

agent_aws: Moved EBS section below EC2 section (usually belong together)

by Simon Betz

Module: check_mk Branch: master Commit: 0cd803c0c8c3f22560ddccda1a1475ff2ced5664 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cd803c0c8c3f2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 26 11:33:37 2019 +0200 agent_aws: Moved EBS section below EC2 section (usually belong together) Change-Id: Id8d8eb1439331a18f76b2427d4207df2e048441c --- cmk/special_agents/agent_aws.py | 551 ++++++++++++++++++++-------------------- 1 file changed, 269 insertions(+), 282 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0cd803c0c8…

5 years, 2 months

Cleaned up AWS EC2 tests

by Simon Betz

Module: check_mk Branch: master Commit: 88872c9b9fff4b5e633ec10dacfce05cd3a29a34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88872c9b9fff4b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 25 17:29:02 2019 +0200 Cleaned up AWS EC2 tests Change-Id: Ic0398fe1be9a7dfcb8e00c44d0fe91f6ae72fbe5 --- cmk/special_agents/agent_aws.py | 1 + .../agent_aws/agent_aws_fake_clients.py | 771 +++++++++++---- .../special_agents/agent_aws/test_agent_aws_ec2.py | 1044 ++++---------------- 3 files changed, 793 insertions(+), 1023 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=88872c9b9f…

5 years, 2 months

AWS fake clients: Simplified indexing

by Simon Betz

Module: check_mk Branch: master Commit: ce1af130974a30dd5593547820ce3225dc0fd0d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce1af130974a30… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 25 12:21:26 2019 +0200 AWS fake clients: Simplified indexing Change-Id: I290e3a173ee4c5f2d8ecec45e7c7599e2569af93 --- tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py | 7 ++----- tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py | 4 ++-- 2 files changed, 4 insertions(+), 7 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 b4d72c6..fd3067a 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 @@ -40,13 +40,10 @@ class List(Entity): list_ = [] for choice in self._from_choice.choices: elem = {self._from_choice.key: choice} - elem.update( - {e.key: e.create("%s-%s" % (idx, choice), amount) for e in self._elements}) + elem.update({e.key: e.create(choice, amount) for e in self._elements}) list_.append(elem) return list_ - return [{e.key: e.create("%s-%s" % (idx, x), amount) - for e in self._elements} - for x in xrange(amount)] + return [{e.key: e.create(x, amount) for e in self._elements} for x in xrange(amount)] class Dict(Entity): 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 66c5617..c012bb7 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 @@ -91,9 +91,9 @@ elb_params = [ ((None, None), ['LoadBalancerName-0', 'LoadBalancerName-1', 'LoadBalancerName-2'], ['LoadBalancerName-0', 'LoadBalancerName-1']), (([['FOO']], [['BAR']]), [], []), - (([['Key-0-0']], [['Value-0-0']]), ['LoadBalancerName-0', 'LoadBalancerName-1'], + (([['Key-0']], [['Value-0']]), ['LoadBalancerName-0', 'LoadBalancerName-1'], ['LoadBalancerName-0', 'LoadBalancerName-1']), - (([['Key-0-0', 'Foo']], [['Value-0-0', 'Bar']]), ['LoadBalancerName-0', 'LoadBalancerName-1'], + (([['Key-0', 'Foo']], [['Value-0', 'Bar']]), ['LoadBalancerName-0', 'LoadBalancerName-1'], ['LoadBalancerName-0', 'LoadBalancerName-1']), ]

5 years, 2 months

agent_aws: Simplified fetching EBS volume states

by Simon Betz

Module: check_mk Branch: master Commit: 61181e9162c859547465af4a6c6511983d057e00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61181e9162c859… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 25 13:01:04 2019 +0200 agent_aws: Simplified fetching EBS volume states Change-Id: I8885585a95948c884d3e20b54474d8d648c78474 --- cmk/special_agents/agent_aws.py | 52 ++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 4987283..32fe0ee 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -2338,62 +2338,50 @@ class EBSSummary(AWSSectionGeneric): def _fetch_raw_content(self, colleague_contents): col_volumes, _col_instances = colleague_contents.content if self._tags is None and self._names is not None: - return self._fetch_volumes_filtered_by_names(col_volumes) - if self._tags is not None: - return self._fetch_volumes_filtered_by_tags(col_volumes) - return self._fetch_volumes_without_filter() + volumes = self._fetch_volumes_filtered_by_names(col_volumes) + elif self._tags is not None: + volumes = self._fetch_volumes_filtered_by_tags(col_volumes) + else: + volumes = self._fetch_volumes_without_filter() + + for vol_id, vol in volumes.iteritems(): + response = self._client.describe_volume_status(VolumeIds=[vol_id]) + for state in self._get_response_content(response, 'VolumeStatuses'): + if state['VolumeId'] == vol_id: + vol.setdefault('VolumeStatus', state['VolumeStatus']) + return volumes def _fetch_volumes_filtered_by_names(self, col_volumes): if col_volumes: - volumes = { - vol['VolumeId']: vol for vol in col_volumes if vol['VolumeId'] in self._names - } - else: - volumes = self._format_volumes(self._client.describe_volumes(VolumeIds=self._names)) - return (volumes, - self._format_volume_states( - self._client.describe_volume_status(VolumeIds=self._names))) + return {vol['VolumeId']: vol for vol in col_volumes if vol['VolumeId'] in self._names} + return self._format_volumes(self._client.describe_volumes(VolumeIds=self._names)) def _fetch_volumes_filtered_by_tags(self, col_volumes): if col_volumes: tags = self._prepare_tags_for_api_response(self._tags) - volumes = { + return { vol['VolumeId']: vol for vol in col_volumes for tag in vol['Tags'] if tag in tags } - else: - volumes = self._format_volumes(self._client.describe_volumes(Filters=self._tags)) - return (volumes, - self._format_volume_states(self._client.describe_volume_status(Filters=self._tags))) + return self._format_volumes(self._client.describe_volumes(Filters=self._tags)) def _fetch_volumes_without_filter(self): - return (self._format_volumes(self._client.describe_volumes()), - self._format_volume_states(self._client.describe_volume_status())) + return self._format_volumes(self._client.describe_volumes()) def _format_volumes(self, response): return {r['VolumeId']: r for r in self._get_response_content(response, 'Volumes')} - def _format_volume_states(self, response): - return {r['VolumeId']: r for r in self._get_response_content(response, 'VolumeStatuses')} - def _compute_content(self, raw_content, colleague_contents): _col_volumes, col_instances = colleague_contents.content instance_name_mapping = {v['InstanceId']: k for k, v in col_instances.iteritems()} - volumes, volume_states = raw_content.content - content = [] - for volume_id in set(volumes.keys()).union(set(volume_states.keys())): - volume = volumes.get(volume_id, {}) - volume.update(volume_states.get(volume_id, {})) - content.append(volume) - content_by_piggyback_hosts = {} - for row in content: - for attachment in row['Attachments']: + for vol in raw_content.content.itervalues(): + for attachment in vol['Attachments']: attachment_id = attachment['InstanceId'] instance_name = instance_name_mapping.get(attachment_id) if instance_name is None: instance_name = "" - content_by_piggyback_hosts.setdefault(instance_name, []).append(row) + content_by_piggyback_hosts.setdefault(instance_name, []).append(vol) return AWSComputedContent(content_by_piggyback_hosts, raw_content.cache_timestamp) def _create_results(self, computed_content):

5 years, 2 months

Make Cppcheck builders green again.

by Sven Panne

Module: check_mk Branch: master Commit: 5a2626c56f3360f8a4a4bd76ecde85c7b061ef07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a2626c56f3360… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 26 12:15:14 2019 +0200 Make Cppcheck builders green again. As a stopgap measure, we simply add enough global suppressions for now to get things green again. After that, we can activate and fix checks one by one... Change-Id: I7495fa4a92ed47dcbcd99d83c97eba49d8984050 --- livestatus/src/cppcheck-suppressions.txt | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/livestatus/src/cppcheck-suppressions.txt b/livestatus/src/cppcheck-suppressions.txt index eab09ad..02ff896 100644 --- a/livestatus/src/cppcheck-suppressions.txt +++ b/livestatus/src/cppcheck-suppressions.txt @@ -1,12 +1,16 @@ +containerOutOfBoundsIndexExpression missingIncludeSystem +missingOverride +noConstructor +noExplicitConstructor passedByValue -unusedFunction -// cppcheck doesn't undestand uniform initialization yet. -constStatement -// This is nonsense, but otherwise cppcheck complains even if it shouldn't. +preprocessorErrorDirective +redundantAssignment +shadowVar +shiftTooManyBitsSigned +sizeofFunctionCall +uninitMemberVar unmatchedSuppression -// cppcheck is simply too dumb about macros... -*:*/include/boost/config.hpp -// cppcheck doesn't like some RE2 and googletest stuff, silly and not our business... -noExplicitConstructor:*/include/re2/*.h -*:*/include/gtest/internal/*.h +unusedFunction +unusedPrivateFunction +useStlAlgorithm

5 years, 2 months

← Newer
1
2
3
4
5
6
7
8
...
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