Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 70a9807c6320e3ccdf35e46631aa5e6c9df22a20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70a9807c6320e3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 26 14:52:44 2019 +0200 Activate missingOverride again. Change-Id: I8d594d3d1031d4c11832c08a1e8617355c2556a4 --- livestatus/src/cppcheck-suppressions.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/livestatus/src/cppcheck-suppressions.txt b/livestatus/src/cppcheck-suppressions.txt index 3aaa5b2..e019cfa 100644 --- a/livestatus/src/cppcheck-suppressions.txt +++ b/livestatus/src/cppcheck-suppressions.txt @@ -1,5 +1,4 @@ missingIncludeSystem -missingOverride noConstructor noExplicitConstructor passedByValue @@ -14,3 +13,8 @@ useStlAlgorithm // unmatchedSuppression:*/include/boost/* preprocessorErrorDirective:*/include/boost/* +// The TEST/TEST_F macros from googletest do not contain "override". +unmatchedSuppression:*/include/gtest/* +missingOverride:*/include/gtest/* +unmatchedSuppression:test_*.cc +missingOverride:test_*.cc

5 years, 5 months

Activate containerOutOfBoundsIndexExpression again.

by Sven Panne

Module: check_mk Branch: master Commit: 56d52b7a126469215848e81706dcef1ecf3b887b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56d52b7a126469… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 26 14:30:27 2019 +0200 Activate containerOutOfBoundsIndexExpression again. Change-Id: I86711d62e4a51d9834a68d9d860ebcbe7a73a2b7 --- livestatus/src/RendererJSON.cc | 4 ++++ livestatus/src/RendererPython.cc | 2 ++ livestatus/src/RendererPython3.cc | 2 ++ livestatus/src/cppcheck-suppressions.txt | 1 - 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/livestatus/src/RendererJSON.cc b/livestatus/src/RendererJSON.cc index d1563f5..cc9f963 100644 --- a/livestatus/src/RendererJSON.cc +++ b/livestatus/src/RendererJSON.cc @@ -68,9 +68,13 @@ void RendererJSON::endDict() { _os << "}"; } void RendererJSON::outputNull() { _os << "null"; } void RendererJSON::outputBlob(const std::vector<char> &value) { + // cppcheck is too dumb to see that we just take the address... :-/ + // cppcheck-suppress containerOutOfBoundsIndexExpression outputUnicodeString("", &value[0], &value[value.size()], Encoding::latin1); } void RendererJSON::outputString(const std::string &value) { + // cppcheck is too dumb to see that we just take the address... :-/ + // cppcheck-suppress containerOutOfBoundsIndexExpression outputUnicodeString("", &value[0], &value[value.size()], _data_encoding); } diff --git a/livestatus/src/RendererPython.cc b/livestatus/src/RendererPython.cc index 4737ae6..18b991b 100644 --- a/livestatus/src/RendererPython.cc +++ b/livestatus/src/RendererPython.cc @@ -72,5 +72,7 @@ void RendererPython::outputBlob(const std::vector<char> &value) { } void RendererPython::outputString(const std::string &value) { + // cppcheck is too dumb to see that we just take the address... :-/ + // cppcheck-suppress containerOutOfBoundsIndexExpression outputUnicodeString("u", &value[0], &value[value.size()], _data_encoding); } diff --git a/livestatus/src/RendererPython3.cc b/livestatus/src/RendererPython3.cc index 80f48f2..33012fc 100644 --- a/livestatus/src/RendererPython3.cc +++ b/livestatus/src/RendererPython3.cc @@ -72,5 +72,7 @@ void RendererPython3::outputBlob(const std::vector<char> &value) { } void RendererPython3::outputString(const std::string &value) { + // cppcheck is too dumb to see that we just take the address... :-/ + // cppcheck-suppress containerOutOfBoundsIndexExpression outputUnicodeString("", &value[0], &value[value.size()], _data_encoding); } diff --git a/livestatus/src/cppcheck-suppressions.txt b/livestatus/src/cppcheck-suppressions.txt index fcc3d7a..3aaa5b2 100644 --- a/livestatus/src/cppcheck-suppressions.txt +++ b/livestatus/src/cppcheck-suppressions.txt @@ -1,4 +1,3 @@ -containerOutOfBoundsIndexExpression missingIncludeSystem missingOverride noConstructor

5 years, 5 months

Started AWS/ELBv2 tests

by Simon Betz

Module: check_mk Branch: master Commit: b80de985feb15a3399a9a511f2d75a88f53234f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b80de985feb15a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 26 13:58:06 2019 +0200 Started AWS/ELBv2 tests Change-Id: I1033e3886547e47e3a8abc84e9eba6f8857f80ca --- cmk/special_agents/agent_aws.py | 2 +- .../agent_aws/test_agent_aws_elbv2.py | 108 +++++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 15d63df..63a050a 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -2149,7 +2149,7 @@ class ELBv2Limits(AWSSectionLimits): rules = [] for listener in listeners: response = self._client.describe_rules(ListenerArn=listener['ListenerArn']) - rules.append(self._get_response_content(response, 'Rules')) + rules.extend(self._get_response_content(response, 'Rules')) # Limit 100 holds for rules which are not default, see AWS docs: # https://docs.aws.amazon.com/de_de/general/latest/gr/aws_service_limits.html diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elbv2.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elbv2.py new file mode 100644 index 0000000..334cbfa --- /dev/null +++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elbv2.py @@ -0,0 +1,108 @@ +# pylint: disable=redefined-outer-name + +import pytest +from agent_aws_fake_clients import ( + ELBv2DescribeLoadBalancersIB, + ELBv2DescribeTargetGroupsIB, + ELBv2DescribeListenersIB, + ELBv2DescribeRulesIB, + ELBv2DescribeAccountLimitsIB, + ELBv2DescribeTargetHealthIB, +) + +from cmk.special_agents.agent_aws import ( + AWSConfig, + ResultDistributor, + ELBv2Limits, + ELBSummaryGeneric, + ELBv2TargetGroups, +) + + +class FakeELBv2Client(object): + def describe_load_balancers(self): + return { + 'LoadBalancers': ELBv2DescribeLoadBalancersIB.create_instances(amount=1), + 'NextMarker': 'string', + } + + def describe_target_groups(self, LoadBalancerArn=None): + return { + 'TargetGroups': ELBv2DescribeTargetGroupsIB.create_instances(amount=1), + 'NextMarker': 'string', + } + + def describe_listeners(self, LoadBalancerArn=None): + return { + 'Listeners': ELBv2DescribeListenersIB.create_instances(amount=1), + 'NextMarker': 'string', + } + + def describe_rules(self, ListenerArn=None): + return { + 'Rules': ELBv2DescribeRulesIB.create_instances(amount=1), + 'NextMarker': 'string', + } + + def describe_account_limits(self): + return { + 'Limits': ELBv2DescribeAccountLimitsIB.create_instances(amount=1)[0]['Limits'], + 'NextMarker': 'string', + } + + def describe_target_health(self, TargetGroupArn=None): + return { + 'TargetHealthDescriptions': ELBv2DescribeTargetHealthIB.create_instances(amount=1), + } + + +(a)pytest.fixture() +def get_elbv2_sections(): + def _create_elbv2_sections(names, tags): + region = 'region' + config = AWSConfig('hostname', (None, None)) + config.add_single_service_config('elbv2_names', names) + config.add_service_tags('elbv2_tags', tags) + + fake_elbv2_client = FakeELBv2Client() + + elbv2_limits_distributor = ResultDistributor() + elbv2_summary_distributor = ResultDistributor() + + elbv2_limits = ELBv2Limits(fake_elbv2_client, region, config, elbv2_limits_distributor) + elbv2_summary = ELBSummaryGeneric( + fake_elbv2_client, region, config, elbv2_summary_distributor, resource='elbv2') + elbv2_target_groups = ELBv2TargetGroups(fake_elbv2_client, region, config) + + elbv2_limits_distributor.add(elbv2_summary) + elbv2_summary_distributor.add(elbv2_target_groups) + return elbv2_limits, elbv2_summary, elbv2_target_groups + + return _create_elbv2_sections + + +def test_agent_aws_elbv2_limits(get_elbv2_sections): + elbv2_limits, _elbv2_summary, _elbv2_target_groups = get_elbv2_sections(None, (None, None)) + _elbv2_limits_results = elbv2_limits.run().results + + assert elbv2_limits.interval == 300 + assert elbv2_limits.name == "elbv2_limits" + + +def test_agent_aws_elbv2_summary(get_elbv2_sections): + elbv2_limits, elbv2_summary, _elbv2_target_groups = get_elbv2_sections(None, (None, None)) + _elbv2_limits_results = elbv2_limits.run().results + _elbv2_summary_results = elbv2_summary.run().results + + assert elbv2_summary.interval == 300 + assert elbv2_summary.name == "elbv2_summary" + + +def test_agent_aws_elbv2_target_groups(get_elbv2_sections): + elbv2_limits, elbv2_summary, elbv2_target_groups = get_elbv2_sections(None, (None, None)) + _elbv2_limits_results = elbv2_limits.run().results + _elbv2_summary_results = elbv2_summary.run().results + _elbv2_target_groups_results = elbv2_target_groups.run().results + + assert elbv2_target_groups.interval == 300 + assert elbv2_target_groups.name == "elbv2_target_groups"

5 years, 5 months

checktestlib: make error message work for tuples

by Moritz Kiemer

Module: check_mk Branch: master Commit: 0933a81557046e9a9a7eaf27a68ae6b129c9b50c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0933a81557046e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 26 12:42:22 2019 +0200 checktestlib: make error message work for tuples Change-Id: I5219e19094b86f4d2d960c1f8bcfc82e47ac5fa3 --- tests/unit/checks/checktestlib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index 8e9515c..b74699f 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -104,7 +104,7 @@ class BasicCheckResult(Tuploid): self.multiline = None assert status in [0, 1, 2, 3], \ - "BasicCheckResult: status must be in (0, 1, 2, 3) - not %r" % status + "BasicCheckResult: status must be in (0, 1, 2, 3) - not %r" % (status,) ti = type(infotext) assert ti in [str, unicode], \

5 years, 5 months

storeonce_servicesets: add test

by Moritz Kiemer

Module: check_mk Branch: master Commit: c908e5ed205101d5fa573120bc510c151c79f26e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c908e5ed205101… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 26 13:35:55 2019 +0200 storeonce_servicesets: add test Change-Id: Ica45ffc33119a2a15719487a62f7378e1358b6dd --- .../datasets/storeonce_servicesets_regression.py | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/storeonce_servicesets_regression.py b/tests/unit/checks/generictests/datasets/storeonce_servicesets_regression.py new file mode 100644 index 0000000..d5c8b41 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/storeonce_servicesets_regression.py @@ -0,0 +1,75 @@ +# yapf: disable + + +checkname = 'storeonce_servicesets' + + +info = [ + ['[1]'], + ['ServiceSet ID', '1'], + ['ServiceSet Name', 'Service Set 1'], + ['ServiceSet Alias', 'SET1'], + ['Serial Number', 'CZ25132LTD01'], + ['Software Version', '3.18.7-1841.1'], + ['Product Class', 'HPE StoreOnce 4700 Backup'], + ['Deduplication Ratio', '16.626312639082'], + ['ServiceSet Health Level', '1'], + ['ServiceSet Health', 'OK'], + ['ServiceSet Status', 'Running'], + ['Replication Health Level', '1'], + ['Replication Health', 'OK'], + ['Replication Status', 'Running'], + ['Overall Health Level', '1'], + ['Overall Health', 'OK'], + ['Overall Status', 'Running'], + ['Housekeeping Health Level', '1'], + ['Housekeeping Health', 'OK'], + ['Housekeeping Status', 'Running'], + ['Primary Node', 'hpcz25132ltd'], + ['Secondary Node', 'None'], + ['Active Node', 'hpcz25132ltd'], + ['cloudCapacityBytes', '0'], + ['cloudDiskBytes', '0'], + ['cloudReadWriteLicensedDiskBytes', '0'], + ['cloudFreeBytes', '0'], + ['cloudUserBytes', '0'], + ['localCapacityBytes', '75952808613643'], + ['localDiskBytes', '49547481098312'], + ['localFreeBytes', '21647101662987'], + ['localUserBytes', '823791911219548'], + ['combinedCapacityBytes', '75952808613643'], + ['combinedDiskBytes', '49547481098312'], + ['combinedFreeBytes', '21647101662987'], + ['combinedUserBytes', '823791911219548'], +] + + +discovery = { + '': [ + ('1', {}), + ], + 'capacity': [ + ('1', {}), + ], +} + + +checks = { + '': [ + ('1', {}, [ + (0, 'Alias: SET1', []), + (0, 'Overall Status: Running, Overall Health: OK', []), + ]), + ], + 'capacity': [ + ('1', {}, [ + (0, '71.5% used (24.70 of 34.54 PB), trend: 0.00 B / 24 hours', [ + ('1', 26516458472.0, 29669065864.704296, 33377699097.792336, 0, 37086332330.88037), + ('fs_size', 37086332330.88037, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 1545263847.1200154), + ]), + (0, 'Dedup ratio: 16.63', []), + ]), + ], +}

5 years, 5 months

Activate preprocessorErrorDirective again.

by Sven Panne

Module: check_mk Branch: master Commit: 0b62ec3c7f298ce3cf869a14ee0a2f1a04b2e3cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b62ec3c7f298c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 26 14:14:50 2019 +0200 Activate preprocessorErrorDirective again. Change-Id: I445ae476d8fc46a13b3e63f95537913720c653e3 --- livestatus/src/cppcheck-suppressions.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/livestatus/src/cppcheck-suppressions.txt b/livestatus/src/cppcheck-suppressions.txt index 073e164..fcc3d7a 100644 --- a/livestatus/src/cppcheck-suppressions.txt +++ b/livestatus/src/cppcheck-suppressions.txt @@ -4,7 +4,6 @@ missingOverride noConstructor noExplicitConstructor passedByValue -preprocessorErrorDirective redundantAssignment shiftTooManyBitsSigned sizeofFunctionCall @@ -13,3 +12,6 @@ unmatchedSuppression unusedFunction unusedPrivateFunction useStlAlgorithm +// +unmatchedSuppression:*/include/boost/* +preprocessorErrorDirective:*/include/boost/*

5 years, 5 months

agent_aws: Removed duplicate code

by Simon Betz

Module: check_mk Branch: master Commit: 9e01e90eaf8634463d39c2adf2d0d4775ad72aaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e01e90eaf8634… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 26 11:54:44 2019 +0200 agent_aws: Removed duplicate code Change-Id: I836b5dac0b2aaa425ea9b8343f6d7db5da4bae01 --- cmk/special_agents/agent_aws.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 1da0bba..15d63df 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -2156,9 +2156,6 @@ class ELBv2Limits(AWSSectionLimits): # > Limits für Elastic Load Balancing load_balancer['Rules'] = [rule for rule in rules if not rule['IsDefault']] - response = self._client.describe_target_groups(LoadBalancerArn=lb_arn) - load_balancer['TargetGroups'] = self._get_response_content(response, 'TargetGroups') - response = self._client.describe_account_limits() limits = self._get_response_content(response, 'Limits') return load_balancers, limits @@ -2257,9 +2254,12 @@ class ELBv2TargetGroups(AWSSectionGeneric): # Just to be sure, that we do not describe target groups of other lbs continue - load_balancer_arn = load_balancer['LoadBalancerArn'] - response = self._client.describe_target_groups(LoadBalancerArn=load_balancer_arn) - target_groups = self._get_response_content(response, 'TargetGroups') + if 'TargetGroups' not in load_balancer: + response = self._client.describe_target_groups( + LoadBalancerArn=load_balancer['LoadBalancerArn']) + load_balancer['TargetGroups'] = self._get_response_content(response, 'TargetGroups') + + target_groups = load_balancer.get('TargetGroups', []) for target_group in target_groups: response = self._client.describe_target_health( TargetGroupArn=target_group['TargetGroupArn'])

5 years, 5 months

Cleanup AWS fake client builder

by Simon Betz

Module: check_mk Branch: master Commit: 327d9c3702304dbae712ed6890c0c7fb2ea108d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=327d9c3702304d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 26 11:55:12 2019 +0200 Cleanup AWS fake client builder Change-Id: Ife225205ef32d19842db64065f1bde7fa33e4e54 --- .../agent_aws/agent_aws_fake_clients.py | 1411 ++++++++++++-------- .../agent_aws/test_agent_aws_costs_and_usage.py | 4 +- .../special_agents/agent_aws/test_agent_aws_ebs.py | 16 +- .../special_agents/agent_aws/test_agent_aws_ec2.py | 32 +- .../special_agents/agent_aws/test_agent_aws_elb.py | 12 +- .../special_agents/agent_aws/test_agent_aws_rds.py | 4 +- .../special_agents/agent_aws/test_agent_aws_s3.py | 10 +- 7 files changed, 904 insertions(+), 585 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=327d9c3702…

5 years, 5 months

Fix new flaky test

by Lars Michelsen

Module: check_mk Branch: master Commit: f03b36526f0c912357f7364d4031b750be0c0767 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f03b36526f0c91… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 26 13:46:58 2019 +0200 Fix new flaky test Change-Id: I86409a1e1c8491d09c9e6e1e79b7cfcb9bb018a3 --- tests/unit/cmk_base/test_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index b8d8cbd..210087a 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -459,7 +459,7 @@ def test_host_config_icons_and_actions(monkeypatch, hostname, result): ("icon2", [], ["testhost2"], {}), ]) config_cache = ts.apply(monkeypatch) - assert config_cache.get_host_config(hostname).icons_and_actions == result + assert sorted(config_cache.get_host_config(hostname).icons_and_actions) == sorted(result) @pytest.mark.parametrize("hostname,result", [

5 years, 5 months

agent_aws: move datetime serializer to utils

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4b7a22f37a498c21c3aecd4fd2a593574360fad2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b7a22f37a498c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 26 09:19:35 2019 +0200 agent_aws: move datetime serializer to utils Change-Id: I561ae83d572679044d86f7bc62d804de8a9ddb77 --- cmk/special_agents/agent_aws.py | 12 ++++-------- cmk/special_agents/utils.py | 9 +++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 5f900a3..1da0bba 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -29,7 +29,6 @@ Special agent for monitoring Amazon web services (AWS) with Check_MK. import abc import argparse -import datetime import json import logging import sys @@ -45,6 +44,8 @@ from cmk.utils.paths import tmp_dir import cmk.utils.store as store import cmk.utils.password_store +from cmk.special_agents.utils import datetime_serializer + AWSStrings = Union[bytes, unicode] # TODO @@ -457,11 +458,6 @@ AWSEC2LimitsSpecial = { # '----------------------------------------------------------------------' -def _datetime_converter(o): - if isinstance(o, datetime.datetime): - return o.__str__() - - def _chunks(list_, length=100): return [list_[i:i + length] for i in xrange(0, len(list_), length)] @@ -683,7 +679,7 @@ class AWSSection(object): return content, self._cache_file.stat().st_mtime def _write_to_cache(self, raw_content): - json_dump = json.dumps(raw_content, default=_datetime_converter) + json_dump = json.dumps(raw_content, default=datetime_serializer) store.save_file(str(self._cache_file), json_dump) @abc.abstractmethod @@ -2811,7 +2807,7 @@ class AWSSections(object): if write_piggyback_header: sys.stdout.write("<<<<%s>>>>\n" % row.piggyback_hostname) sys.stdout.write(section_header) - sys.stdout.write("%s\n" % json.dumps(row.content, default=_datetime_converter)) + sys.stdout.write("%s\n" % json.dumps(row.content, default=datetime_serializer)) if write_piggyback_header: sys.stdout.write("<<<<>>>>\n") diff --git a/cmk/special_agents/utils.py b/cmk/special_agents/utils.py index 05d930b..907bb52 100644 --- a/cmk/special_agents/utils.py +++ b/cmk/special_agents/utils.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. """Place for common code shared among different Check_MK special agents""" +import datetime import getopt import json import pprint @@ -93,3 +94,11 @@ USAGE: agent_%s --section_url [{section_name},{url}] print line else: return content + + +def datetime_serializer(obj): + """Custom serializer to pass to json dump functions""" + if isinstance(obj, datetime.datetime): + return obj.__str__() + # fall back to json default behaviour: + raise TypeError("%r is not JSON serializable" % obj)

5 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019