Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64657 discussions

Check_MK Git: check_mk: Renamed several filter URI variables

by Mathias Kettner

Module: check_mk Branch: master Commit: eacb614142b8b8aa89d943a57707c937f4d0ba0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eacb614142b8b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 17:58:59 2014 +0200 Renamed several filter URI variables These are variables that conflict with other filters. In most cases these are pairs of regex and exact match filters. The regex filters have been renamed in a way that there is no conflict anymore. --- web/htdocs/views.py | 22 ++++++++++++++-------- web/htdocs/visuals.py | 29 ++++++++++++++++++++--------- web/plugins/visuals/filters.py | 12 ++++++------ 3 files changed, 40 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eacb614142…

10 years

Check_MK Git: check_mk: htmllib: new functions for stashing current variables

by Mathias Kettner

Module: check_mk Branch: master Commit: 0f143221e711abec4d1e8a222aab33c0e4ac871e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f143221e711ab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 17:54:40 2014 +0200 htmllib: new functions for stashing current variables --- web/htdocs/htmllib.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 3de2f9f..4b7dacd 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -58,6 +58,7 @@ class html: self.link_target = None self.form_name = None self.form_vars = [] + self.var_stash = [] self.context_buttons_open = False self.mobile = False self.buffering = True @@ -987,6 +988,12 @@ class html: self.vars = dict([(k,v) for (k,v) in self.vars.iteritems() if not k.startswith(prefix)]) self.listvars = dict([(k,v) for (k,v) in self.listvars.iteritems() if not k.startswith(prefix)]) + def stash_vars(self): + self.var_stash.append(self.vars.copy()) + + def unstash_vars(self): + self.vars = self.var_stash.pop() + def javascript(self, code): self.write("<script language=\"javascript\">\n%s\n</script>\n" % code)

10 years

Check_MK Git: check_mk: remove old outdated comment

by Mathias Kettner

Module: check_mk Branch: master Commit: 03f3b096f95ff5829f9c233faec581fea67eb8a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03f3b096f95ff5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 15:13:33 2014 +0200 remove old outdated comment --- web/plugins/visuals/filters.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 2babf82..e953e0d 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -299,10 +299,7 @@ class FilterServiceState(Filter): for var, text in [(self.prefix + "st0", _("OK")), (self.prefix + "st1", _("WARN")), \ (self.prefix + "st2", _("CRIT")), (self.prefix + "st3", _("UNKNOWN")), (self.prefix + "stp", _("PEND"))]: - #if html.mobile: - #text = text[:1] html.checkbox(var, True, label=text) - # html.write(" %s " % text) html.end_checkbox_group() def filter(self, infoname):

10 years

Check_MK Git: check_mk: Fixed editing dashlet details

by Mathias Kettner

Module: check_mk Branch: master Commit: c24c7b10d5908acb7a20088ccbe5e10aff1f5653 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c24c7b10d5908a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 16:38:02 2014 +0200 Fixed editing dashlet details --- web/plugins/dashboard/dashlets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 49e9167..ea44fad 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -536,7 +536,7 @@ def dashlet_view_render_input(dashlet): views.load_views() if html.var("id"): # only needed in case of editing an existing view - views.transform_view_to_valuespec(dashlet) + views.transform_view_to_valuespec_value(dashlet) return views.render_view_config(dashlet) def dashlet_view_handle_input(ident, dashlet): @@ -544,7 +544,7 @@ def dashlet_view_handle_input(ident, dashlet): dashlet.setdefault('title', _('View')) import views # FIXME: HACK, clean this up somehow views.load_views() - return views.create_view_config(dashlet, dashlet) + return views.create_view_from_valuespec(dashlet, dashlet) dashlet_types["view"] = { "title" : _("View"),

10 years

Check_MK Git: check_mk: Avoid exception on Dictionary without elements

by Mathias Kettner

