Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Cleanup most call sites of cmk.gui.pages.register_page_handler()

by Lars Michelsen

Module: check_mk Branch: master Commit: 9bfd6feecd27dfbbc02e2b6c73acb93a7a56026d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bfd6feecd27df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 6 15:34:01 2019 +0200 Cleanup most call sites of cmk.gui.pages.register_page_handler() Change-Id: I2a9ed7f9b3888bd93217bc89d7d86dc8dcf76ea1 --- cmk/gui/valuespec.py | 10 ++++++---- cmk/gui/wato/__init__.py | 26 ++++++-------------------- cmk/gui/wato/pages/activate_changes.py | 9 +++------ cmk/gui/wato/pages/automation.py | 10 +++------- cmk/gui/wato/pages/backup.py | 6 ++---- cmk/gui/wato/pages/folders.py | 11 +++-------- cmk/gui/wato/pages/host_diagnose.py | 6 ++---- cmk/gui/wato/pages/services.py | 10 +++------- cmk/gui/wato/pages/sites.py | 6 ++---- cmk/gui/wato/user_profile.py | 6 ++---- 10 files changed, 32 insertions(+), 68 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9bfd6feecd…

5 years, 6 months

Refactored login and logut pages to use class registration

by Lars Michelsen

Module: check_mk Branch: master Commit: 1cdb443b2935f37462772ab367c809c8440f8387 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cdb443b2935f3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 6 20:20:17 2019 +0200 Refactored login and logut pages to use class registration Change-Id: I6aa4abf4075455580d68f95943fb64219fdee117 --- cmk/gui/login.py | 68 ++++++++++++++++++++++++++++++++---------------------- web/app/index.wsgi | 4 +++- 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/cmk/gui/login.py b/cmk/gui/login.py index 150e539..4661a27 100644 --- a/cmk/gui/login.py +++ b/cmk/gui/login.py @@ -36,7 +36,7 @@ import cmk.gui.utils as utils from cmk.gui.log import logger import cmk.gui.i18n import cmk.gui.mobile -import cmk.gui.pages +from cmk.gui.pages import page_registry, Page from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.htmllib import HTML @@ -423,21 +423,31 @@ def do_login(): return "%s" % e -(a)cmk.gui.pages.register("login") -def page_login(no_html_output=False): - # Initialize the cmk.gui.i18n for the login dialog. This might be overridden - # later after user login - cmk.gui.i18n.localize(html.request.var("lang", config.get_language())) +(a)page_registry.register_page("login") +class LoginPage(Page): + def __init__(self): + super(LoginPage, self).__init__() + self._no_html_output = False - result = do_login() - if isinstance(result, tuple): - return result # Successful login - elif no_html_output: - raise MKAuthException(_("Invalid login credentials.")) + def set_no_html_output(self, no_html_output): + self._no_html_output = no_html_output - if html.mobile: - return cmk.gui.mobile.page_login() - return normal_login_page() + def page(self): + # Initialize the cmk.gui.i18n for the login dialog. This might be + # overridden later after user login + cmk.gui.i18n.localize(html.request.var("lang", config.get_language())) + + result = do_login() + if isinstance(result, tuple): + return # Successful login + + if self._no_html_output: + raise MKAuthException(_("Invalid login credentials.")) + + if html.mobile: + return cmk.gui.mobile.page_login() + + return normal_login_page() def normal_login_page(called_directly=True): @@ -520,19 +530,21 @@ def normal_login_page(called_directly=True): html.footer() -(a)cmk.gui.pages.register("logout") -def page_logout(): - invalidate_auth_session() +(a)page_registry.register_page("logout") +class LogoutPage(Page): + def page(self): + invalidate_auth_session() - if auth_type == 'cookie': - raise HTTPRedirect(config.url_prefix() + 'check_mk/login.py') - else: - # Implement HTTP logout with cookie hack - if not html.request.has_cookie('logout'): - html.response.headers[ - 'WWW-Authenticate'] = 'Basic realm="OMD Monitoring Site %s"' % config.omd_site() - html.response.set_http_cookie('logout', '1') - raise FinalizeRequest(httplib.UNAUTHORIZED) + if auth_type == 'cookie': + raise HTTPRedirect(config.url_prefix() + 'check_mk/login.py') else: - html.response.delete_cookie('logout') - raise HTTPRedirect(config.url_prefix() + 'check_mk/') + # Implement HTTP logout with cookie hack + if not html.request.has_cookie('logout'): + html.response.headers[ + 'WWW-Authenticate'] = 'Basic realm="OMD Monitoring Site %s"' % config.omd_site( + ) + html.response.set_http_cookie('logout', '1') + raise FinalizeRequest(httplib.UNAUTHORIZED) + else: + html.response.delete_cookie('logout') + raise HTTPRedirect(config.url_prefix() + 'check_mk/') diff --git a/web/app/index.wsgi b/web/app/index.wsgi index 2398103..80db921 100644 --- a/web/app/index.wsgi +++ b/web/app/index.wsgi @@ -238,7 +238,9 @@ class Application(object): # This either displays the login page or validates the information submitted # to the login form. After successful login a http redirect to the originally # requested page is performed. - login.page_login(self._plain_error()) + login_page = login.LoginPage() + login_page.set_no_html_output(self._plain_error()) + login_page.handle_page() raise FinalizeRequest(httplib.OK)

