Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Refactored snapin and user attribute snapins to new mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: 14ee0a5eefa07b73514d989d50b9947a056786f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14ee0a5eefa07b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 09:56:14 2018 +0200 Refactored snapin and user attribute snapins to new mechanism * The registries need to be located in the common utils module of the plugin component. * Plugins are now registered explicitly using the decorator Change-Id: If8a6d842b9058c4b08c8e36b58d2dc638f9eeab6 --- cmk/gui/plugins/sidebar/__init__.py | 1 + cmk/gui/plugins/sidebar/about.py | 3 +- cmk/gui/plugins/sidebar/bookmarks.py | 2 + cmk/gui/plugins/sidebar/master_control.py | 3 +- cmk/gui/plugins/sidebar/nagvis_maps.py | 3 +- cmk/gui/plugins/sidebar/quicksearch.py | 3 +- cmk/gui/plugins/sidebar/speedometer.py | 3 +- cmk/gui/plugins/sidebar/utils.py | 24 +++ cmk/gui/plugins/sidebar/virtual_host_tree.py | 3 +- cmk/gui/plugins/userdb/__init__.py | 166 ++----------------- cmk/gui/plugins/userdb/user_attributes.py | 7 +- cmk/gui/plugins/userdb/utils.py | 233 +++++++++++++++++++++++++++ cmk/gui/sidebar.py | 30 +--- cmk/gui/userdb.py | 43 ----- 14 files changed, 292 insertions(+), 232 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=14ee0a5eef…

6 years, 1 month

