Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64657 discussions

Check_MK Git: check_mk: #1123 Rule based notifications: New condition " Match Service Groups"

by Andreas Boesl

Module: check_mk Branch: master Commit: cdc0a13ee70358e6c0b36620d2b2ebb56f274871 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdc0a13ee70358… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 7 14:03:32 2014 +0200 #1123 Rule based notifications: New condition "Match Service Groups" --- .werks/1123 | 9 +++++++++ ChangeLog | 1 + check_mk_templates.cfg | 1 + modules/notify.py | 26 +++++++++++++++++++++++++- web/htdocs/wato.py | 21 ++++++++++++++------- 5 files changed, 50 insertions(+), 8 deletions(-) diff --git a/.werks/1123 b/.werks/1123 new file mode 100644 index 0000000..c856d9d --- /dev/null +++ b/.werks/1123 @@ -0,0 +1,9 @@ +Title: Rule based notifications: New condition "Match Service Groups" +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i6 +Date: 1412683344 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6ef12ef..554de9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -141,6 +141,7 @@ * 1151 Add variables (HOST/SERVICE)ACK(AUTHOR/COMMENT) to notification context... * 1394 HTML notifications have a new content field for debugging variables... * 1400 Added example notification script for Pushover to doc/treasures/notifications... + * 1123 Rule based notifications: New condition "Match Service Groups" * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... * 1157 FIX: Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend)... * 1407 FIX: Fix exception in rule based notification on non-Ascii characters in log message diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index 7cef53f..47bc763 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -397,6 +397,7 @@ define command { NOTIFY_NOTIFICATIONAUTHORALIAS='$NOTIFICATIONAUTHORALIAS$' \ NOTIFY_SERVICEACKAUTHOR='$SERVICEACKAUTHOR$' \ NOTIFY_SERVICEACKCOMMENT='$SERVICEACKCOMMENT$' \ + NOTIFY_SERVICEGROUPNAMES='$SERVICEGROUPNAMES$' \ NOTIFY_HOSTACKAUTHOR='$HOSTACKAUTHOR$' \ NOTIFY_HOSTACKCOMMENT='$HOSTACKCOMMENT$' \ NOTIFY_HOSTGROUPNAMES='$HOSTGROUPNAMES$' \ diff --git a/modules/notify.py b/modules/notify.py index 57b90d9..276b11a 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -626,6 +626,7 @@ def rbn_match_rule(rule, context): rbn_match_folder(rule, context) or \ rbn_match_hosttags(rule, context) or \ rbn_match_hostgroups(rule, context) or \ + rbn_match_servicegroups(rule, context) or \ rbn_match_hosts(rule, context) or \ rbn_match_exclude_hosts(rule, context) or \ rbn_match_services(rule, context) or \ @@ -672,6 +673,29 @@ def rbn_match_hosttags(rule, context): "|".join(tags), "|".join(required)) +def rbn_match_servicegroups(rule, context): + if context["WHAT"] != "SERVICE": + return + required_groups = rule.get("match_servicegroups") + if required_groups != None: + sgn = context.get("SERVICEGROUPNAMES") + if sgn == None: + return "No information about service groups is in the context, but service " \ + "must be in group %s" % ( " or ".join(required_groups)) + if sgn: + servicegroups = sgn.split(",") + else: + return "The service is in no group, but %s is required" % ( + " or ".join(required_groups)) + + for group in required_groups: + if group in servicegroups: + return + + return "The service is only in the groups %s, but %s is required" % ( + sgn, " or ".join(required_groups)) + + def rbn_match_hostgroups(rule, context): required_groups = rule.get("match_hostgroups") if required_groups != None: @@ -689,7 +713,7 @@ def rbn_match_hostgroups(rule, context): if group in hostgroups: return - return "The host only is the groups %s, but %s is required" % ( + return "The host is only in the groups %s, but %s is required" % ( hgn, " or ".join(required_groups)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ad72b8d..a4cf757 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8114,17 +8114,17 @@ def FolderChoice(**kwargs): return DropdownChoice(**kwargs) -class HostgroupChoice(DualListChoice): - def __init__(self, **kwargs): +class GroupChoice(DualListChoice): + def __init__(self, what, **kwargs): DualListChoice.__init__(self, **kwargs) + self.what = what self._choices = lambda: self.load_groups() def load_groups(self): all_groups = userdb.load_group_information() - this_group = all_groups.get("host", {}) + this_group = all_groups.get(self.what, {}) return [ (k, t['alias'] and t['alias'] or k) for (k, t) in this_group.items() ] - def vs_notification_bulkby(): return ListChoice( title = _("Create separate notification bulks based on"), @@ -8262,7 +8262,7 @@ def vs_notification_rule(userid = None): title = _("Match Host Tags")) ), ( "match_hostgroups", - HostgroupChoice( + GroupChoice("host", title = _("Match Host Groups"), help = _("The host must be in one of the selected host groups"), allow_empty = False, @@ -8296,6 +8296,13 @@ def vs_notification_rule(userid = None): empty_text = _("Please specify at least one service regex. Disable the option if you want to allow all services."), ) ), + ( "match_servicegroups", + GroupChoice("service", + title = _("Match Service Groups"), + help = _("The host must be in one of the selected service groups"), + allow_empty = False, + ) + ), ( "match_exclude_services", ListOfStrings( title = _("Do <b>not</b> match the following services"), @@ -8546,7 +8553,7 @@ def vs_notification_rule(userid = None): ], optional_keys = [ "match_folder", "match_hosttags", "match_hostgroups", "match_hosts", "match_exclude_hosts", - "match_services", "match_exclude_services", "match_plugin_output", + "match_services", "match_servicegroups", "match_exclude_services", "match_plugin_output", "match_timeperiod", "match_escalation", "match_escalation_throttle", "match_sl", "match_host_event", "match_service_event", "match_ec", "match_checktype", "bulk", "contact_users", "contact_groups", "contact_emails" ], @@ -8556,7 +8563,7 @@ def vs_notification_rule(userid = None): + contact_headers + [ ( _("Conditions"), [ "match_folder", "match_hosttags", "match_hostgroups", "match_hosts", "match_exclude_hosts", - "match_services", "match_exclude_services", "match_plugin_output", + "match_services", "match_servicegroups", "match_exclude_services", "match_plugin_output", "match_checktype", "match_timeperiod", "match_escalation", "match_escalation_throttle", "match_sl", "match_host_event", "match_service_event", "match_ec" ] ),

