Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

Fixed link of empty virtual folder tree snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: d2997de7a24ff7b9c45df28182ea082868a978b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2997de7a24ff7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 12:49:41 2017 +0200 Fixed link of empty virtual folder tree snapin Change-Id: I4737ed29a1c1e7923199522685f2086be59e6675 --- web/htdocs/htmllib.py | 6 ++++-- web/plugins/sidebar/shipped.py | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 2d35c6f..55a9987 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -111,8 +111,9 @@ class RequestTimeout(MKException): class Escaper(object): def __init__(self): super(Escaper, self).__init__() - self._unescaper_text = re.compile(r'<(/?)(h1|h2|b|tt|i|u|br(?: /)?|nobr(?: /)?|pre|a|sup|p|li|ul|ol)>') - self._unescaper_href = re.compile(r'<a href=(?:"|\')(.*?)(?:"|\')>') + self._unescaper_text = re.compile(r'<(/?)(h1|h2|b|tt|i|u|br(?: /)?|nobr(?: /)?|pre|a|sup|p|li|ul|ol)>') + self._unescaper_href = re.compile(r'<a href=(?:"|\')(.*?)(?:"|\')>') + self._unescaper_href_target = re.compile(r'<a href=(?:"|\')(.*?)(?:"|\') target=(?:"|\')(.*?)(?:"|\')>') # Encode HTML attributes. Replace HTML syntax with HTML text. @@ -149,6 +150,7 @@ class Escaper(object): text = self.escape_attribute(text) text = self._unescaper_text.sub(r'<\1\2>', text) # Also repair link definitions + text = self._unescaper_href_target.sub(r'<a href="\1" target="\2">', text) text = self._unescaper_href.sub(r'<a href="\1">', text) text = re.sub(r'&nbsp;', ' ', text) return text diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 7c6d636..9a281fa 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1883,9 +1883,9 @@ class VirtualHostTree(SidebarSnapin): self._load() if not config.virtual_host_trees: url = 'wato.py?varname=virtual_host_trees&mode=edit_configvar' - multisite = html.render_a("Multisite", href=url, target="main") - html.p(HTML(_('You have not defined any virtual host trees. You can do this ' - 'in the global settings for %s.') % multisite)) + multisite_link = html.render_a(_("global settings"), href=url, target="main") + html.p(_('You have not defined any virtual host trees. You can do this ' + 'in the %s.') % multisite_link) return self._show_tree_selection()

6 years, 11 months

Tests: Use daily version by default instead of default version ( better use case for developers workflow)

by Lars Michelsen

Module: check_mk Branch: master Commit: a4f1776fca84da68d858cf01e923a6f7248d7b84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4f1776fca84da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 11:39:33 2017 +0200 Tests: Use daily version by default instead of default version (better use case for developers workflow) Change-Id: If928c4c9537597fdeecca4c82456964142935262 --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index e6f1c23..748d2ef 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -73,7 +73,7 @@ def setup_site_and_switch_user(): def _get_site_object(): def site_version(): - return os.environ.get("VERSION", testlib.CMKVersion.DEFAULT) + return os.environ.get("VERSION", testlib.CMKVersion.DAILY) def site_edition(): return os.environ.get("EDITION", testlib.CMKVersion.CEE)

6 years, 11 months

Fixed styling of empty virtual host tree link

by Lars Michelsen

