Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

mk_jolokia: minor improvement of error handling

by Moritz Kiemer

Module: check_mk Branch: master Commit: ffb6bcdc01f7cbce015363522a7054382b9a792c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffb6bcdc01f7cb… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jan 28 09:42:38 2019 +0100 mk_jolokia: minor improvement of error handling We now transport the error output to the check to deal with it, instead of silently skipping the instance if the jolokia_info section fails. Change-Id: I419de0cec2697363c8ce09be5d4091d9543fd18c --- agents/plugins/mk_jolokia.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 648bdc9..fb8e86e 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -464,11 +464,11 @@ def query_instance(inst): def generate_jolokia_info(inst): # Determine type of server - data = fetch_var(inst, "version", "") - - if not data: - sys.stderr.write("%s ERROR: Empty server info\n" % inst.name) - raise SkipInstance() + try: + data = fetch_var(inst, "version", "") + except (SkipInstance, SkipMBean) as exc: + yield inst.name, "ERROR", str(exc) + raise SkipInstance(exc) info = data.get('info', {}) version = info.get('version', "unknown")

5 years, 4 months

mk_jolokia: a couple of tests for config validation

by Moritz Kiemer

Module: check_mk Branch: master Commit: 61c311401ee264e5ee60227cb5c479b973ed8950 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61c311401ee264… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jan 28 09:42:38 2019 +0100 mk_jolokia: a couple of tests for config validation Change-Id: I366bcd22b9e836655201a26cf0f304ecca8d59ac --- tests/unit/plugins/test_mk_jolokia.py | 44 ++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/tests/unit/plugins/test_mk_jolokia.py b/tests/unit/plugins/test_mk_jolokia.py index e119e6b..ebb8bf2 100644 --- a/tests/unit/plugins/test_mk_jolokia.py +++ b/tests/unit/plugins/test_mk_jolokia.py @@ -21,6 +21,37 @@ def test_missing_config_basic(removed): SANITIZE(config) +def test_missing_config_auth(): + def missing_keys(key_string): + msg_pattern = r'Missing key\(s\): %s in configuration for UnitTest' % key_string + return pytest.raises(ValueError, match=msg_pattern) + + config = copy.deepcopy(mk_jolokia.DEFAULT_CONFIG) + for key in ("password", "user", "service_password", "client_cert", "client_key"): + config.pop(key) + config["instance"] = "UnitTest" + config["mode"] = "digest" + + with missing_keys("password, user"): + SANITIZE(config) + config["user"] = "TestUser" + with missing_keys("password"): + SANITIZE(config) + + config["mode"] = "https" + with missing_keys("client_cert, client_key"): + SANITIZE(config) + config["client_cert"] = "path/to/MyClientCert" + with missing_keys("client_key"): + SANITIZE(config) + config["client_key"] = "mysecretkey" + + config["service_user"] = "service user" + config["service_url"] = "u://r/l" + with missing_keys("service_password"): + SANITIZE(config) + + def test_config_instance(): config = copy.deepcopy(mk_jolokia.DEFAULT_CONFIG) assert SANITIZE(config).get("instance") == "8080" @@ -34,12 +65,23 @@ def test_config_timeout(): assert isinstance(SANITIZE(config).get("timeout"), float) +def test_config_legacy_cert_path_to_verify(): + config = copy.deepcopy(mk_jolokia.DEFAULT_CONFIG) + config["verify"] = None + assert SANITIZE(config).get("verify") is True + config["cert_path"] = "_default" + assert SANITIZE(config).get("verify") is True + config["verify"] = None + config["cert_path"] = "some/path/to/file" + assert SANITIZE(config).get("verify") == "some/path/to/file" + + @pytest.mark.parametrize("config,base_url", [({ "protocol": "sftp", "server": "billy.theserver", "port": 42, "suburi": "jolo-site", - "timeout": 2.0 + "timeout": 0 }, "sftp://billy.theserver:42/jolo-site/")]) def test_jolokia_instance_base_url(config, base_url): joloi = mk_jolokia.JolokiaInstance(config)

5 years, 4 months