10 years

Check_MK Git: check_mk: Fix some bugs with edit_dictionary

by Mathias Kettner

Module: check_mk Branch: master Commit: 087b2fd828447ef24d9f3c64b3a9d1b576eb52d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=087b2fd828447e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 10:44:22 2014 +0200 Fix some bugs with edit_dictionary --- web/htdocs/forms.py | 56 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index b305f42..1c0ae42 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -25,7 +25,6 @@ # Boston, MA 02110-1301 USA. from lib import * -from valuespec import * # A input function with the same call syntax as htmllib.textinput() def input(valuespec, varprefix, defvalue): @@ -42,33 +41,47 @@ def get_input(valuespec, varprefix): def edit_dictionary(entries, value, **args): - return edit_dictionaries( - [ ("value", Dictionary(title=title, elements=entries)) ], - { "value" : value }, - **args) + result = edit_dictionaries([("value", entries)], value, **args) + if result: + return result["value"] + else: + return result -# Edit a dictionary with several sub-dictionaries +# Edit a list of several dictionaries. Those can either be dictionary +# valuespec or just a list of elements. Each entry in dictionaries is +# a pair of key and either a list of elements or a Dictionary. def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, validate=None, buttontext=None, title=None, buttons = None, method="GET", preview=False, varprefix="", formname="form", consume_transid = True): + # Convert list of entries/dictionaries + sections = [] + for keyname, d in dictionaries: + if type(d) == list: + sections.append((keyname, title or _("Properties"), d)) + else: + sections.append((keyname, d.title() or title, d._elements)) # valuespec Dictionary + new_value = value.copy() if html.var("filled_in") == formname and html.transaction_valid(): if not preview and consume_transid: html.check_transaction() messages = [] - for keyname, dictionary in dictionaries: + for keyname, section_title, entries in sections: new_value[keyname] = {} - entries = dictionary._elements for name, vs in entries: + if len(sections) == 1: + vp = varprefix + else: + vp = keyname + "_" + varprefix try: - v = vs.from_html_vars(keyname + "_" + varprefix + name) + v = vs.from_html_vars(vp + name) vs.validate_value(v, keyname + "_" + varprefix + name) new_value[keyname][name] = v except MKUserError, e: - messages.append("%s: %s" % (vs.title(), e.message)) + messages.append("%s: %s" % (title, e.message)) html.add_user_error(e.varname, e.message) if validate and not html.has_user_errors(): @@ -88,25 +101,30 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, html.begin_form(formname, method=method) - for keyname, dictionary in dictionaries: - header(dictionary.title()) + for keyname, title, entries in sections: + subvalue = value.get(keyname, {}) + header(title) first = True - for name, vs in dictionary._elements: + for name, vs in entries: section(vs.title()) html.help(vs.help()) - if name in value: - v = value[name] + if name in subvalue: + v = subvalue[name] else: v = vs.default_value() - vs.render_input(keyname + "_" + varprefix + name, v) + if len(sections) == 1: + vp = varprefix + else: + vp = keyname + "_" + varprefix + vs.render_input(vp + name, v) if (not focus and first) or (name == focus): - vs.set_focus(keyname + "_" + varprefix + name) + vs.set_focus(vp + name) first = False end() if buttons: - for name, title, icon in buttons: - html.button(name, title) + for name, button_title, icon in buttons: + html.button(name, button_title) else: if buttontext == None: buttontext = _("Save")

