Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: #2223 Allow cancelling actions to be omitted of the cancelled event is not (yet) open

by Mathias Kettner

Module: check_mk Branch: master Commit: be3c9c48f7012a794bbec1d7b7c707122446bf8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be3c9c48f7012a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 23 09:51:44 2015 +0200 #2223 Allow cancelling actions to be omitted of the cancelled event is not (yet) open If you have an Event Console rule that uses delaying or counting at the same time as cancelling, and if this rule furthermore defines actions when cancelling, then you can have these actions only be executed if the event has made it in to the <tt>open</tt> phase. The default is still the old behaviour: that cancelling actions are also executed when the event is still being delayed or in phase <tt>counting</tt> --- .werks/2223 | 14 ++++++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 11 ++++++++--- mkeventd/web/plugins/wato/mkeventd.py | 12 +++++++++++- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/.werks/2223 b/.werks/2223 new file mode 100644 index 0000000..ad178cb --- /dev/null +++ b/.werks/2223 @@ -0,0 +1,14 @@ +Title: Allow cancelling actions to be omitted of the cancelled event is not (yet) open +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i1 +Date: 1429775384 +Class: feature + +If you have an Event Console rule that uses delaying or counting at the +same time as cancelling, and if this rule furthermore defines actions when +cancelling, then you can have these actions only be executed if the event +has made it in to the <tt>open</tt> phase. The default is still the old +behaviour: that cancelling actions are also executed when the event is still +being delayed or in phase <tt>counting</tt> diff --git a/ChangeLog b/ChangeLog index e1c2c29..e69a20c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -501,6 +501,7 @@ * 1878 SEC: Fixed possible shell injection when filtering the EC archive... * 2099 Allow replication of Event Console rule and settings... * 2107 mkeventd: can now handle syslog format of Sophos firewalls + * 2223 Allow cancelling actions to be omitted of the cancelled event is not (yet) open... * 1839 FIX: Fix exception when notifying EC alert into monitoring for traps (because PID is missing) * 1813 FIX: Fixed bug in event console rule editor when no contact groups configured * 1974 FIX: Event console views were randomly ignoring host filters... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 8846616..3363138 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2925,6 +2925,7 @@ class EventStatus(): # Fill a few fields of the cancelled event with data from # the cancelling event so that action scripts have useful # values and the logfile entry if more relevant. + previous_phase = event["phase"] event["phase"] = "closed" event["state"] = 0 # OK event["text"] = new_event["text"] @@ -2933,9 +2934,13 @@ class EventStatus(): event["priority"] = new_event["priority"] log_event_history(event, "CANCELLED") actions = rule.get("cancel_actions", []) - # TODO: Execute the cancelling actions only, if the event - # was open. Do not do this e.g. on delayed or counting. - do_event_actions(actions, event, is_cancelling = True) + if actions: + if previous_phase != "open" \ + and rule.get("cancel_action_phases", "always") == "open": + log("Do not execute cancelling actions, event %s's phase is not 'open' but '%s'" % + (event["id"], previous_phase)) + else: + do_event_actions(actions, event, is_cancelling = True) to_delete.append(nr) for nr in to_delete[::-1]: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index b3a2b86..da99f10 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -301,6 +301,16 @@ vs_mkeventd_rule = Dictionary( choices = mkeventd.action_choices, ) ), + ( "cancel_action_phases", + DropdownChoice( + title = _("Do Cancelling-Actions when..."), + choices = [ + ( "always", _("Always when an event is being cancelled")), + ( "open", _("Only when the cancelled event is in phase OPEN")), + ], + help = _("With this setting you can prevent actions to be executed when " + "events are being cancelled that are in the phases DELAYED or COUNTING."), + )), ( "autodelete", Checkbox( title = _("Automatic Deletion"), @@ -689,7 +699,7 @@ vs_mkeventd_rule = Dictionary( ( _("Rule Properties"), [ "id", "description", "comment", "docu_url", "disabled" ] ), ( _("Matching Criteria"), [ "match", "match_host", "match_ipaddress", "match_application", "match_priority", "match_facility", "match_sl", "match_ok", "cancel_priority", "match_timeperiod" ]), - ( _("Outcome & Action"), [ "state", "sl", "contact_groups", "actions", "cancel_actions", "drop", "autodelete" ]), + ( _("Outcome & Action"), [ "state", "sl", "contact_groups", "actions", "cancel_actions", "cancel_action_phases", "drop", "autodelete" ]), ( _("Counting & Timing"), [ "count", "expect", "delay", "livetime", ]), ( _("Rewriting"), [ "set_text", "set_host", "set_application", "set_comment", "set_contact" ]), ],

9 years, 4 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 789e0c67d998eb6b7d01c74bfb0e25d45350d96f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=789e0c67d998eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 23 09:49:35 2015 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4c5fe94..f9bef4a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2223 +2233

9 years, 4 months

Check_MK Git: check_mk: #2212 FIX oracle_tablespaces: Fix plugin output in case of detected problem in Autoextend settings

by Mathias Kettner

Module: check_mk Branch: master Commit: 8686677ecd19232221c1367d02ef95a6b6b8efa7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8686677ecd1923… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 22 16:24:20 2015 +0200 #2212 FIX oracle_tablespaces: Fix plugin output in case of detected problem in Autoextend settings The checkout would output <tt>NO AUTOEXTEND(!!)</tt> if it had detected that autoextend was on but should be off. The <tt>NO</tt> has now been removed in order to fix the output. The vice versa case has also been fixed. --- .werks/2212 | 12 ++++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/2212 b/.werks/2212 new file mode 100644 index 0000000..4d99ea2 --- /dev/null +++ b/.werks/2212 @@ -0,0 +1,12 @@ +Title: oracle_tablespaces: Fix plugin output in case of detected problem in Autoextend settings +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429712580 + +The checkout would output <tt>NO AUTOEXTEND(!!)</tt> if it had detected that autoextend +was on but should be off. The <tt>NO</tt> has now been removed in order to fix +the output. The vice versa case has also been fixed. diff --git a/ChangeLog b/ChangeLog index cbfcae9..9fa75dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -339,6 +339,7 @@ * 2213 FIX: cisco_temperature: Fixed behaviour in cases where device reports status but no temperature... * 2069 FIX: netapp_api_disk.summary: fixed one missing disk in summary check... * 2070 FIX: agent_netapp: fixed exception when a channel has no shelf-list configured + * 2212 FIX: oracle_tablespaces: Fix plugin output in case of detected problem in Autoextend settings... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index c1784b7..92b0154 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -205,10 +205,10 @@ def check_oracle_tablespaces(item, params, info): # Check autoextend status if parameter not set to None if autoext != None: if autoext and num_extensible == 0: - infotext += ", AUTOEXTEND(!!)" + infotext += ", NO AUTOEXTEND(!!)" status = 2 elif not autoext and num_extensible > 0: - infotext += ", NO AUTOTEXTEND(!!)" + infotext += ", AUTOTEXTEND(!!)" status = 2 elif num_extensible > 0: infotext += ", autoextend"

9 years, 4 months

Check_MK Git: check_mk: #2182 FIX Fixed services randomly becoming stale when using CMC

by Lars Michelsen

Module: check_mk Branch: master Commit: 5051382fccad2aba0279cb658e506b0209db5a7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5051382fccad2a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 22 13:53:53 2015 +0200 #2182 FIX Fixed services randomly becoming stale when using CMC Fixed update of services when host has just been added and fist performed check was the discovery check. --- .werks/2182 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/2182 b/.werks/2182 new file mode 100644 index 0000000..e77ca1e --- /dev/null +++ b/.werks/2182 @@ -0,0 +1,11 @@ +Title: Fixed services randomly becoming stale when using CMC +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429703582 + +Fixed update of services when host has just been added and fist +performed check was the discovery check. diff --git a/ChangeLog b/ChangeLog index 84b9fd8..1909ec5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 2187 FIX: Avoid CLOSE_WAIT sockets for agent connection in case of timeouts... * 2194 FIX: Avoid new discovered checks from being used without config reload * 2180 FIX: cmk -D showed always "bulkwalk: no" for SNMPv3 hosts (which is wrong)... + * 2182 FIX: Fixed services randomly becoming stale when using CMC... Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API...

9 years, 4 months

Check_MK Git: check_mk: ups_socomec_capacity: Move default value for dict parameters to factory settings

by Konstantin Büttner

Module: check_mk Branch: master Commit: ca6bfcd5f9e37ca92cc0eacb84f9530c13c136e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca6bfcd5f9e37c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Apr 22 13:19:06 2015 +0200 ups_socomec_capacity: Move default value for dict parameters to factory settings --- checks/ups_socomec_capacity | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/checks/ups_socomec_capacity b/checks/ups_socomec_capacity index 3897008..acfc4e1 100644 --- a/checks/ups_socomec_capacity +++ b/checks/ups_socomec_capacity @@ -32,15 +32,16 @@ # upsBatteryTemperature 1.3.6.1.4.1.4555.1.1.1.1.2.6 -ups_capacity_default_levels = { 'battime': (0, 0), 'capacity': (95, 90) } +factory_settings["ups_capacity_default_levels"] = { 'battime': (0, 0), 'capacity': (95, 90) } def inventory_ups_socomec_capacity(info): if len(info) > 0: - return [(None, 'ups_capacity_default_levels')] + return [(None,{})] def check_ups_socomec_capacity(item, params, info): # To support inventories with the old version + # TODO This needs to be reworked. Defaults should not be coded into a check in such a fashion. if type(params) is tuple: # old format with 2 params in tuple warn, crit = params cap_warn, cap_crit = (95, 90) @@ -84,11 +85,12 @@ def check_ups_socomec_capacity(item, params, info): check_info["ups_socomec_capacity"] = { - "check_function" : check_ups_socomec_capacity, - "inventory_function" : inventory_ups_socomec_capacity, - "service_description" : "Battery capacity", - "has_perfdata" : True, - "group" : "ups_capacity", - "snmp_info" : (".1.3.6.1.4.1.4555.1.1.1.1.2" , [ 2, 3, 4 ] ) , - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.4555.1.1.1", + "check_function" : check_ups_socomec_capacity, + "inventory_function" : inventory_ups_socomec_capacity, + "default_levels_variable" : 'ups_capacity_default_levels', + "service_description" : "Battery capacity", + "has_perfdata" : True, + "group" : "ups_capacity", + "snmp_info" : (".1.3.6.1.4.1.4555.1.1.1.1.2" , [ 2, 3, 4 ] ) , + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.4555.1.1.1", }

9 years, 4 months

Check_MK Git: check_mk: Fix some English texts

by Konstantin Büttner

Module: check_mk Branch: master Commit: 73779006d210a7cb9839e5389e9f0c4cfa73efd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73779006d210a7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Apr 22 11:48:22 2015 +0200 Fix some English texts --- web/htdocs/valuespec.py | 10 +++++----- web/plugins/wato/active_checks.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 9cf3180..6dfc4d6 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -835,7 +835,7 @@ class ListOf(ValueSpec): self._allow_empty = kwargs.get("allow_empty", True) self._empty_text = kwargs.get("empty_text") if not self._empty_text: - self._empty_text = _("Please specify at least on entry") + self._empty_text = _("Please specify at least one entry") def del_button(self, vp, nr): js = "valuespec_listof_delete(this, '%s', '%s')" % (vp, nr) @@ -1182,7 +1182,7 @@ class DropdownChoice(ValueSpec): self._label = kwargs.get("label") self._prefix_values = kwargs.get("prefix_values", False) self._sorted = kwargs.get("sorted", False) - self._empty_text = kwargs.get("empty_text", _("There are not defined any elements for this selection yet.")) + self._empty_text = kwargs.get("empty_text", _("There are no elements defined for this selection yet.")) self._no_preselect = kwargs.get("no_preselect", False) self._no_preselect_value = kwargs.get("no_preselect_value", None) @@ -1974,7 +1974,7 @@ class AbsoluteDate(ValueSpec): if self._allow_empty: return None else: - raise MKUserError(varname, _("Please enter a correct number")) + raise MKUserError(varname, _("Please enter a valid number")) if part < mmin or part > mmax: raise MKUserError(varname, _("The value for %s must be between %d and %d" % (_(what), mmin, mmax))) parts.append(part) @@ -2141,7 +2141,7 @@ class TimeofdayRange(ValueSpec): self._bounds[0].validate_value(value[0], varprefix + "_from") self._bounds[1].validate_value(value[1], varprefix + "_until") if value[0] > value[1]: - raise MKUserError(varprefix + "_until", _("The from time must not be greater then the until time.")) + raise MKUserError(varprefix + "_until", _("The from time must not be later then the until time.")) ValueSpec.custom_validate(self, value, varprefix) month_names = [ @@ -2978,7 +2978,7 @@ class ElementSelection(ValueSpec): ValueSpec.__init__(self, **kwargs) self._loaded_at = None self._label = kwargs.get("label") - self._empty_text = kwargs.get("empty_text", _("There are not defined any elements for this selection yet.")) + self._empty_text = kwargs.get("empty_text", _("There are no elements defined for this selection yet.")) def load_elements(self): if self._loaded_at != id(html): diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 4a44607..db7189b 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -29,7 +29,7 @@ register_rulegroup("activechecks", _("Configure active networking checks like HTTP and TCP")) group = "activechecks" -# This elements are also used in check_parameters.py +# These elements are also used in check_parameters.py check_icmp_params = [ ( "rta", Tuple(

9 years, 4 months

Check_MK Git: check_mk: #2211 netapp_api_disk.summary: output physical size of broken disks as an additional information

by Mathias Kettner

Module: check_mk Branch: master Commit: 4bc8a6d0024f8de29f659b9adadfe299c40a8b3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bc8a6d0024f8d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 22 11:25:18 2015 +0200 #2211 netapp_api_disk.summary: output physical size of broken disks as an additional information --- .werks/2211 | 9 +++++++++ ChangeLog | 1 + checks/netapp_api_disk | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/2211 b/.werks/2211 new file mode 100644 index 0000000..04ebea1 --- /dev/null +++ b/.werks/2211 @@ -0,0 +1,9 @@ +Title: netapp_api_disk.summary: output physical size of broken disks as an additional information +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1429694699 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7b0ef1f..cbfcae9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -166,6 +166,7 @@ * 2115 bluenet_meter: new check to monitor energy and power related parameters of Bachmann Bluenet PDUs * 2205 check_icmp: new option for pinging the host alias or an explicity address... * 2210 check_bi_aggr: new option for honoring downtimes and acknowledgements... + * 2211 netapp_api_disk.summary: output physical size of broken disks as an additional information * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/netapp_api_disk b/checks/netapp_api_disk index a7001e5..66ac334 100644 --- a/checks/netapp_api_disk +++ b/checks/netapp_api_disk @@ -103,6 +103,8 @@ def check_netapp_api_disk_summary(_no_item, params, info): info = [] for disk in disks: disk_info = "Serial: %s" % disk.get("serial-number") + if "physical-space" in disk: + disk_info += ", Size: %s" % get_bytes_human_readable(int(disk["physical-space"])) shelf_uid = find_disk_shelf_uid(disk.get("disk-uid")) if shelf_uid: disk_info += " (Shelf: %s, Bay %s)" % (shelf_uid, disk.get("bay"))

9 years, 4 months

Check_MK Git: check_mk: apc_inputs: Cleaned up infotext

by Konstantin Büttner

Module: check_mk Branch: master Commit: 668313abc0e3511e79ec20574c34ceeed5595c97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=668313abc0e351… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Apr 22 11:04:29 2015 +0200 apc_inputs: Cleaned up infotext --- checks/apc_inputs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/checks/apc_inputs b/checks/apc_inputs index 13ca8e0..bb09dd7 100644 --- a/checks/apc_inputs +++ b/checks/apc_inputs @@ -42,7 +42,7 @@ def check_apc_inputs(item, params, info): alarm_states = { '1' : "normal", '2' : "warning", - '3' : "cirtical", + '3' : "critical", '4' : "not applicable", } for name, location, state, alarm_status in info: @@ -58,12 +58,10 @@ def check_apc_inputs(item, params, info): if params['state'] != state: check_state = max( check_state, 1 ) - messages.append("Port state Change from %s to %s(!)" % \ + messages.append("Port state Change from %s to %s" % \ ( states[params['state']], states[state] )) return check_state, ", ".join(messages) - return 3, "Sensor not found" - check_info['apc_inputs'] = {

9 years, 4 months

Check_MK Git: check_mk: #2210 check_bi_aggr: new option for honoring downtimes and acknowledgements

by Mathias Kettner

Module: check_mk Branch: master Commit: 80879c6c94f245ba8728fb01b30b5b758ca239d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80879c6c94f245… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 22 10:16:25 2015 +0200 #2210 check_bi_aggr: new option for honoring downtimes and acknowledgements The active check Check State of BI Aggregation now has two new options for handling aggregates that are in a scheduled downtime or that are acknowledged (visit the according WATO rule set for details). In each of the two cases you can have the state of such an aggregate shifted to OK are at most WARN. --- .werks/2210 | 13 +++++ ChangeLog | 1 + checks/check_bi_aggr | 7 ++- doc/treasures/active_checks/.f12 | 1 + doc/treasures/active_checks/check_bi_aggr | 89 +++++++++++++++++++---------- web/htdocs/valuespec.py | 6 ++ web/plugins/views/bi.py | 12 ++++ web/plugins/views/builtin.py | 9 ++- web/plugins/wato/active_checks.py | 22 ++++++- 9 files changed, 127 insertions(+), 33 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=80879c6c94…

9 years, 4 months

Check_MK Git: check_mk: #2181 Admins can now delete views/dashboards/ reports created by other users

by Lars Michelsen

Module: check_mk Branch: master Commit: 51a61249f3a6c82d2e2283a8b6bd37bebd1c4ac5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51a61249f3a6c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 21 13:51:12 2015 +0200 #2181 Admins can now delete views/dashboards/reports created by other users --- .werks/2181 | 9 +++++++++ ChangeLog | 2 ++ web/htdocs/default_permissions.py | 7 ++++++- web/htdocs/visuals.py | 23 +++++++++++++++-------- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.werks/2181 b/.werks/2181 new file mode 100644 index 0000000..b1e4371 --- /dev/null +++ b/.werks/2181 @@ -0,0 +1,9 @@ +Title: Admins can now delete views/dashboards/reports created by other users +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i1 +Date: 1429617043 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 10eceb9..a06b707 100644 --- a/ChangeLog +++ b/ChangeLog @@ -354,6 +354,7 @@ * 2175 Added icon uploader, unified icon selection... * 2200 New filter for (de-)selecting preliminary notifications to "check-mk-notify"... * 2209 New filter for selecting hosts/services in/out of their service period + * 2181 Admins can now delete views/dashboards/reports created by other users * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views @@ -460,6 +461,7 @@ * 1662 notification plugin spectrum: finalized script. now able to handle host notications * 1213 New Notification macros $SERVICEFORURL$ and $HOSTFORURL$... * 2041 Notification Spooler can now handle incoming and outgoing persistent TCP connections... + NOTE: Please refer to the migration notes! * 2135 Allow to filter notification contacts based on values of custom macros... * 1235 Added notification plugin for Braintower SMS Gateways... * 2188 Rule based notification now allow match for notification comment... diff --git a/web/htdocs/default_permissions.py b/web/htdocs/default_permissions.py index edf0e01..865c5a2 100644 --- a/web/htdocs/default_permissions.py +++ b/web/htdocs/default_permissions.py @@ -151,7 +151,7 @@ def declare_visual_permissions(what, what_plural): config.declare_permission("general.publish_" + what, _("Publish %s") % what_plural, - _("Make %s visible and usable for other users") % what_plural, + _("Make %s visible and usable for other users.") % what_plural, [ "admin", "user" ]) config.declare_permission("general.see_user_" + what, @@ -163,3 +163,8 @@ def declare_visual_permissions(what, what_plural): _("Modify builtin %s") % what_plural, _("Make own published %s override builtin %s for all users.") % (what_plural, what_plural), [ "admin" ]) + + config.declare_permission("general.delete_foreign_" + what, + _("Delete foreign %s") % what_plural, + _("Allows to delete %s created by other users.") % what_plural, + [ "admin" ]) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index e9cdbd6..08290cb 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -268,7 +268,12 @@ def page_list(what, title, visuals, custom_columns = [], # Deletion of visuals delname = html.var("_delete") if delname and html.transaction_valid(): - deltitle = visuals[(config.user_id, delname)]['title'] + if config.may('general.delete_foreign_%s' % what): + user_id = html.var('_user_id', config.user_id) + else: + user_id = config.user_id + + deltitle = visuals[(user_id, delname)]['title'] try: if check_deletable_handler: @@ -276,7 +281,7 @@ def page_list(what, title, visuals, custom_columns = [], c = html.confirm(_("Please confirm the deletion of \"%s\".") % deltitle) if c: - del visuals[(config.user_id, delname)] + del visuals[(user_id, delname)] save(what, visuals) html.reload_sidebar() elif c == False: @@ -313,10 +318,6 @@ def page_list(what, title, visuals, custom_columns = [], # Actions table.cell(_('Actions'), css = 'buttons visuals') - # Edit - if owner == config.user_id: - html.icon_button("edit_%s.py?load_name=%s" % (what_s, visual_name), _("Edit"), "edit") - # Clone / Customize buttontext = _("Create a customized copy of this") backurl = html.urlencode(html.makeuri([])) @@ -325,9 +326,15 @@ def page_list(what, title, visuals, custom_columns = [], html.icon_button(clone_url, buttontext, "clone") # Delete + if owner and (owner == config.user_id or config.may('general.delete_foreign_%s' % what)): + add_vars = [('_delete', visual_name)] + if owner != config.user_id: + add_vars.append(('_user_id', owner)) + html.icon_button(html.makeactionuri(add_vars), _("Delete!"), "delete") + + # Edit if owner == config.user_id: - html.icon_button(html.makeactionuri([('_delete', visual_name)]), - _("Delete!"), "delete") + html.icon_button("edit_%s.py?load_name=%s" % (what_s, visual_name), _("Edit"), "edit") # Custom buttons - visual specific if render_custom_buttons:

9 years, 4 months

← Newer
1
2
3
4
5
6
7
8
9
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015