Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Show predefined condition reference in rule list

by Lars Michelsen

Module: check_mk Branch: master Commit: ad3d347e7ff36320e1cd2bafa098da0a167e4f62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad3d347e7ff363… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 29 23:57:04 2019 +0100 Show predefined condition reference in rule list Change-Id: I07bcc467a8e4dc5062fe06b27dad5f1ef2e451c9 --- cmk/gui/wato/pages/rulesets.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cmk/gui/wato/pages/rulesets.py b/cmk/gui/wato/pages/rulesets.py index 789340c..61560ae 100644 --- a/cmk/gui/wato/pages/rulesets.py +++ b/cmk/gui/wato/pages/rulesets.py @@ -445,6 +445,11 @@ class ModeEditRuleset(WatoMode): def permissions(cls): return [] + def __init__(self): + super(ModeEditRuleset, self).__init__() + store = PredefinedConditionStore() + self._predefined_conditions = store.filter_usable_entries(store.load_for_reading()) + def _from_vars(self): self._name = html.get_ascii_input("varname") self._back_mode = html.get_ascii_input( @@ -809,12 +814,26 @@ class ModeEditRuleset(WatoMode): html.write_text(desc) def _rule_conditions(self, rule): + self._predefined_condition_info(rule) + html.open_ul(class_="conditions") self._tag_conditions(rule) self._host_conditions(rule) self._service_conditions(rule) html.close_ul() + def _predefined_condition_info(self, rule): + condition_id = rule.predefined_condition_id() + if condition_id is None: + return + + condition = self._predefined_conditions[condition_id] + url = watolib.folder_preserving_link([ + ("mode", "edit_predefined_condition"), + ("ident", condition_id), + ]) + html.write(_("Predefined condition: <a href=\"%s\">%s</a>") % (url, condition["title"])) + def _tag_conditions(self, rule): for tagspec in rule.tag_specs: if tagspec[0] == '!':

5 years, 3 months

Moved help texts to valuespecs

by Lars Michelsen

Module: check_mk Branch: master Commit: 35c5f258abbffb3fd686ca356aa1d8fd4a5f89e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35c5f258abbffb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 29 20:11:32 2019 +0100 Moved help texts to valuespecs Change-Id: Ic722c095405d3256e14aab77181976c09676f09b --- cmk/gui/wato/pages/rulesets.py | 57 ++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/cmk/gui/wato/pages/rulesets.py b/cmk/gui/wato/pages/rulesets.py index d7b8a14..562fc9f 100644 --- a/cmk/gui/wato/pages/rulesets.py +++ b/cmk/gui/wato/pages/rulesets.py @@ -1359,7 +1359,7 @@ class EditRuleMode(WatoMode): (self._ruleset.title(), self._folder.alias_path()) def _get_explicit_rule_conditions(self): - vs_tag_conditions = HostTagCondition() + vs_tag_conditions = self._vs_host_tag_condition() tag_list = vs_tag_conditions.from_html_vars("") vs_tag_conditions.validate_value(tag_list, "") @@ -1524,15 +1524,10 @@ class EditRuleMode(WatoMode): # Rule folder forms.section(_("Folder"), css="condition explicit") self._vs_folder().render_input("new_rule_folder", self._folder.path()) - html.help(_("The rule is only applied to hosts directly in or below this folder.")) # Host tags forms.section(_("Host tags"), css="condition explicit") - HostTagCondition().render_input(varprefix="", value=self._rule.tag_specs) - html.help( - _("The rule will only be applied to hosts fulfilling all " - "of the host tag conditions listed here, even if they appear " - "in the list of explicit host names.")) + self._vs_host_tag_condition().render_input(varprefix="", value=self._rule.tag_specs) # Explicit hosts / watolib.ALL_HOSTS forms.section(_("Explicit hosts"), css="condition explicit") @@ -1545,27 +1540,10 @@ class EditRuleMode(WatoMode): if itemtype: if itemtype == "service": forms.section(_("Services"), css="condition explicit") - html.help( - _("Specify a list of service patterns this rule shall apply to. " - "The patterns must match the beginning of the service " - "in question. Adding a <tt>$</tt> to the end forces an excact " - "match. Pattern use regular expressions. A <tt>.*</tt> will " - "match an arbitrary text.")) elif itemtype == "checktype": forms.section(_("Check types"), css="condition explicit") elif itemtype == "item": forms.section(self._ruleset.item_name().title(), css="condition explicit") - if self._ruleset.item_help(): - html.help(self._ruleset.item_help()) - else: - html.help( - _("You can make the rule apply only to certain services of the " - "specified hosts. Do this by specifying explicit items to " - "match here. Hint: make sure to enter the item only, " - "not the full Service description. " - "Note: the match is done on the beginning " - "of the item in question. Regular expressions are interpreted, " - "so appending a <tt>$</tt> will force an exact match.")) else: raise MKUserError(None, "Invalid item type '%s'" % itemtype) @@ -1608,10 +1586,17 @@ class EditRuleMode(WatoMode): def _vs_folder(self): return DropdownChoice( title=_("Folder"), + help=_("The rule is only applied to hosts directly in or below this folder."), choices=watolib.Folder.folder_choices(), encode_value=False, ) + def _vs_host_tag_condition(self): + return HostTagCondition( + help=_("The rule will only be applied to hosts fulfilling all " + "of the host tag conditions listed here, even if they appear " + "in the list of explicit host names."),) + def _vs_explicit_hosts(self): return Alternative( style="dropdown", @@ -1664,6 +1649,29 @@ class EditRuleMode(WatoMode): ], ) + def _explicit_service_help_text(self): + itemtype = self._ruleset.item_type() + if itemtype == "service": + return _("Specify a list of service patterns this rule shall apply to. " + "The patterns must match the beginning of the service " + "in question. Adding a <tt>$</tt> to the end forces an excact " + "match. Pattern use regular expressions. A <tt>.*</tt> will " + "match an arbitrary text.") + + if itemtype == "item": + if self._ruleset.item_help(): + return self._ruleset.item_help() + + return _("You can make the rule apply only to certain services of the " + "specified hosts. Do this by specifying explicit items to " + "match here. Hint: make sure to enter the item only, " + "not the full Service description. " + "Note: the match is done on the beginning " + "of the item in question. Regular expressions are interpreted, " + "so appending a <tt>$</tt> will force an exact match.") + + return None + def _vs_service_conditions(self): itemenum = self._ruleset.item_enum() if itemenum: @@ -1679,6 +1687,7 @@ class EditRuleMode(WatoMode): return ListOfStrings( orientation="horizontal", valuespec=RegExpUnicode(size=30, mode=RegExpUnicode.prefix), + help=self._explicit_service_help_text(), ) def _vs_rule_options(self, disabling=True):

5 years, 3 months

Finalize predefined condition editing

by Lars Michelsen

Module: check_mk Branch: master Commit: 7dacfa19de0f6b660f6b78c94dbfc8459f8403b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dacfa19de0f6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 1 08:43:08 2019 +0200 Finalize predefined condition editing * When changing the folder of a predefined condition the refering rules are now moved to the new folder. * Displaying the folder condition in the predefined conditions list Change-Id: I6a521b81d40b5b0d52f075e9eacb53fc43c8b17b --- cmk/gui/wato/pages/predefined_conditions.py | 33 ++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/cmk/gui/wato/pages/predefined_conditions.py b/cmk/gui/wato/pages/predefined_conditions.py index ffc39a5..e2e71ba 100644 --- a/cmk/gui/wato/pages/predefined_conditions.py +++ b/cmk/gui/wato/pages/predefined_conditions.py @@ -150,6 +150,12 @@ class ModePredefinedConditions(SimpleListMode): table.cell(_("Title"), html.render_text(entry["title"])) table.cell(_("Conditions")) + html.open_ul(class_="conditions") + html.open_li() + html.write("%s: %s" % (_("Folder"), Folder.folder( + entry["conditions"]["folder_path"]).alias_path())) + html.close_li() + html.close_ul() html.write(vs_conditions().value_to_text(entry["conditions"])) table.cell(_("Editable by")) @@ -242,11 +248,32 @@ class ModeEditPredefinedCondition(SimpleEditMode): super(ModeEditPredefinedCondition, self)._save(entries) if old_path != conditions.folder_path: - # TODO: Move rules to other folder (See EditRuleMode.action) - pass + self._move_rules_for_conditions(conditions, old_path) self._rewrite_rules_for(conditions) + def _move_rules_for_conditions(self, conditions, old_path): + # type (RuleConditions, str) -> None + """Apply changed folder of predefined condition to rules""" + old_folder = Folder.folder(old_path) + old_rulesets = FolderRulesets(old_folder) + old_rulesets.load() + + new_folder = Folder.folder(conditions.folder_path) + new_rulesets = FolderRulesets(new_folder) + new_rulesets.load() + + for old_ruleset in old_rulesets.get_rulesets().values(): + for rule in old_ruleset.get_folder_rules(old_folder): + if rule.predefined_condition_id() == self._ident: + old_ruleset.delete_rule(rule) + + new_ruleset = new_rulesets.get(old_ruleset.name) + new_ruleset.append_rule(new_folder, rule) + + new_rulesets.save() + old_rulesets.save() + def _rewrite_rules_for(self, conditions): # type: (RuleConditions) -> None """Apply changed predefined condition to rules @@ -256,7 +283,7 @@ class ModeEditPredefinedCondition(SimpleEditMode): the changed predefined condition. Since the conditions are only applied to the rules while saving them this step is needed. """ - folder = Folder(conditions.folder_path) + folder = Folder.folder(conditions.folder_path) rulesets = FolderRulesets(folder) rulesets.load()

5 years, 3 months

Rewrite affected rule conditions when editing predefined condition

by Lars Michelsen

Module: check_mk Branch: master Commit: 9b786d12f97d057f04b13af92502d4b7679560b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b786d12f97d05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Mar 30 22:39:05 2019 +0100 Rewrite affected rule conditions when editing predefined condition The rules always copy the conditions of the predefined condition for their own. In the moment the conditions of a predefined condition are changed all rules refering to it need to be rewritten to adapt the changes. Change-Id: Ibc196041c5236005a666ece488069518860de6f0 --- cmk/gui/plugins/wato/utils/simple_modes.py | 5 ++++- cmk/gui/wato/pages/predefined_conditions.py | 35 ++++++++++++++++++++++++++++- cmk/gui/wato/pages/rulesets.py | 5 +---- cmk/gui/watolib/rulesets.py | 6 +++++ 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/simple_modes.py b/cmk/gui/plugins/wato/utils/simple_modes.py index 007e6af..6ad1f4b 100644 --- a/cmk/gui/plugins/wato/utils/simple_modes.py +++ b/cmk/gui/plugins/wato/utils/simple_modes.py @@ -411,10 +411,13 @@ class SimpleEditMode(SimpleWatoModeBase): "edit", self._entry, _("Edited the %s '%s'") % (self._mode_type.name_singular(), self._ident)) - self._store.save(entries) + self._save(entries) return self._mode_type.list_mode_name() + def _save(self, entries): + self._store.save(entries) + def page(self): html.begin_form("edit", method="POST") html.prevent_password_auto_completion() diff --git a/cmk/gui/wato/pages/predefined_conditions.py b/cmk/gui/wato/pages/predefined_conditions.py index 6f812cf..ffc39a5 100644 --- a/cmk/gui/wato/pages/predefined_conditions.py +++ b/cmk/gui/wato/pages/predefined_conditions.py @@ -40,7 +40,8 @@ from cmk.gui.valuespec import ( from cmk.gui.plugins.wato.check_mk_configuration import RulespecGroupUserInterface from cmk.gui.wato.pages.rulesets import VSExplicitConditions, RuleConditions -from cmk.gui.watolib.rulesets import AllRulesets, SearchedRulesets +from cmk.gui.watolib.rulesets import AllRulesets, SearchedRulesets, FolderRulesets +from cmk.gui.watolib.hosts_and_folders import Folder from cmk.gui.watolib.rulespecs import ServiceRulespec from cmk.gui.watolib.groups import load_contact_group_information from cmk.gui.watolib.predefined_conditions import PredefinedConditionStore @@ -234,6 +235,38 @@ class ModeEditPredefinedCondition(SimpleEditMode): )), ] + def _save(self, entries): + old_path = self._store.load_for_reading()[self._ident]["conditions"]["folder_path"] + conditions = RuleConditions(**entries[self._ident]["conditions"]) + + super(ModeEditPredefinedCondition, self)._save(entries) + + if old_path != conditions.folder_path: + # TODO: Move rules to other folder (See EditRuleMode.action) + pass + + self._rewrite_rules_for(conditions) + + def _rewrite_rules_for(self, conditions): + # type: (RuleConditions) -> None + """Apply changed predefined condition to rules + + After updating a predefined condition it is necessary to rewrite the + rules.mk the predefined condition refers to. Rules in this file may refer to + the changed predefined condition. Since the conditions are only applied to the + rules while saving them this step is needed. + """ + folder = Folder(conditions.folder_path) + rulesets = FolderRulesets(folder) + rulesets.load() + + for ruleset in rulesets.get_rulesets().values(): + for rule in ruleset.get_folder_rules(folder): + if rule.predefined_condition_id() == self._ident: + rule.update_conditions(conditions) + + rulesets.save() + def _contact_group_choices(self, only_own=False): contact_groups = load_contact_group_information() diff --git a/cmk/gui/wato/pages/rulesets.py b/cmk/gui/wato/pages/rulesets.py index 114b8bf..b7d3293 100644 --- a/cmk/gui/wato/pages/rulesets.py +++ b/cmk/gui/wato/pages/rulesets.py @@ -1200,10 +1200,7 @@ class EditRuleMode(WatoMode): self._rule.rule_options["predefined_condition_id"] = condition_id # CONDITION - conditions = self._get_rule_conditions_from_vars() - self._rule.tag_specs = conditions.host_tags - self._rule.host_list = conditions.host_list - self._rule.item_list = conditions.item_list + self._rule.update_conditions(self._get_rule_conditions_from_vars()) # VALUE if self._ruleset.valuespec(): diff --git a/cmk/gui/watolib/rulesets.py b/cmk/gui/watolib/rulesets.py index 5bc6969..2ef06e3 100644 --- a/cmk/gui/watolib/rulesets.py +++ b/cmk/gui/watolib/rulesets.py @@ -925,6 +925,12 @@ class Rule(object): #TODO: Once we switched the rule format to be dict base, we can move this key to the conditions dict return self.rule_options.get("predefined_condition_id") + def update_conditions(self, conditions): + self.tag_specs = conditions.host_tags + self.host_list = conditions.host_list + if self.ruleset.item_type(): + self.item_list = conditions.item_list + def is_discovery_rule_of(self, host): return self.host_list == [host.name()] \ and self.tag_specs == [] \

5 years, 3 months

Rule editor: Refactored whole rule conditions to valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: 6aa4eeb7d68b4b43e362b35cd8e728593459ae0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6aa4eeb7d68b4b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 29 22:52:55 2019 +0100 Rule editor: Refactored whole rule conditions to valuespec * Encapsulated the single valuespec parts into a single explicit rule condition valuespec * Moved conversion of values to the valuespec processing logic * The valuespec expectes a RuleCondition object and produces one with from_html_vars() Sorry for the huge commit :-/. Wasn't able to use a more incremental way. Change-Id: I3e7b1651418db803586259e0d978062e20f3fe67 --- cmk/gui/valuespec.py | 22 +-- cmk/gui/wato/pages/rulesets.py | 311 +++++++++++++++++++++++------------------ 2 files changed, 186 insertions(+), 147 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6aa4eeb7d6…

5 years, 3 months

Show condition text in predefined condition list

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c89a410396036946d03c11bb00037e0688a4210 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c89a410396036… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Mar 30 00:12:06 2019 +0100 Show condition text in predefined condition list * Moved the textual rendering of rule conditions to the valuespec VSExplicitConditions. * Added a new column "conditions" which displays a description of the conditions just like the regular rule list tables. Change-Id: I5284af67e9e4a18590fd9a00146810e068e869c5 --- cmk/gui/wato/pages/predefined_conditions.py | 40 ++-- cmk/gui/wato/pages/rulesets.py | 321 ++++++++++++++-------------- 2 files changed, 190 insertions(+), 171 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7c89a41039…

5 years, 3 months

Extracted explicit rule condition valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: 8724200ff2c47b89b451831ab2808996f3c2c4c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8724200ff2c47b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 29 23:10:39 2019 +0100 Extracted explicit rule condition valuespec * Moved the condition editing logic to dedicated valuespec class VSExplicitConditions. * Using the condition editing class in the predefined condition edit dialog now. Change-Id: I87cd9f6d7858fb086bcb0ca9b1fcd09cba62ee3b --- cmk/gui/wato/pages/predefined_conditions.py | 19 +++++-- cmk/gui/wato/pages/rulesets.py | 84 ++++++++++++++++------------- 2 files changed, 62 insertions(+), 41 deletions(-) diff --git a/cmk/gui/wato/pages/predefined_conditions.py b/cmk/gui/wato/pages/predefined_conditions.py index 6bf258a..a1913fe 100644 --- a/cmk/gui/wato/pages/predefined_conditions.py +++ b/cmk/gui/wato/pages/predefined_conditions.py @@ -34,8 +34,12 @@ from cmk.gui.valuespec import ( Alternative, DropdownChoice, DualListChoice, + Transform, ) +from cmk.gui.plugins.wato.check_mk_configuration import RulespecGroupUserInterface +from cmk.gui.wato.pages.rulesets import VSExplicitConditions, RuleConditions +from cmk.gui.watolib.rulespecs import ServiceRulespec from cmk.gui.watolib.groups import load_contact_group_information from cmk.gui.watolib.predefined_conditions import PredefinedConditionStore from cmk.gui.plugins.wato import ( @@ -188,9 +192,18 @@ class ModeEditPredefinedCondition(SimpleEditMode): ] def _vs_conditions(self): - return FixedValue( - None, - title=_("Conditions"), + rulespec_class = type("DummyRulespec", (ServiceRulespec,), { + "group": RulespecGroupUserInterface, + "name": "dummy", + "valuespec": None, + }) + # Pylint does not get this right for some reason + dummy_rulespec = rulespec_class() # pylint: disable=abstract-class-instantiated + + return Transform( + VSExplicitConditions(rulespec=dummy_rulespec, render="form_part"), + forth=lambda c: RuleConditions(**c), + back=lambda c: dict(c._asdict()), ) def _contact_group_choices(self, only_own=False): diff --git a/cmk/gui/wato/pages/rulesets.py b/cmk/gui/wato/pages/rulesets.py index b1b1793..789340c 100644 --- a/cmk/gui/wato/pages/rulesets.py +++ b/cmk/gui/wato/pages/rulesets.py @@ -1496,7 +1496,44 @@ class EditRuleMode(WatoMode): conditions) def _vs_explicit_conditions(self, **kwargs): - return Transform( + return VSExplicitConditions(rulespec=self._rulespec, **kwargs) + + 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_rule_options(self, disabling=True): + return Dictionary( + title=_("Rule Properties"), + optional_keys=False, + render="form", + elements=rule_option_elements(disabling), + ) + + +class VSExplicitConditions(Transform): + """Valuespec for editing a set of explicit rule conditions""" + + def __init__(self, rulespec, **kwargs): + self._rulespec = rulespec + super(VSExplicitConditions, self).__init__( Dictionary( elements=[ ("folder_path", self._vs_folder()), @@ -1526,7 +1563,7 @@ class EditRuleMode(WatoMode): if explicit_hosts is not None: explicit["explicit_hosts"] = explicit_hosts - if self._ruleset.item_type(): + if self._rulespec.item_type: explicit_services = self._get_explicit(conditions.item_list, watolib.ALL_SERVICES) if explicit_services is not None: explicit["explicit_services"] = explicit_services @@ -1534,13 +1571,13 @@ class EditRuleMode(WatoMode): return explicit def _service_elements(self): - if not self._ruleset.item_type(): + if not self._rulespec.item_type: return [] return [("explicit_services", self._vs_explicit_services())] def _service_title(self): - item_type = self._ruleset.item_type() + item_type = self._rulespec.item_type if not item_type: return None @@ -1551,7 +1588,7 @@ class EditRuleMode(WatoMode): return _("Check types") if item_type == "item": - return self._ruleset.item_name().title() + return self._rulespec.item_name.title() raise MKUserError(None, "Invalid item type '%s'" % item_type) @@ -1615,27 +1652,6 @@ class EditRuleMode(WatoMode): item_list=item_list, ) - 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_folder(self): return DropdownChoice( title=_("Folder"), @@ -1682,7 +1698,7 @@ class EditRuleMode(WatoMode): ) def _explicit_service_help_text(self): - itemtype = self._ruleset.item_type() + itemtype = self._rulespec.item_type if itemtype == "service": return _("Specify a list of service patterns this rule shall apply to. " "The patterns must match the beginning of the service " @@ -1691,8 +1707,8 @@ class EditRuleMode(WatoMode): "match an arbitrary text.") if itemtype == "item": - if self._ruleset.item_help(): - return self._ruleset.item_help() + if self._rulespec.item_help: + return self._rulespec.item_help return _("You can make the rule apply only to certain services of the " "specified hosts. Do this by specifying explicit items to " @@ -1705,7 +1721,7 @@ class EditRuleMode(WatoMode): return None def _vs_service_conditions(self): - itemenum = self._ruleset.item_enum() + itemenum = self._rulespec.item_enum if itemenum: return Transform( ListChoice( @@ -1722,14 +1738,6 @@ class EditRuleMode(WatoMode): help=self._explicit_service_help_text(), ) - def _vs_rule_options(self, disabling=True): - return Dictionary( - title=_("Rule Properties"), - optional_keys=False, - render="form", - elements=rule_option_elements(disabling), - ) - @mode_registry.register class ModeEditRule(EditRuleMode):

5 years, 3 months

Rule editor: Refactored explicit host condition to valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: 86df4cbc83cbde4e2acce791bb2bf46be12fb997 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86df4cbc83cbde… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 29 16:23:18 2019 +0100 Rule editor: Refactored explicit host condition to valuespec Change-Id: I29476958df524b0fcc4a5ffcd717130ab071eebc --- cmk/gui/wato/pages/rulesets.py | 89 +++++++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 36 deletions(-) diff --git a/cmk/gui/wato/pages/rulesets.py b/cmk/gui/wato/pages/rulesets.py index aac811c..45cbc47 100644 --- a/cmk/gui/wato/pages/rulesets.py +++ b/cmk/gui/wato/pages/rulesets.py @@ -42,12 +42,15 @@ from cmk.gui.exceptions import MKUserError, MKAuthException from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.valuespec import ( + FixedValue, + Checkbox, ListChoice, Tuple, ListOfStrings, Dictionary, RegExpUnicode, DropdownChoice, + Alternative, ) from cmk.gui.watolib.predefined_conditions import PredefinedConditionStore from cmk.gui.watolib.rulespecs import ( @@ -1360,19 +1363,21 @@ class EditRuleMode(WatoMode): vs_tag_conditions.validate_value(tag_list, "") # Host list - if not html.get_checkbox("explicit_hosts"): + explicit_hosts = self._vs_explicit_hosts().from_html_vars("explicit_hosts") + self._vs_explicit_hosts().validate_value(explicit_hosts, "explicit_hosts") + + if explicit_hosts is None: host_list = watolib.ALL_HOSTS else: - negate = html.get_checkbox("negate_hosts") - vs = ListOfStrings() - host_list = vs.from_html_vars("hostlist") - vs.validate_value(host_list, "hostlist") + host_list, negate = explicit_hosts + if negate: host_list = [watolib.ENTRY_NEGATE_CHAR + h for h in host_list] + # append watolib.ALL_HOSTS to negated host lists - if len(host_list) > 0 and host_list[0][0] == watolib.ENTRY_NEGATE_CHAR: + if host_list and host_list[0][0] == watolib.ENTRY_NEGATE_CHAR: host_list += watolib.ALL_HOSTS - elif len(host_list) == 0 and negate: + elif not host_list and negate: host_list = watolib.ALL_HOSTS # equivalent # Item list @@ -1537,35 +1542,17 @@ class EditRuleMode(WatoMode): # Explicit hosts / watolib.ALL_HOSTS forms.section(_("Explicit hosts"), css="condition explicit") - div_id = "div_all_hosts" - - checked = self._rule.host_list != watolib.ALL_HOSTS - html.checkbox( - "explicit_hosts", - checked, - onclick="cmk.valuespecs.toggle_option(this, %r)" % div_id, - label=_("Specify explicit host names")) - html.open_div(style="display:none;" if not checked else None, id_=div_id) - negate_hosts = len(self._rule.host_list) > 0 and self._rule.host_list[0].startswith("!") - - explicit_hosts = [h.strip("!") for h in self._rule.host_list if h != watolib.ALL_HOSTS[0]] - ListOfStrings( - orientation="horizontal", valuespec=ConfigHostname(size=30)).render_input( - "hostlist", explicit_hosts) - - html.checkbox( - "negate_hosts", - negate_hosts, - label=_("Negate: make rule apply for all but the above hosts")) - html.close_div() - html.help( - _("Here you can enter a list of explicit host names that the rule should or should " - "not apply to. Leave this option disabled if you want the rule to " - "apply for all hosts specified by the given tags. The names that you " - "enter here are compared with case sensitive exact matching. Alternatively " - "you can use regular expressions if you enter a tilde (<tt>~</tt>) as the first " - "character. That regular expression must match the beginning of " - "the host names in question.")) + + if self._rule.host_list == watolib.ALL_HOSTS: + explicit_hosts = None + else: + explicit_hosts = [ + h.strip("!") for h in self._rule.host_list if h != watolib.ALL_HOSTS[0] + ] + negate_hosts = len(self._rule.host_list) > 0 and self._rule.host_list[0].startswith("!") + explicit_hosts = (explicit_hosts, negate_hosts) + + self._vs_explicit_hosts().render_input("explicit_hosts", explicit_hosts) # Itemlist itemtype = self._ruleset.item_type() @@ -1660,6 +1647,36 @@ class EditRuleMode(WatoMode): encode_value=False, ) + def _vs_explicit_hosts(self): + return Alternative( + style="dropdown", + elements=[ + FixedValue( + None, + title=_("No explicit host filtering"), + totext="", + ), + Tuple( + title=_("Specify explicit host names"), + elements=[ + ListOfStrings(orientation="horizontal", valuespec=ConfigHostname(size=30,)), + Checkbox( + label=_( + "Negate: make rule apply for all but the above hosts" + ),), + ], + ), + ], + help=_( + "Here you can enter a list of explicit host names that the rule should or should " + "not apply to. Leave this option disabled if you want the rule to " + "apply for all hosts specified by the given tags. The names that you " + "enter here are compared with case sensitive exact matching. Alternatively " + "you can use regular expressions if you enter a tilde (<tt>~</tt>) as the first " + "character. That regular expression must match the beginning of " + "the host names in question."), + ) + def _vs_service_conditions(self): return ListOfStrings( orientation="horizontal",

5 years, 3 months

Rule editor: Refactored folder dropdown to valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: dc108f23ff881aebe580c362f5ddabad80ef8259 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc108f23ff881a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 29 15:57:36 2019 +0100 Rule editor: Refactored folder dropdown to valuespec Change-Id: I518ce585d65ba1fa6b41534c838dadc2faa8facf --- cmk/gui/wato/pages/rulesets.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/cmk/gui/wato/pages/rulesets.py b/cmk/gui/wato/pages/rulesets.py index 2bf6dbb..aac811c 100644 --- a/cmk/gui/wato/pages/rulesets.py +++ b/cmk/gui/wato/pages/rulesets.py @@ -1265,7 +1265,9 @@ class EditRuleMode(WatoMode): self._update_rule_from_html_vars() # Check permissions on folders - new_rule_folder = watolib.Folder.folder(html.request.var("new_rule_folder")) + new_folder_path = self._vs_folder().from_html_vars("new_rule_folder") + self._vs_folder().validate_value(new_folder_path, "new_rule_folder") + new_rule_folder = watolib.Folder.folder(new_folder_path) if not isinstance(self, ModeNewRule): self._folder.need_permission("write") new_rule_folder.need_permission("write") @@ -1522,7 +1524,7 @@ class EditRuleMode(WatoMode): def _show_explicit_conditions(self): # Rule folder forms.section(_("Folder"), css="condition explicit") - html.dropdown("new_rule_folder", watolib.Folder.folder_choices(), deflt=self._folder.path()) + self._vs_folder().render_input("new_rule_folder", self._folder.path()) html.help(_("The rule is only applied to hosts directly in or below this folder.")) # Host tags @@ -1651,6 +1653,13 @@ class EditRuleMode(WatoMode): html.close_table() html.close_center() + def _vs_folder(self): + return DropdownChoice( + title=_("Folder"), + choices=watolib.Folder.folder_choices(), + encode_value=False, + ) + def _vs_service_conditions(self): return ListOfStrings( orientation="horizontal", @@ -1733,8 +1742,10 @@ class ModeNewRule(EditRuleMode): self._folder = watolib.Folder.current() else: - # Submitting the creation dialog - self._folder = watolib.Folder.folder(html.request.var("new_rule_folder")) + # Submitting the edit dialog + folder_path = self._vs_folder().from_html_vars("new_rule_folder") + self._vs_folder().validate_value(folder_path, "new_rule_folder") + self._folder = watolib.Folder.folder(folder_path) def _set_rule(self): host_list = watolib.ALL_HOSTS

5 years, 3 months

Add predefined condition management dialogs

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d71f24c8018e92bd8cf1f48963462386a7280cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d71f24c8018e9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 29 14:50:09 2019 +0100 Add predefined condition management dialogs Change-Id: I1668d1c2835584f7c4e0fb10410128f49800a374 --- cmk/gui/wato/__init__.py | 26 +++ cmk/gui/wato/pages/predefined_conditions.py | 207 +++++++++++++++++++++ cmk/gui/wato/pages/rulesets.py | 74 ++++++-- cmk/gui/watolib/predefined_conditions.py | 57 ++++++ cmk/gui/watolib/rulesets.py | 12 ++ cmk_base/default_config/base.py | 4 + tests/unit/cmk/gui/test_gui_config.py | 1 + .../themes/classic/images/icon_condition.png | Bin 0 -> 3940 bytes .../themes/facelift/images/icon_condition.png | Bin 0 -> 461 bytes 9 files changed, 366 insertions(+), 15 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7d71f24c80…

5 years, 3 months

← Newer
1
...
52
53
54
55
56
57
58
59
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