10 years

Check_MK Git: check_mk: Extract SingleInfoSelection into own function

by Mathias Kettner

Module: check_mk Branch: master Commit: 87f859ba7d974934aeb8678ecf46f64e32e32602 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87f859ba7d9749… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 10:44:43 2014 +0200 Extract SingleInfoSelection into own function --- web/htdocs/visuals.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 130b305..998b8ed 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -362,10 +362,7 @@ def page_create_visual(what, title, info_keys, next_url = None): for key in info_keys: info_choices.append((key, _('Show information of a single %s') % infos[key]['title'])) - vs_infos = ListChoice( - title = _('Specific objects'), - choices = info_choices, - ) + vs_infos = SingleInfoSelection(info_keys) html.header(_('Create %s') % title, stylesheets=["pages"]) html.begin_context_buttons() @@ -972,6 +969,17 @@ class VisualFilter(ValueSpec): def validate_value(self, value, varprefix): ValueSpec.custom_validate(self, value, varprefix) + +def SingleInfoSelection(info_keys, **args): + info_choices = [] + for key in info_keys: + info_choices.append((key, _('Show information of a single %s') % infos[key]['title'])) + + args.setdefault("title", _('Specific objects')) + args["choices"] = info_choices + return ListChoice(**args) + + #. # .--Misc----------------------------------------------------------------. # | __ __ _ |

10 years

Check_MK Git: check_mk: Fixed wording; Fixed exception in complain phase while adding a new view dashlet

by Lars Michelsen

Module: check_mk Branch: master Commit: 2447c364ccf4a41251981b568ca385d241f1843c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2447c364ccf4a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 7 09:40:50 2014 +0200 Fixed wording; Fixed exception in complain phase while adding a new view dashlet --- web/htdocs/dashboard.py | 4 ++-- web/plugins/dashboard/dashlets.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 5ad17c3..e0925af 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -980,9 +980,9 @@ def page_delete_dashlet(): dashboard['mtime'] = int(time.time()) visuals.save('dashboards', dashboards) - html.message(_('The dashlet has deleted.')) + html.message(_('The dashlet has been deleted.')) except MKUserError, e: - html.write("<div class=error>%s</div>\n" % e.message) + html.write("<div class=error>%s</div>\n" % html.attrencode(e.message)) return html.immediate_browser_redirect(1, back_url) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 554445a..49e9167 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -534,7 +534,8 @@ def dashlet_view_parameters(): def dashlet_view_render_input(dashlet): import views # FIXME: HACK, clean this up somehow views.load_views() - if 'group_painters' in dashlet: # only needed in case of loading + if html.var("id"): + # only needed in case of editing an existing view views.transform_view_to_valuespec(dashlet) return views.render_view_config(dashlet)

10 years

Check_MK Git: check_mk: Additional dashboard / dashlet back/

by Lars Michelsen