More plugin registry refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 206cb6195cfc458b4bb34701ba176e76e47501ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=206cb6195cfc45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 20:32:44 2018 +0200 More plugin registry refactoring * Refactored remaining plugin registries to explicit registration * Quicksearch match plugins * User connector plugins * SLA computation and painter plugins * Dropped load_plugins method from Registry class Change-Id: I6d61b4339a86619a77a6fa7e6062704d6c631f8f --- cmk/gui/plugin_registry.py | 31 ++++++------------------------- cmk/gui/plugins/sidebar/quicksearch.py | 18 +++++++++++++----- cmk/gui/plugins/userdb/htpasswd.py | 3 ++- cmk/gui/plugins/userdb/ldap_connector.py | 3 ++- cmk/gui/plugins/userdb/utils.py | 1 - 5 files changed, 23 insertions(+), 33 deletions(-) diff --git a/cmk/gui/plugin_registry.py b/cmk/gui/plugin_registry.py index ce29a44..961f1c8 100644 --- a/cmk/gui/plugin_registry.py +++ b/cmk/gui/plugin_registry.py @@ -29,6 +29,9 @@ import abc # TODO: We decided to change this plugin registry from automatically finding # it's childs to explicit registration. # TODO: In the moment we have this, we can drop the auto_register stuff. +# TODO: Think about the different registry types. For which cases do we need the +# object registry for which the class registry? Does it make sense to consolidate +# both? class Registry(object): """The management object for all available plugins of a component. @@ -52,44 +55,22 @@ class Registry(object): raise NotImplementedError() - def load_plugins(self): - self._entries.clear() - - def _all_subclasses_of(base_class): - l = [] - for plugin_class in base_class.__subclasses__(): # pylint: disable=no-member - l += _all_subclasses_of(plugin_class) - l.append(plugin_class) - return l - - for plugin_class in _all_subclasses_of(self.plugin_base_class()): - if plugin_class.__subclasses__(): # pylint: disable=no-member - continue # Only use leaf classes - - # TODO: Create one base class for all plugin classes to provide a default for this - if hasattr(plugin_class, "auto_register") and not plugin_class.auto_register(): - return - - self.register(self._instanciate(plugin_class)) - - @abc.abstractmethod def _instanciate(self, cls): raise NotImplementedError() - @abc.abstractmethod def register(self, plugin_class): """Decorator to register a class with the registry""" - self._register(plugin_class) + self._register(self._instanciate(plugin_class)) + return plugin_class - @abc.abstractmethod def register_plugin(self, plugin_class): """Method for registering a plugin with the registry. Result is equal to use the register() decorator""" - self._register(plugin_class) + self._register(self._instanciate(plugin_class)) @abc.abstractmethod diff --git a/cmk/gui/plugins/sidebar/quicksearch.py b/cmk/gui/plugins/sidebar/quicksearch.py index d6870a7..1a08d06 100644 --- a/cmk/gui/plugins/sidebar/quicksearch.py +++ b/cmk/gui/plugins/sidebar/quicksearch.py @@ -713,10 +713,14 @@ class MatchPluginRegistry(cmk.gui.plugin_registry.ObjectRegistry): return QuicksearchMatchPlugin - def register(self, obj): + def _register(self, obj): self._entries[obj.__class__.__name__] = obj +match_plugin_registry = MatchPluginRegistry() + + +(a)match_plugin_registry.register class GroupMatchPlugin(QuicksearchMatchPlugin): def __init__(self, group_type = None, filter_shortname = None): super(GroupMatchPlugin, self).__init__(["%sgroups" % group_type, "%ss" % group_type, "services"], @@ -795,6 +799,7 @@ class GroupMatchPlugin(QuicksearchMatchPlugin): +(a)match_plugin_registry.register class ServiceMatchPlugin(QuicksearchMatchPlugin): def __init__(self): super(ServiceMatchPlugin, self).__init__(["services"], "services", "s") @@ -833,6 +838,7 @@ class ServiceMatchPlugin(QuicksearchMatchPlugin): +(a)match_plugin_registry.register class HostMatchPlugin(QuicksearchMatchPlugin): def __init__(self, livestatus_field = None, filter_shortname = None): super(HostMatchPlugin, self).__init__(["hosts", "services"], "hosts", filter_shortname) @@ -910,6 +916,7 @@ class HostMatchPlugin(QuicksearchMatchPlugin): +(a)match_plugin_registry.register class HosttagMatchPlugin(QuicksearchMatchPlugin): def __init__(self): super(HosttagMatchPlugin, self).__init__(["hosts", "services"], "hosts", "tg") @@ -971,30 +978,31 @@ class HosttagMatchPlugin(QuicksearchMatchPlugin): return "", url_infos +(a)match_plugin_registry.register class ServiceGroupMatchPlugin(GroupMatchPlugin): def __init__(self): super(ServiceGroupMatchPlugin, self).__init__(group_type = "service", filter_shortname = "sg") +(a)match_plugin_registry.register class HostGroupMatchPlugin(GroupMatchPlugin): def __init__(self): super(HostGroupMatchPlugin, self).__init__(group_type = "host", filter_shortname = "hg") +(a)match_plugin_registry.register class HostNameMatchPlugin(HostMatchPlugin): def __init__(self): super(HostNameMatchPlugin, self).__init__(livestatus_field = "name", filter_shortname = "h") +(a)match_plugin_registry.register class HostAliasMatchPlugin(HostMatchPlugin): def __init__(self): super(HostAliasMatchPlugin, self).__init__(livestatus_field = "alias", filter_shortname = "al") +(a)match_plugin_registry.register class HostAddressMatchPlugin(HostMatchPlugin): def __init__(self): super(HostAddressMatchPlugin, self).__init__(livestatus_field = "address", filter_shortname = "ad") - - -match_plugin_registry = MatchPluginRegistry() -match_plugin_registry.load_plugins() diff --git a/cmk/gui/plugins/userdb/htpasswd.py b/cmk/gui/plugins/userdb/htpasswd.py index 9472554..958a5b5 100644 --- a/cmk/gui/plugins/userdb/htpasswd.py +++ b/cmk/gui/plugins/userdb/htpasswd.py @@ -34,7 +34,7 @@ import cmk.paths from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.exceptions import MKUserError -from . import UserConnector +from . import UserConnector, user_connector_registry def encrypt_password(password, salt=None, prefix="1"): import cmk.gui.md5crypt @@ -43,6 +43,7 @@ def encrypt_password(password, salt=None, prefix="1"): return cmk.gui.md5crypt.md5crypt(password, salt, '$%s$' % prefix) +(a)user_connector_registry.register class HtpasswdUserConnector(UserConnector): @classmethod def type(cls): diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 12da8f4..f4a834f 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -65,7 +65,7 @@ from cmk.gui.valuespec import * from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.exceptions import MKGeneralException, MKUserError -from . import UserConnector +from . import UserConnector, user_connector_registry # LDAP attributes are case insensitive, we only use lower case! # Please note: This are only default values. The user might override this @@ -132,6 +132,7 @@ def ldap_test_module(): # | This class realizes the ldap connection and communication | # '----------------------------------------------------------------------' +(a)user_connector_registry.register class LDAPUserConnector(UserConnector): # stores the ldap connection suffixes of all connections connection_suffixes = {} diff --git a/cmk/gui/plugins/userdb/utils.py b/cmk/gui/plugins/userdb/utils.py index 39e17f6..9314b70 100644 --- a/cmk/gui/plugins/userdb/utils.py +++ b/cmk/gui/plugins/userdb/utils.py @@ -216,7 +216,6 @@ class UserConnectorRegistry(cmk.gui.plugin_registry.ClassRegistry): user_connector_registry = UserConnectorRegistry() -user_connector_registry.load_plugins() class UserAttributeRegistry(cmk.gui.plugin_registry.ObjectRegistry):

