Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e4839bdd5d1d50541bc614b9d65f600d525a05c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e4839bdd5d1d5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 23 11:16:17 2019 +0100 Fixed comments Change-Id: I70d4b409588f6c8045291b02cc106b38080dacaa --- cmk/gui/plugins/views/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmk/gui/plugins/views/utils.py b/cmk/gui/plugins/views/utils.py index 142eced..dba826f 100644 --- a/cmk/gui/plugins/views/utils.py +++ b/cmk/gui/plugins/views/utils.py @@ -784,19 +784,19 @@ class Sorter(object): @abc.abstractproperty def ident(self): # type: () -> str - """The identity of a painter. One word, may contain alpha numeric characters""" + """The identity of a sorter. One word, may contain alpha numeric characters""" raise NotImplementedError() @abc.abstractproperty def title(self): # type: () -> Text - """Used as display string for the painter in the GUI (e.g. view editor)""" + """Used as display string for the sorter in the GUI (e.g. view editor)""" raise NotImplementedError() @abc.abstractproperty def columns(self): # type: () -> List[str] - """Livestatus columns needed for this painter""" + """Livestatus columns needed for this sorter""" raise NotImplementedError() @abc.abstractmethod

5 years, 8 months

Cleaned up RulespecGroup class hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: 24859df80b169fe49277d8365050fc1fb9adcb02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24859df80b169f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 23 09:52:41 2019 +0100 Cleaned up RulespecGroup class hierarchy * Added a common base class RulespecBaseGroup * Added explicit is_sub_group property CMK-1572 Change-Id: I10f9ed074fe0f419bf2d76be25c111efa7c42bb4 --- cmk/gui/watolib/rulespecs.py | 58 +++++++++++++++++++++++++++++++++++++++----- tests/static/Makefile | 1 + 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/cmk/gui/watolib/rulespecs.py b/cmk/gui/watolib/rulespecs.py index e045adc..7c9bd9b 100644 --- a/cmk/gui/watolib/rulespecs.py +++ b/cmk/gui/watolib/rulespecs.py @@ -27,6 +27,7 @@ import abc import re +from typing import Text # pylint: disable=unused-import import six import cmk.utils.plugin_registry @@ -34,7 +35,8 @@ import cmk.utils.plugin_registry from cmk.gui.i18n import _ -class RulespecGroup(object): +class RulespecBaseGroup(object): + """Base class for all rulespec group types""" __metaclass__ = abc.ABCMeta @abc.abstractproperty @@ -55,8 +57,46 @@ class RulespecGroup(object): """Helpful description of this group""" raise NotImplementedError() + @abc.abstractproperty + def is_sub_group(self): + # type: () -> bool + raise NotImplementedError() + + @abc.abstractproperty + def choice_title(self): + # type: () -> Text + raise NotImplementedError() + + +class RulespecGroup(RulespecBaseGroup): + @abc.abstractproperty + def name(self): + # type: () -> Text + """Unique internal key of this group""" + raise NotImplementedError() + + @abc.abstractproperty + def title(self): + # type: () -> Text + """Human readable title of this group""" + raise NotImplementedError() + + @abc.abstractproperty + def help(self): + # type: () -> Text + """Helpful description of this group""" + raise NotImplementedError() -class RulespecSubGroup(RulespecGroup): + @property + def is_sub_group(self): + return False + + @property + def choice_title(self): + return self.title + + +class RulespecSubGroup(RulespecBaseGroup): __metaclass__ = abc.ABCMeta @abc.abstractproperty @@ -81,10 +121,14 @@ class RulespecSubGroup(RulespecGroup): def help(self): return None # Sub groups currently have no help text + @property + def is_sub_group(self): + return True + class RulespecGroupRegistry(cmk.utils.plugin_registry.ClassRegistry): def plugin_base_class(self): - return RulespecGroup + return RulespecBaseGroup def plugin_name(self, plugin_class): return plugin_class().name @@ -256,8 +300,10 @@ class Rulespecs(object): class Rulespec(object): - NO_FACTORY_DEFAULT = [] # needed for unique ID - FACTORY_DEFAULT_UNUSED = [] # means this ruleset is not used if no rule is entered + # needed for unique ID + NO_FACTORY_DEFAULT = [] # type: list + # means this ruleset is not used if no rule is entered + FACTORY_DEFAULT_UNUSED = [] # type: list def __init__(self, name, group_name, valuespec, item_spec, item_type, item_name, item_help, item_enum, match_type, title, help_txt, is_optional, factory_default, @@ -306,7 +352,7 @@ def register_rule( # Added during 1.6 development for easier transition. Is not needed for # pre 1.6 compatibility - if not isinstance(group, six.string_types) and issubclass(group, RulespecGroup): + if not isinstance(group, six.string_types) and issubclass(group, RulespecBaseGroup): group = group().name rulespec = Rulespec( diff --git a/tests/static/Makefile b/tests/static/Makefile index 63012fb..84a9807 100644 --- a/tests/static/Makefile +++ b/tests/static/Makefile @@ -8,6 +8,7 @@ FILES_TO_CHECK := $(realpath $(addprefix ../../cmk/ec/,defaults.py export.py mai $(realpath $(wildcard ../../cmk_base/*.py)) \ $(realpath $(addprefix ../../cmk/gui/,dashboard.py exceptions.py globals.py htmllib.py \ i18n.py sidebar.py sites.py table.py visuals.py permissions.py)) \ + $(realpath $(addprefix ../../cmk/gui/watolib/,rulespecs.py)) \ $(realpath $(addprefix ../../cmk/gui/plugins/userdb/,htpasswd.py utils.py)) \ $(realpath $(wildcard ../../cmk/gui/plugins/wato/utils/*.py)) MYPYPATH := $(realpath typeshed)

5 years, 8 months

Split up watolib tests

by Lars Michelsen

Module: check_mk Branch: master Commit: f979f3d63d06e073bb3c915154e09e099324ba10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f979f3d63d06e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 23 09:33:16 2019 +0100 Split up watolib tests CMK-1572 Change-Id: Idd4ec85046d97228c771e94a45248026f1f8508d --- .../cmk/gui/watolib/test_analyze_configuration.py | 29 ++ .../{test_watolib.py => watolib/test_rulespecs.py} | 374 +-------------------- tests/unit/cmk/gui/watolib/test_watolib.py | 335 ++++++++++++++++++ 3 files changed, 366 insertions(+), 372 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f979f3d63d…

5 years, 8 months

Fixed multiple registrations of static check parameter rulesets ( was only an internal issue)

by Lars Michelsen

Module: check_mk Branch: master Commit: 40507b4938c633cb224a6d6d6438f773fd495cad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40507b4938c633… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 23 09:55:45 2019 +0100 Fixed multiple registrations of static check parameter rulesets (was only an internal issue) CMK-1572 Change-Id: I9418a9d9f1770071789a5f48e8eca183e166e89f --- cmk/gui/plugins/wato/utils/__init__.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 01cecc9..89b0f60 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -685,11 +685,15 @@ def register_check_parameters(subgroup, # There is never a RulespecSubGroup declaration for the static checks. # Create some based on the regular check groups which should have a definition - main_group_static_class = rulespec_group_registry["static"] - checkparams_static_sub_group_class = type("%sStatic" % subgroup.__name__, (subgroup,), { - "main_group": main_group_static_class, - }) - rulespec_group_registry.register(checkparams_static_sub_group_class) + try: + subgroup_key = "static/" + subgroup().sub_group_name + checkparams_static_sub_group_class = rulespec_group_registry[subgroup_key] + except KeyError: + main_group_static_class = rulespec_group_registry["static"] + checkparams_static_sub_group_class = type("%sStatic" % subgroup.__name__, (subgroup,), { + "main_group": main_group_static_class, + }) + rulespec_group_registry.register(checkparams_static_sub_group_class) register_rule( checkparams_static_sub_group_class,

5 years, 8 months

Add tests for rulespec registration

by Lars Michelsen

Module: check_mk Branch: master Commit: 92cfbecf3a43b903672916511e3d80a78647fd22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92cfbecf3a43b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 23 09:41:35 2019 +0100 Add tests for rulespec registration CMK-1572 Change-Id: I21083a350b957fbf3a9565e11686465cbd2a331c --- tests/unit/cmk/gui/watolib/test_rulespecs.py | 134 ++++++++++++++++++++++++++- 1 file changed, 131 insertions(+), 3 deletions(-) diff --git a/tests/unit/cmk/gui/watolib/test_rulespecs.py b/tests/unit/cmk/gui/watolib/test_rulespecs.py index d5caa39..11f6c22 100644 --- a/tests/unit/cmk/gui/watolib/test_rulespecs.py +++ b/tests/unit/cmk/gui/watolib/test_rulespecs.py @@ -4,7 +4,11 @@ import pytest # type: ignore import cmk.gui.wato # pylint: disable=unused-import import cmk.gui.watolib as watolib import cmk.gui.watolib.rulespecs -from cmk.gui.valuespec import Dictionary +from cmk.gui.valuespec import ( + Dictionary, + TextAscii, + FixedValue, +) from cmk.gui.plugins.wato.utils import register_check_parameters @@ -1325,7 +1329,7 @@ def test_rulespec_get_host_groups(): ]) -def test_register_rule(monkeypatch): +def test_legacy_register_rule(monkeypatch): monkeypatch.setattr(cmk.gui.watolib.rulespecs, "g_rulespecs", watolib.Rulespecs()) monkeypatch.setattr(cmk.gui.watolib.rulespecs, "rulespec_group_registry", watolib.RulespecGroupRegistry()) @@ -1335,9 +1339,9 @@ def test_register_rule(monkeypatch): "dingdong_group", Dictionary( title="DING", + help="s-o-s", elements=[], ), - match="dict", ) group = cmk.gui.watolib.rulespecs.get_rulegroup("grouping") @@ -1350,6 +1354,66 @@ def test_register_rule(monkeypatch): assert "dingdong_group" in rulespec_names assert len(rulespec_names) == 1 + # Check some default values + spec = cmk.gui.watolib.rulespecs.g_rulespecs.get("dingdong_group") + + assert spec.name == "dingdong_group" + assert spec.group_name == "grouping" + assert isinstance(spec.valuespec, Dictionary) + assert spec.match_type == "first" + assert spec.title == "DING" + assert spec.help == "s-o-s" + assert spec.item_spec is None + assert spec.item_type is None + assert spec.item_name is None + assert spec.item_help is None + assert spec.item_enum is None + assert spec.is_optional is False + assert spec.is_deprecated is False + assert spec.factory_default == watolib.Rulespec.NO_FACTORY_DEFAULT + + +def test_legacy_register_rule_attributes(monkeypatch): + monkeypatch.setattr(cmk.gui.watolib.rulespecs, "g_rulespecs", watolib.Rulespecs()) + monkeypatch.setattr(cmk.gui.watolib.rulespecs, "rulespec_group_registry", + watolib.RulespecGroupRegistry()) + + watolib.register_rule( + "dingdong_group", + "rule_name", + Dictionary( + title="DING", + elements=[], + ), + title="title", + help="help me!", + itemspec=TextAscii(title="blub"), + itemtype="service", + itemname=u"Blub", + itemhelp=u"Item help", + itemenum="itemenum", + match="dict", + optional=True, + deprecated=True, + factory_default="humpf", + ) + + spec = cmk.gui.watolib.rulespecs.g_rulespecs.get("rule_name") + assert spec.name == "rule_name" + assert spec.group_name == "dingdong_group" + assert isinstance(spec.valuespec, Dictionary) + assert spec.match_type == "dict" + assert spec.title == "title" + assert spec.help == "help me!" + assert isinstance(spec.item_spec, TextAscii) + assert spec.item_type == "service" + assert spec.item_name == u"Blub" + assert spec.item_help == u"Item help" + assert spec.item_enum == "itemenum" + assert spec.is_optional is True + assert spec.is_deprecated is True + assert spec.factory_default == "humpf" + def test_register_check_parameters(monkeypatch): monkeypatch.setattr(cmk.gui.watolib.rulespecs, "g_rulespecs", watolib.Rulespecs()) @@ -1386,3 +1450,67 @@ def test_register_check_parameters(monkeypatch): ] assert "static_checks:check_group_name" in rulespec_names assert len(rulespec_names) == 1 + + +def dummy_rulespec(): + return cmk.gui.watolib.rulespecs.Rulespec( + name="name", + group_name="group", + valuespec=FixedValue(None), + item_spec=None, + item_type=None, + item_name=None, + item_help=None, + item_enum=None, + match_type="first", + title="bla", + help_txt=None, + is_optional=False, + factory_default=cmk.gui.watolib.rulespecs.Rulespec.NO_FACTORY_DEFAULT, + is_deprecated=False, + ) + + +def test_rulespecs_clear(): + rulespecs = cmk.gui.watolib.rulespecs.Rulespecs() + spec = dummy_rulespec() + rulespecs.register(spec) + assert rulespecs.exists("name") + assert rulespecs.get_all_groups() == ["group"] + assert rulespecs.get_by_group("group") == [spec] + + rulespecs.clear() + + assert not rulespecs.exists("name") + assert rulespecs.get_all_groups() == [] + + with pytest.raises(KeyError): + rulespecs.get_by_group("group") + + +def test_rulespecs_get(): + rulespecs = cmk.gui.watolib.rulespecs.Rulespecs() + + with pytest.raises(KeyError): + rulespecs.get("name") + + spec = dummy_rulespec() + rulespecs.register(spec) + assert rulespecs.get("name") == spec + + +def test_rulespecs_exists(): + rulespecs = cmk.gui.watolib.rulespecs.Rulespecs() + assert not rulespecs.exists("name") + rulespecs.register(dummy_rulespec()) + assert rulespecs.exists("name") + + +def test_rulespecs_get_rulespecs(): + rulespecs = cmk.gui.watolib.rulespecs.Rulespecs() + assert rulespecs.get_rulespecs() == {} + + spec = dummy_rulespec() + rulespecs.register(spec) + + assert rulespecs.get_rulespecs() == {"name": spec}

5 years, 8 months

Fix update to new predictive levels format

by Óscar Nájera

Module: check_mk Branch: master Commit: 6ecce66e555a6a42b9c886659745acc3d6a80801 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ecce66e555a6a… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Jan 22 17:16:24 2019 +0100 Fix update to new predictive levels format When updating to the new scheme of predictive levels, cached data changed format and thus old prediction were deleted upon retrieval and new needed to be calculated on a new step. In the case when the intention is to delete old predictions on purpose it wasn't checked that they belonged to the old format but assumed they were already updated. Because during development one retrieves data always earlier than the maintenance cleanup. Change-Id: Ie23431019fa8b21fb1a32706314cf8866d654fe0 --- cmk_base/prediction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/prediction.py b/cmk_base/prediction.py index bdcd7d4..dca1048 100644 --- a/cmk_base/prediction.py +++ b/cmk_base/prediction.py @@ -245,7 +245,7 @@ def _clean_predictions_dir(pred_dir, params): if f.endswith(".info"): info_file = os.path.join(pred_dir, f) info = cmk.utils.prediction.retrieve_data_for_prediction(info_file, '') - if info["params"]["period"] != params["period"]: + if info is None or info["params"]["period"] != params["period"]: cmk.utils.prediction.clean_prediction_files(info_file[:-5], force=True)

5 years, 8 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 5da7b13e26c562a500a8106e6a4d13b6b561ca3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5da7b13e26c562… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 18:33:10 2019 +0100 Testcommit Change-Id: Ie91fd6a9797c4b2ccec993ec7f58cfa9fafc7e11 --- pytest.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/pytest.ini b/pytest.ini index 7e85fa6..915adc5 100644 --- a/pytest.ini +++ b/pytest.ini @@ -11,3 +11,4 @@ markers = checks: Run all existing test cases for checks. filterwarnings = ignore::ImportWarning +

5 years, 8 months

Improved docker build error handling during tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 78403950431aa40f92b8056c1225bcc7d9b3a1fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78403950431aa4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 17:41:27 2019 +0100 Improved docker build error handling during tests Change-Id: Ib8e81cf5585ab8e6fb2514609e225b1bb2186657 --- tests/docker/test_docker.py | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index 292682f..1b1662c 100644 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -24,10 +24,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import pytest -import docker +import sys import os import subprocess +import pytest +import docker import testlib @@ -64,14 +65,26 @@ def _prepare_build(): def _build(request, client, version, add_args=None): _prepare_build() - image, build_logs = client.images.build( - path=build_path, - tag=_image_name(version), - buildargs={ - "CMK_VERSION": version.version, - "CMK_EDITION": version.edition(), - "CMK_DL_CREDENTIALS": ":".join(testlib.get_cmk_download_credentials()), - }) + try: + image, build_logs = client.images.build( + path=build_path, + tag=_image_name(version), + buildargs={ + "CMK_VERSION": version.version, + "CMK_EDITION": version.edition(), + "CMK_DL_CREDENTIALS": ":".join(testlib.get_cmk_download_credentials()), + }) + except docker.errors.BuildError as e: + sys.stdout.write("= Build log ==================\n") + for entry in e.build_log: + if "stream" in entry: + sys.stdout.write(entry["stream"]) + elif "errorDetail" in entry: + continue # Is already part of the exception message + else: + sys.stdout.write("UNEXPECTED FORMAT: %r\n" % entry) + sys.stdout.write("= Build log ==================\n") + raise # TODO: Enable this on CI system. Removing during development slows down testing #request.addfinalizer(lambda: client.images.remove(image.id, force=True))

5 years, 8 months

Removed superfluous closing div in single dataset layout

by Lars Michelsen

Module: check_mk Branch: master Commit: 07b0b8915d0223f4a157415e80f4c8ab84416e19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07b0b8915d0223… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 17:02:03 2019 +0100 Removed superfluous closing div in single dataset layout Change-Id: I5b0269b410c9589a1eddb1383a217c025a03e953 --- cmk/gui/plugins/views/layouts.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cmk/gui/plugins/views/layouts.py b/cmk/gui/plugins/views/layouts.py index bd1271a..221a2ac 100644 --- a/cmk/gui/plugins/views/layouts.py +++ b/cmk/gui/plugins/views/layouts.py @@ -140,7 +140,6 @@ class LayoutSingleDataset(Layout): html.close_tr() rownum += num_columns html.close_table() - html.close_div() class GroupedBoxesLayout(Layout):

5 years, 8 months

Fixed compatibility to 1.5 liveproxy "connect to local unix socket" config

by Lars Michelsen

Module: check_mk Branch: master Commit: c2aa9ce685d8ba5c6bfdda1830acfdf8994aa6ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2aa9ce685d8ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 16:56:43 2019 +0100 Fixed compatibility to 1.5 liveproxy "connect to local unix socket" config Change-Id: Ia3aeb792d5f7ac1478fb64928fbfb3588e21901b --- cmk/gui/config.py | 8 ++++++++ tests/unit/cmk/gui/test_gui_config.py | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/cmk/gui/config.py b/cmk/gui/config.py index c17b6bd..436ae7d 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -795,6 +795,14 @@ def migrate_old_site_config(site_config): continue socket = site_cfg["socket"] + + # Same as above for liveproxy configs + if isinstance(socket, tuple) and socket[0] == "proxy": + proxy_cfg = socket[1] + if proxy_cfg.get("socket") is None: + proxy_cfg["socket"] = ("local", None) + continue + if socket == 'disabled': site_cfg['disabled'] = True site_cfg['socket'] = ("local", None) diff --git a/tests/unit/cmk/gui/test_gui_config.py b/tests/unit/cmk/gui/test_gui_config.py index f0e8a38..f3eb9e2 100644 --- a/tests/unit/cmk/gui/test_gui_config.py +++ b/tests/unit/cmk/gui/test_gui_config.py @@ -607,6 +607,15 @@ def test_permission_sorting(do_sort, result): "address": ("::1", 1234) }) }), + ({ + "socket": ("proxy", { + "socket": None, + }) + }, { + "socket": ("proxy", { + "socket": ("local", None), + }) + }), # Is allowed in 1.6 and should not be converted ({ "socket": ("proxy", {

5 years, 8 months

← Newer
1
...
12
13
14
15
16
17
18
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019