Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64657 discussions

Check_MK Git: check_mk: Fixed creating new view dashlets

by Lars Michelsen

Module: check_mk Branch: master Commit: 48e1f09cfc97d359ba0fd70dc0cbaa53567cd96e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48e1f09cfc97d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 8 09:52:56 2014 +0200 Fixed creating new view dashlets --- web/plugins/dashboard/dashlets.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 18f9ec1..f13fc4f 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -534,9 +534,7 @@ def dashlet_view_parameters(): def dashlet_view_render_input(dashlet): import views # FIXME: HACK, clean this up somehow views.load_views() - if html.var("id"): - # only needed in case of editing an existing view - views.transform_view_to_valuespec_value(dashlet) + views.transform_view_to_valuespec_value(dashlet) return views.render_view_config(dashlet) def dashlet_view_handle_input(ident, dashlet):

10 years

Check_MK Git: check_mk: Fixed exception in views containing contact related information (e.g. host- and service notifications)

by Lars Michelsen

Module: check_mk Branch: master Commit: f187e5f4e5a17fafa538e4d975d93f84f4f5f1fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f187e5f4e5a17f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 8 09:32:09 2014 +0200 Fixed exception in views containing contact related information (e.g. host- and service notifications) --- web/plugins/visuals/infos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/visuals/infos.py b/web/plugins/visuals/infos.py index 52899b8..f22219c 100644 --- a/web/plugins/visuals/infos.py +++ b/web/plugins/visuals/infos.py @@ -86,7 +86,7 @@ infos['downtime'] = { infos['contact'] = { 'title' : _('Contact'), 'single_spec' : [ - ('contact_name', TextUnicode( + ('log_contact_name', TextUnicode( title = _('Contact Name'), )), ]

10 years

Check_MK Git: check_mk: Fixed favourite host/service views

by Lars Michelsen

Module: check_mk Branch: master Commit: f5078d87df5090006428e7ff13f0ca73b580a8e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5078d87df5090… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 8 09:29:28 2014 +0200 Fixed favourite host/service views --- web/htdocs/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 00a0801..3bceae3 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -374,10 +374,10 @@ def get_role_permissions(): def load_stars(): - return set(config.load_user_file("favorites", [])) + return set(load_user_file("favorites", [])) def save_stars(stars): - config.save_user_file("favorites", list(stars)) + save_user_file("favorites", list(stars)) # Helper functions def load_user_file(name, deflt, lock = False):

10 years

Check_MK Git: check_mk: Dashlets can now register custom validation functions; Fixed problem with url dashlet validation

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e2f8cc17085d55bca0fd2234c14e9495e4f157d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e2f8cc17085d5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 8 09:28:04 2014 +0200 Dashlets can now register custom validation functions; Fixed problem with url dashlet validation --- web/htdocs/dashboard.py | 1 + web/plugins/dashboard/dashlets.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c75304b..82e6739 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -881,6 +881,7 @@ def page_edit_dashlet(): title = _('Properties'), render = 'form', optional_keys = dashlet_type.get('opt_params'), + validate = dashlet_type.get('validate_params'), elements = params, ) elif type(params) == type(lambda x: x): diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index ea44fad..18f9ec1 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -573,6 +573,12 @@ def dashlet_url(params): if params.get('show_in_iframe', True): return params['url'] +def dashlet_url_validate(value, varprefix): + if 'url' not in value and 'urlfunc' not in value: + raise MKUserError(varprefix, _('You need to provide either an URL or ' + 'the name of a python function to be used ' + 'for rendering the dashlet.')) + dashlet_types["url"] = { "title" : _("Custom URL"), "sort_index" : 80, @@ -580,7 +586,7 @@ dashlet_types["url"] = { "iframe_urlfunc" : dashlet_url, "allowed" : config.builtin_role_ids, "size" : (30, 10), - "parameters" : [ + "parameters" : [ ("url", TextAscii( title = _('URL'), size = 50, @@ -595,5 +601,6 @@ dashlet_types["url"] = { default_value = True, )), ], - "opt_params": ['url', 'urlfunc'], + "opt_params" : ['url', 'urlfunc'], + "validate_params" : dashlet_url_validate, }

10 years

Check_MK Git: check_mk: Dashboard: Better exception handling for dashlet rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: c425cf870216e9f448073f32fefe690a94c30f49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c425cf870216e9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 8 09:15:24 2014 +0200 Dashboard: Better exception handling for dashlet rendering --- web/htdocs/dashboard.py | 78 +++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 81c1610..c75304b 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -482,49 +482,49 @@ def render_dashlet(name, board, nr, dashlet, wato_folder, add_url_vars): bg = "" html.write('<div class="dashlet_inner%s" id="dashlet_inner_%d">' % (bg, nr)) - # Optional way to render a dynamic iframe URL - if "iframe_urlfunc" in dashlet_type: - url = dashlet_type["iframe_urlfunc"](dashlet) - if url != None: - dashlet["iframe"] = url - - elif "iframe_render" in dashlet_type: - dashlet["iframe"] = html.makeuri_contextless([ - ('name', name), - ('id', nr), - ('mtime', board['mtime'])] + add_url_vars, filename = "dashboard_dashlet.py") - - # The content is rendered only if it is fixed. In the - # other cases the initial (re)-size will paint the content. - if "render" in dashlet_type: - try: + try: + # Optional way to render a dynamic iframe URL + if "iframe_urlfunc" in dashlet_type: + url = dashlet_type["iframe_urlfunc"](dashlet) + if url != None: + dashlet["iframe"] = url + + elif "iframe_render" in dashlet_type: + dashlet["iframe"] = html.makeuri_contextless([ + ('name', name), + ('id', nr), + ('mtime', board['mtime'])] + add_url_vars, filename = "dashboard_dashlet.py") + + # The content is rendered only if it is fixed. In the + # other cases the initial (re)-size will paint the content. + if "render" in dashlet_type: render_dashlet_content(nr, dashlet) - except MKUserError, e: - html.write('Problem while rendering the dashlet: %s' % html.attrencode(e)) - except Exception, e: - if config.debug: - import traceback - html.write(traceback.format_exc().replace('\n', '<br>\n')) - else: - html.write('Problem while rendering the dashlet: %s' % html.attrencode(e)) - elif "content" in dashlet: # fixed content - html.write(dashlet["content"]) + elif "content" in dashlet: # fixed content + html.write(dashlet["content"]) - elif "iframe" in dashlet: # fixed content containing iframe - if not dashlet.get("reload_on_resize"): - url = add_wato_folder_to_url(dashlet["iframe"], wato_folder) + elif "iframe" in dashlet: # fixed content containing iframe + if not dashlet.get("reload_on_resize"): + url = add_wato_folder_to_url(dashlet["iframe"], wato_folder) + else: + url = 'about:blank' + + # Fix of iPad >:-P + html.write('<div style="width: 100%; height: 100%; -webkit-overflow-scrolling:touch; overflow: hidden;">') + html.write('<iframe id="dashlet_iframe_%d" allowTransparency="true" frameborder="0" width="100%%" ' + 'height="100%%" src="%s"> </iframe>' % (nr, url)) + html.write('</div>') + if dashlet.get("reload_on_resize"): + html.javascript('reload_on_resize["%d"] = "%s"' % + (nr, add_wato_folder_to_url(dashlet["iframe"], wato_folder))) + except MKUserError, e: + html.write('Problem while rendering the dashlet: %s' % html.attrencode(e)) + except Exception, e: + if config.debug: + import traceback + html.write(traceback.format_exc().replace('\n', '<br>\n')) else: - url = 'about:blank' - - # Fix of iPad >:-P - html.write('<div style="width: 100%; height: 100%; -webkit-overflow-scrolling:touch; overflow: hidden;">') - html.write('<iframe id="dashlet_iframe_%d" allowTransparency="true" frameborder="0" width="100%%" ' - 'height="100%%" src="%s"> </iframe>' % (nr, url)) - html.write('</div>') - if dashlet.get("reload_on_resize"): - html.javascript('reload_on_resize["%d"] = "%s"' % - (nr, add_wato_folder_to_url(dashlet["iframe"], wato_folder))) + html.write('Problem while rendering the dashlet: %s' % html.attrencode(e)) html.write("</div></div>\n")

10 years

Check_MK Git: check_mk: Fixed fatal exception since latest changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 26fe51c201c44bb1ce3e1820aa31a88295a8c7e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26fe51c201c44b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 8 09:02:17 2014 +0200 Fixed fatal exception since latest changes --- web/htdocs/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index eeeb2be..f90fbce 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -38,7 +38,7 @@ import livestatus import defaults, config, login, userdb, hooks, visuals, default_permissions try: import reporting -except 1: +except: reporting = None from html_mod_python import *

10 years

Check_MK Git: check_mk: Finished abstraction of Add-To-Dashboard popup

by Mathias Kettner

Module: check_mk Branch: master Commit: 8a7e7b1c8fc55dc76332013250d603992725a6d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a7e7b1c8fc55d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 22:54:27 2014 +0200 Finished abstraction of Add-To-Dashboard popup --- web/htdocs/dashboard.py | 52 +++++++++++----------------------------------- web/htdocs/index.py | 2 +- web/htdocs/js/checkmk.js | 3 ++- web/htdocs/views.py | 3 +++ web/htdocs/visuals.py | 51 ++++++++++++++++++++++++++++++++------------- 5 files changed, 55 insertions(+), 56 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 0118708..81c1610 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1068,55 +1068,27 @@ def add_dashlet(dashlet, dashboard): dashboard['mtime'] = int(time.time()) visuals.save('dashboards', dashboards) -def popup_add_dashlet(): +def popup_add_dashlet(dashboard_name, dashlet_type, context, params): if not config.may("general.edit_dashboards"): - raise MKAuthException(_("You are not allowed to edit dashboards.")) - - dashboard_name = html.var('name') - if not dashboard_name: - raise MKGeneralException(_('The name of the dashboard is missing.')) + # Exceptions do not work here. + return load_dashboards() if dashboard_name not in available_dashboards: - raise MKGeneralException(_('The requested dashboard does not exist.')) - + return dashboard = load_dashboard_with_cloning(dashboard_name) + dashlet = default_dashlet_definition(dashlet_type) + + dashlet["context"] = context + if dashlet_type == 'view': + view_name = params['name'] + else: + dashlet.update(params) - ty = html.var('type') - if not ty: - raise MKGeneralException(_('The type of the dashlet is missing.')) - - dashlet_type = dashlet_types[ty] - - dashlet = default_dashlet_definition(ty) - - # Parse context and params - view_name = None - for what in [ 'context', 'params' ]: - val = html.var(what) - data = {} - if val == None: - raise MKGeneralException(_('Unable to parse the dashlet parameter "%s".') % what) - elif val == '': - dashlet[what] = {} - continue # silently skip empty vars - - for entry in val.split('|'): - key, vartype, val = entry.split(':', 2) - if vartype == 'number': - val = int(val) - data[key] = val - - if what == 'context': - dashlet[what] = data - else: - if ty == 'view': - view_name = data['name'] - dashlet.update(data) # When a view shal be added to the dashboard, load the view and put it into the dashlet - if ty == 'view': + if dashlet_type == 'view': # save the original context and override the context provided by the view context = dashlet['context'] load_view_into_dashlet(dashlet, len(dashboard['dashlets']), view_name) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index f90fbce..eeeb2be 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -38,7 +38,7 @@ import livestatus import defaults, config, login, userdb, hooks, visuals, default_permissions try: import reporting -except: +except 1: reporting = None from html_mod_python import * diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 3799845..e09073c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2276,5 +2276,6 @@ function add_to_visual(visual_type, name) add_visual_data = null; // After adding a dashlet, go to the choosen dashboard - window.location.href = response; + if (response) + window.location.href = response; } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 94e9280..7e276d6 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1896,6 +1896,9 @@ def ajax_export(): view["public"] = True html.write(pprint.pformat(available_views)) +def get_view_by_name(view_name): + load_views() + return available_views[view_name] #. # .--Plugin Helpers------------------------------------------------------. diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 081eee1..2a2636c 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -239,7 +239,10 @@ def available(what, all_visuals): # | Show a list of all visuals with actions to delete/clone/edit | # '----------------------------------------------------------------------' -def page_list(what, title, visuals, custom_columns = [], render_custom_buttons=None): +def page_list(what, title, visuals, custom_columns = [], + render_custom_buttons = None, + render_custom_columns = None): + what_s = what[:-1] if not config.may("general.edit_" + what): raise MKAuthException(_("Sorry, you lack the permission for editing this type of visuals.")) @@ -271,23 +274,23 @@ def page_list(what, title, visuals, custom_columns = [], render_custom_buttons=N custom = [] builtin = [] - for (owner, visualname) in keys_sorted: - if owner == "" and not config.may("%s.%s" % (what_s, visualname)): + for (owner, visual_name) in keys_sorted: + if owner == "" and not config.may("%s.%s" % (what_s, visual_name)): continue # not allowed to see this view - visual = visuals[(owner, visualname)] + visual = visuals[(owner, visual_name)] if owner == config.user_id or \ (visual["public"] and owner != '' and config.user_may(owner, "general.publish_" + what)): - custom.append((owner, visualname, visual)) + custom.append((owner, visual_name, visual)) elif visual["public"] and owner == "": - builtin.append((owner, visualname, visual)) + builtin.append((owner, visual_name, visual)) for title, items in [ (_('Custom'), custom), (_('Builtin'), builtin) ]: html.write('<h3>' + title + '</h3>') table.begin(css = 'data', limit = None) - for owner, visualname, visual in items: + for owner, visual_name, visual in items: table.row(css = 'data') # Actions @@ -295,33 +298,33 @@ def page_list(what, title, visuals, custom_columns = [], render_custom_buttons=N # Edit if owner == config.user_id: - html.icon_button("edit_%s.py?load_name=%s" % (what_s, visualname), _("Edit"), "edit") + 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([])) clone_url = "edit_%s.py?load_user=%s&load_name=%s&back=%s" \ - % (what_s, owner, visualname, backurl) + % (what_s, owner, visual_name, backurl) html.icon_button(clone_url, buttontext, "clone") # Delete if owner == config.user_id: - html.icon_button(html.makeactionuri([('_delete', visualname)]), + html.icon_button(html.makeactionuri([('_delete', visual_name)]), _("Delete!"), "delete") # Custom buttons - visual specific if render_custom_buttons: - render_custom_buttons(visualname, visual) + render_custom_buttons(visual_name, visual) # visual Name - table.cell(_('ID'), visualname) + table.cell(_('ID'), visual_name) # Title table.cell(_('Title')) title = _u(visual['title']) if not visual["hidden"]: html.write("<a href=\"%s.py?%s=%s\">%s</a>" % - (what_s, visual_types[what]['ident_attr'], visualname, html.attrencode(title))) + (what_s, visual_types[what]['ident_attr'], visual_name, html.attrencode(title))) else: html.write(html.attrencode(title)) html.help(html.attrencode(_u(visual['description']))) @@ -339,6 +342,9 @@ def page_list(what, title, visuals, custom_columns = [], render_custom_buttons=N table.cell(_('Public'), visual["public"] and _("yes") or _("no")) table.cell(_('Hidden'), visual["hidden"] and _("yes") or _("no")) + if render_custom_columns: + render_custom_columns(visual_name, visual) + table.end() html.footer() @@ -1185,5 +1191,22 @@ def ajax_add_visual(): module_name = visual_type["module_name"] visual_module = __import__(module_name) handler = eval("visual_module." + visual_type["add_visual_handler"]) - handler() + element_name = html.var("name") + element_type = html.var("type") + # Context and params are | separated lists of : separated triples + # of name, datatype and value. Datatype is int or string + extra_data = [] + for what in [ 'context', 'params' ]: + value = html.var(what) + data = {} + extra_data.append(data) + if value == '': + continue + for entry in value.split('|'): + key, vartype, value = entry.split(':', 2) + if vartype == 'number': + value = int(value) + data[key] = value + + handler(element_name, element_type, *extra_data)

10 years

Check_MK Git: check_mk: visuals: make popup code for adding generic

by Mathias Kettner

Module: check_mk Branch: master Commit: 418e0dac2c795969bd1a6df921ecc92df7acfa93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=418e0dac2c7959… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 19:35:28 2014 +0200 visuals: make popup code for adding generic --- web/htdocs/dashboard.py | 29 ++++++++------- web/htdocs/htmllib.py | 6 ++-- web/htdocs/js/checkmk.js | 80 +++++++++++++++++++----------------------- web/htdocs/views.css | 29 ++++++--------- web/htdocs/visuals.py | 47 ++++++++++++++++++++++--- web/plugins/pages/shipped.py | 6 ++-- 6 files changed, 112 insertions(+), 85 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=418e0dac2c…

10 years

Check_MK Git: check_mk: Better styling of context/filter editor

by Mathias Kettner

Module: check_mk Branch: master Commit: d7756dfcf4297e835f4b1348805a0bbfb21ec4a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7756dfcf4297e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 18:36:52 2014 +0200 Better styling of context/filter editor --- web/htdocs/valuespec.py | 35 +++++++++++++++++++++++++++++------ web/htdocs/views.css | 24 ++++++++++++++++++++++++ web/htdocs/visuals.py | 2 +- 3 files changed, 54 insertions(+), 7 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index cd6d6fb..95eea18 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -908,6 +908,7 @@ class ListOfMultiple(ValueSpec): self._choice_dict = dict(choices) self._size = kwargs.get("size") self._add_label = kwargs.get("add_label", _("Add element")) + self._delete_style = kwargs.get("delete_style", "default") # or "filter" def del_button(self, varprefix, ident): js = "vs_listofmultiple_del('%s', '%s')" % (varprefix, ident) @@ -921,6 +922,12 @@ class ListOfMultiple(ValueSpec): # here is *not* an option since this might not work in case of # a wrong user input. + # Special styling for filters + if self._delete_style == "filter": + extra_css=" filter" + else: + extra_css="" + # In the 'complain' phase, where the user already saved the # form but the validation failed, we must not display the # original 'value' but take the value from the HTML variables. @@ -933,15 +940,29 @@ class ListOfMultiple(ValueSpec): id = '%s_active' % varprefix, add_var = True) # Actual table of currently existing entries - html.write('<table class="valuespec_listof" id="%s_table">' % varprefix) + html.write('<table class="valuespec_listof%s" id="%s_table">' % (extra_css, varprefix)) + + def render_content(): + html.write('<td class="vlof_content%s">' % extra_css) + vs.render_input(prefix, value.get(ident)) + html.write("</td>") + + def render_del(): + html.write('<td class="vlof_buttons%s">' % extra_css) + self.del_button(varprefix, ident) + html.write('</td>') + for ident, vs in self._choices: cls = ident not in value and 'unused' or '' prefix = varprefix + '_' + ident - html.write('<tr id="%s_row" class="%s"><td class=vlof_buttons>' % (prefix, cls)) - self.del_button(varprefix, ident) - html.write("</td><td class=vlof_content>") - vs.render_input(prefix, value.get(ident)) - html.write("</td></tr>") + html.write('<tr id="%s_row" class="%s">' % (prefix, cls)) + if self._delete_style == "filter": + render_content() + render_del() + else: + render_del() + render_content() + html.write("</tr>") html.write("</table>") html.write("<br>") @@ -949,6 +970,8 @@ class ListOfMultiple(ValueSpec): attrs = {} if self._size != None: attrs["style"] = "width: %dex" % self._size + if self._delete_style == "filter": + attrs["class"] = "vlof_filter" 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) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index d3d0a67..f238ccd 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -124,6 +124,30 @@ div.floatfilter .content .filtertime select { width: 136px; } +/* Improving styling of floatfilters that are contained in a ListOf() */ +table.valuespec_listof.filter { + width: 300px; + border-spacing: 0px; +} +select.vlof_filter { + width: 312px; +} +table.valuespec_listof td.vlof_content.filter { + width: 1px; + border-style: none; +} +table.valuespec_listof td.vlof_buttons.filter { + width: 1px; + border-style: none; +} +table.valuespec_listof td.vlof_buttons.filter img { + position: relative; + top: -18px; + left: -28px; + width: 16px; + height: 16px; +} + table.filtertime td { vertical-align: middle; } diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index fed8282..693c527 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -943,7 +943,7 @@ class VisualFilterList(ListOfMultiple): kwargs.setdefault('title', _('Filters')) kwargs.setdefault('add_label', _('Add filter')) - kwargs.setdefault("size", 50) + kwargs["delete_style"] = "filter" ListOfMultiple.__init__(self, fspecs, **kwargs)

10 years

Check_MK Git: check_mk: This filter just worked in the positive sense, not in the negative or

by Mathias Kettner

Module: check_mk Branch: master Commit: 8daa6355a40a996ce425b857ad5fadb5d4ff4af2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8daa6355a40a99… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 17:57:41 2014 +0200 This filter just worked in the positive sense, not in the negative or in the ignore sense. This has been fixed. --- .werks/1379 | 10 ++++++++++ ChangeLog | 1 + web/plugins/visuals/inventory.py | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/1379 b/.werks/1379 new file mode 100644 index 0000000..74e6964 --- /dev/null +++ b/.werks/1379 @@ -0,0 +1,10 @@ +Title: Fixed filter "Host has inventory data" +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.5i6 +Date: 1412697314 +Class: fix + +This filter just worked in the positive sense, not in the negative or +in the ignore sense. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 554de9d..5bc5c41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -164,6 +164,7 @@ NOTE: Please refer to the migration notes! * 0653 script to extract hw/sw inventory data in csv format... * 0655 FIX: win_cpuinfo and mk_inventory.ps1 agent: unit of CPU speed fixed, fixes for long output lines in agent + * 1379 FIX: Fixed filter "Host has inventory data"... check: * 1384 oracle_jobs: new WATO rules, changed service name to SID.OWNER.NAME... diff --git a/web/plugins/visuals/inventory.py b/web/plugins/visuals/inventory.py index b7701c4..6d96135 100644 --- a/web/plugins/visuals/inventory.py +++ b/web/plugins/visuals/inventory.py @@ -121,7 +121,13 @@ class FilterHasInventory(FilterTristate): return "" # No Livestatus filtering right now def filter_table(self, rows): - return [ row for row in rows if row["host_inventory"] ] + tri = self.tristate_value() + if tri == -1: + return rows + elif tri == 1: + return [ row for row in rows if row["host_inventory"] ] + else: # not + return [ row for row in rows if not row["host_inventory"] ] declare_filter(801, FilterHasInventory())

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits