Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

7119 FIX ibm_svc_enclosure: Incorrect parsed agent output led to a false report ' Only 0 of X canisters are online'

by Simon Betz

Module: check_mk Branch: master Commit: d9a54e1eefb1a8e891eccaa5f7af4bc1fcfe2bf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9a54e1eefb1a8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 7 09:06:39 2019 +0100 7119 FIX ibm_svc_enclosure: Incorrect parsed agent output led to a false report 'Only 0 of X canisters are online' Change-Id: I9af61a74cb5bed590197db56a1d09c863bb7d4ef --- .werks/7119 | 11 ++++++++ checks/ibm_svc_enclosure | 70 ++++++++++++++++++------------------------------ 2 files changed, 37 insertions(+), 44 deletions(-) diff --git a/.werks/7119 b/.werks/7119 new file mode 100644 index 0000000..80889a8 --- /dev/null +++ b/.werks/7119 @@ -0,0 +1,11 @@ +Title: ibm_svc_enclosure: Incorrect parsed agent output led to a false report 'Only 0 of X canisters are online' +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1551880134 + + diff --git a/checks/ibm_svc_enclosure b/checks/ibm_svc_enclosure index 73cc5ad..9383cca 100644 --- a/checks/ibm_svc_enclosure +++ b/checks/ibm_svc_enclosure @@ -48,6 +48,7 @@ # IBM-FLASH900 # <<<ibm_svc_enclosure:sep(58)>>> +# id:status:type:product_MTM:serial_number:total_canisters:online_canisters:online_PSUs:drive_slots # 1:online:control:9843-AE2:6860407:2:2:2:12 @@ -63,16 +64,18 @@ def check_ibm_svc_enclosure(item, _no_params, info): for line in info: if line[0] == item: if len(line) == 9: - line = line[:2] + [None, None, None - ] + line[2:6] + ["0"] + line[6:] + ["0", "0", "0", "0"] + line = line[:3] + [None, None, None] + line[3:7] + [ + None + ] + line[7:] + [None, None, None, None] elif len(line) == 13: - line = line + ["0", "0", "0", "0"] + line = line + [None, None, None, None] elif len(line) == 15: - line = line + ["0", "0"] + line = line + [None, None] elif len(line) == 17: pass else: - return 3, "Unknown format" + yield 3, "Unknown format" + return enclosure_id, enclosure_status, _enclosure_type, _managed, _IO_group_id, \ _IO_group_name, _product_MTM, _serial_number, total_canisters, online_canisters, \ @@ -80,49 +83,28 @@ def check_ibm_svc_enclosure(item, _no_params, info): total_secondary_expander_modules, online_secondary_expander_modules = line # Check status - message = "Enclosure %s is %s" % (enclosure_id, enclosure_status) if enclosure_status == "online": status = 0 else: status = 2 - message += "(!!)" - - # Check canisters - if online_canisters == total_canisters: - message += ", all %s canisters are online" % total_canisters - else: - status = 2 - message += ", only %s of %s canisters are online(!!)" % (online_canisters, - total_canisters) - - # Check PSUs - if online_PSUs == total_PSUs: - message += ", all %s PSUs are online" % total_PSUs - else: - status = 2 - message += ", only %s of %s PSUs are online(!!)" % (online_PSUs, total_PSUs) - - # Check FANs (only new firmware) - if online_fan_modules == total_fan_modules: - if total_fan_modules != "0": - message += ", all %s fan modules are online" % total_fan_modules - else: - status = 2 - message += ", only %s of %s fan modules are online(!!)" % (online_fan_modules, - total_fan_modules) - - # Check SEMs (only firmware >= 7.8) - if online_secondary_expander_modules == total_secondary_expander_modules: - if total_secondary_expander_modules != "0": - message += ", all %s secondary expander modules are online" % total_secondary_expander_modules - else: - status = 2 - message += ", only %s of %s secondary expander modules are online(!!)" % ( - online_secondary_expander_modules, total_secondary_expander_modules) - - return status, message - - return 3, "Enclosure %s not found in agent output" % item + yield status, "Status: %s" % enclosure_status + + for online, total, text in [ + (online_canisters, total_canisters, 'canisters'), + (online_PSUs, total_PSUs, "PSUs"), + (online_fan_modules, total_fan_modules, 'fan modules'), + (online_secondary_expander_modules, + total_secondary_expander_modules, + 'secondary expander modules'), + ]: + if online is None: + continue + state = 0 + infotext = "Online %s: %s" % (text, online) + if total is not None and online != total: + state = 2 + infotext += " of %s" % total + yield state, infotext check_info["ibm_svc_enclosure"] = {

5 years, 3 months

7064 cpu.threads: now returns the percentage of threads used

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1cb127801176f34fda3b46bd701213b4b94ed29c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cb127801176f3… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Mar 6 15:14:41 2019 +0100 7064 cpu.threads: now returns the percentage of threads used The check cpu.threads is now able to return the percentage of threads used on linux systems. To use this feature the check_mk_agent has to be updated. Levels for the thread usage can be defined in WATO. Change-Id: I7238a0e78b8434e17c0ce927205e1ae31cead9ec --- .werks/7064 | 12 ++++++ agents/check_mk_agent.linux | 3 ++ checks/cpu | 48 ++++++++++++++++------ cmk/gui/plugins/metrics/check_mk.py | 12 ++++++ cmk/gui/plugins/wato/check_parameters/threads.py | 36 ++++++++++++---- pnp-templates/check_mk-cpu.threads.php | 44 -------------------- .../generictests/datasets/cpu_1_regression.py | 37 +++++++++++++++++ .../generictests/datasets/cpu_2_regression.py | 36 ++++++++++++++++ 8 files changed, 163 insertions(+), 65 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1cb1278011…

5 years, 3 months

regression tests: disable yapf III

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2bc1861ffd8f95a8dbd89cf9c394b84eebb1069d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bc1861ffd8f95… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Mar 6 12:23:06 2019 +0100 regression tests: disable yapf III Change-Id: I4cc96d2179b6a623ee8bde220df7de68c71abf07 --- tests/unit/checks/generictests/regression.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/unit/checks/generictests/regression.py b/tests/unit/checks/generictests/regression.py index 9dafc2e..5d05853 100644 --- a/tests/unit/checks/generictests/regression.py +++ b/tests/unit/checks/generictests/regression.py @@ -46,7 +46,7 @@ import generictests.run class WritableDataset(object): def __init__(self, filename, init_dict): - self.comments = ['yapf: disable', ''] + self.comments = ['yapf: disable'] self.filename = filename self.writelist = ( 'checkname', @@ -77,7 +77,8 @@ class WritableDataset(object): v_str = pprint.pformat(v).replace('\n', '\n' + ' ' * len(k_str)) content += ['', '', k_str + v_str] with open(self.filename, 'w') as f: - f.write('\n# '.join(self.comments)) + for comment in self.comments: + f.write('# %s\n' % comment) f.write('\n'.join(content))

5 years, 4 months

test_active_check: Reduced number of core changes

by Lars Michelsen

Module: check_mk Branch: master Commit: b7d9c6b15a240120834be0e7f4bf38805e969413 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7d9c6b15a2401… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 6 11:40:33 2019 +0100 test_active_check: Reduced number of core changes Change-Id: Ie8692e72c85402a816e8f670e743b88df8015365 --- tests/integration/core/test_active_checks.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/tests/integration/core/test_active_checks.py b/tests/integration/core/test_active_checks.py index cac1a64..abb4e7d 100644 --- a/tests/integration/core/test_active_checks.py +++ b/tests/integration/core/test_active_checks.py @@ -1,15 +1,22 @@ #!/usr/bin/env python # encoding: utf-8 +# pylint: disable=redefined-outer-name +import collections import pytest -from testlib import web +from testlib import web # pylint: disable=unused-import import cmk_base.config as config +DefaultConfig = collections.namedtuple("DefaultConfig", ["core"]) + + +(a)pytest.fixture(scope="module", params=["nagios", "cmc"]) +def test_cfg(request, web, site): + config = DefaultConfig(core=request.param) + site.set_config("CORE", config.core, with_restart=True) -(a)pytest.fixture(scope="module") -def test_cfg(web, site): print "Applying default config" web.add_host( "test-host", attributes={ @@ -18,7 +25,7 @@ def test_cfg(web, site): }) web.activate_changes() - yield None + yield config # # Cleanup code @@ -28,10 +35,7 @@ def test_cfg(web, site): web.delete_host("test-host") -(a)pytest.mark.parametrize(("core"), ["nagios", "cmc"]) -def test_active_check_execution(test_cfg, site, web, core): - site.set_config("CORE", core, with_restart=True) - +def test_active_check_execution(test_cfg, site, web): try: web.set_ruleset( "custom_checks", @@ -75,10 +79,7 @@ def test_active_check_execution(test_cfg, site, web, core): web.activate_changes() -(a)pytest.mark.parametrize(("core"), ["nagios", "cmc"]) -def test_active_check_macros(test_cfg, site, web, core): - site.set_config("CORE", core, with_restart=True) - +def test_active_check_macros(test_cfg, site, web): macros = { "$HOSTADDRESS$": "127.0.0.1", "$HOSTNAME$": "test-host", @@ -141,7 +142,7 @@ def test_active_check_macros(test_cfg, site, web, core): expected_output = "Output: %s" % value # TODO: Cleanup difference between nagios/cmc - if core == "nagios": + if test_cfg.core == "nagios": expected_output = expected_output.strip() if var == "$_HOSTTAGS$": splitted_output = plugin_output.split(" ")

5 years, 4 months

Allow "null" rules in ClusterRoles in the k8s client

by Tom Baerwinkel

Module: check_mk Branch: master Commit: cc3fe3ffed83f114d24ab1001ba6782c932b3514 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc3fe3ffed83f1… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Mar 6 08:41:05 2019 +0100 Allow "null" rules in ClusterRoles in the k8s client In some OpenShift installations several ClusterRoles with a value of "null" for the rules are created. This is not allowed by the official Kubernetes API, but we have to handle it here to be able to monitor such installations. CMK-1738 Change-Id: I275769560c0fa968cfd8f3fa9fd2235ecfdda4bc --- .../0020-kubernetes-allow-empty-rules-in-clusterrole.dif | 11 +++++++++++ .../cmk/special_agents/test_agent_kubernetes.py | 14 ++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/omd/packages/python-modules/patches/0020-kubernetes-allow-empty-rules-in-clusterrole.dif b/omd/packages/python-modules/patches/0020-kubernetes-allow-empty-rules-in-clusterrole.dif new file mode 100644 index 0000000..cc74786 --- /dev/null +++ b/omd/packages/python-modules/patches/0020-kubernetes-allow-empty-rules-in-clusterrole.dif @@ -0,0 +1,11 @@ +--- dest/kubernetes-8.0.0.orig/kubernetes/client/models/v1_cluster_role.py ++++ dest/kubernetes-8.0.0/kubernetes/client/models/v1_cluster_role.py +@@ -181,7 +181,7 @@ class V1ClusterRole(object): + :type: list[V1PolicyRule] + """ + if rules is None: +- raise ValueError("Invalid value for `rules`, must not be `None`") ++ rules = [] + + self._rules = rules + diff --git a/tests/integration/cmk/special_agents/test_agent_kubernetes.py b/tests/integration/cmk/special_agents/test_agent_kubernetes.py new file mode 100644 index 0000000..84ebdd6 --- /dev/null +++ b/tests/integration/cmk/special_agents/test_agent_kubernetes.py @@ -0,0 +1,14 @@ +import pytest + +from kubernetes.client.models import V1ClusterRole + + +def test_v1_clusterrole_without_rules(): + try: + role = V1ClusterRole(rules=None) + except ValueError: + pytest.fail( + "It must be possible to instantiate a V1ClusterRole without explicit roles. " + "This is assured by patch 0020-kubernetes-allow-empty-rules-in-clusterrole.dif.") + + assert role.rules == []

5 years, 4 months

7115 FIX stormshield.include: Fixed possible performance losses

by Simon Betz

Module: check_mk Branch: master Commit: 92f10789f01a236053d47a2ebf71945d44769e1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92f10789f01a23… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 5 14:16:04 2019 +0100 7115 FIX stormshield.include: Fixed possible performance losses Change-Id: I6a365d85632aafb7e87d2baef70b6a7d05f6c15a --- .werks/7115 | 20 ++++++++++++++++++++ checks/stormshield.include | 5 ++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.werks/7115 b/.werks/7115 new file mode 100644 index 0000000..a1fd940 --- /dev/null +++ b/.werks/7115 @@ -0,0 +1,20 @@ +Title: stormshield.include: Fixed possible performance losses +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551791544 +Class: fix + +SNMP scan functions have the task to filter out SNMP hosts +for which it's not worth trying to discover related services. + +In order to achieve this every scan function tries +to find out the right device type by reference to +SNMP SysObjID and/or SNMP SysDescr. + +The stormshield scan functions were not restrictive enough and +the result was that for every SNMP host the SNMP table +below .1.3.6.1.4.1.11256 was requested. This might led to +losses during service discovery of all SNMP devices. diff --git a/checks/stormshield.include b/checks/stormshield.include index 7e2dd48..6b2e4c9 100644 --- a/checks/stormshield.include +++ b/checks/stormshield.include @@ -24,8 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# example output - def stormshield_scan_function(oid): - return oid('.1.3.6.1.4.1.11256.1.0.1.0') + return (oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.4.1.8072') and + oid('.1.3.6.1.4.1.11256.1.0.1.0'))

5 years, 4 months

add test for cisco temperature

by Moritz Kiemer

Module: check_mk Branch: master Commit: f5f51ce46596b4399b6a1ee18dc5c01ecac13638 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5f51ce46596b4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Mar 6 13:48:09 2019 +0100 add test for cisco temperature Change-Id: Ia2faf1b566c3970f75ec66ec9592e224ab085390 --- checks/cisco_temperature | 2 +- .../generictests/datasets/cisco_temperature.py | 2433 ++++++++++++++++++++ 2 files changed, 2434 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f5f51ce465…

5 years, 4 months

Cleaned up output of "Check_MK" service which contained multiple useless " , "

by Lars Michelsen

Module: check_mk Branch: master Commit: 88e33e19eca2c0aee4b67529271d4ac163aeec89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88e33e19eca2c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 20:02:46 2019 +0100 Cleaned up output of "Check_MK" service which contained multiple useless ", " Change-Id: Iae577f992c74202aae37686137bb5cea0ca90a17 --- cmk_base/data_sources/tcp.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index 0008f13..e65a716 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -238,15 +238,17 @@ class TCPDataSource(CheckMKAgentDataSource): def _summary_result(self): agent_info = self._get_agent_info() status, output, perfdata = super(TCPDataSource, self)._summary_result() + infotexts = [output] for sub_status, sub_output in [ self._sub_result_version(agent_info), self._sub_result_only_from(agent_info), ]: status = max(status, sub_status) - output += ", %s" % sub_output + if sub_output: + infotexts.append(sub_output) - return status, output, perfdata + return status, ", ".join(infotexts), perfdata def _is_expected_agent_version(self, agent_version, expected_version): try:

5 years, 4 months

7229 FIX Fixed missing builtin topics in topic dropdown on host tag edit page

by Lars Michelsen

Module: check_mk Branch: master Commit: 2c42c45f9de37988a5cf92a530006eae4f606809 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c42c45f9de379… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 6 07:58:12 2019 +0100 7229 FIX Fixed missing builtin topics in topic dropdown on host tag edit page Change-Id: Id6fc36927f3a787fdee1b2e6db7a125533264edf --- .werks/7229 | 10 ++++++++++ cmk/gui/wato/pages/host_tags.py | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/7229 b/.werks/7229 new file mode 100644 index 0000000..d5ed503 --- /dev/null +++ b/.werks/7229 @@ -0,0 +1,10 @@ +Title: Fixed missing builtin topics in topic dropdown on host tag edit page +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551855478 +Class: fix + + diff --git a/cmk/gui/wato/pages/host_tags.py b/cmk/gui/wato/pages/host_tags.py index 2a7c995..507b326 100644 --- a/cmk/gui/wato/pages/host_tags.py +++ b/cmk/gui/wato/pages/host_tags.py @@ -311,9 +311,16 @@ class ModeEditHosttagConfiguration(WatoMode): self._untainted_hosttags_config.load() def _get_topic_valuespec(self): + # Merging of both objects would ne neat here + builtin_tags_config = watolib.BuiltinHosttagsConfiguration() + builtin_tags_config.load() + + topics = set(builtin_tags_config.get_hosttag_topics()) + topics.update(self._untainted_hosttags_config.get_hosttag_topics()) + return OptionalDropdownChoice( title=_("Topic"), - choices=self._untainted_hosttags_config.get_hosttag_topics(), + choices=list(topics), explicit=TextUnicode(), otherlabel=_("Create New Topic"), default_value=None, @@ -373,6 +380,7 @@ class ModeEditAuxtag(ModeEditHosttagConfiguration): changed_hosttags_config = watolib.HosttagsConfiguration() changed_hosttags_config.load() + if self._is_new_aux_tag(): changed_hosttags_config.aux_tag_list.append(changed_aux_tag) else:

5 years, 4 months

7155 Ended Support for SLES 11 in version 1.6

by Alex Zurhake

Module: check_mk Branch: master Commit: 9fb3780d7fa001d76d5e82ff115d6ffd06d1cb46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fb3780d7fa001… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Mar 6 11:07:02 2019 +0100 7155 Ended Support for SLES 11 in version 1.6 Since SLES 11 are using a OpenSSL version before 1.0.0 we decided to end the support for SLES 11 for our next release. Many Python packages, that are used in Check_MK are dependent on newer OpenSSL versions. An old OpenSSL version is not only a security risk but also a threat for compatibility and stability. Change-Id: I4bbd323c99ceaa78e389f34980df8c727a858611 --- .werks/7155 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/7155 b/.werks/7155 new file mode 100644 index 0000000..941285e --- /dev/null +++ b/.werks/7155 @@ -0,0 +1,10 @@ +Title: Ended Support for SLES 11 in version 1.6 +Level: 1 +Component: distros +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551866384 +Class: feature + +Since SLES 11 are using a OpenSSL version before 1.0.0 we decided to end the support for SLES 11 for our next release. Many Python packages, that are used in Check_MK are dependent on newer OpenSSL versions. An old OpenSSL version is not only a security risk but also a threat for compatibility and stability.

5 years, 4 months

← Newer
1
...
35
36
37
38
39
40
41
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019