Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

4716 FIX Fixed broken config when selecing "empty" icon as host/ service icon image

by Lars Michelsen

Module: check_mk Branch: master Commit: 193a3fcfaefb552d77fa259c681a65a007e343de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=193a3fcfaefb55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 16 10:36:08 2017 +0200 4716 FIX Fixed broken config when selecing "empty" icon as host/service icon image Change-Id: I08127cdbfe331158b421528f5b46be327d4493fd --- .werks/4716 | 11 +++++++++++ modules/check_mk.py | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4716 b/.werks/4716 new file mode 100644 index 0000000..1a85489 --- /dev/null +++ b/.werks/4716 @@ -0,0 +1,11 @@ +Title: Fixed broken config when selecing "empty" icon as host/service icon image +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494923749 + + diff --git a/modules/check_mk.py b/modules/check_mk.py index f86628d..3141fa7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2974,7 +2974,9 @@ def extra_host_attributes(hostname): if values: if key[0] == "_": key = key.upper() - attrs[key] = values[0] + + if values[0] != None: + attrs[key] = values[0] return attrs

7 years, 4 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 05cea55dd65015d36f72fbde582ed58f5c94ff7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05cea55dd65015… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 16 10:35:38 2017 +0200 Reserved 20 Werk IDS Change-Id: I61ff1e1465772c107bf9e0413691b3797c8b2496 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 7e1fd93..6cbdf04 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4716 +4736

7 years, 4 months

4685 FIX Fixed exception when trying to reset a global setting twice

by Lars Michelsen

Module: check_mk Branch: master Commit: 20b089bfc72eb54123fef89101a8240c710eeda0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20b089bfc72eb5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 16 10:22:39 2017 +0200 4685 FIX Fixed exception when trying to reset a global setting twice Change-Id: I41167cb6a2cac29373ac4d6245102fc3f2aac4b6 --- .werks/4685 | 11 +++++++++++ web/htdocs/wato.py | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/4685 b/.werks/4685 new file mode 100644 index 0000000..fd19e7a --- /dev/null +++ b/.werks/4685 @@ -0,0 +1,11 @@ +Title: Fixed exception when trying to reset a global setting twice +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494922940 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 68508f1..73c5ff1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6953,7 +6953,14 @@ def mode_edit_configvar(phase, what = 'globalvars'): elif c == None: return None - del current_settings[varname] + if not html.check_transaction(): + return + + try: + del current_settings[varname] + except KeyError: + pass + msg = _("Resetted configuration variable %s to its default.") % varname else: new_value = get_edited_value(valuespec)

7 years, 4 months

4684 FIX Fixed visualization of on/off toggles in global settings

by Lars Michelsen

Module: check_mk Branch: master Commit: 02ae383745802e7a9eda3199e9ff8249a198725a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02ae383745802e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 16 10:19:51 2017 +0200 4684 FIX Fixed visualization of on/off toggles in global settings Change-Id: Iaf20cbc6d26e47afbf76b4e2096379fee3ab39df --- .werks/4684 | 11 +++++++++++ web/htdocs/wato.css | 5 +++++ web/htdocs/wato.py | 2 ++ 3 files changed, 18 insertions(+) diff --git a/.werks/4684 b/.werks/4684 new file mode 100644 index 0000000..4584d99 --- /dev/null +++ b/.werks/4684 @@ -0,0 +1,11 @@ +Title: Fixed visualization of on/off toggles in global settings +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494922772 + + diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 5156e39..388e819 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -829,6 +829,7 @@ div.varname { } .wato div.globalvars td.simple a.modified, +.wato div.globalvars td.simple div.toggle_switch_container.modified, .wato div.globalvars td.content a.modified > table { border-radius: 5px 5px 5px 5px; border: 1px solid #cdf; @@ -838,6 +839,10 @@ div.varname { padding: 1px 4px 2px 4px; } +.wato div.globalvars td.simple div.toggle_switch_container { + width: 56px; +} + .wato div.globalvars a.modified table.vs_dict_text { border-collapse: separate; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e762ec4..68508f1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6883,12 +6883,14 @@ def render_global_configuration_variables(group_names, default_values, current_s modified_cls = None if is_a_checkbox(valuespec): + html.open_div(class_=["toggle_switch_container", modified_cls]) html.toggle_switch( enabled=value, help=_("Immediately toggle this setting"), href=html.makeactionuri([("_action", "toggle"), ("_varname", varname)]), class_=modified_cls ) + html.close_div() else: html.a(HTML(to_text), href=edit_url, class_=modified_cls)

7 years, 4 months

Updated werk #4658

by Simon Betz

Module: check_mk Branch: master Commit: d77016c42d709b622a4b443d2c31a2c550fd03c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d77016c42d709b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 16 10:14:10 2017 +0200 Updated werk #4658 Change-Id: Ia4c0039f34cba56dd8428f6570e60db24828e180 --- web/plugins/wato/bi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 0e0dd51..670c4a7 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1568,7 +1568,8 @@ class ModeBIEditRule(ModeBI): node_type, node_content = node node_name = node_content[0] pack = self.pack_containing_rule(node_name) - if node_type == 'call' and not self.may_use_rules_in_pack(pack): + if node_type == 'call' and pack is not None and \ + not self.may_use_rules_in_pack(pack): packid = (pack['id'], pack['title']) rules_without_permissions.setdefault(packid, []) rules_without_permissions[packid].append(node_name)

7 years, 4 months

Cleanup --checks option @all

by Simon Betz

Module: check_mk Branch: master Commit: a51a169cb2a379d28c8074f342212da0f3a949a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a51a169cb2a379… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 16 09:49:59 2017 +0200 Cleanup --checks option @all Change-Id: I085d6aa46a8ce1337fa1d7ee42dc5db7f269518a --- modules/check_mk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 398c256..f86628d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4615,9 +4615,10 @@ for o,a in opts: elif o == '-I': seen_I += 1 elif o == "--checks": - check_types = a.split(",") - if len(check_types) == 1 and check_types[0] == "@all": + if a == "@all": check_types = check_info.keys() + else: + check_types = a.split(",") elif o == "--cmc-file": opt_cmc_relfilename = a

7 years, 4 months

Added new argument @all for --checks option

by Simon Betz

Module: check_mk Branch: master Commit: 83ac9ca0552b624b953ffd88e3415cca6817c248 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83ac9ca0552b62… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 15 14:13:15 2017 +0200 Added new argument @all for --checks option Change-Id: Ie9f3453d190cc496e0a8b8562ff7adc430e88f33 --- modules/check_mk.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 0e2f2df..398c256 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4616,6 +4616,9 @@ for o,a in opts: seen_I += 1 elif o == "--checks": check_types = a.split(",") + if len(check_types) == 1 and check_types[0] == "@all": + check_types = check_info.keys() + elif o == "--cmc-file": opt_cmc_relfilename = a elif o == "--split-rrds":

7 years, 4 months

4683 New permission: Clear audit log

by Lars Michelsen

Module: check_mk Branch: master Commit: 929e2500544b22f67251f3c8429a65f127ac1405 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=929e2500544b22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 16 09:45:20 2017 +0200 4683 New permission: Clear audit log With this new permission you can configure read only access to the audit log to users. Change-Id: I78918d04269c802baac8ac539671fdaf9ccb394b --- .werks/4683 | 11 +++++++++++ web/htdocs/wato.py | 14 +++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.werks/4683 b/.werks/4683 new file mode 100644 index 0000000..9963af2 --- /dev/null +++ b/.werks/4683 @@ -0,0 +1,11 @@ +Title: New permission: Clear audit log +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494920680 +Class: feature + +With this new permission you can configure read only access to the audit log to +users. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 558eb5b..e762ec4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4853,7 +4853,8 @@ class ModeAuditLog(WatoMode): def buttons(self): changelog_button() home_button() - if self._log_exists() and config.user.may("wato.auditlog") and config.user.may("wato.edit"): + if self._log_exists() and config.user.may("wato.clear_auditlog") \ + and config.user.may("wato.auditlog") and config.user.may("wato.edit"): html.context_button(_("Download"), html.makeactionuri([("_action", "csv")]), "download") if config.user.may("wato.edit"): @@ -4868,6 +4869,7 @@ class ModeAuditLog(WatoMode): def action(self): if html.var("_action") == "clear": config.user.need_permission("wato.auditlog") + config.user.need_permission("wato.clear_auditlog") config.user.need_permission("wato.edit") return self._clear_audit_log_after_confirm() @@ -17382,12 +17384,18 @@ def load_plugins(force): config.declare_permission("wato.auditlog", _("Audit Log"), - _("Access to the historic audit log. A user with write " - "access can delete the audit log. " + _("Access to the historic audit log. " "The currently pending changes can be seen by all users " "with access to WATO."), [ "admin", ]) + config.declare_permission("wato.clear_auditlog", + _("Clear audit Log"), + _("Clear the entries of the audit log. To be able to clear the audit log " + "a user needs the generic WATO permission \"Make changes, perform actions\", " + "the \"View audit log\" and this permission."), + [ "admin", ]) + config.declare_permission("wato.hosts", _("Host management"), _("Access to the management of hosts and folders. This "

7 years, 4 months

Added Keyerror handling

by Simon Betz

Module: check_mk Branch: master Commit: 124b6f2b19d20d3db2f34d741b6e48dc55bed5bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=124b6f2b19d20d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 15 18:09:20 2017 +0200 Added Keyerror handling Change-Id: I5284cfc915ad8d1962347a7caebcf7d480b165d2 --- web/plugins/wato/bi.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 7085f09..0e0dd51 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1532,7 +1532,6 @@ class ModeBIEditRule(ModeBI): def page(self): - self._may_use_rules_from_packs() if self._new: cloneid = html.var("clone") if cloneid: @@ -1548,6 +1547,8 @@ class ModeBIEditRule(ModeBI): except KeyError: raise MKGeneralException(_("This BI rule does not exist")) + self._may_use_rules_from_packs(value) + html.begin_form("birule", method="POST") self.valuespec().render_input("rule", value) forms.end() @@ -1561,9 +1562,9 @@ class ModeBIEditRule(ModeBI): html.end_form() - def _may_use_rules_from_packs(self): + def _may_use_rules_from_packs(self, rulepack): rules_without_permissions = {} - for node in self._pack["rules"][self._ruleid]["nodes"]: + for node in rulepack.get("nodes", []): node_type, node_content = node node_name = node_content[0] pack = self.pack_containing_rule(node_name) @@ -1573,10 +1574,10 @@ class ModeBIEditRule(ModeBI): rules_without_permissions[packid].append(node_name) if rules_without_permissions: - message = ", ".join([_("in BI rules %s used in pack '%s'") % \ + message = ", ".join([_("BI rules %s from BI pack '%s'") % \ (", ".join([ "'%s'" % ruleid for ruleid in ruleids]), title) for (nodeid, title), ruleids in rules_without_permissions.items()]) - raise MKAuthException(_("You have no permission for changes %s.") % message) + raise MKAuthException(_("You have no permission for changes in this rule using %s.") % message) def valuespec(self):

7 years, 4 months

4659 Added bulk moving operation for BI rules

by Simon Betz

Module: check_mk Branch: master Commit: 8d0e201954f078cb4d94f5963686b17aa51c2bcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d0e201954f078… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 15 13:08:38 2017 +0200 4659 Added bulk moving operation for BI rules Change-Id: I92df2156f8ac9b168a83a450c82ba804996228d2 --- .werks/4659 | 10 ++++++++++ web/plugins/wato/bi.py | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/.werks/4659 b/.werks/4659 new file mode 100644 index 0000000..1b5220e --- /dev/null +++ b/.werks/4659 @@ -0,0 +1,10 @@ +Title: Added bulk moving operation for BI rules +Level: 1 +Component: bi +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494846484 +Class: feature + + diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index b9c1c75..7085f09 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1114,6 +1114,9 @@ class ModeBIRules(ModeBI): elif html.var("_bulk_delete_bi_rules"): return self._bulk_delete_rules_after_confirm() + elif html.var("_bulk_move_bi_rules"): + return self._bulk_move_rules_after_confirm() + def _delete_rule_after_confirm(self): ruleid = html.var("_del_rule") @@ -1162,6 +1165,35 @@ class ModeBIRules(ModeBI): raise MKUserError(None, _("You cannot delete this rule: it is still used by other rules.")) + def _bulk_move_rules_after_confirm(self): + target = None + if html.has_var('bulk_moveto'): + target = html.var('bulk_moveto', '') + html.javascript('update_bulk_moveto("%s")' % target) + + target_pack = None + if target in self._packs: + target_pack = self._packs[target] + + selected_rules = self._get_selected_rules() + if selected_rules and target_pack is not None: + c = wato_confirm(_("Confirm moving of %d rules to %s") % \ + (len(selected_rules), target_pack['title']), + _("Do you really want to move %d rules to %s?") % \ + (len(selected_rules), target_pack['title'])) + if c: + for ruleid in selected_rules: + rule_attrs = self._pack["rules"][ruleid] + target_pack["rules"].setdefault(ruleid, rule_attrs) + del self._pack["rules"][ruleid] + self._add_change("bi-move-rule", + _("Moved BI rule with id %s to BI pack %s") % (ruleid, target)) + self.save_config() + + elif c == False: + return "" + + def _get_selected_rules(self): selected_rules = [] for varname in html.all_varnames_with_prefix("_c_rule_"): @@ -1191,7 +1223,17 @@ class ModeBIRules(ModeBI): html.hidden_fields() fieldstyle = "margin-top:10px" - html.button("_bulk_delete_bi_rules", _("Bulk Delete"), "submit", style=fieldstyle) + html.button("_bulk_delete_bi_rules", _("Bulk delete"), "submit", style=fieldstyle) + html.button("_bulk_move_bi_rules", _("Bulk move"), "submit", style=fieldstyle) + + if html.has_var('bulk_moveto'): + html.javascript('update_bulk_moveto("%s")' % html.var('bulk_moveto', '')) + choices = [ (pack_id, attrs["title"]) for pack_id, attrs in self._packs.items() + if pack_id is not self._pack["id"] and self.is_contact_for_pack(attrs) ] + + html.select("bulk_moveto", choices, "@", + onchange = "update_bulk_moveto(this.value)", + attrs = {'class': 'bulk_moveto', 'style': fieldstyle}) html.end_form()

7 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017