7058 netscaler_vserver: the check is now cluster aware

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 52d3751308e8ba8a10fb7f4d6397fe02047570c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52d3751308e8ba… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Feb 5 09:51:57 2019 +0100 7058 netscaler_vserver: the check is now cluster aware The check can now be used together with Check_MK clusters. The cluster behaviour can be defined via the corresponding WATO rule. Change-Id: I4dd672a40d5df809add02f2f70d3e9f78cae650e --- .werks/7058 | 12 ++ checkman/netscaler_vserver | 2 + checks/netscaler_vserver | 138 +++++++++++++-------- .../wato/check_parameters/netscaler_vserver.py | 43 +++++-- 4 files changed, 132 insertions(+), 63 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=52d3751308…

5 years, 4 months

Try to mitigate timing issues during docker tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 2119aedee841ea4cf276eee4282b9766fd3a6dbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2119aedee841ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 4 12:10:07 2019 +0100 Try to mitigate timing issues during docker tests Change-Id: I0bad2d4ae6849fe6933e5f5fbe6979a8d51fe30b --- tests/docker/test_docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index 1b1662c..23463dd 100644 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -154,7 +154,7 @@ def _start(request, client, version=None, is_update=False, **kwargs): request.addfinalizer(lambda: c.remove(force=True)) - testlib.wait_until(lambda: c.exec_run(["omd", "status"], user=site_id)[0] == 0, timeout=30) + testlib.wait_until(lambda: c.exec_run(["omd", "status"], user=site_id)[0] == 0, timeout=120) output = c.logs() if not is_update:

5 years, 4 months

add dependency libgthread-2_0-0 to SLES_12 and SLES_12SP1. Without libgthread-2_0-0 omd start site fails

by Alex Zurhake

Module: check_mk Branch: master Commit: 4f4b4660c3c46783abf49c6ee051e940b1b5a536 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f4b4660c3c467… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Feb 4 11:12:11 2019 +0100 add dependency libgthread-2_0-0 to SLES_12 and SLES_12SP1. Without libgthread-2_0-0 omd start site fails Change-Id: I2e6d904ebbb081b2aa76fe988322cdd7e94f6956 --- omd/distros/SLES_12.mk | 1 + omd/distros/SLES_12SP1.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/omd/distros/SLES_12.mk b/omd/distros/SLES_12.mk index ebcae8f..48c49c5 100644 --- a/omd/distros/SLES_12.mk +++ b/omd/distros/SLES_12.mk @@ -87,6 +87,7 @@ OS_PACKAGES += poppler-tools # needed for preview of PDF in reporting OS_PACKAGES += libpcap1 # needed for ICMP of CMC OS_PACKAGES += libffi4 # needed for pyOpenSSL and dependant OS_PACKAGES += libjpeg62 # needed by PIL +OS_PACKAGES += libgthread-2_0-0 # Needed by cmc (rrd library) USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s PACKAGE_INSTALL = zypper -n refresh ; zypper -n install diff --git a/omd/distros/SLES_12SP1.mk b/omd/distros/SLES_12SP1.mk index 58e83f5..a771651 100644 --- a/omd/distros/SLES_12SP1.mk +++ b/omd/distros/SLES_12SP1.mk @@ -87,6 +87,7 @@ OS_PACKAGES += poppler-tools # needed for preview of PDF in reporting OS_PACKAGES += libpcap1 # needed for ICMP of CMC OS_PACKAGES += libffi4 # needed for pyOpenSSL and dependant OS_PACKAGES += libjpeg62 # needed by PIL +OS_PACKAGES += libgthread-2_0-0 # Needed by cmc (rrd library) USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s PACKAGE_INSTALL = zypper -n refresh ; zypper -n install

5 years, 4 months

agent_aws: Moved fetching information about EC2 security groups to own section

by Simon Betz

