Checkmk git commits September 2011

checkmk-commits@lists.checkmk.com

3 participants
125 discussions

Check_MK Git: check_mk: Added additional missing localizations when processing commands

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fc2f820775af3f9bc40fa4ed563a7f8cddc314a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc2f820775af3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 14:14:44 2011 +0200 Added additional missing localizations when processing commands --- web/htdocs/views.py | 73 ++++++++++++++++++++++++++------------------------- 1 files changed, 37 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fc2f820775…

13 years

Check_MK Git: check_mk: FIX: Not showing the action form in "try" mode of the view editor

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d98166bc51cbf159c4e18bc8aa2b09d741728fb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d98166bc51cbf1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 14:40:00 2011 +0200 FIX: Not showing the action form in "try" mode of the view editor --- ChangeLog | 1 + web/htdocs/views.py | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd71f13..c7e0b1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * FIX: fix error when using non-Ascii characters in view title * 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 * 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/views.py b/web/htdocs/views.py index 9fdfb07..7d2fb0c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1793,6 +1793,8 @@ def collist_of_collection(collection, join_target = []): def show_action_form(is_open, datasource): if not config.may("act"): return + if html.has_var("try"): + return # We take the first info to be the native data type of this table # and show actions useful for that

13 years

Check_MK Git: check_mk: Submitting the view editor via ENTER key saves the view now instead of try mode

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 78ca5dee87934223d58cb9c8929b94d97f8802a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78ca5dee879342… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 15:07:56 2011 +0200 Submitting the view editor via ENTER key saves the view now instead of try mode --- .bugs/198 | 10 +++++++--- ChangeLog | 1 + web/htdocs/check_mk.css | 5 +++++ web/htdocs/views.py | 6 +++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.bugs/198 b/.bugs/198 index 2f87d06..f869863 100644 --- a/.bugs/198 +++ b/.bugs/198 @@ -1,9 +1,13 @@ Title: "Try" in view editor zeigt Action Formular Component: multisite +State: done +Class: cleanup +Date: 2011-08-31 12:55:15 Benefit: 3 -State: open Cost: 2 -Date: 2011-08-31 12:55:15 -Class: cleanup +Fun: 0 Dort sollte kein Formular angezeigt werden. + +2011-09-05 14:40:10: changed state open -> done +ist erledigt. diff --git a/ChangeLog b/ChangeLog index c7e0b1d..2c02929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 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 + * Submitting the view editor via ENTER key saves the view now instead of try mode 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 3c71f04..16aa16e 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1581,6 +1581,11 @@ div.columneditor td, div.columneditor select { font-size: 0.9em; } +input#try{ + float:left; +} + + /* __ ___ _ _ _ \ \ / (_) _____ _| | (_)___| |_ diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7d2fb0c..f7f82ad 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -706,10 +706,10 @@ function toggle_section(nr, oImg) { html.write('<tr><td class="legend button" colspan=2>') - html.button("try", _("Try out")) - html.write(" ") html.button("save", _("Save")) - html.write("</table>\n") + html.write(" ") + html.button("try", _("Try out")) + html.write("</td></tr></table>\n") html.end_form() html.write("</div></td></tr></table>\n")

13 years

Check_MK Git: check_mk: FIX: endless javascript when fetching pnp graphs on host/service detail pages

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 54a493dbfcdac33c68cbabf0454311c989fe09bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54a493dbfcdac3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 13:16:54 2011 +0200 FIX: endless javascript when fetching pnp graphs on host/service detail pages --- ChangeLog | 1 + web/htdocs/js/check_mk.js | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c121dcb..a66e5de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * FIX: Fixed js errors in IE when having not enough space on dashboard * FIX: fix error when using non-Ascii characters in view title * FIX: fix error on comment page caused by missing sorter + * FIX: endless javascript when fetching pnp graphs on host/service detail pages * 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/js/check_mk.js b/web/htdocs/js/check_mk.js index a19595c..3df1ca8 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -319,15 +319,15 @@ function pnp_error_response_handler(data, statusCode) { function pnp_response_handler(data, code) { var valid_response = true; - var response = null; + var response = []; try { response = eval(code); for(var i = 0; i < response.length; i++) { - var graph = response[i]; var view = data['view'] == '' ? '0' : data['view']; - create_graph(data, '&' + graph['image_url'].replace('&view='+view, '')); - i = null; + create_graph(data, '&' + response[i]['image_url'].replace('&view='+view, '')); } + view = null; + i = null; } catch(e) { valid_response = false; } @@ -339,9 +339,9 @@ function pnp_response_handler(data, code) { // Fallback bei doofer/keiner Antwort function fallback_graphs(data) { - for(var i = 0; i < 8; i++) { - create_graph(data, '&host=' + data['host'] + '&srv=' + data['service'] + '&source=' + i); - } + for(var s = 0; s < 8; s++) { + create_graph(data, '&host=' + data['host'] + '&srv=' + data['service'] + '&source=' + s); + } } function create_graph(data, params) {

13 years

Check_MK Git: check_mk: Top buttons recognizing search filter now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bef81a57d7bf4e94108eb3e4d4134c2a788fd0c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bef81a57d7bf4e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 13:04:03 2011 +0200 Top buttons recognizing search filter now --- web/htdocs/wato.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2fef9db..09342b9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -655,7 +655,8 @@ def mode_file(phase): # a folder information but not yet moved to that folder). If at least # one host has a target folder, then we show an additional bulk action. at_least_one_imported = False - for hostname in hostnames: + more_than_ten_items = False + for num, hostname in enumerate(hostnames): if search_text and (search_text.lower() not in hostname.lower()): continue @@ -665,9 +666,12 @@ def mode_file(phase): if effective.get("imported_folder"): at_least_one_imported = True + if num == 11: + more_than_ten_items = True + # Add the bulk action buttons also to the top of the table when this # list shows more than 10 rows - if len(hostnames) > 10: + if more_than_ten_items: bulk_actions(at_least_one_imported) for hostname in hostnames:

13 years

Check_MK Git: check_mk: Changed row selection in WATO to new row selection mechanism

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8f18f6296452d459a23c7f631fc8a0a70239ce21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f18f6296452d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 12:46:35 2011 +0200 Changed row selection in WATO to new row selection mechanism --- ChangeLog | 1 + web/htdocs/htmllib.py | 10 ++++++++++ web/htdocs/js/check_mk.js | 13 ++++++++++--- web/htdocs/wato.py | 29 ++++++++++++++--------------- web/plugins/views/layouts.py | 12 ++---------- 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0398110..b3ab8c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,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 + * Changed row selection in WATO to new row selection mechanism 1.1.11i3: Core, Setup, etc.: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c9cbc4d..9de3262 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -790,3 +790,13 @@ class html: def end_foldable_container(self): self.write("</ul>") + + def init_rowselect(self): + selected = [] + if self.has_var('selected_rows'): + selected_rows = self.var('selected_rows', '') + if selected_rows or ',' in selected_rows: + selected = selected_rows.split(',') + + self.javascript('g_selected_rows = %s;\n' + 'init_rowselect();' % repr(selected)) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 18272db..a19595c 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -915,7 +915,10 @@ function real_style(obj, attr) { // If elem is a TD and has no background find the backround of the parent // e.g. the TR and then set this color as background for the TD - if(obj.tagName == 'TD' && (st == 'transparent' || st == 'rgba(0, 0, 0, 0)')) + // But only do this when the TR is not in the highlight scope + if(obj.tagName == 'TD' + && obj.parentNode.row_num === undefined + && (st == 'transparent' || st == 'rgba(0, 0, 0, 0)')) st = real_style(obj.parentNode, attr); return st; @@ -1046,7 +1049,9 @@ function toggle_all_rows() { var all_selected = true; for(var i = 0; i < elems.length && all_selected == true; i++) { - if(elems[i].tagName != 'TD' && elems[i].tagName != 'DIV') + if(elems[i].tagName != 'TD' + && elems[i].tagName != 'TR' + && elems[i].tagName != 'DIV') continue; if(g_selected_rows.indexOf(elems[i].row_num) === -1) @@ -1075,7 +1080,9 @@ function table_init_rowselect(oTable) { var childs = document.getElementsByClassName('dr'); for(var i = 0; i < childs.length; i++) { - if(childs[i].tagName != 'TD' && childs[i].tagName != 'DIV') + if(childs[i].tagName != 'TD' + && childs[i].tagName != 'TR' + && childs[i].tagName != 'DIV') continue; var elem = childs[i]; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cd13efa..6f10be4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -621,10 +621,10 @@ def mode_file(phase): # Show table of hosts in this file colspan = 5 - html.begin_form("hosts", None, "POST") + html.begin_form("hosts", None, "POST", onsubmit = 'add_row_selections(this);') html.write("<table class=data>\n") - html.write("<tr><th class=left></th><th></th><th>" + _("Hostname") + "</th>") - + html.write("<tr><th class=left></th><th>" + _("Hostname") + "</th>") + for attr, topic in host_attributes: if attr.show_in_table(): html.write("<th>%s</th>" % attr.title()) @@ -635,7 +635,6 @@ def mode_file(phase): odd = "odd" search_text = html.var("search") - selected_hosts = get_hostnames_from_checkboxes() at_least_one_imported = False for hostname in hostnames: if search_text and (search_text.lower() not in hostname.lower()): @@ -645,15 +644,9 @@ def mode_file(phase): effective = effective_attributes(host, g_file) # Rows with alternating odd/even styles - html.write('<tr class="data %s0">' % odd) + html.write('<tr class="dr_%s dr data %s0">' % (hostname, odd)) odd = odd == "odd" and "even" or "odd" - # Check box (if none is checked, then the default is to check all) - def_value = selected_hosts == [] - html.write("<td class=select>") - html.checkbox("sel_%s" % hostname, def_value, 'wato_select') - html.write("</td>") - # Column with actions (buttons) edit_url = make_link([("mode", "edithost"), ("host", hostname)]) services_url = make_link([("mode", "inventory"), ("host", hostname)]) @@ -697,9 +690,9 @@ def mode_file(phase): # bulk actions - html.write('<tr class="data %s0"><td class=select>' % odd) - html.jsbutton('_markall', 'X', 'javascript:wato_check_all(\'wato_select\');') - html.write("</td><td colspan=%d>" % colspan) + html.write('<tr class="data %s0">' % odd) + html.write("<td colspan=%d>" % colspan) + html.jsbutton('_markall', 'X', 'javascript:toggle_all_rows();') html.write(_("On all selected hosts:\n")) html.button("_bulk_delete", _("Delete")) html.button("_bulk_edit", _("Edit")) @@ -721,16 +714,22 @@ def mode_file(phase): html.hidden_fields() html.end_form() + html.init_rowselect() # Create list of all hosts that are select with checkboxes in the current file def get_hostnames_from_checkboxes(): hostnames = g_hosts.keys() hostnames.sort() + + selected = [] + if html.var('selected_rows', '') != '': + selected = html.var('selected_rows', '').split(',') + selected_hosts = [] search_text = html.var("search") for name in hostnames: if (not search_text or (search_text.lower() in name.lower())) \ - and html.var("sel_" + name): + and name in selected: selected_hosts.append(name) return selected_hosts diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 6f17cc5..104f6b4 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -28,15 +28,7 @@ def init_rowselect(): # Don't make rows selectable when no commands can be fired if not 'C' in html.display_options or not config.may("act"): return - - row_nums = [] - if html.has_var('selected_rows'): - selected_rows = html.var('selected_rows', '') - if selected_rows or ',' in selected_rows: - row_nums = selected_rows.split(',') - - html.javascript('g_selected_rows = %s;\n' - 'init_rowselect();' % repr(row_nums)) + html.init_rowselect() # ------------------------------------------------------------------------- # ____ _ _ @@ -253,7 +245,7 @@ def render_tiled(rows, view, group_painters, painters, _ignore_num_columns): if not group_open: html.write("<tr><td class=tiles>") group_open = True - html.write('<div class="dr_%d dr tile %s"><table>' % (row_id(view, row), sclass)) + html.write('<div class="dr_%s dr tile %s"><table>' % (row_id(view, row), sclass)) # We need at least five painters. empty_painter = { "paint" : (lambda row: ("", "")) }

13 years

Check_MK Git: check_mk: Bulk action buttons are shown at the top of hostlists too when the lists have more than 10 list items

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 566a862ed99219d3ef36033c4133e306aea99077 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=566a862ed99219… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 12:55:55 2011 +0200 Bulk action buttons are shown at the top of hostlists too when the lists have more than 10 list items --- ChangeLog | 4 +++ web/htdocs/wato.py | 56 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3ab8c9..c121dcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,7 +16,11 @@ * Added missing sorters for "service nth service perfdata" painters * Implemented row selection in views to select only a subset of shown data for actions + + WATO: * Changed row selection in WATO to new row selection mechanism + * Bulk action buttons are shown at the top of hostlists too when the lists + have more than 10 list items 1.1.11i3: Core, Setup, etc.: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6f10be4..2fef9db 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -634,7 +634,26 @@ def mode_file(phase): html.write("</tr>\n") odd = "odd" + def bulk_actions(at_least_one_imported): + # bulk actions + html.write('<tr class="data %s0">' % odd) + html.write("<td colspan=%d>" % colspan) + html.jsbutton('_markall', 'X', 'javascript:toggle_all_rows();') + html.write(' ' + _("On all selected hosts:\n")) + html.button("_bulk_delete", _("Delete")) + html.button("_bulk_edit", _("Edit")) + html.button("_bulk_cleanup", _("Cleanup")) + html.button("_bulk_inventory", _("Inventory")) + host_move_combo(None) + if at_least_one_imported: + html.button("_bulk_movetotarget", _("Move to Target Folders")) + html.write("</td></tr>\n") + search_text = html.var("search") + + # Remember if that host has a target folder (i.e. was imported with + # a folder information but not yet moved to that folder). If at least + # one host has a target folder, then we show an additional bulk action. at_least_one_imported = False for hostname in hostnames: if search_text and (search_text.lower() not in hostname.lower()): @@ -643,6 +662,21 @@ def mode_file(phase): host = g_hosts[hostname] effective = effective_attributes(host, g_file) + if effective.get("imported_folder"): + at_least_one_imported = True + + # Add the bulk action buttons also to the top of the table when this + # list shows more than 10 rows + if len(hostnames) > 10: + bulk_actions(at_least_one_imported) + + for hostname in hostnames: + if search_text and (search_text.lower() not in hostname.lower()): + continue + + host = g_hosts[hostname] + effective = effective_attributes(host, g_file) + # Rows with alternating odd/even styles html.write('<tr class="dr_%s dr data %s0">' % (hostname, odd)) odd = odd == "odd" and "even" or "odd" @@ -682,27 +716,7 @@ def mode_file(phase): html.write("</td>") html.write("</tr>\n") - # Remember if that host has a target folder (i.e. was imported with - # a folder information but not yet moved to that folder). If at least - # one host has a target folder, then we show an additional bulk action. - if effective.get("imported_folder"): - at_least_one_imported = True - - - # bulk actions - html.write('<tr class="data %s0">' % odd) - html.write("<td colspan=%d>" % colspan) - html.jsbutton('_markall', 'X', 'javascript:toggle_all_rows();') - html.write(_("On all selected hosts:\n")) - html.button("_bulk_delete", _("Delete")) - html.button("_bulk_edit", _("Edit")) - html.button("_bulk_cleanup", _("Cleanup")) - html.button("_bulk_inventory", _("Inventory")) - host_move_combo(None) - if at_least_one_imported: - html.button("_bulk_movetotarget", _("Move to Target Folders")) - html.write("</td></tr>\n") - + bulk_actions(at_least_one_imported) html.write("</table>\n") # Important: remove selected hosts from the hidden fields. Otherwise

13 years

Check_MK Git: check_mk: Creating pending log entry for changed file/ folder titles

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b1aa4b86b5e7beeee2e882fc821d93c2e2084711 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1aa4b86b5e7be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 12:06:34 2011 +0200 Creating pending log entry for changed file/folder titles --- web/htdocs/wato.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ec33a70..cd13efa 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -379,12 +379,16 @@ def mode_editfolder(phase, what, new): else: new_thing["num_hosts"] = 0 g_files[newpath] = new_thing - + g_folder["." + what + "s"][name] = new_thing log_audit(new_thing, "new-" + what, _("Created new %s %s") % (the_what, title)) call_hook_file_or_folder_created(what, new_thing) else: + if the_thing["title"] != title: + log_pending(the_thing, "edit-" + what, _("Changed title of %s from \"%s\" to \"%s\"") % + (the_what, the_thing["title"], title)) + the_thing["title"] = title the_thing["roles"] = roles the_thing["attributes"] = attributes

13 years

Check_MK Git: check_mk: Added uniq key generator for indentifying the data rows (e.g. used in row selection)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0fa2a7215d4f83385585442c50d7bec127ace7e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fa2a7215d4f83… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 11:26:32 2011 +0200 Added uniq key generator for indentifying the data rows (e.g. used in row selection) --- web/htdocs/js/check_mk.js | 5 +++-- web/htdocs/views.py | 36 ++++++++++++++++++++++++------------ web/plugins/views/datasources.py | 32 ++++++++++++++++++++++++-------- web/plugins/views/layouts.py | 12 ++++++------ 4 files changed, 57 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0fa2a7215d…

13 years

Check_MK Git: check_mk: Dont make rows selectable when no commands can be fired

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4a91624fd6bcba64dc214b9058cfabba3464541 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4a91624fd6bcb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 10:17:46 2011 +0200 Dont make rows selectable when no commands can be fired --- web/plugins/views/layouts.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 5c8a98b..09c710a 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -25,6 +25,10 @@ # Boston, MA 02110-1301 USA. def init_rowselect(): + # Don't make rows selectable when no commands can be fired + if not 'C' in html.display_options or not config.may("act"): + return + row_nums = [] if html.has_var('selected_rows'): selected_rows = html.var('selected_rows', '')

13 years

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2011