Checkmk git commits August 2011

checkmk-commits@lists.checkmk.com

3 participants
272 discussions

Check_MK Git: check_mk: FIX: Some reload changes where lost in merge - somehow

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e4f470891fd33da08cc0a22ba6f86f40e6fe8778 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4f470891fd33d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 11:03:52 2011 +0200 FIX: Some reload changes where lost in merge - somehow --- web/htdocs/views.py | 45 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 36 insertions(+), 9 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 3bf420a..56efde2 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1070,12 +1070,31 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # If all display_options are upper case assume all not given values default # to lower-case. Vice versa when all display_options are lower case. # When the display_options are mixed case assume all unset options to be enabled - do_defaults = display_options.isupper() and all_display_options.lower() or all_display_options - for c in do_defaults: - if c.lower() not in display_options.lower(): - display_options += c + def apply_display_option_defaults(opts): + do_defaults = opts.isupper() and all_display_options.lower() or all_display_options + for c in do_defaults: + if c.lower() not in opts.lower(): + opts += c + return opts + + display_options = apply_display_option_defaults(display_options) + # Add the display_options to the html object for later linking etc. html.display_options = display_options + # This is needed for letting only the data table reload. The problem is that + # the data table is re-fetched via javascript call using special display_options + # but these special display_options must not be used in links etc. So we use + # a special var _display_options for defining the display_options for rendering + # the data table to be reloaded. The contents of "display_options" are used for + # linking to other views. + if html.has_var('_display_options'): + display_options = html.var("_display_options", "") + display_options = apply_display_option_defaults(display_options) + + # Below we have the following display_options vars: + # htmk.display_options - Use this when rendering the current view + # html.var("display_options") - Use this for linking to other views + # If display option 'M' is set, then all links are targetet to the 'main' # frame. Also the display options are removed since the view in the main # frame should be displayed in standard mode. @@ -1216,7 +1235,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Show heading (change between "preview" mode and full page mode) if show_heading: # Show/Hide the header with page title, MK logo, etc. - if 'H' in display_options: + if 'H' in display_options: html.body_start(view_title(view)) if 'T' in display_options: html.top_heading(view_title(view)) @@ -1227,10 +1246,10 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru show_context_links(view, hide_filters) need_navi = show_buttons and ( - 'D' in display_options or - 'F' in display_options or - 'C' in display_options or - 'O' in display_options or + 'D' in display_options or + 'F' in display_options or + 'C' in display_options or + 'O' in display_options or 'E' in display_options) if need_navi: html.write("<table class=navi><tr>\n") @@ -1326,6 +1345,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Ende des Bereichs mit den Tabs html.write("</table>\n") # class=navi + # The refreshing content container + if 'R' in display_options: + html.write("<div id=data_container>\n") if not has_done_actions: # Limit exceeded? Show warning @@ -1343,6 +1365,10 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru for sitename, info in html.live.deadsites.items(): html.show_error("<b>%s - Livestatus error</b><br>%s" % (info["site"]["alias"], info["exception"])) + # FIXME: Sauberer wäre noch die Status Icons hier mit aufzunehmen + if 'R' in display_options: + html.write("</div>\n") + if show_footer: pid = os.getpid() if html.live.successfully_persisted(): @@ -1353,6 +1379,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru html.bottom_focuscode() if 'Z' in display_options: html.bottom_footer() + if 'H' in display_options: html.body_end()

13 years, 1 month

Check_MK Git: check_mk: The heder time is now updated again when present

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 07b04e6f7a3a12bc27634a8b5473bffaba67a16b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07b04e6f7a3a12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 09:58:35 2011 +0200 The heder time is now updated again when present --- web/htdocs/htmllib.py | 2 +- web/htdocs/js/check_mk.js | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4183ae6..9efc3e0 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -552,7 +552,7 @@ class html: else: login_text = "not logged in" self.write("<table class=header><tr><td class=left>%s</td><td class=right>" - "%s     <b class=headertime>%s</b> <a href=\"http://mathias-kettner.de\"><img src=\"images/mk_logo_small.gif\"/></a></td></tr></table>" % + "%s     <b id=headertime>%s</b> <a href=\"http://mathias-kettner.de\"><img src=\"images/mk_logo_small.gif\"/></a></td></tr></table>" % (title, login_text, time.strftime("%H:%M"))) self.write("<hr class=header>\n") diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 9da51f5..21ead5b 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -597,6 +597,29 @@ function startReloadTimer(url) { gReloadTimer = setTimeout("handleReload('" + url + "')", Math.ceil(parseFloat(gReloadTime) * 1000)); } +function updateHeaderTime() { + var oTime = document.getElementById('headertime'); + if(!oTime) + return; + + var t = new Date(); + + var hours = t.getHours(); + if(hours < 10) + hours = "0" + hours; + + var min = t.getMinutes(); + if(min < 10) + min = "0" + min; + + oTime.innerHTML = hours + ':' + min + + min = null; + hours = null; + t = null; + oTime = null; +} + function handleContentReload(_unused, code) { var o = document.getElementById('data_container'); o.innerHTML = code; @@ -618,6 +641,9 @@ function handleContentReload(_unused, code) { } } + // Update the header time + updateHeaderTime(); + aScripts = null; o = null; startReloadTimer('');

13 years, 1 month

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: cd4770cb80857daa11e149f7f88d826897e46886 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd4770cb80857d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 09:59:13 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk into reload Conflicts: ChangeLog ---

13 years, 1 month

Check_MK Git: check_mk: Added error handler for view update

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c241a1b6562e71656c420f174ac37ab52d92d8c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c241a1b6562e71… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 10:40:18 2011 +0200 Added error handler for view update --- web/htdocs/js/check_mk.js | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index d8246e0..cee3b14 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -608,26 +608,17 @@ function startReloadTimer(url) { gReloadTimer = setTimeout("handleReload('" + url + "')", Math.ceil(parseFloat(gReloadTime) * 1000)); } +function handleContentReloadError(data, statusCode) { + var o = document.getElementById('data_container'); + o.innerHTML = '<div class=error>Update failed (' + statusCode + + '). The shown data might be outdated</div>' + o.innerHTML; + o = null; +} + function handleContentReload(_unused, code) { var o = document.getElementById('data_container'); o.innerHTML = code; - - // Need to fix javascript execution in innerHTML - var aScripts = o.getElementsByTagName('script'); - for(var i in aScripts) { - if(aScripts[i].src && aScripts[i].src !== '') { - var oScr = document.createElement('script'); - oScr.src = aScripts[i].src; - document.body.appendChild(oScr); - oScr = null; - } else { - try { - eval(aScripts[i].text); - } catch(e) { - alert(" Script error: " + aScripts[i].text); - } - } - } + executeJS('data_container'); aScripts = null; o = null; @@ -662,7 +653,7 @@ function handleReload(url) { var url = makeuri(params); display_options = null; - get_url(url, handleContentReload, ''); + get_url(url, handleContentReload, '', handleContentReloadError); url = null; } }

13 years, 1 month

Check_MK Git: check_mk: Merge branch 'reload'

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9dbdb800a574925ddeede158aab23ac8ce58200f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dbdb800a57492… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 10:46:33 2011 +0200 Merge branch 'reload' Conflicts: ChangeLog web/htdocs/js/check_mk.js ---

13 years, 1 month

Check_MK Git: check_mk: Open tabs in views do not prevent reloading the displayed data anymore

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f0efd3336b6961e86ed6bd7051f4d656e6ef478c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0efd3336b6961… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 09:37:54 2011 +0200 Open tabs in views do not prevent reloading the displayed data anymore --- ChangeLog | 4 ++++ web/htdocs/js/check_mk.js | 11 ----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a621f0..dedb5bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.11i4 + Multisite: + * Open tabs in views do not prevent reloading the displayed data anymore + 1.1.11i3: Core, Setup, etc.: * FIX: allow host names to have spaces diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index d8246e0..9da51f5 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -226,8 +226,6 @@ function filter_activation(oid) selectobject = null; } -var gNumOpenTabs = 0; - function toggle_tab(linkobject, oid) { var table = document.getElementById(oid); @@ -235,20 +233,11 @@ function toggle_tab(linkobject, oid) table.style.display = ""; linkobject.setAttribute("className", "left open"); linkobject.setAttribute("class", "left open"); - - // Stop the refresh while at least one tab is open - gNumOpenTabs += 1; - setReload(0); } else { table.style.display = "none"; linkobject.setAttribute("className", "left closed"); linkobject.setAttribute("class", "left closed"); - - // Re-Enable the reload - gNumOpenTabs -= 1; - if(gNumOpenTabs == 0) - setReload(gReloadTime); } table = null; }

13 years, 1 month

Check_MK Git: check_mk: Added temporary workaround for not updated WATO titles in status GUIs

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b2de150d80321a3edc8c0c5261ff66490149eb38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2de150d80321a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 09:28:39 2011 +0200 Added temporary workaround for not updated WATO titles in status GUIs --- web/plugins/views/wato.py | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 4d9bba6..827c13b 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -30,6 +30,9 @@ import wato class FilterWatoFile(Filter): def __init__(self): Filter.__init__(self, "filename", "WATO Folder/File", "host", ["filename"], []) + self.load_wato_data() + + def load_wato_data(self): self.tree = wato.api.get_folder_tree() self.path_to_tree = {} # keep mapping from string-paths to folders/files self.selection = self.folder_selection(self.tree, "", 0) @@ -68,6 +71,14 @@ class FilterWatoFile(Filter): return sel def heading_info(self, info): + # FIXME: There is a problem with caching data and changing titles of WATO files + # Everything is changed correctly but the filter object is stored in the + # global multisite_filters var and self.path_to_tree is not refreshed when + # rendering this title. Thus the threads might have old information about the + # file titles and so on. + # The call below needs to use some sort of indicator wether the cache needs + # to be renewed or not. + self.load_wato_data() current = html.var(self.name) if current and current != "/": return self.path_to_tree.get(current)

13 years, 1 month

Check_MK Git: check_mk: Fixed ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ce069bdf287f6ca8f1bbee8d7ccd82086e28c791 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce069bdf287f6c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 25 10:24:29 2011 +0200 Fixed ChangeLog --- ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d18dd4..214340e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * FIX: WATO filtered status GUIs did not update the title after changing the title of the file/folder in WATO * FIX: Removed new python syntax which is incompatible with old python versions + * Views are not reloaded completely anymore. The data tables are reloaded + on their own. 1.1.11i3: Core, Setup, etc.: @@ -68,8 +70,6 @@ * Added several missing i18n strings in view editor * Views can now be sorted by the users by clicking on the table headers. The user sort options are not persisted. - * Views are not reloaded completely anymore. The data tables are reloaded - on their own. * Perf-O-Meters are now aware if there really is a PNP graph WATO:

13 years, 1 month

Check_MK Git: check_mk: Multisite: avoid if/ then construct that is not working on RedHat 5.6

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 666da84c8a7e71f230f922086125d4c0b81e520a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=666da84c8a7e71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 25 10:06:18 2011 +0200 Multisite: avoid if/then construct that is not working on RedHat 5.6 --- ChangeLog | 4 ++++ web/htdocs/views.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index eed23c3..4390f0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.11i4: + Multisite: + * FIX: avoid if/then construct that is not working on RedHat 5.6 + 1.1.11i3: Core, Setup, etc.: * FIX: allow host names to have spaces diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 3bf420a..f46dacd 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1143,7 +1143,11 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru query = filterheaders + view.get("add_headers", "") # [4] Sorting - use view sorters or url supplied sorters - sorter_list = parse_url_sorters(html.var('sort')) if html.has_var('sort') else view["sorters"] + if html.has_var('sort'): + sorter_list = parse_url_sorters(html.var('sort')) + else: + sorter_list = view["sorters"] + sorters = [ (multisite_sorters[sn], reverse) for sn, reverse in sorter_list ] # [5] Grouping

13 years, 1 month

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: 18cd636ff07d1e82d02e16f59c8c802aebab1273 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18cd636ff07d1e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 25 10:23:32 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog web/htdocs/views.py ---

13 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2011