Module: check_mk Branch: master Commit: 660f2cba36a4207412d90d0c55c513e0dc62020d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=660f2cba36a420… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 11:55:00 2017 +0200 Fixed styling of empty virtual host tree link Change-Id: I94216e00cc1e5d11e85946abf64b6c36afb751d8 --- web/plugins/sidebar/shipped.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 93fd8d9..7c6d636 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1854,7 +1854,7 @@ class VirtualHostTree(SidebarSnapin): tree_id = tree_conf["tree"] # Fallback to first defined tree in case the user selected does not exist anymore - if tree_id not in self._trees: + if tree_id not in self._trees and self._trees: tree_id = self._tree_choices()[0][0] self._cwds = tree_conf["cwd"] @@ -1884,8 +1884,8 @@ class VirtualHostTree(SidebarSnapin): if not config.virtual_host_trees: url = 'wato.py?varname=virtual_host_trees&mode=edit_configvar' multisite = html.render_a("Multisite", href=url, target="main") - html.write_html(_('You have not defined any virtual host trees. You can do this ' - 'in the global settings for %s.') % multisite) + html.p(HTML(_('You have not defined any virtual host trees. You can do this ' + 'in the global settings for %s.') % multisite)) return self._show_tree_selection() @@ -2353,6 +2353,18 @@ function virtual_host_tree_enter(path) top: 0px; left: 0px; } + +#snapin_tag_tree p { + margin: 0; +} + +#snapin_tag_tree p a { + text-decoration: underline; +} + +#snapin_tag_tree p a:hover { + text-decoration: none; +} """ register_snapin("tag_tree", VirtualHostTree())

6 years, 11 months

4960 Virtual host trees: Add option to exclude empty tag choices from the trees

by Lars Michelsen

Module: check_mk Branch: master Commit: 3229b54af6ae5ba61fcede3545f7bc7f4d7d0a0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3229b54af6ae5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 11:24:24 2017 +0200 4960 Virtual host trees: Add option to exclude empty tag choices from the trees Change-Id: Id20b1846c2efc4af1ab29a9d518fc4b09f16f017 --- .werks/4960 | 10 ++++++++++ web/plugins/sidebar/shipped.py | 5 +++++ web/plugins/wato/check_mk_configuration.py | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/.werks/4960 b/.werks/4960 new file mode 100644 index 0000000..ea6aa8d --- /dev/null +++ b/.werks/4960 @@ -0,0 +1,10 @@ +Title: Virtual host trees: Add option to exclude empty tag choices from the trees +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499765053 +Class: feature + + diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index fed9e12..93fd8d9 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -2174,6 +2174,11 @@ function virtual_host_tree_enter(path) continue # silently skip not existant tag groups tag_value, tag_title = self._get_tag_group_value(tag_groups[level_spec], tags) + + if self._trees[self._current_tree_id].get("exclude_empty_tag_choices", False) \ + and tag_value is None: + continue + this_level_branches.append(tree_entry.setdefault("_children", {}).setdefault((tag_title, tag_value), {})) parent_level_branches = this_level_branches diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 79a8e73..9827f69 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -429,6 +429,10 @@ register_configvar(group, title = _("Title of the tree"), allow_empty = False, )), + ("exclude_empty_tag_choices", Checkbox( + title = _("Exclude empty tag choices"), + default_value = False, + )), ("tree_spec", ListOf( DropdownChoice( choices = virtual_host_tree_choices,

6 years, 11 months

4959 FIX Web-API: Fixed calls related to groups when using CME

by Lars Michelsen

Module: check_mk Branch: master Commit: 7516f27a056e42fb682caa1c97807fcd19349bb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7516f27a056e42… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 10:55:25 2017 +0200 4959 FIX Web-API: Fixed calls related to groups when using CME The WEB API calls related to groups of hosts, services or contacts were not dealing with the customer field. This has been added as required attribute now when using the CME just like it's done when using the GUI. Change-Id: I03f84bd265726f9e7055d1234ac0ad335d3ffff2 --- .werks/4959 | 13 ++++++++++ tests/web/test_webapi.py | 62 +++++++++++++++++++++++++++++++++++++------- web/htdocs/webapi.py | 5 ++++ web/plugins/webapi/webapi.py | 14 ++++++++-- 4 files changed, 83 insertions(+), 11 deletions(-) diff --git a/.werks/4959 b/.werks/4959 new file mode 100644 index 0000000..ad64467 --- /dev/null +++ b/.werks/4959 @@ -0,0 +1,13 @@ +Title: Web-API: Fixed calls related to groups when using CME +Level: 1 +Component: wato +Compatible: compat +Edition: cme +Version: 1.5.0i1 +Date: 1499763203 +Class: fix + +The WEB API calls related to groups of hosts, services or contacts +were not dealing with the customer field. This has been added as +required attribute now when using the CME just like it's done when +using the GUI. diff --git a/tests/web/test_webapi.py b/tests/web/test_webapi.py index 5d5c471..ee78e66 100644 --- a/tests/web/test_webapi.py +++ b/tests/web/test_webapi.py @@ -9,6 +9,7 @@ import base64 from PIL import Image from StringIO import StringIO +import cmk from testlib import web, APIError def test_global_settings(site, web): @@ -157,43 +158,69 @@ def test_write_host_tags(web, site): web.delete_host("test-host-dmz") +# TODO: Parameterize test for cme / non cme @pytest.mark.parametrize(("group_type"), [ "contact", "host", "service" ]) def test_add_group(web, group_type): group_id = "%s_testgroup_id" % group_type group_alias = "%s_testgroup_alias" % group_type try: - web.add_group(group_type, group_id, {"alias": group_alias}) + attributes = {"alias": group_alias} + + if cmk.is_managed_edition(): + attributes["customer"] = "provider" + + web.add_group(group_type, group_id, attributes) all_groups = web.get_all_groups(group_type) assert group_id in all_groups assert group_alias == all_groups[group_id]["alias"] + + if cmk.is_managed_edition(): + assert provider == all_groups[group_id]["provider"] finally: web.delete_group(group_type, group_id) +# TODO: Parameterize test for cme / non cme @pytest.mark.parametrize(("group_type"), [ "contact", "host", "service" ]) def test_edit_group(web, group_type): group_id = "%s_testgroup_id" % group_type group_alias = "%s_testgroup_alias" % group_type group_alias2 = "%s_testgroup_otheralias" % group_type try: - web.add_group(group_type, group_id, {"alias": group_alias}) - web.edit_group(group_type, group_id, {"alias": group_alias2}) + attributes = {"alias": group_alias} + + if cmk.is_managed_edition(): + attributes["customer"] = "provider" + + web.add_group(group_type, group_id, attributes) + + attributes["alias"] = group_alias2 + web.edit_group(group_type, group_id, attributes) all_groups = web.get_all_groups(group_type) assert group_id in all_groups - assert group_alias2 in all_groups[group_id]["alias"] + assert group_alias2 == all_groups[group_id]["alias"] + + if cmk.is_managed_edition(): + assert "provider" == all_groups[group_id]["customer"] finally: web.delete_group(group_type, group_id) +# TODO: Parameterize test for cme / non cme @pytest.mark.parametrize(("group_type"), [ "contact", "host", "service" ]) def test_edit_group_missing(web, group_type): group_id = "%s_testgroup_id" % group_type group_alias = "%s_testgroup_alias" % group_type group_alias2 = "%s_testgroup_otheralias" % group_type try: - web.add_group(group_type, group_id, {"alias": group_alias}) + attributes = {"alias": group_alias} + + if cmk.is_managed_edition(): + attributes["customer"] = "provider" + + web.add_group(group_type, group_id, attributes) try: #web.edit_group(group_type, group_id, {"alias": group_alias2}, expect_error = True) web.edit_group(group_type, "%s_missing" % group_id, {"alias": group_alias2}, expect_error = True) @@ -206,14 +233,26 @@ def test_edit_group_missing(web, group_type): web.delete_group(group_type, group_id) +# TODO: Parameterize test for cme / non cme def test_edit_cg_group_with_nagvis_maps(web, site): dummy_map_filepath1 = "%s/etc/nagvis/maps/blabla.cfg" % site.root dummy_map_filepath2 = "%s/etc/nagvis/maps/bloblo.cfg" % site.root try: file(dummy_map_filepath1, "w") file(dummy_map_filepath2, "w") - web.add_group("contact", "nagvis_test", {"alias": "nagvis_test_alias", "nagvis_maps": ["blabla"]}) - web.edit_group("contact", "nagvis_test", {"alias": "nagvis_test_alias", "nagvis_maps": ["bloblo"]}) + + attributes = { + "alias": "nagvis_test_alias", + "nagvis_maps": ["blabla"] + } + + if cmk.is_managed_edition(): + attributes["customer"] = "provider" + + web.add_group("contact", "nagvis_test", attributes) + + attributes["nagvis_maps"] = ["bloblo"] + web.edit_group("contact", "nagvis_test", attributes) all_groups = web.get_all_groups("contact") assert "nagvis_test" in all_groups @@ -224,13 +263,18 @@ def test_edit_cg_group_with_nagvis_maps(web, site): os.unlink(dummy_map_filepath2) - +# TODO: Parameterize test for cme / non cme @pytest.mark.parametrize(("group_type"), [ "contact", "host", "service" ]) def test_delete_group(web, group_type): group_id = "%s_testgroup_id" % group_type group_alias = "%s_testgroup_alias" % group_type try: - web.add_group(group_type, group_id, {"alias": group_alias}) + attributes = {"alias": group_alias} + + if cmk.is_managed_edition(): + attributes["customer"] = "provider" + + web.add_group(group_type, group_id, attributes) finally: web.delete_group(group_type, group_id) diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index f84f935..ce070ee 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -32,6 +32,11 @@ import config from watolib import * from valuespec import * +if cmk.is_managed_edition(): + import managed +else: + managed = None + try: import simplejson as json except ImportError: diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 99c6433..d24ef58 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -466,17 +466,27 @@ def action_delete_group(request, group_type): def get_group_extra_info(request, group_type): extra_info = {} extra_info["alias"] = request.get("alias") + if group_type == "contact" and "nagvis_maps" in request: extra_info["nagvis_maps"] = request["nagvis_maps"] + + if cmk.is_managed_edition(): + extra_info["customer"] = request["customer"] + return extra_info def validate_group_request_keys(request, group_type): + required_keys = ["groupname", "alias"] + + if cmk.is_managed_edition(): + required_keys.append("customer") + if group_type == "contact": - validate_request_keys(request, required_keys=["groupname", "alias"], + validate_request_keys(request, required_keys=required_keys, optional_keys=["nagvis_maps"]) else: - validate_request_keys(request, required_keys=["groupname", "alias"]) + validate_request_keys(request, required_keys=required_keys) def action_add_group(request, group_type):

6 years, 11 months

4958 FIX Group changes are added only to affected sites

by Lars Michelsen

Module: check_mk Branch: master Commit: c3672721a862184ab81be80692d6d0fa783a05a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3672721a86218… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 09:52:36 2017 +0200 4958 FIX Group changes are added only to affected sites Changes for edited groups (of hosts, services or contacts) are not added to all sites anymore. Instead only the sites of the associated customers get the change now. Change-Id: I6e6d78e45e815f7d1ae432af192f0e9fb3c8778c --- .werks/4958 | 13 +++++++++++++ web/htdocs/watolib.py | 20 ++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.werks/4958 b/.werks/4958 new file mode 100644 index 0000000..bf07120 --- /dev/null +++ b/.werks/4958 @@ -0,0 +1,13 @@ +Title: Group changes are added only to affected sites +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cme +State: unknown +Version: 1.5.0i1 +Date: 1499759323 + +Changes for edited groups (of hosts, services or contacts) are not +added to all sites anymore. Instead only the sites of the associated +customers get the change now. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index a6ef26a..eab4cbc 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -8251,7 +8251,7 @@ def add_group(name, group_type, extra_info): raise MKUserError("name", _("Sorry, there is already a group with that name")) _set_group(all_groups, group_type, name, extra_info) - add_change("edit-%sgroups" % group_type, _("Create new %s group %s") % (group_type, name)) + add_group_change(extra_info, "edit-%sgroups" % group_type, _("Create new %s group %s") % (group_type, name)) def edit_group(name, group_type, extra_info): @@ -8263,7 +8263,7 @@ def edit_group(name, group_type, extra_info): raise MKUserError("name", _("Unknown group: %s") % name) _set_group(all_groups, group_type, name, extra_info) - add_change("edit-%sgroups" % group_type, _("Updated properties of %s group %s") % (group_type, name)) + add_group_change(extra_info, "edit-%sgroups" % group_type, _("Updated properties of %s group %s") % (group_type, name)) def delete_group(name, group_type): @@ -8275,17 +8275,25 @@ def delete_group(name, group_type): if name not in groups: raise MKUserError(None, _("Unknown %s group: %s") % (group_type, name)) - # Check if still used usages = find_usages_of_group(name, group_type) if usages: raise MKUserError(None, _("Unable to delete group. It is still in use")) - # Delete group - del groups[name] + group = groups.pop(name) save_group_information(all_groups) - add_change("edit-%sgroups", _("Deleted %s group %s") % (group_type, name)) + add_group_change(group, "edit-%sgroups", _("Deleted %s group %s") % (group_type, name)) + + +# TODO: Consolidate all group change related functions in a class that can be overriden +# by the CME code for better encapsulation. +def add_group_change(group, action_name, text): + group_sites = None + if cmk.is_managed_edition() and not managed.is_global(group["customer"]): + group_sites = managed.get_sites_of_customer(group["customer"]) + + add_change(action_name, text, sites=group_sites) def save_group_information(all_groups, custom_default_config_dir = None):

6 years, 11 months

4885 New button to export data structure of configured rule

by Simon Betz

Module: check_mk Branch: master Commit: 4a97fad3b4490528aca4ac20eb41a5d477f63d08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a97fad3b44905… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 16 14:15:50 2017 +0200 4885 New button to export data structure of configured rule Change-Id: I15d2ac221bd3e37af3fb1171e09f8fcb3aed4b7f --- .werks/4885 | 15 ++++++++ web/htdocs/wato.py | 103 +++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 87 insertions(+), 31 deletions(-) diff --git a/.werks/4885 b/.werks/4885 new file mode 100644 index 0000000..39237fd --- /dev/null +++ b/.werks/4885 @@ -0,0 +1,15 @@ +Title: New button to export data structure of configured rule +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499353072 +Class: feature + +With this new {{Export}} button you are able to see +the internal data structure of a configured rule which +can be used for Web API calls described in werk #4699. + +For more information about Check_MK's Web-API see +https://mathias-kettner.de/checkmk_wato_webapi.html diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ab7037a..77d6490 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13368,12 +13368,19 @@ class ModeEditRule(WatoMode): def _set_rule(self): - try: - rulenr = int(html.var("rulenr")) - self._rule = self._ruleset.get_rule(self._folder, rulenr) - except (KeyError, TypeError, ValueError, IndexError): - raise MKUserError("rulenr", _("You are trying to edit a rule which does " - "not exist anymore.")) + if html.var("rulenr"): + try: + rulenr = int(html.var("rulenr")) + self._rule = self._ruleset.get_rule(self._folder, rulenr) + except (KeyError, TypeError, ValueError, IndexError): + raise MKUserError("rulenr", _("You are trying to edit a rule which does " + "not exist anymore.")) + elif html.var("_export_rule"): + self._rule = Rule(self._folder, self._ruleset) + self._update_rule_from_html_vars() + + else: + raise NotImplementedError() def title(self): @@ -13412,9 +13419,11 @@ class ModeEditRule(WatoMode): self._folder.need_permission("write") new_rule_folder.need_permission("write") + if html.var("_export_rule"): + return "edit_rule" + if new_rule_folder == self._folder: self._rule.folder = new_rule_folder - self._save_rule() else: @@ -13530,6 +13539,14 @@ class ModeEditRule(WatoMode): def page(self): + if html.var("_export_rule"): + self._show_rule_representation() + + else: + self._show_rule_editor() + + + def _show_rule_editor(self): if self._ruleset.help(): html.div(HTML(self._ruleset.help()), class_="info") @@ -13636,41 +13653,65 @@ class ModeEditRule(WatoMode): else: raise MKGeneralException("Invalid item type '%s'" % itemtype) - if itemtype: - checked = html.get_checkbox("explicit_services") - if checked == None: # read from rule itself - checked = len(self._rule.item_list) == 0 or self._rule.item_list[0] != "" - div_id = "item_list" - html.checkbox("explicit_services", checked, onclick="valuespec_toggle_option(this, %r)" % div_id, - label = _("Specify explicit values")) - html.open_div(id_=div_id, style=["display: none;" if not checked else "", "padding: 0px;"]) - - negate_entries = len(self._rule.item_list) > 0 and self._rule.item_list[0].startswith(ENTRY_NEGATE_CHAR) - if negate_entries: - cleaned_item_list = [ i.lstrip(ENTRY_NEGATE_CHAR) for i in self._rule.item_list[:-1] ] # strip last entry (ALL_SERVICES) - else: - cleaned_item_list = self._rule.item_list + checked = html.get_checkbox("explicit_services") + if checked == None: # read from rule itself + checked = len(self._rule.item_list) == 0 or self._rule.item_list[0] != "" + div_id = "item_list" + html.checkbox("explicit_services", checked, onclick="valuespec_toggle_option(this, %r)" % div_id, + label = _("Specify explicit values")) + html.open_div(id_=div_id, style=["display: none;" if not checked else "", "padding: 0px;"]) + + negate_entries = len(self._rule.item_list) > 0 and self._rule.item_list[0].startswith(ENTRY_NEGATE_CHAR) + if negate_entries: + cleaned_item_list = [ i.lstrip(ENTRY_NEGATE_CHAR) for i in self._rule.item_list[:-1] ] # strip last entry (ALL_SERVICES) + else: + cleaned_item_list = self._rule.item_list - itemenum = self._ruleset.item_enum() - if itemenum: - value = [ x.rstrip("$") for x in cleaned_item_list ] - itemspec = ListChoice(choices = itemenum, columns = 3) - itemspec.render_input("item", value) - else: - self._vs_service_conditions().render_input("itemlist", cleaned_item_list) + itemenum = self._ruleset.item_enum() + if itemenum: + value = [ x.rstrip("$") for x in cleaned_item_list ] + itemspec = ListChoice(choices = itemenum, columns = 3) + itemspec.render_input("item", value) + else: + self._vs_service_conditions().render_input("itemlist", cleaned_item_list) - html.checkbox("negate_entries", negate_entries, label = - _("Negate: make rule apply for all but the above entries")) + html.checkbox("negate_entries", negate_entries, label = + _("Negate: make rule apply for all but the above entries")) - html.close_div() + html.close_div() forms.end() + html.button("save", _("Save")) html.hidden_fields() vs_rule_options().set_focus("options") + html.button("_export_rule", _("Export")) + html.end_form() + def _show_rule_representation(self): + content = "<pre>%s</pre>" % html.render_text(pprint.pformat(self._rule.to_dict_config())) + + html.write(_("This rule representation can be used for Web API calls.")) + html.br() + html.br() + + html.open_center() + html.open_table(class_="progress") + + html.open_tr() + html.th("Rule representation for Web API") + html.close_tr() + + html.open_tr() + html.td(html.render_div(content, id_="rule_representation"), class_="log") + html.close_tr() + + html.close_table() + html.close_center() + + def _vs_service_conditions(self,): return ListOfStrings( orientation = "horizontal",

6 years, 11 months

4957 FIX Group headers of views are now displayed in PDF reports

by Lars Michelsen

Module: check_mk Branch: master Commit: 237eeca17aeb955553b959ce5e190a13569fa706 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=237eeca17aeb95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 08:24:15 2017 +0200 4957 FIX Group headers of views are now displayed in PDF reports The often missed group header of view tables has now been added to the PDF reports. Especially in views that contain performance graphs these headers are useful with the default report settings. Change-Id: I68b2a738d3bdf4a55f67edcf60b53805e78125b1 --- .werks/4957 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/4957 b/.werks/4957 new file mode 100644 index 0000000..db4d9b1 --- /dev/null +++ b/.werks/4957 @@ -0,0 +1,12 @@ +Title: Group headers of views are now displayed in PDF reports +Level: 1 +Component: reporting +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1499754184 +Class: fix + +The often missed group header of view tables has now been added to the +PDF reports. Especially in views that contain performance graphs these +headers are useful with the default report settings.

6 years, 11 months

Fixed rendering snapins on dashboards

by Lars Michelsen

Module: check_mk Branch: master Commit: 0306684aee80f58ad163d7abbf250e917083c731 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0306684aee80f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 07:00:24 2017 +0200 Fixed rendering snapins on dashboards Change-Id: I802677dfd72276fb41b61dfad98e94e74c05f138 --- web/plugins/dashboard/dashlets.py | 7 ++++--- web/plugins/sidebar/shipped.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 48763a5..089770b 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -816,7 +816,7 @@ def dashlet_snapin(nr, dashlet): html.open_div(id_="snapin_container_%s" % dashlet['snapin'], class_="snapin") html.open_div(id_="snapin_%s" % dashlet['snapin'], class_="content") sidebar.render_snapin_styles(snapin) - snapin['render']() + snapin.show() html.close_div() html.close_div() html.close_div() @@ -826,12 +826,13 @@ def dashlet_snapin(nr, dashlet): def dashlet_snapin_get_snapins(): import sidebar # FIXME: HACK, clean this up somehow - return sorted([ (k, v['title']) for k, v in sidebar.sidebar_snapins.items() ], key=lambda x: x[1]) + return sorted([ (k, v.title()) for k, v in sidebar.sidebar_snapins.items() ], + key=lambda x: x[1]) def dashlet_snapin_title(dashlet): import sidebar # FIXME: HACK, clean this up somehow - return sidebar.sidebar_snapins[dashlet['snapin']]['title'] + return sidebar.sidebar_snapins[dashlet['snapin']].title() dashlet_types["snapin"] = { diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index c758169..fed9e12 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1876,7 +1876,7 @@ class VirtualHostTree(SidebarSnapin): def description(self): return _("This snapin shows tree views of your hosts based on their tag " "classifications. You can configure which tags to use in your " - "global settings of Multisite."), + "global settings of Multisite.") def show(self):

6 years, 11 months

cleaned up issue in yesterdays change

by Lars Michelsen

Module: check_mk Branch: master Commit: fca98b1bbef1a0c0df34fe5812d6d13b697f7735 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fca98b1bbef1a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 07:01:24 2017 +0200 cleaned up issue in yesterdays change Change-Id: I6a549c2bf06cd7d146f1790f42a456ac5618939b --- web/htdocs/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 2069297..a6ef26a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3730,7 +3730,7 @@ class SiteManagement(object): domains = [ConfigDomainGUI] if config.liveproxyd_enabled: - domains = ConfigDomainLiveproxy + domains.append(ConfigDomainLiveproxy) del all_sites[site_id] SiteManagement.save_sites(all_sites)

6 years, 11 months

← Newer
1
...
18
19
20
21
22
23
24
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017