Module: check_mk Branch: master Commit: e7cf0a307c899aa22b71993aa5c43309a8c42940 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7cf0a307c899a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sat Feb 2 13:55:59 2019 +0100 agent_aws: Moved fetching information about EC2 security groups to own section Change-Id: I8b1d35a76228ac2e539346128c2c44c20db62fe5 --- agents/special/agent_aws | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index e3fd3f5..94c5344 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -401,33 +401,14 @@ class EC2Summary(AWSSectionGeneric): # TODO Filter response = self._client.describe_instances() try: - instances = { + return { self._extract_instance_name_from_tags(instance): instance for reservation in response['Reservations'] for instance in reservation.get('Instances', []) } except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) - instances = {} - - # TODO Filter - response = self._client.describe_security_groups() - try: - security_groups = {group['GroupId']: group for group in response['SecurityGroups']} - except KeyError as e: - logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) - security_groups = {} - return instances, security_groups - - def _compute_content(self, raw_content, colleague_contents): - instances, security_groups = raw_content.content - - for instance in instances.itervalues(): - for security_group in instance.get('SecurityGroups', []): - security_group_id = security_group['GroupId'] - if security_group_id in security_groups: - security_group.update(security_groups[security_group_id]) - return AWSComputedContent(instances, raw_content.cache_timestamp) + return {} def _extract_instance_name_from_tags(self, instance): for tag in instance.get('Tags', []): @@ -435,6 +416,9 @@ class EC2Summary(AWSSectionGeneric): return tag['Value'] return instance['InstanceId'] + def _compute_content(self, raw_content, colleague_contents): + return AWSComputedContent(raw_content.content, raw_content.cache_timestamp) + def _create_results(self, computed_content): return [AWSSectionResult("", [computed_content.content])] @@ -455,14 +439,27 @@ class EC2SecurityGroups(AWSSectionGeneric): return AWSColleagueContents({}, 0) def _fetch_raw_content(self, colleague_contents): - return colleague_contents.content + # TODO Filter + response = self._client.describe_security_groups() + try: + return {group['GroupId']: group for group in response['SecurityGroups']} + except KeyError as e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + return {} def _compute_content(self, raw_content, colleague_contents): - return AWSComputedContent(raw_content.content, raw_content.cache_timestamp) + content_by_piggyback_hosts = {} + for instance_name, instance in colleague_contents.content.iteritems(): + for security_group_from_instance in instance.get('SecurityGroups', []): + security_group = raw_content.content.get(security_group_from_instance['GroupId']) + if security_group is None: + continue + content_by_piggyback_hosts.setdefault(instance_name, []).append(security_group) + return AWSComputedContent(content_by_piggyback_hosts, raw_content.cache_timestamp) def _create_results(self, computed_content): return [ - AWSSectionResult(piggyback_hostname, rows.get('SecurityGroups', [])) + AWSSectionResult(piggyback_hostname, rows) for piggyback_hostname, rows in computed_content.content.iteritems() ] @@ -1204,7 +1201,7 @@ class AWSSectionsGeneric(AWSSections): #---sections-------------------------------------------------------- elb_health = ELBHealth(elb_client, hostname, region) - ec2_security_groups = EC2SecurityGroups(None, hostname, region) + ec2_security_groups = EC2SecurityGroups(ec2_client, hostname, region) ec2 = EC2(cloudwatch_client, hostname, region) ebs = EBS(cloudwatch_client, hostname, region) elb = ELB(cloudwatch_client, hostname, region)

5 years, 4 months

7091 FIX brocade_optical: Fixed KeyError caused by incomplete agent data

by Simon Betz

Module: check_mk Branch: master Commit: e1ebeaf0a8cc1d58d1d3dc06fade4ee8fc61c695 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1ebeaf0a8cc1d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 17 17:27:30 2019 +0100 7091 FIX brocade_optical: Fixed KeyError caused by incomplete agent data Change-Id: I6652836156b766e14f551ca289c7b296ff37a714 --- .werks/7091 | 10 + checks/brocade_optical | 86 +++-- .../datasets/brocade_optical_1_regression.py | 187 ++++++++++ .../datasets/brocade_optical_2_regression.py | 382 +++++++++++++++++++++ 4 files changed, 636 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e1ebeaf0a8…

5 years, 4 months

agent_aws: Removed dead code

by Simon Betz

Module: check_mk Branch: master Commit: d4fc0172831678eab64b2edf1f7c8a4b48881713 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4fc0172831678… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sat Feb 2 13:35:25 2019 +0100 agent_aws: Removed dead code Change-Id: Ic96bc039282a71227c9db444debe3b15463a5b82 --- agents/special/agent_aws | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index a1fedff..e3fd3f5 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -395,10 +395,7 @@ class EC2Summary(AWSSectionGeneric): return 300 def _get_colleague_contents(self): - colleague = self._received_results.get('security_groups') - if colleague and colleague.content: - return AWSColleagueContents(colleague.content, colleague.cache_timestamp) - return AWSColleagueContents([], 0) + return AWSColleagueContents(None, 0) def _fetch_raw_content(self, colleague_contents): # TODO Filter

5 years, 4 months

7057 FIX Allow "coding" comment in notification scripts

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 16d4b4ad9a0e62c4df2cce15afe065af13db472b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16d4b4ad9a0e62… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Feb 4 09:43:34 2019 +0100 7057 FIX Allow "coding" comment in notification scripts Notification scripts can contain the name of the notification script as a comment after the shebang and the optional encoding comment. When the encoding comment contained only the word "coding" but not "encoding" the encoding comment was accidentally used as the title of the notification script. Now the regular expression from https://docs.python.org/2.7/reference/lexical_analysis.html is used to recognize encoding comments. Therefore, "coding" and "encoding" can now be used. Change-Id: Ieb2151276a57452d75c3f010bbecaffb037becd1 --- .werks/7057 | 18 ++++++++++++++++++ cmk/gui/watolib/user_scripts.py | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/7057 b/.werks/7057 new file mode 100644 index 0000000..fc071ee --- /dev/null +++ b/.werks/7057 @@ -0,0 +1,18 @@ +Title: Allow "coding" comment in notification scripts +Level: 1 +Component: notifications +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1549018644 + +Notification scripts can contain the name of the notification +script as a comment after the shebang and the optional encoding +comment. When the encoding comment contained only the word +"coding" but not "encoding" the encoding comment was accidentally +used as the title of the notification script. Now the regular +expression from https://docs.python.org/2.7/reference/lexical_analysis.html +is used to recognize encoding comments. Therefore, "coding" and +"encoding" can now be used. diff --git a/cmk/gui/watolib/user_scripts.py b/cmk/gui/watolib/user_scripts.py index ba4303c..f38af8c 100644 --- a/cmk/gui/watolib/user_scripts.py +++ b/cmk/gui/watolib/user_scripts.py @@ -38,6 +38,7 @@ """ import os +import re import cmk.utils.paths @@ -76,7 +77,7 @@ def _load_user_scripts_from(adir): lines = file(path) lines.next() line = lines.next().decode("utf-8").strip() - if line.startswith("#") and "encoding:" in line: + if line.startswith("#") and re.search(r'coding[=:]\s*([-\w.]+)', line): line = lines.next().strip() if line.startswith("#"): info["title"] = line.lstrip("#").strip().split("#", 1)[0]

5 years, 4 months

7139 FIX cisco_ip_sla: Don't crash upon vanished IP SLA

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6ed05d34134376eb0c67bc72f234bbbf0c8ed9f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ed05d34134376… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Feb 4 09:24:51 2019 +0100 7139 FIX cisco_ip_sla: Don't crash upon vanished IP SLA Change-Id: I972c69540ba38cf98e1212a61ba4743f8acd7152 --- .werks/7139 | 11 +++++++++++ checks/cisco_ip_sla | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/7139 b/.werks/7139 new file mode 100644 index 0000000..0c53b4a --- /dev/null +++ b/.werks/7139 @@ -0,0 +1,11 @@ +Title: cisco_ip_sla: Don't crash upon vanished IP SLA +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1549263498 + + diff --git a/checks/cisco_ip_sla b/checks/cisco_ip_sla index 09d1f85..4a369e3 100644 --- a/checks/cisco_ip_sla +++ b/checks/cisco_ip_sla @@ -144,8 +144,9 @@ def inventory_cisco_ip_sla(parsed): yield index, {} -def check_cisco_ip_sla(item, params, parsed): - for description, value, unit, type_ in parsed[item]: +@get_parsed_item_data +def check_cisco_ip_sla(_item, params, data): + for description, value, unit, type_ in data: if not value: continue

5 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019