Module: check_mk Branch: master Commit: 50307c43cf54c5da94b47f7caa2d3305d0351c6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50307c43cf54c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 16:38:47 2014 +0200 Avoid exception on Dictionary without elements --- web/htdocs/valuespec.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5edd1ad..cd6d6fb 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2558,10 +2558,12 @@ class Dictionary(ValueSpec): return value def _get_elements(self): - if type(self._elements) == list: + if type(self._elements) == type(lambda: None): + return self._elements() + elif type(self._elements) == list: return self._elements else: - return self._elements() + return [] def render_input(self, varprefix, value): value = self.migrate(value)

10 years

Check_MK Git: check_mk: Extract function for filters from view to visuals

by Mathias Kettner

Module: check_mk Branch: master Commit: f5548c7a69f4a7fbb6c11cc4d8fa5e05de1c3b10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5548c7a69f4a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 16:39:17 2014 +0200 Extract function for filters from view to visuals --- web/htdocs/views.py | 20 ++------------------ web/htdocs/visuals.py | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index eec6912..92e7f87 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -536,7 +536,6 @@ def transform_view_to_valuespec_value(view): view['visibility'].append(key) view['grouping'] = { "grouping" : view.get('group_painters', []) } - view['filters'] = { "context" : view.get('context', {}) } view['sorting'] = { "sorters" : view.get('sorters', {}) } columns = [] @@ -559,8 +558,6 @@ def transform_view_to_valuespec_value(view): columns.append((pname, viewname, '')) - - def transform_valuespec_value_to_view(view): for ident, attrs in view.items(): # Transform some valuespec specific options to legacy view @@ -572,6 +569,7 @@ def transform_valuespec_value_to_view(view): view[option] = True del attrs['options'] view.update(attrs) + del view["view"] elif ident == 'sorting': view.update(attrs) @@ -871,21 +869,7 @@ def show_view(view, show_heading = False, show_buttons = True, # in context. In this case, take them from the context type definition. show_filters = visuals.show_filters(view, datasource['infos']) - # Populate the HTML vars with missing context vars. The context vars set - # in single context are enforced (can not be overwritten by URL). The normal - # filter vars in "multiple" context are not enforced. - for key in visuals.get_single_info_keys(view): - if key in view['context']: - html.set_var(key, view['context'][key]) - - # Now apply the multiple context filters - for info_key in datasource['infos']: - for fname, fval in view['context'].items(): - if type(fval) == dict: # this is a real filter - for varname, val in fval.items(): - # shown filters are set, if form is fresh and variable not supplied in URL - if only_count or (html.var("filled_in") != "filter" and not html.has_var(varname)): - html.set_var(varname, val) + visuals.add_context_to_html_vars(view, datasource["infos"], only_count) # Af any painter, sorter or filter needs the information about the host's # inventory, then we load it and attach it as column "host_inventory" diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index d7c674e..8ff8d70 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -467,7 +467,6 @@ def process_context_specs(context_specs): ident = 'context_' + info_key attrs = spec.from_html_vars(ident) - html.debug(attrs) spec.validate_value(attrs, ident) context.update(attrs) return context @@ -477,6 +476,9 @@ def render_context_specs(visual, context_specs): for info_key, spec in context_specs: forms.section(spec.title()) ident = 'context_' + info_key + # Trick: the field "context" contains a dictionary with + # all filter settings, from which the value spec will automatically + # extract those that it needs. value = visual.get('context', {}) spec.render_input(ident, value) @@ -623,8 +625,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, save_and_go = None for nr, (title, pagename, icon) in enumerate(sub_pages): if html.var("save%d" % nr): - save_and_go = html.makeuri_contextless([(visual_types[what]['ident_attr'], visualname)], - filename = pagename + '.py') + save_and_go = pagename if save_and_go or html.var("save") or html.var("try") or html.var("search"): try: @@ -656,7 +657,8 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, if html.var("save") or save_and_go: if save_and_go: - back = save_and_go + back = html.makeuri_contextless([(visual_types[what]['ident_attr'], visual['name'])], + filename = save_and_go + '.py') else: back = html.var('back') if not back: @@ -869,6 +871,30 @@ def show_filters(visual, info_keys): return list(set(show_filters)) # remove duplicates + +def add_context_to_html_vars(visual, only_infos=None, only_count=False): + if only_infos == None: + only_infos = infos.keys() # all datasources! + + # Populate the HTML vars with missing context vars. The context vars set + # in single context are enforced (can not be overwritten by URL). The normal + # filter vars in "multiple" context are not enforced. + for key in get_single_info_keys(visual): + if key in visual['context']: + html.set_var(key, visual['context'][key]) + + # Now apply the multiple context filters + for info_key in only_infos: + for fname, fval in visual['context'].items(): + if type(fval) == dict: # this is a real filter + for varname, val in fval.items(): + # shown filters are set, if form is fresh and variable not supplied in URL + if only_count or (html.var("filled_in") != "filter" and not html.has_var(varname)): + html.set_var(varname, val) + + + + #. # .--ValueSpecs----------------------------------------------------------. # | __ __ _ ____ |

10 years

Check_MK Git: check_mk: views: make transform function symmetric

by Mathias Kettner

Module: check_mk Branch: master Commit: 2b217065c944577b2b118b89b31770aa8ef586f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b217065c94457… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 13:20:23 2014 +0200 views: make transform function symmetric --- web/htdocs/views.py | 116 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 79 insertions(+), 37 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 20cc908..eec6912 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -97,6 +97,9 @@ def transform_old_views(): ds_name = view['datasource'] datasource = multisite_datasources[ds_name] + if "context" not in view: # legacy views did not have this explicitly + view.setdefault("user_sortable", True) + # This tries to map the datasource and additional settings of the # views to get the correct view context if 'single_infos' not in view: @@ -295,8 +298,8 @@ def page_edit_view(): visuals.page_edit_visual('views', multisite_views, custom_field_handler = render_view_config, - load_handler = transform_view_to_valuespec, - create_handler = create_view_config, + load_handler = transform_view_to_valuespec_value, + create_handler = create_view_from_valuespec, info_handler = get_view_infos, try_handler = lambda view: show_view(view, False, False) ) @@ -509,71 +512,74 @@ def render_view_config(view, general_properties=True): view['datasource'] = ds_name for ident, vs in view_editor_specs(ds_name, general_properties): - vs.render_input(ident, view) - -# Is used to change the view structure to be compatible to the valuespec -# This needs to perform the inverted steps of the create_view() function -# FIXME: One day we should rewrite this to make no transform needed anymore -def transform_view_to_valuespec(view): - view['options'] = [] + vs.render_input(ident, view[ident]) + +# Is used to change the view structure to be compatible to +# the valuespec This needs to perform the inverted steps of the +# transform_valuespec_value_to_view() function. FIXME: One day we should +# rewrite this to make no transform needed anymore +def transform_view_to_valuespec_value(view): + view["view"] = {} # Several global variables are put into a sub-dict + # Only copy our known keys. Reporting element, etc. might have their own keys as well + for key in [ "datasource", "browser_reload", "layout", "num_columns", "column_headers" ]: + if key in view: + view["view"][key] = view[key] + + view["view"]['options'] = [] for key, title in view_editor_options(): if view.get(key): - view['options'].append(key) + view['view']['options'].append(key) view['visibility'] = [] for key in [ 'hidden', 'hidebutton', 'public' ]: if view.get(key): view['visibility'].append(key) - view['grouping'] = view['group_painters'] - view['filters'] = view['context'] + view['grouping'] = { "grouping" : view.get('group_painters', []) } + view['filters'] = { "context" : view.get('context', {}) } + view['sorting'] = { "sorters" : view.get('sorters', {}) } - view['columns'] = [] - for entry in view['painters']: + columns = [] + view['columns'] = { "columns" : columns } + for entry in view.get('painters', []): if len(entry) == 5: pname, viewname, tooltip, join_index, col_title = entry - view['columns'].append((pname, join_index, viewname, tooltip, col_title)) + columns.append((pname, join_index, viewname, tooltip, col_title)) elif len(entry) == 4: pname, viewname, tooltip, join_index = entry - view['columns'].append((pname, join_index, viewname, tooltip, '')) + columns.append((pname, join_index, viewname, tooltip, '')) elif len(entry) == 3: pname, viewname, tooltip = entry - view['columns'].append((pname, viewname, tooltip)) + columns.append((pname, viewname, tooltip)) else: pname, viewname = entry - view['columns'].append((pname, viewname, '')) + columns.append((pname, viewname, '')) + -# Extract properties of view from HTML variables and construct -# view object, to be used for saving or displaying -# -# old_view is the old view dict which might be loaded from storage. -# view is the new dict object to be updated. -def create_view_config(old_view, view): - ds_name = old_view.get('datasource', html.var('datasource')) - datasource = multisite_datasources[ds_name] - for ident, vs in view_editor_specs(ds_name): - attrs = vs.from_html_vars(ident) - vs.validate_value(attrs, ident) +def transform_valuespec_value_to_view(view): + for ident, attrs in view.items(): # Transform some valuespec specific options to legacy view # format. We do not want to change the view data structure # at the moment. if ident == 'view': - for option in attrs['options']: - view[option] = True - del attrs['options'] - + if "options" in attrs: + for option in attrs['options']: + view[option] = True + del attrs['options'] view.update(attrs) elif ident == 'sorting': view.update(attrs) + del view["sorting"] elif ident == 'grouping': view['group_painters'] = attrs['grouping'] + del view["grouping"] elif ident == 'columns': painters = [] @@ -593,7 +599,25 @@ def create_view_config(old_view, view): else: painters.append((pname, viewname, tooltip)) view['painters'] = painters + del view["columns"] + +# Extract properties of view from HTML variables and construct +# view object, to be used for saving or displaying +# +# old_view is the old view dict which might be loaded from storage. +# view is the new dict object to be updated. +def create_view_from_valuespec(old_view, view): + ds_name = old_view.get('datasource', html.var('datasource')) + datasource = multisite_datasources[ds_name] + vs_value = {} + for ident, vs in view_editor_specs(ds_name): + attrs = vs.from_html_vars(ident) + vs.validate_value(attrs, ident) + vs_value[ident] = attrs + + transform_valuespec_value_to_view(vs_value) + view.update(vs_value) return view #. @@ -704,6 +728,13 @@ def page_view(): # (e.g. from the services table while we are in a hosts view) # If join_columns is False, we only return the "normal" columns. def get_needed_columns(view, painters): + # Make sure that the information about the available views is present. If + # called via the reporting, than this might not be the case + try: + available_views + except: + load_views() + columns = [] for entry in painters: painter = entry[0] @@ -818,8 +849,13 @@ def show_view(view, show_heading = False, show_buttons = True, display_options = prepare_display_options() # User can override the layout settings via HTML variables (buttons) - # which are safed persistently. This is known as "view options" - vo = view_options(view["name"]) + # which are safed persistently. This is known as "view options". Note: a few + # can be anonymous (e.g. when embedded into a report). In that case there + # are no display options. + if "name" in view: + vo = view_options(view["name"]) + else: + vo = {} num_columns = vo.get("num_columns", view.get("num_columns", 1)) browser_reload = vo.get("refresh", view.get("browser_reload", None)) @@ -994,9 +1030,15 @@ def show_view(view, show_heading = False, show_buttons = True, html.set_browser_reload(browser_reload) # The layout of the view: it can be overridden by several specifying - # an output format (like json or python). + # an output format (like json or python). Note: the layout is not + # always needed. In case of an embedded view in the reporting this + # field is simply missing, because the rendering is done by the + # report itself. if html.output_format == "html": - layout = multisite_layouts[view["layout"]] + if "layout" in view: + layout = multisite_layouts[view["layout"]] + else: + layout = None else: layout = multisite_layouts.get(html.output_format) if not layout:

10 years

Check_MK Git: check_mk: ListOfMultiple: new option for setting width

by Mathias Kettner

Module: check_mk Branch: master Commit: aa9e7091b38c1f9be5cf26df7d1255555b82d692 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa9e7091b38c1f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 14:10:29 2014 +0200 ListOfMultiple: new option for setting width --- web/htdocs/valuespec.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index b32705f..5edd1ad 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -904,9 +904,9 @@ class ListOf(ValueSpec): class ListOfMultiple(ValueSpec): def __init__(self, choices, **kwargs): ValueSpec.__init__(self, **kwargs) - self._choices = choices + self._choices = choices self._choice_dict = dict(choices) - + self._size = kwargs.get("size") self._add_label = kwargs.get("add_label", _("Add element")) def del_button(self, varprefix, ident): @@ -946,7 +946,10 @@ class ListOfMultiple(ValueSpec): html.write("<br>") choosable = [('', '')] + [ (ident, vs.title()) for ident, vs in self._choices if ident not in value ] - html.select(varprefix + '_choice', choosable) + attrs = {} + if self._size != None: + attrs["style"] = "width: %dex" % self._size + html.select(varprefix + '_choice', choosable, attrs=attrs) html.javascript('vs_listofmultiple_init(\'%s\');' % varprefix) html.jsbutton(varprefix + '_add', self._add_label, "vs_listofmultiple_add('%s')" % varprefix)