5 years, 6 months

Add completion suggestion for label input fields

by Lars Michelsen

Module: check_mk Branch: master Commit: 96d6caf43039dedaed41e9929dc5754fa14254fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96d6caf43039de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 6 16:42:10 2019 +0200 Add completion suggestion for label input fields * When typing into the label input fields dropdowns will show suggestions based on the already existing labels and the already inserted text. * Depending on the "world" the input field is operating on different sources need to be used for completion. * When working with a label filter in a status view the labels need to be fetched from livestatus. It may only suggest labels of the activated configuration. * When working in WATO the labels need to be based on the confiuration that is currently being edited. It needs to work with the labels of all sources (explicit, rulesets and discovered lables). This needs to be implemented in the next steps. CMK-1934 Change-Id: Ic5870c6159a4a83b61731ed73f9cfcb7ac8271f6 --- cmk/gui/plugins/visuals/filters.py | 2 +- cmk/gui/plugins/wato/builtin_attributes.py | 2 +- cmk/gui/plugins/wato/check_mk_configuration.py | 2 + cmk/gui/valuespec.py | 53 ++++++++++++++++++++++++-- tests/unit/cmk/gui/test_pages.py | 1 + web/htdocs/js/modules/forms.js | 39 ++++++++++++++++++- 6 files changed, 93 insertions(+), 6 deletions(-) diff --git a/cmk/gui/plugins/visuals/filters.py b/cmk/gui/plugins/visuals/filters.py index 152c56a..e9cc5e5 100644 --- a/cmk/gui/plugins/visuals/filters.py +++ b/cmk/gui/plugins/visuals/filters.py @@ -2625,7 +2625,7 @@ class ABCLabelFilter(Filter): return [(self.htmlvars[0], row[self._column])] def _valuespec(self): - return Labels() + return Labels(world=Labels.World.CORE) def display(self): self._valuespec().render_input(self._var_prefix, self._current_value()) diff --git a/cmk/gui/plugins/wato/builtin_attributes.py b/cmk/gui/plugins/wato/builtin_attributes.py index db1ebb2..47e1838 100644 --- a/cmk/gui/plugins/wato/builtin_attributes.py +++ b/cmk/gui/plugins/wato/builtin_attributes.py @@ -918,7 +918,7 @@ class HostAttributeLabels(ABCHostAttributeValueSpec): return True def valuespec(self): - return Labels() + return Labels(world=Labels.World.CONFIG) def filter_matches(self, crit, value, hostname): return set(value).issuperset(set(crit)) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index f99d9a6..1ce8637 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -1343,6 +1343,7 @@ class RulespecServiceLabels(ServiceRulespec): @property def valuespec(self): return Labels( + world=Labels.World.CONFIG, title=_("Service labels"), help=_("Use this ruleset to assign labels to service of your choice."), ) @@ -1365,6 +1366,7 @@ class RulespecHostLabels(HostRulespec): @property def valuespec(self): return Labels( + world=Labels.World.CONFIG, title=_("Host labels"), help=_("Use this ruleset to assign labels to hosts of your choice."), ) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 399ad45..856d607 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -63,7 +63,7 @@ import cmk.utils.defines as defines import cmk.gui.forms as forms import cmk.gui.utils as utils from cmk.gui.i18n import _ -from cmk.gui.pages import page_registry, Page +from cmk.gui.pages import page_registry, Page, AjaxPage from cmk.gui.globals import html from cmk.gui.htmllib import HTML from cmk.gui.exceptions import MKUserError, MKGeneralException @@ -4234,7 +4234,12 @@ class TextOrRegExpUnicode(TextOrRegExp): class Labels(ValueSpec): """Valuespec to render and input a collection of object labels""" - def __init__(self, *args, **kwargs): + class World(Enum): + CONFIG = "config" + CORE = "core" + + def __init__(self, world, *args, **kwargs): + self._world = world kwargs.setdefault("help", "") kwargs["help"] += _("Labels need to be in the format <tt>[KEY]:[VALUE]</tt>. " "For example <tt>os:windows</tt>.") @@ -4255,13 +4260,55 @@ class Labels(ValueSpec): html.help(self.help()) html.text_input( varprefix, - default_value=json.dumps(["%s:%s" % e for e in value.items()]).decode("utf-8"), + default_value=json.dumps(_encode_labels_for_tagify(value.items())).decode("utf-8"), cssclass="labels", attrs={ "placeholder": _("Add some label"), + "data-world": self._world.value, }) +(a)page_registry.register_page("ajax_autocomplete_labels") +class PageAutocompleteLabels(AjaxPage): + """Return all known labels to support tagify label input dropdown completion""" + + def page(self): + request = html.get_request() + return _encode_labels_for_tagify( + self._get_labels(Labels.World(request["world"]), request["search_label"])) + + def _get_labels(self, world, search_label): + if world == Labels.World.CONFIG: + return self._get_labels_from_config(search_label) + + if world == Labels.World.CORE: + return self._get_labels_from_core(search_label) + + raise NotImplementedError() + + def _get_labels_from_config(self, search_label): + return [] # TODO: Implement me + + # Would be better to optimize this kind of query somehow. The best we can + # do without extending livestatus is to use the Cache header for liveproxyd + def _get_labels_from_core(self, search_label): + import cmk.gui.sites as sites + query = ("GET services\n" \ + "Cache: reload\n" \ + "Columns: host_labels labels\n") + + labels = set() + for row in sites.live().query(query): + labels.update(row[0].items()) + labels.update(row[1].items()) + + return list(labels) + + +def _encode_labels_for_tagify(labels): + return [{"value": "%s:%s" % e} for e in labels] + + class IconSelector(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) diff --git a/tests/unit/cmk/gui/test_pages.py b/tests/unit/cmk/gui/test_pages.py index adb6e4a..f3da112 100644 --- a/tests/unit/cmk/gui/test_pages.py +++ b/tests/unit/cmk/gui/test_pages.py @@ -10,6 +10,7 @@ def test_registered_pages(): 'add_bookmark', 'ajax_activation_state', 'ajax_add_visual', + 'ajax_autocomplete_labels', 'ajax_backup_job_state', 'ajax_dashlet_pos', 'ajax_delete_user_notification', diff --git a/web/htdocs/js/modules/forms.js b/web/htdocs/js/modules/forms.js index 68d68d2..9ad2c97 100644 --- a/web/htdocs/js/modules/forms.js +++ b/web/htdocs/js/modules/forms.js @@ -27,6 +27,7 @@ import "select2"; import Tagify from "@yaireo/tagify"; import * as utils from "utils"; +import * as ajax from "ajax"; export function enable_dynamic_form_elements(container=null) { enable_select2_dropdowns(container); @@ -54,9 +55,45 @@ function enable_label_input_fields(container) { let elements = container.querySelectorAll("input.labels"); elements.forEach(element => { - new Tagify(element, { + let ajax_obj; + let tagify = new Tagify(element, { pattern: /^[^:]+:[^:]+$/, }); + + let world = element.getAttribute("data-world"); + + // Realize the auto completion dropdown field by using an ajax call + tagify.on("input", function(e) { + var value = e.detail; + tagify.settings.whitelist.length = 0; // reset the whitelist + + var post_data = "request=" + encodeURIComponent(JSON.stringify({ + "search_label": value, + "world": world, + })); + + if (ajax_obj) + ajax_obj.abort(); + + ajax_obj = ajax.call_ajax("ajax_autocomplete_labels.py", { + method: "POST", + post_data: post_data, + response_handler: function(handler_data, ajax_response) { + var response = JSON.parse(ajax_response); + if (response.result_code != 0) { + console.log("Error [" + response.result_code + "]: " + response.result); // eslint-disable-line + return; + } + + handler_data.tagify.settings.whitelist = response.result; + handler_data.tagify.dropdown.show.call(handler_data.tagify, handler_data.value); + }, + handler_data: { + value: value, + tagify: tagify, + }, + }); + }); }); }

5 years, 6 months

Same label / tag visualization in edit mode and display mode

by Lars Michelsen

Module: check_mk Branch: master Commit: 33920930683f2264f45051c7e1713344bf76d8d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33920930683f22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 16:26:13 2019 +0200 Same label / tag visualization in edit mode and display mode Change-Id: Iaf159a9e800b3d67acba038837d3a6e65ed43f94 --- cmk/gui/htmllib.py | 8 +++++--- cmk/gui/view_utils.py | 11 ++++++++--- web/htdocs/themes/classic/scss/_pages.scss | 4 ++++ web/htdocs/themes/facelift/scss/_pages.scss | 4 ++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index ab54b33..5a85665 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -484,9 +484,11 @@ class HTMLGenerator(OutputFunnel): "div", "p", "span", "canvas", "strong", "sub", "tt", "u", "i", "b", "x", "option"]) # these tags can be called by open_name(), close_name() and render_name(), e.g. 'self.open_html()' - _tag_names = set(['html', 'head', 'body', 'header', 'footer', 'a', 'b', 'sup',\ - 'script', 'form', 'button', 'p', 'select', 'fieldset',\ - 'table', 'tbody', 'row', 'ul', 'li', 'br', 'nobr', 'input', 'span']) + _tag_names = set([ + 'html', 'head', 'body', 'header', 'footer', 'a', 'b', 'sup', 'script', 'form', 'button', + 'p', 'select', 'fieldset', 'table', 'tbody', 'row', 'ul', 'li', 'br', 'nobr', 'input', + 'span', 'tags', 'tag' + ]) # Of course all shortcut tags can be used as well. _tag_names.update(_shortcut_tags) diff --git a/cmk/gui/view_utils.py b/cmk/gui/view_utils.py index dee6379..9a7da96 100644 --- a/cmk/gui/view_utils.py +++ b/cmk/gui/view_utils.py @@ -124,13 +124,18 @@ def check_limit(rows, limit, user): def render_tag_groups(tag_groups, object_type, with_links): - return HTML("").join( + elements = [ _render_tag_group(tg_id, tag, object_type, with_links) - for tg_id, tag in sorted(tag_groups.items())) + for tg_id, tag in sorted(tag_groups.items()) + ] + return html.render_tags( + HTML("").join(elements), class_=["tagify", "labels", "display"], readonly="true") def _render_tag_group(tg_id, tag, object_type, with_link): - span = html.render_span("%s:%s" % (tg_id, tag), class_="tag_group") + span = html.render_tag( + html.render_div(html.render_span("%s:%s" % (tg_id, tag), class_=["tagify__tag-text"])), + class_=["tagify--noAnim"]) if not with_link: return span diff --git a/web/htdocs/themes/classic/scss/_pages.scss b/web/htdocs/themes/classic/scss/_pages.scss index 58b3612..9a9c72f 100644 --- a/web/htdocs/themes/classic/scss/_pages.scss +++ b/web/htdocs/themes/classic/scss/_pages.scss @@ -1556,3 +1556,7 @@ span.tag_group { font-size: 8pt; } } + +.tagify.display[readonly] tag > div::before { + background: #d6d6d6; +} diff --git a/web/htdocs/themes/facelift/scss/_pages.scss b/web/htdocs/themes/facelift/scss/_pages.scss index 5ccf0a0..7e6d316 100644 --- a/web/htdocs/themes/facelift/scss/_pages.scss +++ b/web/htdocs/themes/facelift/scss/_pages.scss @@ -51,3 +51,7 @@ span.tag_group { font-size: 8pt; } } + +.tagify.display[readonly] tag > div::before { + background: #d6d6d6; +}

5 years, 6 months

Handle host / service labels in status GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 6fc60252f57c71614c8d0498426bd03806e2b7bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fc60252f57c71… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 20:30:11 2019 +0200 Handle host / service labels in status GUI * Add painter, sorter and filter for the new service labels. * Improved visualizations of labels and tags * Add painters and filters for labels to several standard views CMK-1778 Change-Id: I56713fbc7283a2c84106d8628a0ef15bce99f2fd --- cmk/gui/htmllib.py | 2 +- cmk/gui/plugins/views/__init__.py | 2 + cmk/gui/plugins/views/builtin.py | 10 +++- cmk/gui/plugins/views/painters.py | 54 +++++++++++++++++ cmk/gui/plugins/views/sorters.py | 52 +++++++++++++++++ cmk/gui/plugins/views/utils.py | 8 ++- cmk/gui/plugins/visuals/filters.py | 90 ++++++++++++++++++++++++++++- cmk/gui/valuespec.py | 12 ++-- cmk/gui/view_utils.py | 38 +++++++++--- cmk/gui/wato/pages/folders.py | 2 +- web/htdocs/js/modules/forms.js | 2 +- web/htdocs/themes/classic/scss/_pages.scss | 18 +----- web/htdocs/themes/facelift/scss/_pages.scss | 18 +----- 13 files changed, 257 insertions(+), 51 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6fc60252f5…

5 years, 6 months

Generalized load_plugins fixture and cleaned up call sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 68559a03a3d02ff4af131a24e07f538b8fd6931b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68559a03a3d02f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 6 12:28:24 2019 +0200 Generalized load_plugins fixture and cleaned up call sites Change-Id: Ie40c1dd30bc62ef6be08908b269739fb650a1645 --- tests/unit/cmk/gui/conftest.py | 9 +++++++++ tests/unit/cmk/gui/test_gui_config.py | 8 +------- tests/unit/cmk/gui/test_views.py | 19 +++++++------------ tests/unit/cmk/gui/test_visuals.py | 20 ++++++++------------ 4 files changed, 25 insertions(+), 31 deletions(-) diff --git a/tests/unit/cmk/gui/conftest.py b/tests/unit/cmk/gui/conftest.py index 6f049a9..636150a 100644 --- a/tests/unit/cmk/gui/conftest.py +++ b/tests/unit/cmk/gui/conftest.py @@ -47,3 +47,12 @@ def load_config(register_builtin_html): yield cmk.utils.log.logger.setLevel(old_root_log_level) + + +(a)pytest.fixture() +def load_plugins(register_builtin_html, monkeypatch, tmpdir): + import cmk.gui.modules as modules + config_dir = Path("%s" % tmpdir) / "var/check_mk/web" + config_dir.mkdir(parents=True) # pylint: disable=no-member + monkeypatch.setattr(config, "config_dir", "%s" % config_dir) + modules.load_all_plugins() diff --git a/tests/unit/cmk/gui/test_gui_config.py b/tests/unit/cmk/gui/test_gui_config.py index 53d6c18..0077f41 100644 --- a/tests/unit/cmk/gui/test_gui_config.py +++ b/tests/unit/cmk/gui/test_gui_config.py @@ -16,13 +16,7 @@ from cmk.gui.permissions import ( permission_registry, ) - -(a)pytest.fixture(autouse=True) -def load_plugins(register_builtin_html, monkeypatch, tmpdir): - config_dir = Path("%s" % tmpdir).joinpath("var/check_mk/web") - config_dir.mkdir(parents=True) # pylint: disable=no-member - monkeypatch.setattr(config, "config_dir", "%s" % config_dir) - modules.load_all_plugins() +pytestmark = pytest.mark.usefixtures("load_plugins") def test_registered_permission_sections(): diff --git a/tests/unit/cmk/gui/test_views.py b/tests/unit/cmk/gui/test_views.py index 51a0290..c5801fc 100644 --- a/tests/unit/cmk/gui/test_views.py +++ b/tests/unit/cmk/gui/test_views.py @@ -14,16 +14,8 @@ from cmk.gui.valuespec import ValueSpec import cmk.gui.plugins.views import cmk.gui.modules as modules - -(a)pytest.fixture() -def load_view_plugins(register_builtin_html, monkeypatch, tmpdir): - config_dir = Path("%s" % tmpdir).joinpath("var/check_mk/web") - config_dir.mkdir(parents=True) # pylint: disable=no-member - monkeypatch.setattr(config, "config_dir", "%s" % config_dir) - modules.load_all_plugins() - @pytest.fixture() -def view(register_builtin_html, load_view_plugins): +def view(register_builtin_html, load_plugins): view_name = "allhosts" view_spec = cmk.gui.views.multisite_builtin_views[view_name] return cmk.gui.views.View(view_name, view_spec) @@ -701,7 +693,8 @@ def test_registered_datasources(): # These tests make adding new elements needlessly painful. # Skip pending discussion with development team. @pytest.mark.skip -def test_registered_painters(load_view_plugins): +(a)pytest.mark.usefixture("load_plugins") +def test_registered_painters(): expected = { 'aggr_acknowledged': { 'columns': ['aggr_effective_state'], @@ -4084,7 +4077,8 @@ def test_legacy_register_painter(monkeypatch): # These tests make adding new elements needlessly painful. # Skip pending discussion with development team. @pytest.mark.skip -def test_registered_sorters(load_view_plugins): +(a)pytest.mark.usefixture("load_plugins") +def test_registered_sorters(): expected = { 'aggr_group': { 'columns': ['aggr_group'], @@ -5781,7 +5775,8 @@ def test_get_needed_join_columns(view): 'service_description', ]) -def test_create_view_basics(load_view_plugins): +(a)pytest.mark.usefixture("load_plugins") +def test_create_view_basics(): view_name = "allhosts" view_spec = cmk.gui.views.multisite_builtin_views[view_name] view = cmk.gui.views.View(view_name, view_spec) diff --git a/tests/unit/cmk/gui/test_visuals.py b/tests/unit/cmk/gui/test_visuals.py index d265766..f65c592 100644 --- a/tests/unit/cmk/gui/test_visuals.py +++ b/tests/unit/cmk/gui/test_visuals.py @@ -10,14 +10,6 @@ import cmk.gui.visuals as visuals import cmk.gui.modules as modules -(a)pytest.fixture() -def load_plugins(register_builtin_html, monkeypatch, tmpdir): - config_dir = Path("%s" % tmpdir).joinpath("var/check_mk/web") - config_dir.mkdir(parents=True) # pylint: disable=no-member - monkeypatch.setattr(config, "config_dir", "%s" % config_dir) - modules.load_all_plugins() - - def test_get_filter(): f = visuals.get_filter("hostregex") assert isinstance(f, cmk.gui.plugins.visuals.Filter) @@ -71,11 +63,13 @@ expected_visual_types = { } -def test_registered_visual_types(load_plugins): +(a)pytest.mark.usefixture("load_plugins") +def test_registered_visual_types(): assert sorted(utils.visual_type_registry.keys()) == sorted(expected_visual_types.keys()) -def test_registered_visual_type_attributes(load_plugins): +(a)pytest.mark.usefixture("load_plugins") +def test_registered_visual_type_attributes(): for ident, plugin_class in utils.visual_type_registry.items(): plugin = plugin_class() spec = expected_visual_types[ident] @@ -3658,14 +3652,16 @@ expected_infos = { # These tests make adding new elements needlessly painful. # Skip pending discussion with development team. @pytest.mark.skip -def test_registered_infos(load_plugins): +(a)pytest.mark.usefixture("load_plugins") +def test_registered_infos(): assert sorted(utils.visual_info_registry.keys()) == sorted(expected_infos.keys()) # These tests make adding new elements needlessly painful. # Skip pending discussion with development team. @pytest.mark.skip -def test_registered_info_attributes(load_plugins): +(a)pytest.mark.usefixture("load_plugins") +def test_registered_info_attributes(): for ident, cls in utils.visual_info_registry.items(): info = cls() spec = expected_infos[ident]

5 years, 6 months

Add tests for page handlers

by Lars Michelsen

Module: check_mk Branch: master Commit: 52b5b5d37c7b71e00002001a1beb3ae0287be62d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52b5b5d37c7b71… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 6 12:38:05 2019 +0200 Add tests for page handlers * Add test to check for the registered page handlers * Add tests for registration procedure Change-Id: Ie45f39105c2aef16997840e1297343744c29c92d --- tests/unit/cmk/gui/test_pages.py | 176 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/tests/unit/cmk/gui/test_pages.py b/tests/unit/cmk/gui/test_pages.py new file mode 100644 index 0000000..9bac39c --- /dev/null +++ b/tests/unit/cmk/gui/test_pages.py @@ -0,0 +1,176 @@ +import sys +import pytest + +import cmk.gui.pages + + +(a)pytest.mark.usefixtures("load_plugins") +def test_registered_pages(): + assert sorted(cmk.gui.pages._pages) == sorted([ + 'add_bookmark', + 'ajax_activation_state', + 'ajax_add_visual', + 'ajax_backup_job_state', + 'ajax_dashlet_pos', + 'ajax_delete_user_notification', + 'ajax_graph', + 'ajax_graph_hover', + 'ajax_inv_render_tree', + 'ajax_metric_choice', + 'ajax_pagetype_add_element', + 'ajax_popup_action_menu', + 'ajax_popup_add_metric_to_custom_graph', + 'ajax_popup_add_visual', + 'ajax_popup_icon_selector', + 'ajax_popup_move_to_folder', + 'ajax_render_graph_content', + 'ajax_reschedule', + 'ajax_scalar_choice', + 'ajax_search', + 'ajax_service_discovery', + 'ajax_set_foldertree', + 'ajax_set_rowselection', + 'ajax_set_viewoption', + 'ajax_start_activation', + 'ajax_switch_help', + 'ajax_userdb_sync', + 'ajax_vs_autocomplete', + 'automation_login', + 'bi', + 'bi_debug', + 'bi_render_tree', + 'bi_save_treestate', + 'bi_set_assumption', + 'bookmark_lists', + 'clear_failed_notifications', + 'combined_graphs', + 'count_context_button', + 'crashed_check', + 'create_dashboard', + 'create_report', + 'create_view', + 'create_view_dashlet', + 'create_view_dashlet_infos', + 'create_view_infos', + 'custom_graph', + 'custom_graph_design', + 'custom_graphs', + 'custom_snapins', + 'dashboard', + 'dashboard_dashlet', + 'delete_dashlet', + 'download_agent', + 'download_agent_output', + 'download_crash_report', + 'download_mkp', + 'download_stored_report', + 'edit_bookmark_list', + 'edit_custom_graph', + 'edit_custom_snapin', + 'edit_dashboard', + 'edit_dashboards', + 'edit_dashlet', + 'edit_graph_collection', + 'edit_graph_tuning', + 'edit_report', + 'edit_report_content', + 'edit_report_element', + 'edit_report_fixel', + 'edit_reports', + 'edit_sla_configuration', + 'edit_view', + 'edit_views', + 'export_views', + 'fetch_agent_output', + 'graph_collection', + 'graph_collections', + 'graph_dashlet', + 'graph_export', + 'graph_image', + 'graph_tunings', + 'gui_crash', + 'host_inv_api', + 'host_service_graph_popup', + 'index', + 'login', + 'logout', + 'logwatch', + 'mobile', + 'mobile_view', + 'noauth:ajax_graph_images', + 'noauth:automation', + 'noauth:deploy_agent', + 'noauth:pnp_template', + 'noauth:run_cron', + 'notify', + 'prediction_graph', + 'register_agent', + 'report', + 'report_download_preview', + 'report_instant', + 'report_instant_graph_collection', + 'report_scheduler', + 'report_scheduler_edit', + 'report_scheduler_preview', + 'report_store', + 'report_thumbnail', + 'search_open', + 'side', + 'sidebar_add_snapin', + 'sidebar_ajax_set_snapin_site', + 'sidebar_ajax_speedometer', + 'sidebar_ajax_tag_tree', + 'sidebar_ajax_tag_tree_enter', + 'sidebar_fold', + 'sidebar_get_messages', + 'sidebar_message_read', + 'sidebar_move_snapin', + 'sidebar_openclose', + 'sidebar_snapin', + 'sla_configurations', + 'sla_details', + 'switch_master_state', + 'switch_site', + 'tree_openclose', + 'user_change_pw', + 'user_profile', + 'version', + 'view', + 'wato', + 'wato_ajax_diag_host', + 'wato_ajax_execute_check', + 'wato_ajax_fetch_site_status', + 'wato_ajax_profile_repl', + 'webapi', + 'werk', + ]) + + +def test_pages_register(monkeypatch, capsys): + monkeypatch.setattr(cmk.gui.pages, "_pages", {}) + + @cmk.gui.pages.register("123handler") + def page_handler(): + sys.stdout.write("123") + + handler = cmk.gui.pages.get_page_handler("123handler") + assert callable(handler) + + handler() + assert capsys.readouterr()[0] == "123" + + +def test_pages_register_handler(monkeypatch, capsys): + monkeypatch.setattr(cmk.gui.pages, "_pages", {}) + + class PageClass(object): + def handle_page(self): + sys.stdout.write("234") + + cmk.gui.pages.register_page_handler("234handler", lambda: PageClass().handle_page()) + + handler = cmk.gui.pages.get_page_handler("234handler") + assert callable(handler) + + handler() + assert capsys.readouterr()[0] == "234"

5 years, 6 months

GUI CSS: Deployed view styles for tabs and options (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 0b419b9b8235253bf1d014c2fbfd702673e4507d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b419b9b823525… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Apr 5 10:35:51 2019 +0200 GUI CSS: Deployed view styles for tabs and options (CMK-1171) Change-Id: Ib4e7d5f5adaaa41a144bd63ab90f6e0e8ba51308 --- web/htdocs/themes/facelift/scss/_main.scss | 113 ------ web/htdocs/themes/facelift/scss/_views.scss | 543 +++++++++++++++++----------- 2 files changed, 338 insertions(+), 318 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0b419b9b82…

5 years, 6 months

aws_ec2_limits: New check which monitors AWS/EC2 limits

by Simon Betz

Module: check_mk Branch: master Commit: ba5dc2ed03434c4a09ad235d4a05286236cda49f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba5dc2ed03434c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 4 13:26:56 2019 +0200 aws_ec2_limits: New check which monitors AWS/EC2 limits Change-Id: I2154b3f9fa1cf0872738d884d3c38e84fd307653 --- .werks/7122 | 22 + checkman/aws_ec2_limits | 44 ++ checks/aws_ebs_limits | 14 +- checks/aws_ec2_limits | 81 ++++ checks/aws_elb_limits | 6 +- checks/aws_rds_limits | 30 +- checks/aws_s3_limits | 2 +- cmk/gui/plugins/wato/check_parameters/aws.py | 97 +++-- cmk/gui/plugins/wato/datasource_programs.py | 4 +- cmk/special_agents/agent_aws.py | 582 ++++++++++++++++++++++++++- 10 files changed, 813 insertions(+), 69 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ba5dc2ed03…

5 years, 6 months

agent_aws: Removed duplicate code ( getting response content and preparation of tags)

by Simon Betz

Module: check_mk Branch: master Commit: df75d2918224631906c0e780deacc82ea935ee0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df75d291822463… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 4 13:18:53 2019 +0200 agent_aws: Removed duplicate code (getting response content and preparation of tags) Change-Id: I0395b218c16f8e5d70a2341bead21782740a585c --- cmk/special_agents/agent_aws.py | 231 ++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 154 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=df75d29182…

5 years, 6 months

← Newer
1
...
39
40
41
42
43
44
45
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019