forth navigation fixes Message-ID: <54339703.AdsysKD0liPjZ9Xh%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: e2aecb012b2d5eaa0585c8c4353b34ea2f24d610 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2aecb012b2d5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 7 09:32:11 2014 +0200 Additional dashboard / dashlet back/forth navigation fixes --- web/htdocs/dashboard.py | 17 ++++++++++------- web/htdocs/views.py | 2 +- web/htdocs/visuals.py | 6 ++++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index abf730a..5ad17c3 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -680,10 +680,7 @@ def page_create_view_dashlet(): if create: import views - # %s can not be added using html.makeuri(), replaced with datasource later - url = html.makeuri([], filename = "create_view_dashlet_infos.py") - url += '&datasource=%s' - + url = html.makeuri([('back', html.makeuri([]))], filename = "create_view_dashlet_infos.py") views.page_create_view(next_url=url) else: @@ -698,8 +695,13 @@ def page_create_view_dashlet_infos(): # Create a new view by choosing the datasource and the single object types visuals.page_create_visual('views', _("View"), views.multisite_datasources[ds_name]['infos'], - next_url = 'edit_dashlet.py?name=%s&type=view&datasource=%s&single_infos=%%s' % - (html.urlencode(html.var('name')), ds_name)) + next_url = html.makeuri_contextless([ + ('name', html.var('name')), + ('type', 'view'), + ('datasource', ds_name), + ('back', html.makeuri([])), + ('next', html.makeuri_contextless([('name', html.var('name')), ('edit', '1')],'dashboard.py')), + ], filename = 'edit_dashlet.py')) def choose_view(name): import views @@ -822,6 +824,7 @@ def page_edit_dashlet(): html.begin_context_buttons() back_url = html.var('back', 'dashboard.py?name=%s&edit=1' % board) + next_url = html.var('next', back_url) html.context_button(_('Back'), back_url, 'back') html.end_context_buttons() @@ -906,7 +909,7 @@ def page_edit_dashlet(): visuals.save('dashboards', dashboards) - html.immediate_browser_redirect(1, back_url) + html.immediate_browser_redirect(1, next_url) if mode == 'edit': html.message(_('The dashlet has been saved.')) else: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index a646a88..f23839b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -241,7 +241,7 @@ def page_create_view(next_url = None): if not next_url: next_url = html.makeuri([('datasource', ds)], filename = "create_view_infos.py") else: - next_url = next_url % ds + next_url = next_url + '&datasource=%s' % ds html.http_redirect(next_url) return diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 130b305..c4b22b9 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -390,8 +390,10 @@ def page_create_visual(what, title, info_keys, next_url = None): vs_infos.validate_value(single_infos, 'single_infos') if not next_url: - next_url = 'edit_'+what_s+'.py?mode=create&single_infos=%s' - html.http_redirect(next_url % ','.join(single_infos)) + next_url = 'edit_'+what_s+'.py?mode=create&single_infos=%s' % ','.join(single_infos) + else: + next_url += '&single_infos=%s' % ','.join(single_infos) + html.http_redirect(next_url) return except MKUserError, e:

10 years

Check_MK Git: check_mk: Updated bug entries #2194

by Lars Michelsen

Module: check_mk Branch: master Commit: d0fafac0bff1759ce7d289c7b6bed27b6da9e1ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0fafac0bff175… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 7 08:44:55 2014 +0200 Updated bug entries #2194 --- .bugs/2194 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2194 b/.bugs/2194 index 2d25fff..ec89b25 100644 --- a/.bugs/2194 +++ b/.bugs/2194 @@ -1,9 +1,9 @@ Title: Dashboard: Exception when editing dashlet details of host stats Component: multisite -State: open +Class: bug +State: done Date: 2014-10-06 19:02:25 Targetversion: future -Class: bug When you go to the dashlet properties of the host statistics, then you get an exception: @@ -15,3 +15,6 @@ Traceback (most recent call last): File "/omd/sites/heute/share/check_mk/web/htdocs/dashboard.py", line 816, in page_edit_dashlet single_infos = dashlet['single_infos'] KeyError: 'single_infos' + +2014-10-07 08:41:35: changed state open -> done +Fixed.

10 years

Check_MK Git: check_mk: Fixed exception when trying to edit builtin dashboards

by Lars Michelsen

Module: check_mk Branch: master Commit: e495e1102276ec4bfebdffef6f2423def77d95a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e495e1102276ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 7 08:41:24 2014 +0200 Fixed exception when trying to edit builtin dashboards --- web/plugins/dashboard/builtin.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 5cefa64..5d6dd0a 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -34,12 +34,13 @@ builtin_dashboards["main"] = { "monitored devices."), "dashlets" : [ { - "title" : _("Host Statistics"), - "type" : 'hoststats', - "position" : (1, 1), - "refresh" : 60, - "show_title" : True, - "context" : {}, + "title" : _("Host Statistics"), + "type" : 'hoststats', + "position" : (1, 1), + "refresh" : 60, + "show_title" : True, + "context" : {}, + 'single_infos' : [], }, { "title" : _("Service Statistics"), @@ -48,6 +49,7 @@ builtin_dashboards["main"] = { "refresh" : 60, "show_title" : True, "context" : {}, + 'single_infos' : [], }, { "type" : "view", @@ -205,6 +207,7 @@ if defaults.omd_site: "position" : (1, 1), "size" : (GROW, GROW), "context" : {}, + "single_infos" : [], }, ] }

10 years

Check_MK Git: check_mk: Fixed several "back" button navigation issues in dashboard editor

by Lars Michelsen

Module: check_mk Branch: master Commit: bd23966d62fa9242f55ab60340a26db2c5eecb35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd23966d62fa92… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 7 09:02:47 2014 +0200 Fixed several "back" button navigation issues in dashboard editor --- .bugs/2192 | 7 +++++-- web/htdocs/dashboard.py | 11 +++++++---- web/htdocs/views.py | 2 +- web/plugins/dashboard/dashlets.py | 3 ++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.bugs/2192 b/.bugs/2192 index b163378..5df5f1d 100644 --- a/.bugs/2192 +++ b/.bugs/2192 @@ -1,11 +1,14 @@ Title: Dashboard: Back button (abort) while adding view to dashboard leads away Component: multisite -State: open +Class: bug +State: done Date: 2014-10-06 18:38:23 Targetversion: future -Class: bug When you add a view to a dashboard, and in the process press "Back", then you do not get back but to the list of views. Solution: Either remove the button or make it work as expected. + +2014-10-07 09:02:32: changed state open -> done +Done. diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 7ac8255..abf730a 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -388,7 +388,8 @@ def render_dashboard(name): add_existing_view_type = dashlet_types['view'].copy() add_existing_view_type['title'] = _('Existing View') - add_existing_view_type['add_urlfunc'] = lambda: 'create_view_dashlet.py?name=%s&create=0' % html.urlencode(name) + add_existing_view_type['add_urlfunc'] = lambda: 'create_view_dashlet.py?name=%s&create=0&back=%s' % \ + (html.urlencode(name), html.urlencode(html.makeuri([('edit', '1')]))) choices = [ ('view', add_existing_view_type) ] choices += sorted(dashlet_types.items(), key = lambda x: x[1].get('sort_index', 0)) @@ -679,9 +680,10 @@ def page_create_view_dashlet(): if create: import views + # %s can not be added using html.makeuri(), replaced with datasource later url = html.makeuri([], filename = "create_view_dashlet_infos.py") - url += '&datasource=%s' # %s can not be added using html.makeuri() - # Note: %s will later be replaced by datasource + url += '&datasource=%s' + views.page_create_view(next_url=url) else: @@ -710,7 +712,8 @@ def choose_view(name): html.header(_('Create Dashlet from existing View'), stylesheets=["pages"]) html.begin_context_buttons() - html.context_button(_("Back"), html.makeuri([('edit', 1)], filename = "dashboard.py"), "back") + back_url = html.var("back", "dashboard.py?edit=1&name=%s" % html.urlencode(html.var('name'))) + html.context_button(_("Back"), back_url, "back") html.end_context_buttons() if html.var('save') and html.check_transaction(): diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 34b6d4c..a646a88 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -207,6 +207,7 @@ def page_edit_views(): # Create datasource selection valuespec, also for other modules def DatasourceSelection(): + # FIXME: Sort the datasources by (assumed) common usage datasources = [] for ds_name, ds in multisite_datasources.items(): datasources.append((ds_name, ds['title'])) @@ -222,7 +223,6 @@ def DatasourceSelection(): def page_create_view(next_url = None): - # FIXME: Sort the datasources by (assumed) common usage vs_ds = DatasourceSelection() ds = 'services' # Default selection diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 4be7271..554445a 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -525,7 +525,8 @@ def dashlet_view(nr, params): views.show_view(params, True, True, True) def dashlet_view_add_url(): - return 'create_view_dashlet.py?name=%s' % html.urlencode(html.var('name')) + return 'create_view_dashlet.py?name=%s&back=%s' % \ + (html.urlencode(html.var('name')), html.urlencode(html.makeuri([('edit', '1')]))) def dashlet_view_parameters(): return dashlet_view_render_input, dashlet_view_handle_input

10 years

Check_MK Git: check_mk: Back URLs of edit dashlet or delete dashlet confirm dialog bring users back to edit mode of dashboard

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fc2de8bcd81d7646b8705232834d80b802f4b07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fc2de8bcd81d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 7 08:45:22 2014 +0200 Back URLs of edit dashlet or delete dashlet confirm dialog bring users back to edit mode of dashboard --- web/htdocs/dashboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c60628c..7ac8255 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -442,7 +442,7 @@ window.onresize = function () { calculate_dashboard(); } dashboard_scheduler(1); """ % (MAX, GROW, raster, header_height, screen_margin, title_height, dashlet_padding, dashlet_min_size, corner_overlap, refresh_dashlets, ','.join(on_resize), name, board['mtime'], - html.makeuri([]), repr(dashlets_js))) + html.makeuri([('edit', '1')]), repr(dashlets_js))) if mode == 'edit': html.javascript('toggle_dashboard_edit(true)')

10 years

Check_MK Git: check_mk: forms: helper function for editing severals dicts at once

by Mathias Kettner

Module: check_mk Branch: master Commit: e018c2929c47432e36f13e7cb07a05ac4eb082bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e018c2929c4743… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 08:56:32 2014 +0200 forms: helper function for editing severals dicts at once --- web/htdocs/forms.py | 72 +++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 225ba3c..b305f42 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. from lib import * +from valuespec import * # A input function with the same call syntax as htmllib.textinput() def input(valuespec, varprefix, defvalue): @@ -40,34 +41,42 @@ def get_input(valuespec, varprefix): return value +def edit_dictionary(entries, value, **args): + return edit_dictionaries( + [ ("value", Dictionary(title=title, elements=entries)) ], + { "value" : value }, + **args) -# preview = True: Do not output error messages, do not consume -# current transaction. This is for preview mode -def edit_dictionary(entries, value, focus=None, hover_help=True, +# Edit a dictionary with several sub-dictionaries +def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, validate=None, buttontext=None, title=None, buttons = None, method="GET", preview=False, varprefix="", formname="form", consume_transid = True): + new_value = value.copy() if html.var("filled_in") == formname and html.transaction_valid(): if not preview and consume_transid: html.check_transaction() messages = [] - for name, vs in entries: - try: - v = vs.from_html_vars(varprefix + name) - vs.validate_value(v, varprefix + name) - new_value[name] = v - except MKUserError, e: - messages.append("%s: %s" % (vs.title(), e.message)) - html.add_user_error(e.varname, e.message) - - if validate and not html.has_user_errors(): - try: - validate(new_value) - except MKUserError, e: - messages.append(e.message) - html.add_user_error(e.varname, e.message) + for keyname, dictionary in dictionaries: + new_value[keyname] = {} + entries = dictionary._elements + for name, vs in entries: + try: + v = vs.from_html_vars(keyname + "_" + varprefix + name) + vs.validate_value(v, keyname + "_" + varprefix + name) + new_value[keyname][name] = v + except MKUserError, e: + messages.append("%s: %s" % (vs.title(), e.message)) + html.add_user_error(e.varname, e.message) + + if validate and not html.has_user_errors(): + try: + validate(new_value[keyname]) + except MKUserError, e: + messages.append(e.message) + html.add_user_error(e.varname, e.message) if messages: if not preview: @@ -79,19 +88,20 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, html.begin_form(formname, method=method) - header(title and title or _("Properties")) - first = True - for name, vs in entries: - section(vs.title()) - html.help(vs.help()) - if name in value: - v = value[name] - else: - v = vs.default_value() - vs.render_input(varprefix + name, v) - if (not focus and first) or (name == focus): - vs.set_focus(varprefix + name) - first = False + for keyname, dictionary in dictionaries: + header(dictionary.title()) + first = True + for name, vs in dictionary._elements: + section(vs.title()) + html.help(vs.help()) + if name in value: + v = value[name] + else: + v = vs.default_value() + vs.render_input(keyname + "_" + varprefix + name, v) + if (not focus and first) or (name == focus): + vs.set_focus(keyname + "_" + varprefix + name) + first = False end() if buttons:

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits