Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Refactored page plugins to new module hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: 97a3a4d2b6c56812356735b861bc90eebb0969fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97a3a4d2b6c568… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jul 8 23:06:11 2018 +0200 Refactored page plugins to new module hierarchy * Moved web/plugins/pages to cmk/gui/plugins/pages * Plugins are real modules now * Did not change plugin API yet Change-Id: Ia3a4851ae25fffbd39569677644f13f424b138fc --- cmk/gui/modules.py | 46 ++++++++++++++++++------ cmk/gui/plugins/pages/__init__.py | 58 +++++++++++++++++++++++++++++++ {web => cmk/gui}/plugins/pages/bi.py | 1 + {web => cmk/gui}/plugins/pages/cron.py | 1 + {web => cmk/gui}/plugins/pages/metrics.py | 1 + {web => cmk/gui}/plugins/pages/mobile.py | 1 + {web => cmk/gui}/plugins/pages/shipped.py | 2 ++ cmk/gui/plugins/pages/utils.py | 33 ++++++++++++++++++ {web => cmk/gui}/plugins/pages/wato.py | 1 + 9 files changed, 134 insertions(+), 10 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=97a3a4d2b6…

6 years, 2 months

Refactored webapi plugins to new module hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ac39f4418ca4b1e551866f7fe8ed9357afc6dfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ac39f4418ca4b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Refactored webapi plugins to new module hierarchy * Moved web/plugins/webapi to cmk/gui/plugins/webapi * Plugins are real modules now * Did not change plugin API yet Change-Id: I87641596ceff279670c4407b018be81d8d01216c --- cmk/gui/plugins/webapi/__init__.py | 64 ++++++++++++ cmk/gui/plugins/webapi/utils.py | 165 ++++++++++++++++++++++++++++++ {web => cmk/gui}/plugins/webapi/webapi.py | 21 +++- cmk/gui/webapi.py | 136 +++--------------------- 4 files changed, 263 insertions(+), 123 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1ac39f4418…

6 years, 2 months

Exceptions in WATO processing now correctly result in crash reports

by Lars Michelsen

Module: check_mk Branch: master Commit: 15bcfc3c175b8cee6ee5afd52e109581e583416c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15bcfc3c175b8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Exceptions in WATO processing now correctly result in crash reports Change-Id: Ifd113e963650bb94cd69f12d1056f25eb067ae29 --- cmk/gui/wato/__init__.py | 63 ++++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 39 deletions(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index a238ff5..2939705 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -408,48 +408,33 @@ def page_handler(): show_body_start=display_options.enabled(display_options.H), show_top_heading=display_options.enabled(display_options.T)) - try: - if display_options.enabled(display_options.B): - # Show contexts buttons - html.begin_context_buttons() - mode.buttons() - for inmode, buttontext, target in extra_buttons: - if inmode == current_mode: - if hasattr(target, '__call__'): - target = target() - if not target: - continue - if '/' == target[0] or target.startswith('../') or '://' in target: - html.context_button(buttontext, target) - else: - html.context_button(buttontext, watolib.folder_preserving_link([("mode", target)])) - html.end_context_buttons() - - if not html.is_transaction() or (watolib.is_read_only_mode_enabled() and watolib.may_override_read_only_mode()): - show_read_only_warning() - - # Show outcome of action - if html.has_user_errors(): - html.show_error(action_message) - elif action_message: - html.message(action_message) - - # Show content - mode.handle_page() - - except MKGeneralException: - raise + if display_options.enabled(display_options.B): + # Show contexts buttons + html.begin_context_buttons() + mode.buttons() + for inmode, buttontext, target in extra_buttons: + if inmode == current_mode: + if hasattr(target, '__call__'): + target = target() + if not target: + continue + if '/' == target[0] or target.startswith('../') or '://' in target: + html.context_button(buttontext, target) + else: + html.context_button(buttontext, watolib.folder_preserving_link([("mode", target)])) + html.end_context_buttons() - except MKInternalError: - html.unplug_all() - raise + if not html.is_transaction() or (watolib.is_read_only_mode_enabled() and watolib.may_override_read_only_mode()): + show_read_only_warning() - except MKAuthException: - raise + # Show outcome of action + if html.has_user_errors(): + html.show_error(action_message) + elif action_message: + html.message(action_message) - except Exception, e: - html.unplug_all() - html.show_error(traceback.format_exc().replace('\n', '<br />')) + # Show content + mode.handle_page() if watolib.is_sidebar_reload_needed(): html.reload_sidebar()

6 years, 2 months

Refactored visuals plugins to new module hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: 8dc2bc1540cf9893f98382ffd315b74bccb45932 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dc2bc1540cf98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Refactored visuals plugins to new module hierarchy * Moved web/plugins/visuals to cmk/gui/plugins/visuals * Plugins are real modules now * Did not change plugin API yet Change-Id: Iac6eb8983d0d4bfbd7ff0101ec1bba2a12820369 --- cmk/gui/dashboard.py | 8 + cmk/gui/plugins/visuals/__init__.py | 58 +++ {web => cmk/gui}/plugins/visuals/filters.py | 643 +++++++++++++++++++------- {web => cmk/gui}/plugins/visuals/infos.py | 78 +++- {web => cmk/gui}/plugins/visuals/inventory.py | 35 +- cmk/gui/plugins/visuals/utils.py | 302 ++++++++++++ {web => cmk/gui}/plugins/visuals/wato.py | 17 +- cmk/gui/visuals.py | 136 +----- web/plugins/dashboard/dashlets.py | 5 - web/plugins/views/inventory.py | 55 ++- web/plugins/visuals/bi.py | 316 ------------- web/plugins/visuals/mkeventd.py | 246 ---------- 12 files changed, 993 insertions(+), 906 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8dc2bc1540…

6 years, 2 months

Refactored SLA plugin registries to new logic

by Lars Michelsen

Module: check_mk Branch: master Commit: 2cd361a9958f72c4ccf890f8d74adf5348c1af00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cd361a9958f72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Refactored SLA plugin registries to new logic Change-Id: I39b2b94e2e205895e50611db0c2c4744cfc804f4 --- cmk/gui/plugin_registry.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmk/gui/plugin_registry.py b/cmk/gui/plugin_registry.py index 681de17..2080608 100644 --- a/cmk/gui/plugin_registry.py +++ b/cmk/gui/plugin_registry.py @@ -86,6 +86,14 @@ class Registry(object): del self._entries[key] + def __getitem__(self, key): + return self._entries[key] + + + def values(self): + return self._entries.values() + + def items(self): return self._entries.items()

6 years, 2 months

Abstracted plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f76b5a13b3ba568ae93e28792f7625f4945b76b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f76b5a13b3ba5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Abstracted plugin registry Change-Id: I132a1daab1484cfc5e67b85122d2f89d1a9d571b --- cmk/gui/plugin_registry.py | 89 +++++++++++++++++++++++++++++++++++++ cmk/gui/plugins/sidebar/__init__.py | 26 +++++++++++ cmk/gui/sidebar.py | 59 +++++++++--------------- 3 files changed, 136 insertions(+), 38 deletions(-) diff --git a/cmk/gui/plugin_registry.py b/cmk/gui/plugin_registry.py new file mode 100644 index 0000000..068abc7 --- /dev/null +++ b/cmk/gui/plugin_registry.py @@ -0,0 +1,89 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +import abc + +class Registry(object): + """The management object for all available plugins of a component. + + 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. + """ + __metaclass__ = abc.ABCMeta + + def __init__(self): + super(Registry, self).__init__() + self._entries = {} + + + # TODO: Make staticmethod (But abc.abstractstaticmethod not available. How to make this possible?) + @abc.abstractmethod + def plugin_base_class(self): + 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 + + self.register(plugin_class) + + + @abc.abstractmethod + def register(self, plugin_class): + raise NotImplementedError() + + + def __contains__(self, text): + return text in self._entries + + + def __delitem__(self, key): + del self._entries[key] + + + def items(self): + return self._entries.items() + + + def keys(self): + return self._entries.keys() + + + def get(self, key, deflt=None): + return self._entries.get(key, deflt) diff --git a/cmk/gui/plugins/sidebar/__init__.py b/cmk/gui/plugins/sidebar/__init__.py index 081c702..7054431 100644 --- a/cmk/gui/plugins/sidebar/__init__.py +++ b/cmk/gui/plugins/sidebar/__init__.py @@ -1,3 +1,29 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + import os import glob diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py index 1db6a2f..d35e11a 100644 --- a/cmk/gui/sidebar.py +++ b/cmk/gui/sidebar.py @@ -49,6 +49,7 @@ import cmk.gui.notify as notify import cmk.gui.werks as werks import cmk.gui.sites as sites import cmk.gui.modules as modules +import cmk.gui.plugin_registry import cmk.gui.plugins.sidebar import cmk.gui.plugins.sidebar.quicksearch from cmk.gui.exceptions import MKGeneralException, MKUserError, MKException @@ -123,7 +124,7 @@ def load_plugins(force): # TODO: Deprecate this one day. def transform_old_dict_based_snapins(): for snapin_id, snapin in sidebar_snapins.items(): - snapin_registry.register_snapin(GenericSnapin(snapin_id, snapin)) + snapin_registry.register(GenericSnapin(snapin_id, snapin)) # TODO: Deprecate this one day. @@ -565,37 +566,31 @@ def ajax_switch_site(): #. -# .--Snapin API----------------------------------------------------------. -# | ____ _ _ ____ ___ | -# | / ___| _ __ __ _ _ __ (_)_ __ / \ | _ \_ _| | -# | \___ \| '_ \ / _` | '_ \| | '_ \ / _ \ | |_) | | | -# | ___) | | | | (_| | |_) | | | | | / ___ \| __/| | | -# | |____/|_| |_|\__,_| .__/|_|_| |_| /_/ \_\_| |___| | -# | |_| | -# +----------------------------------------------------------------------+ -# | The new snapin API allows encapsulating the whole functionality of a | -# | snapin in a single object. This includes page handlers and so on. | -# | All new snapins need to be realized as child of SidebarSnapin() and | -# | use the register_snapin() function to register with the sidebar. | +# .--Plugins-------------------------------------------------------------. +# | ____ _ _ | +# | | _ \| |_ _ __ _(_)_ __ ___ | +# | | |_) | | | | |/ _` | | '_ \/ __| | +# | | __/| | |_| | (_| | | | | \__ \ | +# | |_| |_|\__,_|\__, |_|_| |_|___/ | +# | |___/ | # '----------------------------------------------------------------------' -# Load all plugins. The snapins will then register on their own by subclassing SidebarSnapin -import cmk.gui.plugins.sidebar - -class SnapinRegistry(object): - def __init__(self): - super(SnapinRegistry, self).__init__() - self._snapins = {} +class SnapinRegistry(cmk.gui.plugin_registry.Registry): + """The management object for all available plugins. - def load_snapins(self): - for snapin_class in cmk.gui.plugins.sidebar.SidebarSnapin.__subclasses__(): # pylint: disable=no-member - self.register_snapin(snapin_class()) + The snapins are loaded by importing cmk.gui.plugins.sidebar. These plugins + contain subclasses of the cmk.gui.plugins.SidebarSnapin class. + SnapinRegistry.load_plugins() will register all snapins with this management + object and make them available for use. + """ + def plugin_base_class(self): + return cmk.gui.plugins.sidebar.SidebarSnapin - def register_snapin(self, snapin): + def register(self, snapin): snapin_id = snapin.type_name() - self._snapins[snapin_id] = snapin + self._entries[snapin_id] = snapin config.declare_permission("sidesnap.%s" % snapin_id, snapin.title(), @@ -605,20 +600,8 @@ class SnapinRegistry(object): modules.register_handlers(snapin.page_handlers()) - def __contains__(self, text): - return text in self._snapins - - - def items(self): - return self._snapins.items() - - - def get(self, key, deflt=None): - return self._snapins.get(key, deflt) - - snapin_registry = SnapinRegistry() -snapin_registry.load_snapins() +snapin_registry.load_plugins() class GenericSnapin(cmk.gui.plugins.sidebar.SidebarSnapin):

6 years, 2 months

Refactored WATO plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: 1c07ef42ca4eb3b2986a551ec4b298b34f22b469 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c07ef42ca4eb3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Refactored WATO plugins * Introducing module based plugin hierarchy for WATO * Move some code around * Started extracting wato.py into component with submodules * WATO modes are now registered just by subclassing WatoMode (cmk.gui.wato.base_modes.WatoMode). All WatoMode subclasses now have to implement the classmethods name() and permissions(). Registration with the modes dictionary is deprecated now * Cleaned up notifications / alert (-> event) mode inheritance a bit * Cleaned up several import of "wato" module from other GUI modules * Cleaned up configuration based host attributes a bit Some cleanups related to CEE/CME specific code separation are left. Change-Id: Ice38d5ed06160473916bfe11130196a94a13eac6 --- cmk/gui/config.py | 34 +- cmk/gui/dashboard.py | 4 +- cmk/gui/plugins/metrics/check_mk.py | 1 - cmk/gui/plugins/sidebar/virtual_host_tree.py | 4 +- cmk/gui/plugins/userdb/ldap_connector.py | 1 - cmk/gui/plugins/wato/__init__.py | 58 + {web => cmk/gui}/plugins/wato/ac_tests.py | 26 +- {web => cmk/gui}/plugins/wato/active_checks.py | 26 +- {web => cmk/gui}/plugins/wato/background_job.py | 70 +- {web => cmk/gui}/plugins/wato/backup_domains.py | 3 + {web => cmk/gui}/plugins/wato/bi.py | 321 +- .../gui}/plugins/wato/builtin_attributes.py | 137 +- {web => cmk/gui}/plugins/wato/builtin_modules.py | 11 +- .../gui}/plugins/wato/check_mk_configuration.py | 42 +- {web => cmk/gui}/plugins/wato/check_parameters.py | 16 +- .../gui}/plugins/wato/datasource_programs.py | 10 + .../gui}/plugins/wato/globals_notification.py | 11 +- {web => cmk/gui}/plugins/wato/inventory.py | 8 + {web => cmk/gui}/plugins/wato/mkeventd.py | 173 +- {web => cmk/gui}/plugins/wato/nagvis_auth.py | 5 +- {web => cmk/gui}/plugins/wato/notifications.py | 10 +- {web => cmk/gui}/plugins/wato/omd_configuration.py | 30 +- cmk/gui/plugins/wato/utils.py | 1083 +++++ cmk/gui/table.py | 1 + cmk/gui/userdb.py | 4 +- cmk/gui/valuespec.py | 23 +- cmk/gui/views.py | 6 +- cmk/gui/{wato.py => wato/__init__.py} | 4263 ++++++++------------ cmk/gui/wato/base_modes.py | 128 + cmk/gui/wato/context_buttons.py | 81 + .../gui/wato/html_elements.py | 54 +- cmk/gui/wato/main_menu.py | 108 + cmk/gui/wato/pages/__init__.py | 0 cmk/gui/wato/pages/global_settings.py | 296 ++ cmk/gui/watolib.py | 611 ++- tests/unit/web/old/classes.py | 2 +- tests/unit/web/old/html_tests.py | 2 +- tests/unit/web/test_htmllib_Escaper.py | 2 +- tests/unit/web/test_htmllib_HTML.py | 3 +- tests/unit/web/test_htmllib_HTMLGenerator.py | 2 +- tests/unit/web/test_htmllib_OutputFunnel.py | 2 +- tests/unit/web/tools.py | 2 +- web/plugins/icons/wato.py | 8 +- web/plugins/pages/wato.py | 3 +- web/plugins/views/commands.py | 13 +- web/plugins/views/painters.py | 9 +- web/plugins/wato/auth.py | 30 - web/plugins/webapi/webapi.py | 36 +- 48 files changed, 4640 insertions(+), 3133 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1c07ef42ca…

6 years, 2 months

Moved helper function to fetch groups from livestatus to more generic place

by Lars Michelsen

Module: check_mk Branch: master Commit: b16e33bf8f6c027211ed7393990df39e558c3296 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b16e33bf8f6c02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Moved helper function to fetch groups from livestatus to more generic place Change-Id: I85f6bb7a90adea0e471f4f6b4b69d5f00e289574 --- cmk/gui/availability.py | 2 +- cmk/gui/plugins/sidebar/shipped.py | 6 +----- cmk/gui/sites.py | 10 ++++++++++ web/plugins/visuals/filters.py | 12 +++--------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmk/gui/availability.py b/cmk/gui/availability.py index c08ceef..da661d5 100644 --- a/cmk/gui/availability.py +++ b/cmk/gui/availability.py @@ -1050,7 +1050,7 @@ def compute_availability_groups(what, av_data, avoptions): # 2. Compute names for the groups and sort according to these names if grouping != "host": - group_titles = dict(visuals.all_groups(grouping[:-7])) + group_titles = dict(sites.all_groups(grouping[:-7])) titled_groups = [] for group_id in all_group_ids: diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index bbc391b..01c360f 100644 --- a/cmk/gui/plugins/sidebar/shipped.py +++ b/cmk/gui/plugins/sidebar/shipped.py @@ -207,12 +207,8 @@ sidebar_snapins["dashboards"] = { # '----------------------------------------------------------------------' def render_groups(what): - data = sites.live().query("GET %sgroups\nColumns: name alias\n" % what) - name_to_alias = dict(data) - groups = [(name_to_alias[name].lower(), name_to_alias[name], name) for name in name_to_alias.keys()] - groups.sort() # sort by Alias in lowercase html.open_ul() - for alias_lower, alias, name in groups: + for name, alias in sites.all_groups(what): url = "view.py?view_name=%sgroup&%sgroup=%s" % (what, what, html.urlencode(name)) bulletlink(alias or name, url) html.close_ul() diff --git a/cmk/gui/sites.py b/cmk/gui/sites.py index 008c8cd..e588414 100644 --- a/cmk/gui/sites.py +++ b/cmk/gui/sites.py @@ -102,6 +102,16 @@ def cores_by_site(): return cores + +def all_groups(what): + # type: (str) -> List[Tuple[str, str]] + """Returns a list of host/service/contact groups (pairs of name/alias) + + Groups are collected via livestatus from all sites. In case no alias is defined + the name is used as second element. The list is sorted by lower case alias in the first place.""" + groups = live().query("GET %sgroups\nCache: reload\nColumns: name alias\n" % what) + return sorted([ (name, alias or name) for name, alias in groups ], key=lambda e: e[1].lower()) + #. # .--Internal------------------------------------------------------------. # | ___ _ _ | diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 9d44ec1..44ef7a8 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -256,12 +256,6 @@ class FilterAddressFamilies(Filter): declare_filter(103, FilterAddressFamilies()) -# Helper that retrieves the list of host/service/contactgroups via Livestatus -# use alias by default but fallback to name if no alias defined -def all_groups(what): - groups = dict(sites.live().query("GET %sgroups\nCache: reload\nColumns: name alias\n" % what)) - return [ (name, groups[name] or name) for name in groups.keys() ] - class FilterMultigroup(Filter): def __init__(self, what, title, negateable=False): self.htmlvar = what + "groups" @@ -281,7 +275,7 @@ class FilterMultigroup(Filter): def valuespec(self): return DualListChoice( - choices = all_groups(self.what), + choices = sites.all_groups(self.what), rows=3 if self.negateable else 4, enlarge_active=True ) @@ -340,7 +334,7 @@ class FilterGroupCombo(Filter): return True def display(self): - choices = all_groups(self.what.split("_")[-1]) + choices = sites.all_groups(self.what.split("_")[-1]) if not self.enforce: choices = [("", "")] + choices html.dropdown(self.htmlvars[0], choices, sorted=True) @@ -418,7 +412,7 @@ class FilterGroupSelection(Filter): self.what = infoname def display(self): - choices = all_groups(self.what[:-5]) # chop off "group", leaves host or service + choices = sites.all_groups(self.what[:-5]) # chop off "group", leaves host or service html.dropdown(self.htmlvars[0], choices, sorted=True) def current_value(self):

6 years, 2 months

Moved CEE metrics code to modularized plugin

by Lars Michelsen

Module: check_mk Branch: master Commit: 26f76232eadfd3c5b5dd30bbaf21abc76d0034c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26f76232eadfd3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Moved CEE metrics code to modularized plugin Change-Id: Ic702dd1df5c83efdf6067eff7ec7fbfe7942161e --- cmk/gui/metrics.py | 944 ++------------------------- cmk/gui/plugins/metrics/__init__.py | 75 +++ {web => cmk/gui}/plugins/metrics/check_mk.py | 26 +- cmk/gui/plugins/metrics/utils.py | 836 ++++++++++++++++++++++++ web/plugins/dashboard/dashlets.py | 5 +- 5 files changed, 981 insertions(+), 905 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=26f76232ea…

6 years, 2 months

Several userdb refactorings

by Lars Michelsen

Module: check_mk Branch: master Commit: c71c485f1fcf00ab8468e60d5c4ebb5512e1afe4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c71c485f1fcf00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 09:10:23 2018 +0200 Several userdb refactorings * Moved userdb plugins to dedicated modules * Refactored user attribute plugin API to classes * Fixed several linter issues on the way (a lot more to do) Change-Id: If3ad423df526a6ed0d6d7b261a659a54b830d79f --- cmk/gui/plugin_registry.py | 23 +- cmk/gui/plugins/userdb/__init__.py | 201 ++++++++++++++++++ {web => cmk/gui}/plugins/userdb/hook_auth.py | 44 ++-- {web => cmk/gui}/plugins/userdb/htpasswd.py | 18 +- .../gui/plugins/userdb/ldap_connector.py | 76 ++++--- cmk/gui/plugins/userdb/user_attributes.py | 144 +++++++++++++ cmk/gui/sidebar.py | 2 +- cmk/gui/userdb.py | 233 ++++++++++----------- cmk/gui/wato.py | 45 ++-- cmk/gui/watolib.py | 2 +- web/plugins/userdb/user_attributes.py | 108 ---------- web/plugins/webapi/webapi.py | 123 ++++++++++- 12 files changed, 700 insertions(+), 319 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c71c485f1f…

6 years, 2 months

← Newer
1
...
28
29
30
31
32
33
34
...
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