[checkmk-commits] 3955 BI rule ID can now be renamed

Module: check_mk Branch: master Commit: ad1dac0ac09229e84cf8ae9f8c27974b5b2b4d60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad1dac0ac09229… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Mon Oct 10 14:40:12 2016 +0200 3955 BI rule ID can now be renamed --- .werks/3955 | 9 +++++++ ChangeLog | 3 +++ web/plugins/wato/bi.py | 66 ++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 60 insertions(+), 18 deletions(-) diff --git a/.werks/3955 b/.werks/3955 new file mode 100644 index 0000000..213bcc0 --- /dev/null +++ b/.werks/3955 @@ -0,0 +1,9 @@ +Title: BI rule ID can now be renamed +Level: 1 +Component: bi +Compatible: compat +Version: 1.4.0i2 +Date: 1476103155 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index bfd956e..3250114 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,9 @@ * 3914 FIX: Roles: Aliases are now unique during cloning * 3820 FIX: Network scan: no longer fails completely if hostname already exists in configuration... + BI: + * 3955 BI rule ID can now be renamed + Livestatus: * 3740 Moved livedump utility from treasures directly into bin directory... diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index adb4ae0..2463647 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1351,10 +1351,29 @@ class ModeBIEditRule(ModeBI): def action(self): self.must_be_contact_for_pack() - if html.check_transaction(): - vs_rule = self.valuespec() - new_rule = vs_rule.from_html_vars('rule') - vs_rule.validate_value(new_rule, 'rule') + + vs_rule = self.valuespec() + new_rule = vs_rule.from_html_vars('rule') + vs_rule.validate_value(new_rule, 'rule') + + if self._ruleid and self._ruleid != new_rule["id"]: + existing_ruleid = self._ruleid + new_ruleid = new_rule["id"] + c = wato_confirm(_("Confirm renaming existing BI rule"), + _("Do you really want to rename the existing BI rule <b>%s</b> to <b>%s</b>?") % \ + (existing_ruleid, new_ruleid)) + if c: + self._ruleid = new_ruleid + del self._pack["rules"][existing_ruleid] + self._pack["rules"][new_ruleid] = new_rule + self._rename_existing_ruleid_after_confirm(existing_ruleid) + log_pending(SYNC, None, "bi-edit-rule", _("Renamed BI rule %s") % self._ruleid) + self.save_config() + + else: + return False + + elif html.check_transaction(): if self._new: self._ruleid = new_rule["id"] @@ -1365,6 +1384,7 @@ class ModeBIEditRule(ModeBI): _("There is already a rule with the id <b>%s</b>. " "It is in the pack <b>%s</b> and as the title <b>%s</b>") % ( self._ruleid, pack["title"], existing_rule["title"])) + if not new_rule["nodes"]: raise MKUserError(None, _("Please add at least one child node. Empty rules are useless.")) @@ -1380,11 +1400,25 @@ class ModeBIEditRule(ModeBI): raise MKUserError(None, _("There is a cycle in your rules. This rule calls itself - " "either directly or indirectly.")) log_pending(SYNC, None, "bi-edit-rule", _("Modified BI rule %s") % self._ruleid) + self.save_config() return "bi_rules" + def _rename_existing_ruleid_after_confirm(self, existing_ruleid): + for packinfo in self._packs.values(): + for rule_id, rule_info in packinfo['rules'].items(): + new_nodes = [] + for this_node in rule_info.get('nodes', []): + node_ty, node_info = this_node + if node_ty == 'call' and existing_ruleid == node_info[0]: + new_nodes.append( ('call', tuple( [self._ruleid] + list(node_info)[1:] )) ) + else: + new_nodes.append( this_node ) + rule_info['nodes'] = new_nodes + + def page(self): if self._new: cloneid = html.var("clone") @@ -1410,6 +1444,16 @@ class ModeBIEditRule(ModeBI): def valuespec(self): elements = [ + ( "id", + TextAscii( + title = _("Unique Rule ID"), + help = _("The ID of the rule must be a unique text. It will be used as an internal key " + "when rules refer to each other. The rule IDs will not be visible in the status " + "GUI. They are just used within the configuration."), + allow_empty = False, + size = 24, + ), + ), ( "title", TextUnicode( title = _("Rule Title"), @@ -1473,20 +1517,6 @@ class ModeBIEditRule(ModeBI): ), ] - - if self._new: - elements = [ - ( "id", - TextAscii( - title = _("Unique Rule ID"), - help = _("The ID of the rule must be a unique text. It will be used as an internal key " - "when rules refer to each other. The rule IDs will not be visible in the status " - "GUI. They are just used within the configuration."), - allow_empty = False, - size = 24, - ), - )] + elements - return Dictionary( title = _("General Properties"), optional_keys = False,