Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

Check_MK Git: check_mk: New view setting for page header: repeat.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 828dede6f01e3cfa50fe0ea87327a388db51aa04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=828dede6f01e3c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 27 15:36:04 2012 +0200 New view setting for page header: repeat. --- ChangeLog | 2 ++ web/htdocs/views.py | 2 +- web/plugins/views/layouts.py | 42 +++++++++++++++++++++++++----------------- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee87ca6..2797dad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ editing views * FIX: Fixed login redirection problem after relogging * Filter for times now accept ranges (from ... until) + * New view setting for page header: repeat. This repeats the + column headers every 20'th row. Checks & Agents: * FIX: Made logwatch parsing mechanism a little more robust diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f88befc..f139fa8 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -718,7 +718,7 @@ function toggle_section(nr, oImg) { html.select("column_headers", [ ("off", _("off")), - ("pergroup", _("once per group"), + ("pergroup", _("once per group")), ("repeat", _("repeat every 20'th row")) ]) html.write("</td><tr>\n") diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index d5d7acf..b5d9585 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -111,6 +111,9 @@ multisite_layouts["dataset"] = { # # ------------------------------------------------------------------------- def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show_checkboxes): + + repeat_heading_every = 20 # in case column_headers is "repeat" + # N columns. Each should contain approx the same number of entries groups = [] last_group = None @@ -159,7 +162,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show # render one group - def render_group(header, rows, paintheader): + def render_group(header, rows): html.write("<table class=groupheader><tr class=groupheader>") painted = False for p in group_painters: @@ -171,8 +174,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show html.write("<div class=tableshadow><table class=data>") trclass = None - # paint table headers, if configured - if paintheader: + def show_header_line(): html.write("<tr>") if show_checkboxes: render_group_checkbox_th() @@ -181,7 +183,17 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show html.write("\n") html.write("</tr>\n") + column_headers = view.get("column_headers") + if column_headers: + show_header_line() + + visible_row_number = 0 for index, row in rows: + if view.get("column_headers") == "repeat": + if visible_row_number > 0 and visible_row_number % repeat_heading_every == 0: + show_header_line() + visible_row_number += 1 + register_events(row) # needed for playing sounds if trclass == "odd": trclass = "even" @@ -203,21 +215,11 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show init_rowselect() # render table - if view.get("column_headers") != "off": - headerswitch = -1 - else: - headerswitch = 0 - html.write("<table class=boxlayout><tr>") for column in columns: html.write("<td class=boxcolumn>") for header, rows in column: - if headerswitch: - paintheader = True - headerswitch -= 1 - else: - paintheader = False - render_group(header, rows, paintheader) + render_group(header, rows) html.write("</td>") html.write("</tr></table>\n") @@ -327,6 +329,9 @@ multisite_layouts["tiled"] = { # # ------------------------------------------------------------------------ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_checkboxes): + + repeat_heading_every = 20 # in case column_headers is "repeat" + html.write("<table class=data>\n") last_group = None trclass = None @@ -401,9 +406,12 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ # paint top, left and right shadows group_rows = count_group_members(row, rows[index:]) - rowspan = 3 + group_rows / num_columns + rowspan = group_rows / num_columns if group_rows % num_columns: rowspan += 1 + if view.get("column_headers") == "repeat": + rowspan += rowspan / repeat_heading_every + rowspan += 3 html.write("<tr>\n") for x in range(0, num_columns): if x > 0: @@ -426,10 +434,10 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ # At the beginning of the line? Beginn new line if column == 1: - visible_row_number += 1 if view.get("column_headers") == "repeat": - if visible_row_number % 20 == 0: + if visible_row_number > 0 and visible_row_number % repeat_heading_every == 0: show_header_line() + visible_row_number += 1 # In one-column layout we use the state of the service # or host - if available - to color the complete line

12 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of /var/www/80/git. mathias-kettner.de/check_mk

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: f69582c789792146ac8fa6a8001c9e2894c31947 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f69582c7897921… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 27 14:09:31 2012 +0200 Merge branch 'master' of /var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Start implementing repeated column headers

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1f87ef91cf688d101f834a2ca84a0d08f13a0c7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f87ef91cf688d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 27 14:09:28 2012 +0200 Start implementing repeated column headers --- web/htdocs/views.py | 6 +++++- web/plugins/views/layouts.py | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d4f48af..3b65753 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -712,7 +712,11 @@ function toggle_section(nr, oImg) { if html.var("column_headers") == 'perpage': html.set_var("column_headers", 'pergroup') - html.select("column_headers", [ ("off", _("off")), ("pergroup", _("once per group")) ]) + html.select("column_headers", [ + ("off", _("off")), + ("pergroup", _("once per group"), + ("repeat", _("repeat every 20'th row")) ]) + html.write("</td><tr>\n") html.write("<tr><td>%s:</td><td>" % _('Sortable by user')) html.checkbox('user_sortable', True) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index e19a364..d5d7acf 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -367,6 +367,7 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ index = 0 + visible_row_number = 0 for row in rows: register_events(row) # needed for playing sounds # Show group header, if a new group begins. But only if grouping @@ -386,6 +387,7 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ # paint group header group_open = True + visible_row_number = 0 html.write("<tr class=groupheader>") html.write("<td class=groupheader colspan=%d><table class=groupheader><tr>" % (num_painters * (num_columns + 2) + (num_columns - 1))) @@ -424,6 +426,11 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ # At the beginning of the line? Beginn new line if column == 1: + visible_row_number += 1 + if view.get("column_headers") == "repeat": + if visible_row_number % 20 == 0: + show_header_line() + # In one-column layout we use the state of the service # or host - if available - to color the complete line if num_columns == 1:

12 years, 2 months

Check_MK Git: check_mk: WATO: check box toggling takes failed into account

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 85c56d10f9ec8cd952d340474fc9e93aa6d041f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85c56d10f9ec8c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 27 13:47:25 2012 +0200 WATO: check box toggling takes failed into account --- web/htdocs/js/checkmk.js | 32 ++++++++++++++++++++++---------- web/htdocs/wato.py | 8 +++++++- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index b7c14fe..f5e816b 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1044,11 +1044,16 @@ function highlight_elem(elem, on) { highlight_elem(childs[i], on); } -function select_all_rows(elems) { +function select_all_rows(elems, only_failed) { + if (typeof only_failed === 'undefined') { + only_failed = false; + } for(var i = 0; i < elems.length; i++) { - elems[i].checked = true; - if(g_selected_rows.indexOf(elems[i].name) === -1) - g_selected_rows.push(elems[i].name); + if (!only_failed || elems[i].classList.contains('failed')) { + elems[i].checked = true; + if (g_selected_rows.indexOf(elems[i].name) === -1) + g_selected_rows.push(elems[i].name); + } } } @@ -1195,16 +1200,23 @@ function toggle_all_rows(obj) { var checkboxes = get_all_checkboxes(obj || document); var all_selected = true; - for(var i = 0; i < checkboxes.length && all_selected == true; i++) - if(g_selected_rows.indexOf(checkboxes[i].name) === -1) + var none_selected = true; + var some_failed = false; + for(var i = 0; i < checkboxes.length; i++) { + if (g_selected_rows.indexOf(checkboxes[i].name) === -1) all_selected = false; + else + none_selected = false; + if (checkboxes[i].classList.contains('failed')) + some_failed = true; + } // Toggle the state - if(all_selected) { + if (all_selected) remove_selected_rows(checkboxes); - } else { - select_all_rows(checkboxes); - } + else + select_all_rows(checkboxes, some_failed && none_selected); + } // Iterates over all the cells of the given checkbox and executes the given diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 187acca..2f99a4b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1228,7 +1228,13 @@ def show_hosts(folder): delete_url = make_action_link([("mode", "folder"), ("_delete_host", hostname)]) html.write('<td class=checkbox>') - html.write("<input type=checkbox name=\"_c_%s\" value=%d />" % (hostname, colspan)) + # Use CSS class "failed" in order to provide information about + # selective toggling inventory-failed hosts for Javascript + if host.get("inventory_failed"): + css_class = "class=failed" + else: + css_class = "" + html.write("<input type=checkbox %s name=\"_c_%s\" value=%d />" % (css_class, hostname, colspan)) html.write('</td>\n') html.write("<td class=buttons>")

12 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: edcb8c1c2ee65b80df59122bd409113fc461a715 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edcb8c1c2ee65b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 27 12:21:35 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: WATO: inventory recursively

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e2e53e15d9bfb9cbae3e93777f19691cbce7662d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2e53e15d9bfb9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 27 12:21:32 2012 +0200 WATO: inventory recursively --- ChangeLog | 3 + web/htdocs/images/button_inventory_failed_hi.png | Bin 0 -> 5017 bytes web/htdocs/images/button_inventory_failed_lo.png | Bin 0 -> 5213 bytes web/htdocs/images/icon_inventory.png | Bin 0 -> 6476 bytes web/htdocs/images/icon_inventory_failed.png | Bin 0 -> 5213 bytes web/htdocs/wato.py | 102 +++++++++++++++++---- 6 files changed, 85 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e2e53e15d9…

12 years, 2 months

Check_MK Git: check_mk: Fix: Megaraid catched wrong output from some versions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ffbe9ef810c1f21448a29802a2a902ed59f4fd04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffbe9ef810c1f2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Apr 26 22:58:38 2012 +0200 Fix: Megaraid catched wrong output from some versions --- checks/megaraid_pdisks | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index 0cdf8c7..6ce5d3d 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -59,7 +59,8 @@ def megaraid_pdisks_parse(info): current_adapter = {} adapters[int(line[1])] = current_adapter elif line[0] == 'dev2enc': - current_adapter[int(line[5])] = int(line[2]) + if line[2].isdigit(): + current_adapter[int(line[5])] = int(line[2]) elif line[0] == 'Adapter' and len(line) == 2: current_adapter = adapters[int(line[1][1:])] # Raute weglassen adapter = int(line[1][1:])

12 years, 2 months

Check_MK Git: check_mk: Better layout of sidebar footer

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7614d76d7fd5c8cb0b5f4480e4942c1d841d8157 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7614d76d7fd5c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 26 18:08:27 2012 +0200 Better layout of sidebar footer --- web/htdocs/js/sidebar.js | 2 +- web/htdocs/sidebar.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 48cf29a..0ec43e4 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -397,7 +397,7 @@ function setSidebarHeight() { if (height == 0) return; - oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 5) + 'px'; + oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 0) + 'px'; oFooter = null; diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 1e9f0c8..a44d87b 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -93,7 +93,7 @@ body.side { position: absolute; bottom: 0; left: 0; - height: 50px; + height: 44px; width: 100%; z-index: 10; background-repeat: no-repeat; @@ -103,7 +103,7 @@ body.side { #side_footer img.iconbutton { position: relative; top: 10px; - left: 10px; + left: 9px; margin-right: 3px; }

12 years, 2 months

Check_MK Git: check_mk: Fixed dimensions of bread crump

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0144276185f3d656cddd75fe3fb96a3bd1a39f13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0144276185f3d6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 26 18:04:23 2012 +0200 Fixed dimensions of bread crump --- web/htdocs/wato.css | 54 ++++++++++++-------------------------------------- web/htdocs/wato.py | 10 ++++++-- 2 files changed, 20 insertions(+), 44 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 94d3a83..826c4bf 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -45,6 +45,7 @@ Boston, MA 02110-1301 USA. /* Tables in WATO are not size to 100% per default */ .wato table.data { + box-shadow: 0 0 3px #334488; width: auto; } .wato table.data th { @@ -259,8 +260,10 @@ table.validationerror img { /* Path to current folder at top of screen */ .wato div.folderpath { - margin-bottom: 10px; + margin-bottom: 8px; height: 30px; + position: relative; + left: 3px; } .wato div.folderpath ul { @@ -303,10 +306,16 @@ table.validationerror img { } .wato div.folderpath li select { - padding-top: 1px; - padding-bottom: 1px; + padding: 2px 0px 2px 4px; background-color: #6da1b8; - color: #000; + margin: 0; + color: #fff; + font-weight: normal; + font-size: 8pt; + border-style: none; + position: relative; + right: -6px; + z-index: 200; } .wato div.folderpath li:hover select { @@ -360,43 +369,6 @@ table.validationerror img { background-image: url('images/breadcrumb_r_hi.png'); } -/*.wato div.folderpath a, .wato div.folderpath b, .wato div.folderpath i { - float: left; -} - -.wato div.folderpath i { - margin: 0px 3px; - font-weight: bold; - font-style: normal; -} - -.wato div.folderpath a, -.wato div.folderpath b { - -moz-border-radius: 3px; - background-color: #8ab; - padding: 2px 9px; - color: #fff; - font-weight: normal; -} -.wato div.folderpath a { - text-decoration: none; -} -.wato div.folderpath a:hover { - color: #fff; - background-color: #9bc; -}*/ - -.wato select.folderpath { - background-color: #8ab; - -moz-border-radius: 3px; - padding: 2px 4px; - margin: 0; - color: #fff; - font-weight: normal; - font-size: 8pt; - border-style: none; -} - .wato div.floatfolder { position: relative; left:-14px; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b165568..06fa96f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -317,7 +317,6 @@ def page_handler(): else: html.context_button(buttontext, make_link([("mode", target)])) html.end_context_buttons() - html.write("<br>") # Show outcome of action if html.has_user_errors(): @@ -10704,6 +10703,7 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo while folder: folders.append(folder) folder = folder.get(".parent") + subfolders = the_folder[".folders"] parts = [] for folder in folders[::-1]: @@ -10715,6 +10715,7 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo else: parts.append(the_folder["title"]) + # Render the folder path html.write("<div class=folderpath><ul>\n") num = 0 @@ -10724,11 +10725,14 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo else: bc_el_start(z_index = 100 + num) html.write('<div class=content>%s</div>\n' % part) - bc_el_end() + + bc_el_end(num == len(parts)-1 + and not ( + len(subfolders) > 0 and not link_to_last) + and "end" or "") num += 1 # Render the current folder when having subfolders - subfolders = the_folder[".folders"] if len(subfolders) > 0 and not link_to_last: bc_el_start(z_index = 100 + num) html.write("<div class=content><form method=GET name=folderpath>")

12 years, 2 months

Check_MK Git: check_mk: Adapted time filters of builtin views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 45a184028c9eeac10f172f1710807770fe5668b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45a184028c9eea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 26 17:39:29 2012 +0200 Adapted time filters of builtin views --- web/plugins/views/builtin.py | 101 +++++++++++++++--------------------------- web/plugins/views/filters.py | 5 ++- 2 files changed, 40 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=45a184028c…

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2012