6 years, 1 month

Plugin registry: Add explicit registering method and decorator

by Lars Michelsen

Module: check_mk Branch: master Commit: 86a13a6d3c5a7db0fbd202e8118808f8dd508f70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86a13a6d3c5a7d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 09:55:46 2018 +0200 Plugin registry: Add explicit registering method and decorator * Plugins will be changed to register explicitly with the registry * The automatic plugin discovery will be dropped later Change-Id: Iea9a89c92eda06ac5cab796a577269fbf92f5521 --- cmk/gui/plugin_registry.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugin_registry.py b/cmk/gui/plugin_registry.py index ddd68bc..ce29a44 100644 --- a/cmk/gui/plugin_registry.py +++ b/cmk/gui/plugin_registry.py @@ -35,8 +35,9 @@ class Registry(object): The snapins are loaded by importing cmk.gui.plugins.[component]. These plugins contain subclasses of the cmk.gui.plugins.PluginBase (e.g. SidebarSnpain) class. - Registry.load_plugins() will register all snapins with this management - object and make them available for use. + + Entries are registered with this registry using either the register_plugin() + method or the Registry.register() decorator. """ __metaclass__ = abc.ABCMeta @@ -79,6 +80,20 @@ class Registry(object): @abc.abstractmethod def register(self, plugin_class): + """Decorator to register a class with the registry""" + self._register(plugin_class) + + + @abc.abstractmethod + def register_plugin(self, plugin_class): + """Method for registering a plugin with the registry. + + Result is equal to use the register() decorator""" + self._register(plugin_class) + + + @abc.abstractmethod + def _register(self, plugin_class): raise NotImplementedError()

6 years, 1 month

Add unit tests for plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 63a273e022d266244716d4f897bc5e68943bd164 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63a273e022d266… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 18:25:56 2018 +0200 Add unit tests for plugin registry Change-Id: I1dd263db8f5e6feeb0a7100bb4eae43089bc8711 --- tests/unit/web/test_plugin_registry.py | 90 ++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/tests/unit/web/test_plugin_registry.py b/tests/unit/web/test_plugin_registry.py new file mode 100644 index 0000000..b9b3931 --- /dev/null +++ b/tests/unit/web/test_plugin_registry.py @@ -0,0 +1,90 @@ +import pytest + +import cmk.gui.plugin_registry + +class Plugin(object): + pass + + +class PluginRegistry(cmk.gui.plugin_registry.ClassRegistry): + def plugin_base_class(self): + return Plugin + + def _register(self, plugin_class): + self._entries[plugin_class.__name__] = plugin_class + + +(a)pytest.fixture(scope="module") +def basic_registry(): + registry = PluginRegistry() + registry.register_plugin(Plugin) + return registry + + +def test_initialization(): + registry = PluginRegistry() + assert registry.items() == [] + + +def test_decorator_registration(): + registry = PluginRegistry() + assert registry.items() == [] + + @registry.register + class DecoratedPlugin(object): + pass + + assert registry.get("DecoratedPlugin") == DecoratedPlugin + + +def test_method_registration(): + registry = PluginRegistry() + assert registry.items() == [] + + class MethodRegisteredPlugin(object): + pass + + registry.register_plugin(MethodRegisteredPlugin) + assert registry.get("MethodRegisteredPlugin") == MethodRegisteredPlugin + + +def test_contains(basic_registry): + assert "bla" not in basic_registry + assert "Plugin" in basic_registry + + +def test_delitem(basic_registry): + with pytest.raises(KeyError): + del basic_registry["bla"] + + @basic_registry.register + class DelPlugin(object): + pass + + del basic_registry["DelPlugin"] + + +def test_getitem(basic_registry): + with pytest.raises(KeyError): + _unused = basic_registry["bla"] + + assert basic_registry["Plugin"] == Plugin + + +def test_values(basic_registry): + assert basic_registry.values() == [Plugin] + + +def test_items(basic_registry): + assert basic_registry.items() == [("Plugin", Plugin)] + + +def test_keys(basic_registry): + assert basic_registry.keys() == ["Plugin"] + + +def test_get(basic_registry): + assert basic_registry.get("bla") is None + assert basic_registry.get("bla", "blub") == "blub" + + assert basic_registry.get("Plugin") == Plugin

6 years, 1 month

Replaced object registries with class registries

by Lars Michelsen

Module: check_mk Branch: master Commit: b2323f182661fb92bbac43666721070292a6fb01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2323f182661fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jul 22 13:34:43 2018 +0200 Replaced object registries with class registries * Changed all object registries to class registries: * Sidebar snapins * Quicksearch match plugins * User attributes Changed some object methods to class methods to make this ible. * Dropped object registry feature Change-Id: I205d2a951fe0bf29a9b195fb96f3c2065b12340a --- cmk/gui/plugin_registry.py | 41 ++++-------- cmk/gui/plugins/sidebar/about.py | 10 ++- cmk/gui/plugins/sidebar/bookmarks.py | 9 ++- cmk/gui/plugins/sidebar/master_control.py | 10 ++- cmk/gui/plugins/sidebar/nagvis_maps.py | 12 ++-- cmk/gui/plugins/sidebar/quicksearch.py | 29 ++++++--- cmk/gui/plugins/sidebar/speedometer.py | 9 ++- cmk/gui/plugins/sidebar/utils.py | 35 ++++++----- cmk/gui/plugins/sidebar/virtual_host_tree.py | 12 ++-- cmk/gui/plugins/userdb/user_attributes.py | 12 ++-- cmk/gui/plugins/userdb/utils.py | 8 +-- cmk/gui/sidebar.py | 93 +++++++++++++--------------- cmk/gui/userdb.py | 50 ++++++++------- 13 files changed, 177 insertions(+), 153 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b2323f1826…

6 years, 1 month

Refactored WATO mode registry to to explicit registration

by Lars Michelsen

Module: check_mk Branch: master Commit: 8eec42cb719f4d5218fa6ceddbaa6957d3c55388 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eec42cb719f4d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jul 22 13:34:01 2018 +0200 Refactored WATO mode registry to to explicit registration Change-Id: Id33793261f396d55e7d27d07568a48f2070db910 --- cmk/gui/plugins/wato/background_job.py | 3 ++ cmk/gui/plugins/wato/bi.py | 8 +++ cmk/gui/plugins/wato/mkeventd.py | 10 ++++ cmk/gui/plugins/wato/utils/__init__.py | 13 +++++ cmk/gui/wato/__init__.py | 95 +++++++++++++++++++++++++++------- cmk/gui/wato/pages/groups.py | 7 +++ cmk/gui/wato/pages/password_store.py | 3 ++ cmk/gui/wato/pages/sites.py | 3 ++ 8 files changed, 124 insertions(+), 18 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8eec42cb71…

6 years, 1 month

Cleaned up unnecessary-semicolon findings

by Lars Michelsen

Module: check_mk Branch: master Commit: bccbf02f3b2ce88991afbfe33de3ea8e1342f784 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bccbf02f3b2ce8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 09:10:48 2018 +0200 Cleaned up unnecessary-semicolon findings Change-Id: I17d057f28cb7044d2b1b8fd58fedc3174c728d68 --- agents/plugins/mtr | 6 +++--- omd/packages/omd/omd | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/plugins/mtr b/agents/plugins/mtr index 3ffe9e3..549ff58 100755 --- a/agents/plugins/mtr +++ b/agents/plugins/mtr @@ -126,7 +126,7 @@ def read_status(): continue host = parts[0] lasttime = int(float(parts[1])) - status[host] = {'hops': {}, 'lasttime': lasttime}; + status[host] = {'hops': {}, 'lasttime': lasttime} hops = int(parts[2]) for i in range(0, hops): status[host]["hops"][i+1] = { @@ -240,13 +240,13 @@ def parse_report(host): hopline = re.compile(r'^\s*\d+\.') # 10.|-- 129.250.2.147 0.0% 10 325.6 315.5 310.3 325.6 5.0 for line in lines: if not hopline.match(line): - continue; # | `|-- 129.250.2.159 + continue # | `|-- 129.250.2.159 hopcount += 1 parts = line.split() if len(parts) < 8: sys.stdout.write("**ERROR** Bug parsing host/hop, " "line has less than 8 parts: %s\n" % line) - continue; + continue status[host]['hops'][hopcount] = { 'hopname': parts[1], 'loss' : parts[2], diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index ef63be0..c5de7d2 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -491,7 +491,7 @@ def user_has_group(user, group): return True g = group_by_id(group_id(group)) if user in g.gr_mem: - return True; + return True except: return False

6 years, 1 month

Disable too-many-ancestors on external class hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: f4f63415364dc9afccdd31cef09632b5f110481e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4f63415364dc9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 09:31:59 2018 +0200 Disable too-many-ancestors on external class hierarchy Change-Id: I00256038ac5ecaf4608d74562e707fa2ed1bc782 --- bin/mkbench | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/mkbench b/bin/mkbench index 3e3463a..be787ef 100755 --- a/bin/mkbench +++ b/bin/mkbench @@ -3141,7 +3141,8 @@ def run_report(test_id): # | The GUI rendering code | # '----------------------------------------------------------------------' -class Window(npyscreen.FormBaseNew): +# The class hierarchy is out of our control. Use it as intended by npyscreen. +class Window(npyscreen.FormBaseNew): # pylint: disable=too-many-ancestors pass

6 years, 1 month

Addition to werk 6340 (control.tar.xz was not deleted from package)

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f84625c06497877b8106025200a3ba1b2a1905d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f84625c064978… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 16:33:55 2018 +0200 Addition to werk 6340 (control.tar.xz was not deleted from package) Change-Id: Ibf8720badf1ca2e847cdf1d438148b526bddf6e9 --- agents/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/Makefile b/agents/Makefile index 2e5a4ab..61b5d33 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -76,7 +76,7 @@ build: packages: rpm deb -rpm $(RPM_PACKAGE): +rpm $(RPM_PACKAGE): waitmax rm -rf $(RPM_TOPDIR) mkdir -p $(RPM_TOPDIR)/RPMS mkdir -p $(RPM_TOPDIR)/SRPMS @@ -123,9 +123,9 @@ deb $(DEB_PACKAGE): $(RPM_PACKAGE) tar czf control.tar.gz $(TAROPTS) -C ctrl . && \ xz --decompress data.tar.xz && \ gzip data.tar && \ - ar d ../$(DEB_PACKAGE) data.tar.xz && \ + ar d ../$(DEB_PACKAGE) data.tar.xz control.tar.xz && \ ar r ../$(DEB_PACKAGE) debian-binary control.tar.gz data.tar.gz rm -rf deb-unpack clean: - rm -rf *~ waitmax + rm -rf *~ waitmax *.rpm *.deb

6 years, 1 month

pylint: enable too-many-branches checker

by Lars Michelsen

Module: check_mk Branch: master Commit: a54c82aac62afd63a5d316c25f4bf75d5229deac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a54c82aac62afd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 08:22:53 2018 +0200 pylint: enable too-many-branches checker Change-Id: Ia5d727e538e72d05a38538e130793bcf46424cbd --- tests/pylint/pylintrc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index ab09382..f018401 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -68,10 +68,6 @@ disable= # depending on an implicit protocol to create them is an even worse one. global-variable-undefined, #--------------------------------------------------------------------------- - # We should enable this, at the moment it just means splitting up two - # gigantic functions. - too-many-branches, - #--------------------------------------------------------------------------- # We have tons of unused imports, it is just a matter of removing them and # leave those which have a "magic" purpose. unused-import,

6 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018