10 years

Check_MK Git: check_mk: ListChoice: add hidden variable, make filled-in detection simpler

by Mathias Kettner

Module: check_mk Branch: master Commit: c06894c43d1c9d9a4997e394e6c2e42802314fe4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c06894c43d1c9d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 11:21:40 2014 +0200 ListChoice: add hidden variable, make filled-in detection simpler --- web/htdocs/valuespec.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index dbdde99..b32705f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1421,6 +1421,8 @@ class ListChoice(ValueSpec): html.checkbox("%s_%d" % (varprefix, nr), key in value, label = title) html.write("</td>") html.write("</tr></table>") + # Make sure that at least one variable with the prefix is present + html.hidden_field(varprefix, "1") def value_to_text(self, value): self.load_elements()

10 years

Check_MK Git: check_mk: Group all context configuration into one block

by Mathias Kettner

Module: check_mk Branch: master Commit: d723b48209c200eaa7b1db1ae1d98dd11bf0c426 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d723b48209c200… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 14:11:18 2014 +0200 Group all context configuration into one block This makes the view editor more clearly laid out. --- web/htdocs/visuals.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 91d05b1..d7c674e 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -434,8 +434,15 @@ def get_context_specs(visual, info_handler): params = info['single_spec'] optional = True isopen = True + vs = Dictionary( + title = info['title'], + # render = 'form', + form_isopen = isopen, + optional_keys = optional, + elements = params, + ) else: - filter_list = VisualFilterList([info_key]) + filter_list = VisualFilterList([info_key], title=info['title']) filter_names = filter_list.filter_names() params = [ ('filters', filter_list), @@ -444,14 +451,8 @@ def get_context_specs(visual, info_handler): # Make it open by default when at least one filter is used isopen = bool([ fn for fn in visual.get('context', {}).keys() if fn in filter_names ]) + vs = filter_list - vs = Dictionary( - title = _('Context: ') + info['title'], - render = 'form', - form_isopen = isopen, - optional_keys = optional, - elements = params, - ) # Single info context specifications should be listed first if info_key in visual['single_infos']: @@ -466,20 +467,17 @@ def process_context_specs(context_specs): ident = 'context_' + info_key attrs = spec.from_html_vars(ident) + html.debug(attrs) spec.validate_value(attrs, ident) - if 'filters' in attrs: # multi object context - context.update(attrs['filters']) - else: # single object context - context.update(attrs) + context.update(attrs) return context def render_context_specs(visual, context_specs): + forms.header(_("Context / Search Filters")) for info_key, spec in context_specs: + forms.section(spec.title()) ident = 'context_' + info_key - if info_key in visual['single_infos']: - value = visual.get('context', {}) - else: - value = {'filters': visual.get('context', {})} + value = visual.get('context', {}) spec.render_input(ident, value) def page_edit_visual(what, all_visuals, custom_field_handler = None, @@ -908,6 +906,7 @@ class VisualFilterList(ListOfMultiple): kwargs.setdefault('title', _('Filters')) kwargs.setdefault('add_label', _('Add filter')) + kwargs.setdefault("size", 50) ListOfMultiple.__init__(self, fspecs, **kwargs)

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits