Checkmk git commits September 2011

checkmk-commits@lists.checkmk.com

3 participants
125 discussions

Check_MK Git: check_mk: Multisite: new view option for showing checkboxes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59eeeaf777f78bdc39538e1981c21d9f901dc928 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59eeeaf777f78b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 16:28:34 2011 +0200 Multisite: new view option for showing checkboxes --- web/htdocs/views.py | 63 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 19 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d2d8614..d04e87e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -702,6 +702,9 @@ function toggle_section(nr, oImg) { html.write("<tr><td>%s:</td><td>" % _('Sortable by user')) html.checkbox('user_sortable', True) html.write("</td><tr>\n") + html.write("<tr><td>%s:</td><td>" % _('Show check boxes')) + html.checkbox('show_checkboxes', False) + html.write("</td><tr>\n") html.write("</table>\n") section_footer(sid) @@ -805,6 +808,7 @@ def load_view_into_html_vars(view): html.set_var("mustsearch", view["mustsearch"] and "on" or "") html.set_var("hidebutton", view.get("hidebutton", False) and "on" or "") html.set_var("user_sortable", view.get("user_sortable", True) and "on" or "") + html.set_var("show_checkboxes", view.get("show_checkboxes", False) and "on" or "") # [3] Filters for name, filt in multisite_filters.items(): @@ -905,17 +909,19 @@ def create_view(): except: browser_reload = 0 - play_sounds = html.var("play_sounds", "") != "" - public = html.var("public", "") != "" and config.may("publish_views") - hidden = html.var("hidden", "") != "" - mustsearch = html.var("mustsearch", "") != "" - hidebutton = html.var("hidebutton", "") != "" - column_headers = html.var("column_headers") - user_sortable = html.var("user_sortable") + play_sounds = html.var("play_sounds", "") != "" + public = html.var("public", "") != "" and config.may("publish_views") + hidden = html.var("hidden", "") != "" + mustsearch = html.var("mustsearch", "") != "" + hidebutton = html.var("hidebutton", "") != "" + column_headers = html.var("column_headers") + user_sortable = html.var("user_sortable") + show_checkboxes = html.var("show_checkboxes") + show_filternames = [] hide_filternames = [] hard_filternames = [] - hard_filtervars = [] + hard_filtervars = [] for fname, filt in multisite_filters.items(): usage = html.var("filter_%s" % fname) @@ -1001,6 +1007,7 @@ def create_view(): "play_sounds" : play_sounds, "column_headers" : column_headers, "user_sortable" : user_sortable, + "show_checkboxes" : show_checkboxes, "show_filters" : show_filternames, "hide_filters" : hide_filternames, "hard_filters" : hard_filternames, @@ -1126,8 +1133,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # 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"]) - num_columns = vo.get("num_columns", view.get("num_columns", 1)) - browser_reload = vo.get("refresh", view.get("browser_reload", None)) + num_columns = vo.get("num_columns", view.get("num_columns", 1)) + browser_reload = vo.get("refresh", view.get("browser_reload", None)) + show_checkboxes = vo.get("show_checkboxes", view.get("show_checkboxes", False)) if browser_reload and 'R' in display_options: html.set_browser_reload(browser_reload) @@ -1280,12 +1288,20 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Buttons for view options if 'O' in display_options: # Link for selecting/deselecting all rows - if 'C' in display_options and len(rows) > 0 and config.may("act") and not html.do_actions(): - html.write('<td class="left w30"><a href="javascript:toggle_all_rows()" ' - 'title="%s">%s</a></td>\n' % (_('Toggle all row selections'), _('x'))) + if 'C' in display_options and config.may("act") and not html.do_actions(): + if show_checkboxes: + addclass = " selected" + title = _("Hide check boxes") + uri = html.makeuri([("show_checkboxes", "")]) + else: + addclass = "" + title = _("Show check boxes for selecting specific items for the commands") + uri = html.makeuri([("show_checkboxes", "on")]) + html.write('<td class="left w30%s"><a href="%s" title="%s">%s</a></td>\n' % + (addclass, uri, title, _('X'))) html.write("<td class=minigap></td>\n") - if config.user_may(config.user, "view_option_columns"): + if config.may("view_option_columns"): for col in config.view_option_columns: uri = html.makeuri([("num_columns", col)]) if col == num_columns: @@ -1296,7 +1312,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru (addclass, uri, _('%d column layout') % col, col)) html.write("<td class=minigap></td>\n") - if 'R' in display_options and config.user_may(config.user, "view_option_refresh"): + if 'R' in display_options and config.may("view_option_refresh"): for ref in config.view_option_refreshes: uri = html.makeuri([("refresh", ref)]) if ref == browser_reload or (not ref and not browser_reload): @@ -1369,7 +1385,6 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if not has_done_actions: # Limit exceeded? Show warning html.check_limit(rows, get_limit()) - show_checkboxes = html.var("show_checkboxes", "") != "" layout["render"](rows, view, group_painters, painters, num_columns, show_checkboxes) # Play alarm sounds, if critical events have been displayed @@ -1408,7 +1423,8 @@ def view_options(viewname): v = vo.get(viewname, {}) must_save = False - if config.user_may(config.user, "view_option_refresh"): + # Refresh rate + if config.may("view_option_refresh"): if html.has_var("refresh"): try: v["refresh"] = int(html.var("refresh")) @@ -1418,7 +1434,8 @@ def view_options(viewname): elif "refresh" in v: del v["refresh"] - if config.user_may(config.user, "view_option_columns"): + # Number of columns in layout + if config.may("view_option_columns"): if html.has_var("num_columns"): try: v["num_columns"] = max(1, int(html.var("num_columns"))) @@ -1428,7 +1445,15 @@ def view_options(viewname): elif "num_columns" in v: del v["num_columns"] - if config.user_may(config.user, "painter_options"): + # Show checkboxes for commands + if config.may("act"): + if html.has_var("show_checkboxes"): + v["show_checkboxes"] = html.var("show_checkboxes", "") != "" + must_save = True + elif "show_checkboxes" in v: + del v["show_checkboxes"] + + if config.may("painter_options"): for on, opt in multisite_painter_options.items(): if html.has_var(on): must_save = True

13 years

Check_MK Git: check_mk: Multisite: intermediate multi-row-select-change

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82d3e0925077ed80d89eb092024049c48e7aa044 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82d3e0925077ed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 16:09:38 2011 +0200 Multisite: intermediate multi-row-select-change --- web/htdocs/check_mk.css | 5 +++++ web/htdocs/views.py | 7 ++++--- web/plugins/views/layouts.py | 19 ++++++++++++++----- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index df11129..8f27f4c 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -658,6 +658,11 @@ table.data tr.data td { vertical-align: middle; } +table.data tr.data td.checkbox { + width: 20px; + text-align: center; +} + table.data td.host { border-style: none; font-weight: bold; diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 5c6b8f1..d2d8614 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1369,7 +1369,8 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if not has_done_actions: # Limit exceeded? Show warning html.check_limit(rows, get_limit()) - layout["render"](rows, view, group_painters, painters, num_columns) + show_checkboxes = html.var("show_checkboxes", "") != "" + layout["render"](rows, view, group_painters, painters, num_columns, show_checkboxes) # Play alarm sounds, if critical events have been displayed if 'S' in display_options and view.get("play_sounds"): @@ -1550,7 +1551,7 @@ def show_context_links(thisview, active_filters): active_filter_vars = set([]) for filt in active_filters: for var in filt.htmlvars: - if html.has_var(var) and var not in active_filter_vars: + if html.has_var(var): active_filter_vars.add(var) # sort views after text of possible button (sort buttons after their text) @@ -1584,7 +1585,7 @@ def show_context_links(thisview, active_filters): continue # add context link to this view - if len(used_contextvars) > 0: + if len(used_contextvars): if first: first = False html.begin_context_buttons() diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 9882dc4..09834cb 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -38,7 +38,7 @@ def init_rowselect(): # |____/|_|_| |_|\__, |_|\___| # |___/ # ------------------------------------------------------------------------- -def render_single_dataset(rows, view, group_painters, painters, num_columns): +def render_single_dataset(rows, view, group_painters, painters, num_columns, _ignore_show_checkboxes): for row in rows: register_events(row) # needed for playing sounds @@ -78,7 +78,7 @@ multisite_layouts["dataset"] = { # |____/ \___/_/\_\___|\__,_| # # ------------------------------------------------------------------------- -def render_grouped_boxes(rows, view, group_painters, painters, num_columns): +def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show_checkboxes): # N columns. Each should contain approx the same number of entries groups = [] last_group = None @@ -199,7 +199,7 @@ multisite_layouts["boxed"] = { # |_| |_|_|\___|\__,_| # # ------------------------------------------------------------------------- -def render_tiled(rows, view, group_painters, painters, _ignore_num_columns): +def render_tiled(rows, view, group_painters, painters, _ignore_num_columns, _ignore_show_checkboxes): html.write("<table class=\"data tiled\">\n") last_group = None @@ -284,17 +284,21 @@ multisite_layouts["tiled"] = { # |_|\__,_|_.__/|_|\___| # # ------------------------------------------------------------------------ -def render_grouped_list(rows, view, group_painters, painters, num_columns): +def render_grouped_list(rows, view, group_painters, painters, num_columns, show_checkboxes): html.write("<table class=data>\n") last_group = None trclass = None column = 1 group_open = False num_painters = len(painters) + if show_checkboxes: + num_painters += 1 def show_header_line(): html.write("<tr>") for n in range(1, num_columns + 1): + if show_checkboxes: + html.write("<th></th>") for p in painters: paint_header(view, p) html.write("</tr>\n") @@ -337,7 +341,8 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns): # paint group header group_open = True html.write("<tr class=groupheader>") - html.write("<td class=groupheader colspan=%d><table class=groupheader><tr>" % (num_painters * (num_columns + 2) + (num_columns - 1))) + html.write("<td class=groupheader colspan=%d><table class=groupheader><tr>" % + (num_painters * (num_columns + 2) + (num_columns - 1))) painted = False for p in group_painters: if painted: @@ -390,6 +395,10 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns): trclass = "odd" html.write('<tr class="data %s%d">' % (trclass, state)) + if show_checkboxes: + html.write("<td class=checkbox>") + html.write("<input type=checkbox name=\"172377356\" title=lars hirnibaldi=77 width=88>") + html.write("</td>") for p in painters: paint(p, row, row_id(view, row)) column += 1

13 years

Check_MK Git: check_mk: FIX: Preventing up-then-over effect while loading the dashboard in firefox

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b0d6acc8adfc275ed1f4216a39f91211d00a57b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0d6acc8adfc27… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 10:24:04 2011 +0200 FIX: Preventing up-then-over effect while loading the dashboard in firefox --- ChangeLog | 1 + web/htdocs/check_mk.css | 5 +++-- web/htdocs/js/dashboard.js | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b690a3..32e1fb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * FIX: fix error on comment page caused by missing sorter * FIX: endless javascript when fetching pnp graphs on host/service detail pages * FIX: Not showing the action form in "try" mode of the view editor + * FIX: Preventing up-then-over effect while loading the dashboard in firefox * Added missing i18n strings in command form and list of views * Views are not reloaded completely anymore. The data tables are reloaded on their own. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 5b43013..df11129 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1663,16 +1663,17 @@ div#dashboard { div.dashlet { + position: absolute; padding: 0px; margin: 0px; + display: none; } /* content area of dashlet, if no iframes are used */ div.dashlet div.dashlet_inner { + position: absolute; padding: 0px; margin: 0px; - /* vertical-align: middle; - text-align: center; */ } /* Dashlets with "background" set to True */ diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 72d18bc..b456b38 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -42,10 +42,11 @@ function resize_dashlets(id, code) oDash = document.getElementById("dashlet_" + dashlet[0]); if(oDash) { oDash.style.position = 'absolute'; - oDash.style.left = dashlet[1] + "px"; - oDash.style.top = dashlet[2] + "px"; - oDash.style.width = dashlet[3] + "px"; - oDash.style.height = dashlet[4] + "px"; + oDash.style.display = 'block'; + oDash.style.left = dashlet[1] + "px"; + oDash.style.top = dashlet[2] + "px"; + oDash.style.width = dashlet[3] + "px"; + oDash.style.height = dashlet[4] + "px"; } // resize shadow images

13 years

Check_MK Git: check_mk: Fixed sidebar head styling in chrome

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 15a2f587395910a51f1f9c9a5500387463e7c930 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15a2f587395910… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 09:33:24 2011 +0200 Fixed sidebar head styling in chrome --- web/htdocs/check_mk.css | 15 +++------------ web/htdocs/sidebar.py | 10 +++++----- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 16aa16e..5b43013 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -191,10 +191,11 @@ body.side { background-image: url("images/sidebar_top.png"); } -#side_header a.logo { +#side_header a { display: block; + width: 100%; height: 55px; - width: 270px; + text-decoration: none; } #side_version { @@ -207,16 +208,6 @@ body.side { width: 200px; } -#side_version a { - text-decoration: none; - color: #e8e8e8; -} - -#side_version a:hover { - text-decoration: underline; - color: #fff; -} - /* Scrolling part with snapins */ #side_content { z-index: 5; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 3a8ebf8..3a37d67 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -109,11 +109,11 @@ def save_user_config(user_config): config.save_user_file("sidebar", user_config) def sidebar_head(): - html.write('<a title="%s" target="main" href="%s">' - '<div id="side_header">' - '</div></a>\n' % (_("Go to main overview"), config.start_url)) - html.write('<a target="main" href="%s">' % config.start_url) - html.write('<div id="side_version">%s</div></a>\n' % defaults.check_mk_version) + html.write('<div id="side_header">' + '<a title="%s" target="main" href="%s">' + '<div id="side_version">%s</div>' + '</a>' + '</div>\n' % (_("Go to main overview"), config.start_url, defaults.check_mk_version)) def sidebar_foot(): html.write('<div id="side_footer">')

13 years

Check_MK Git: check_mk: Added idkeys to bi datasources

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f7ed9484502208f3527858ab612b863580d00cfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7ed9484502208… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 08:56:58 2011 +0200 Added idkeys to bi datasources --- web/plugins/views/bi.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index dcab308..7bb3582 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -39,6 +39,7 @@ multisite_datasources["bi_aggregations"] = { "table" : bi.table, "infos" : [ "aggr" ], "keys" : [], + "idkeys" : [ 'aggr_name' ], } multisite_datasources["bi_host_aggregations"] = { @@ -46,6 +47,7 @@ multisite_datasources["bi_host_aggregations"] = { "table" : bi.host_table, "infos" : [ "host", "aggr" ], "keys" : [], + "idkeys" : [ 'aggr_name' ], } # ____ _ _

13 years

Check_MK Git: check_mk: Fixed i18n string syntax error

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f5687e7a6527ffdd2473d73123af9e29a63c9b96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5687e7a6527ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 08:39:02 2011 +0200 Fixed i18n string syntax error --- web/htdocs/views.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4f1cde4..5c6b8f1 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1847,7 +1847,7 @@ def show_action_form(is_open, datasource): elif what == "comment": show_comment_actions() else: - html.write("<tr><td>"+_('No commands possible for %ss')+"</td></tr>" % what) + html.write("<tr><td>"+ _('No commands possible for %ss') % what +"</td></tr>") html.write("</table></div>\n") html.end_form()

13 years

Check_MK Git: check_mk: FIX: Added idkeys columns to livestatus query

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 26d2c793505c4aa95c45418696642bf29d93e698 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26d2c793505c4a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 08:37:09 2011 +0200 FIX: Added idkeys columns to livestatus query --- web/htdocs/views.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 3e2f2c4..4f1cde4 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1195,6 +1195,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Add key columns, needed for executing commands columns += datasource["keys"] + # Add idkey columns, needed for identifying the row + columns += datasource["idkeys"] + # Make column list unique and remove (implicit) site column colset = set(columns) if "site" in colset:

13 years

Check_MK Git: check_mk: Host comments have red backgrounded rows when host is down

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf89c9eccdd8d7a2d4ce2f3f62231f3fb084022c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf89c9eccdd8d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 15:22:37 2011 +0200 Host comments have red backgrounded rows when host is down --- .bugs/163 | 11 ++++++++--- .bugs/199 | 11 ++++++++--- .bugs/222 | 10 +++++++--- ChangeLog | 1 + web/htdocs/views.py | 2 +- web/plugins/views/layouts.py | 6 +++++- 6 files changed, 30 insertions(+), 11 deletions(-) diff --git a/.bugs/163 b/.bugs/163 index 247510f..581a30e 100644 --- a/.bugs/163 +++ b/.bugs/163 @@ -1,10 +1,11 @@ Title: backgrounds in downtime view not shown for host downtimes Component: multisite +State: done +Class: nastiness +Date: 2011-03-01 14:42:34 Benefit: 2 -State: open Cost: 4 -Date: 2011-03-01 14:42:34 -Class: nastiness +Fun: 0 The problem is that the host_state is not fetched via livestatus. These code parts were written by sir hack-a-lot ;-). This would workaround the problem and bring the color to the host columns . And the host_state and host_has_been_checked columns are fetched from much more views (maybe useless in most cases). @@ -75,3 +76,7 @@ index 135b1ed..6a870d1 100644 html.write('<tr class="data %s%d">' % (trclass, state)) for p in painters: + +2011-09-05 15:21:28: changed state open -> done +Background color is correctly shown for host rows e.g. in "Comments" view +for example when a host is DOWN the row has lightred background diff --git a/.bugs/199 b/.bugs/199 index 6b3d660..948b214 100644 --- a/.bugs/199 +++ b/.bugs/199 @@ -1,11 +1,16 @@ Title: <ENTER> im view editor sollte Formular abschicken Component: multisite +State: done +Class: cleanup +Date: 2011-08-31 12:56:00 Benefit: 4 -State: open Cost: 1 -Date: 2011-08-31 12:56:00 -Class: cleanup +Fun: 0 Wenn man viel mit Tastaturkürzeln arbeitet, nervt es, dass man im View Editor beim Druck auf <ENTER> immer das Formular nur im "Try" Modus abschickt. Man sollte da das Formular eher ganz abschicken. + +2011-09-05 15:08:25: changed state open -> done +Ist erledigt. Die Reihenfolge der submit Buttons ist hier scheinbar +maßgeblich. diff --git a/.bugs/222 b/.bugs/222 index 9b86204..303b18e 100644 --- a/.bugs/222 +++ b/.bugs/222 @@ -1,10 +1,11 @@ Title: Quicksearch should reload items after Nagios restart Component: multisite +State: done +Class: feature +Date: 2011-03-10 11:07:54 Benefit: 2 -State: open Cost: 3 -Date: 2011-03-10 11:07:54 -Class: feature +Fun: 0 Quicksearch should also do a refresh every 10 Seconds but only retrieve the start time of the nagios sites. These are always available @@ -14,3 +15,6 @@ the last time, all items (hosts, services) should be loaded new. The See Also: should link to all check manpages concerning df.include checks. Also there should be a table of these checks. + +2011-09-05 15:09:55: changed state open -> done +Has already been implemented. diff --git a/ChangeLog b/ChangeLog index 2c02929..9cd5e57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ for actions * Sort titles in views can be enabled by clicking on the whole cells now * Submitting the view editor via ENTER key saves the view now instead of try mode + * Host comments have red backgrounded rows when host is down WATO: * Changed row selection in WATO to new row selection mechanism diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f7f82ad..ac20417 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1616,7 +1616,7 @@ def query_data(datasource, columns, add_columns, add_headers, only_sites = [], l state_columns = [] if "service" in datasource["infos"]: state_columns += [ "service_has_been_checked", "service_state" ] - elif "host" in datasource["infos"]: + if "host" in datasource["infos"]: state_columns += [ "host_has_been_checked", "host_state" ] for c in state_columns: if c not in columns: diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 104f6b4..9882dc4 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -377,7 +377,11 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns): # or host - if available - to color the complete line if num_columns == 1: # render state, if available through whole tr - state = row.get("service_state", 0) + if row.get('service_description', '') == '': + state = row.get("host_state", 0) + if state > 0: state +=1 # 1 is critical for hosts + else: + state = row.get("service_state", 0) else: state = 0 if trclass == "odd":

13 years

Check_MK Git: check_mk: Implemented extra_custom_links to be used in views to register custom context links

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bfa74d8fd4a0602a387cf8620ae5eeb6c397aff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfa74d8fd4a060… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 16:15:50 2011 +0200 Implemented extra_custom_links to be used in views to register custom context links --- ChangeLog | 1 + web/htdocs/views.py | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cd5e57..4b690a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * Sort titles in views can be enabled by clicking on the whole cells now * Submitting the view editor via ENTER key saves the view now instead of try mode * Host comments have red backgrounded rows when host is down + * Implemented extra_custom_links to be used in views to register custom context links WATO: * Changed row selection in WATO to new row selection mechanism diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ac20417..3e2f2c4 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -49,6 +49,7 @@ multisite_sorters = {} multisite_builtin_views = {} multisite_painter_options = {} ubiquitary_filters = [] # Always show this filters +extra_context_links = [] # Load all view plugins def load_plugins(): @@ -1587,6 +1588,30 @@ def show_context_links(thisview, active_filters): vars_values = [ (var, html.var(var)) for var in set(used_contextvars) ] html.context_button(view_linktitle(view), html.makeuri_contextless(vars_values + [("view_name", name)]), view.get("icon")) + # Add the plugin registered context links when the var requirements can be met + # custom context links can be registered in view plugins like this: + # + # def get_my_link_url(view): + # (...) + # return '/url/to/link/to' + # + # extra_context_links = [ + # ([], 'The Title', get_my_link_url, 'map'), + # ] + # + # The first element is a list of required var names to show this button + # The fourth element it the name of the icon (icon_<name>.png) + # + # The url render function needs to return the target URL as string but can + # also return None to disable this link for the current view + for needed_vars, title, url_func, icon in extra_context_links: + miss = [ v for v in needed_vars if v not in active_filter_vars ] + if miss: + break + url = url_func(view) + if url is not None: + html.context_button(title, url, icon) + if not first: html.end_context_buttons()

13 years

Check_MK Git: check_mk: Sort titles in views can be enabled by clicking on the whole cells now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3d984ae9573ff720d2c93caeb2099efff0387fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3d984ae9573ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 14:29:22 2011 +0200 Sort titles in views can be enabled by clicking on the whole cells now --- ChangeLog | 1 + web/htdocs/check_mk.css | 18 +++++++++++------- web/htdocs/views.py | 12 +++++++----- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index a66e5de..fd71f13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * Added missing sorters for "service nth service perfdata" painters * Implemented row selection in views to select only a subset of shown data for actions + * Sort titles in views can be enabled by clicking on the whole cells now WATO: * Changed row selection in WATO to new row selection mechanism diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 96bf4ed..3c71f04 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -619,21 +619,25 @@ table.data th { } /* Table header links (For sorting) */ -table.data th a { - color: #fff; + +table.data th.sort { text-decoration: underline; } -table.data th a:hover { - color: #fff; - text-decoration: none; +table.data th.sort:hover { + background-color: #A4B2B2; + cursor: pointer; +} + +table.data th.sort:hover { + color: #000; } -table.data th a.asc { +table.data th.asc { color: #CBDCF2; } -table.data th a.desc { +table.data th.desc { color: #CBDCF2; } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ad522ba..9fdfb07 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2390,6 +2390,9 @@ def paint_header(view, p): # - Add the display options (Keeping the same display options as current) # - Link to _self (Always link to the current frame) # - Keep the _body_class variable (e.g. for dashlets) + thclass = '' + onclick = '' + title = '' if 'L' in html.display_options \ and view.get('user_sortable', True) \ and get_sorter_name_of_painter(painter) is not None: @@ -2401,12 +2404,11 @@ def paint_header(view, p): if hasattr(html, 'title_display_options'): params.append(('display_options', html.title_display_options)) - t = "<a class=\"%s\" href=\"%s\" title=\"%s\" target=\"_self\">%s</a>" % \ - (get_primary_sorter_order(view, painter), - html.makeuri(params, 'sort'), - _('Sort by %s') % t, t) + thclass = ' class="sort %s"' % get_primary_sorter_order(view, painter) + onclick = ' onclick="location.href=\'%s\'"' % html.makeuri(params, 'sort') + title = ' title="%s"' % (_('Sort by %s') % t) - html.write("<th>%s</th>" % t) + html.write("<th%s%s%s>%s</th>" % (thclass, onclick, title, t)) def register_events(row): if config.sounds != []:

13 years

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2011