Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

Added descriptions to some of the graphing units

by Mathias Kettner

Module: check_mk Branch: master Commit: 33d3a1ac147d3842da6f544f8edfc26b6a715bb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33d3a1ac147d38… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 27 13:50:37 2016 +0100 Added descriptions to some of the graphing units --- web/plugins/metrics/check_mk.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 7563d30..b3eed41 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -47,6 +47,7 @@ unit_info[""] = { "title" : "", + "description" : _("Floating point numnber"), "symbol" : "", "render" : lambda v: "%.1f" % v, } @@ -61,6 +62,7 @@ unit_info["count"] = { # value ranges from 0.0 ... 100.0 unit_info["%"] = { "title" : _("%"), + "description" : _("Percentage (0...100)"), "symbol" : _("%"), "render" : lambda v: percent_human_redable(v, 3), } @@ -68,6 +70,7 @@ unit_info["%"] = { # Similar as %, but value ranges from 0.0 ... 1.0 unit_info["ratio"] = { "title" : _("%"), + "description" : _("Percentage given in range (0...1)"), "symbol" : _("%"), "render_scale" : 100.0, # Scale by this before rendering if "render" not being used "render" : lambda v: percent_human_redable(v, 3), @@ -75,6 +78,7 @@ unit_info["ratio"] = { unit_info["s"] = { "title" : _("sec"), + "description" : _("Timespan or Duration in seconds"), "symbol" : _("s"), "render" : age_human_readable, "stepping" : "time", # for vertical graph labels @@ -82,6 +86,7 @@ unit_info["s"] = { unit_info["1/s"] = { "title" : _("per second"), + "description" : _("Frequency (displayed in events/s)"), "symbol" : _("/s"), "render" : lambda v: "%s%s" % (drop_dotzero(v), _("/s")), } @@ -89,6 +94,7 @@ unit_info["1/s"] = { unit_info["hz"] = { "title" : _("Hz"), "symbol" : _("Hz"), + "description" : _("Frequency (displayed in Hz)"), "render" : lambda v : physical_precision(v, 3, _("Hz")), }

8 years, 7 months

Edit host form: prevent browser completion of SNMP community field

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c2a0707d655e931572214a1403c0ea18ce59a84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c2a0707d655e9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 13:29:26 2016 +0100 Edit host form: prevent browser completion of SNMP community field --- web/htdocs/wato.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index af074fd..23e57bb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1275,6 +1275,7 @@ def mode_edit_host(phase, new, is_cluster): html.write("<div class=info>" + lock_message + "</div>") html.begin_form("edit_host", method="POST") + html.prevent_password_auto_completion() # host name forms.header(_("General Properties"))

8 years, 7 months

#2971 FIX heartbeat_crm: Is now compatible with more forms of crm_mon output formats

by Lars Michelsen

Module: check_mk Branch: master Commit: 7fb74461f62db455378ed2e47c85391361ce3194 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fb74461f62db4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 13:21:05 2016 +0100 #2971 FIX heartbeat_crm: Is now compatible with more forms of crm_mon output formats --- .werks/2971 | 9 +++++++++ ChangeLog | 1 + checks/heartbeat_crm | 19 ++++++++++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.werks/2971 b/.werks/2971 new file mode 100644 index 0000000..755c9e4 --- /dev/null +++ b/.werks/2971 @@ -0,0 +1,9 @@ +Title: heartbeat_crm: Is now compatible with more forms of crm_mon output formats +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453897233 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2dda256..49f7d06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -224,6 +224,7 @@ * 2962 FIX: esx_vsphere_vm.guest_tools: Fixed exception in case no version info is available * 2963 FIX: esx_vsphere_datastores: Deal with empty url attribute of datastores * 2983 FIX: netapp_api_disk: fixed exception when disks were not included in the raid... + * 2971 FIX: heartbeat_crm: Is now compatible with more forms of crm_mon output formats Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index 5070704..d8bde4e 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -75,10 +75,23 @@ def heartbeat_crm_parse_general(info): num_nodes = None num_resources = None for line in info: - if ' '.join(line[0:2]) == 'Last updated:': - last_updated = ' '.join(line[2:]) - elif ' '.join(line[0:2]) == 'Current DC:': + line_txt = ' '.join(line) + + if line_txt.startswith("Last updated:"): + if "Last change:" in line_txt: + # Some versions seem to combine both lines + last_updated = line_txt[:line_txt.index("Last change:")].split(": ")[1].strip() + else: + last_updated = ' '.join(line[2:]) + + elif line_txt.startswith('Current DC:'): dc = line[2] + + elif "nodes and" in line_txt and "resources configured" in line_txt: + # Some versions put number of nodes and resources in one line + num_nodes = int(line[0]) + num_resources = int(line[3]) + elif ' '.join(line[1:3]).rstrip('.,') == 'Nodes configured': num_nodes = int(line[0]) elif ' '.join(line[1:3]).rstrip('.,') == 'Resources configured':

8 years, 7 months

Cleanup ; Fixed bug in previous change

by Lars Michelsen

Module: check_mk Branch: master Commit: ed3fea7ab39e39f13088202ae3a494f84272a865 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed3fea7ab39e39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 13:28:00 2016 +0100 Cleanup ; Fixed bug in previous change --- web/htdocs/sidebar.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 55bc832..1a9fd21 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -306,14 +306,15 @@ def render_snapin(name, state): html.write("<div id=\"snapin_container_%s\" class=snapin>\n" % name) # When not permitted to open/close snapins, the snapins are always opened - if state == "closed" and config.may("general.configure_sidebar"): - style = ' style="display:none"' - headclass = "closed" - minimaxi = "maxi" - else: + if state == "open" or not config.may("general.configure_sidebar"): style = "" headclass = "open" minimaxi = "mini" + else: + style = ' style="display:none"' + headclass = "closed" + minimaxi = "maxi" + toggle_url = "sidebar_openclose.py?name=%s&state=" % name html.write('<div class="head %s" ' % headclass) @@ -344,7 +345,7 @@ def render_snapin(name, state): if config.may("general.configure_sidebar"): toggle_actions = " onclick=\"toggle_sidebar_snapin(this,'%s')\"" \ " onmouseover=\"this.style.cursor='pointer'\"" \ - " onmouseout=\"this.style.cursor='auto'" % toggle_url + " onmouseout=\"this.style.cursor='auto'\"" % toggle_url else: toggle_actions = "" html.write("<b class=heading%s>%s</b>" % (toggle_actions, snapin["title"]))

8 years, 7 months

Add central default render options for graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: e1c5834969b21d9497419fe1b8f3a7c5f99ad7a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1c5834969b21d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 27 12:40:46 2016 +0100 Add central default render options for graphs --- web/plugins/views/painters.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 04a5598..d06ee7b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -876,19 +876,8 @@ def paint_time_graph_cmk(row, show_timeranges=False): "host_name" : row["host_name"], "service_description" : row.get("service_description", "_HOST_"), }) - - graph_data_range = { - "time_range" : get_graph_timerange_from_painter_options() - } - - graph_render_options = { - "font_size" : 11, - "show_controls" : True, - "show_service" : False, - "show_legend" : True, - "resizable" : True, - "interaction" : True, - } + graph_data_range = { "time_range" : get_graph_timerange_from_painter_options() } + graph_render_options = {} return "", metrics.render_graphs_from_specification_html( graph_specification,

8 years, 7 months

Updated bug entries #2379, #2359

by Lars Michelsen

Module: check_mk Branch: master Commit: 147b20e1bcb8dadc052c17644ed51f44746a527a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=147b20e1bcb8da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 11:00:06 2016 +0100 Updated bug entries #2379, #2359 --- .bugs/2359 | 9 ++++++--- .bugs/2379 | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.bugs/2359 b/.bugs/2359 index 1f5c04a..9544c9b 100644 --- a/.bugs/2359 +++ b/.bugs/2359 @@ -1,9 +1,12 @@ Title: Quotes in generated confirmation messages are htmlized incorrectly Component: multisite -State: open +Class: bug +State: done Date: 2015-08-31 16:18:23 Targetversion: 1.2.7 -Class: bug Apparently the mechanism to convert " into " is incorrect or applied in places where this isn't required. One reproducable example is when hitting the "Send monitoring notification" button in the Event Console the confirmation message is "Do you really want to execute that action "Send monitoring notification&quot the following 1 Event Console Events?". -Apart from the that the grammer is quite bad imho. \ No newline at end of file +Apart from the that the grammer is quite bad imho. +2016-01-27 10:59:57: changed state open -> done +This was a simple issue in this exception text, not a general problem of the generic exception handling. +Solved. diff --git a/.bugs/2379 b/.bugs/2379 index 07218e5..a6ec770 100644 --- a/.bugs/2379 +++ b/.bugs/2379 @@ -1,10 +1,12 @@ Title: Drop action menu icon for services without an entry in this Component: multisite -State: open +Class: bug +State: done Date: 2015-09-22 09:53:11 Targetversion: future -Class: bug In certain circumstances the dropdown menu for a host or service can be completely empty (e.g. when using cmcdump). Drop this menu completely in that case. + +2016-01-27 10:56:40: changed state open -> done

8 years, 7 months

Fixed wrong encoded error message in EC

by Lars Michelsen

Module: check_mk Branch: master Commit: 0bd4e97d28b0534799c9d1fe337752acf0fcd170 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bd4e97d28b053… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 11:00:19 2016 +0100 Fixed wrong encoded error message in EC --- mkeventd/web/plugins/views/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index a91b82d..5f6f488 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -691,7 +691,7 @@ if mkeventd_enabled: for action_id, title in mkeventd.action_choices(omit_hidden = True): if html.var("_action_" + action_id): return "ACTION;%s;%s;%s" % (row["event_id"], config.user_id, action_id), \ - (_("execute that action "%s&quot") % title) + (_("execute that action \"%s\"") % title) multisite_commands.append({ "tables" : [ "event" ],

8 years, 7 months

#2967 FIX Hosts/Services: Hiding action menu trigger for empty menus

by Lars Michelsen

Module: check_mk Branch: master Commit: bb9d4acf851027b01f229de2bfc09172849d5d32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb9d4acf851027… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 10:56:30 2016 +0100 #2967 FIX Hosts/Services: Hiding action menu trigger for empty menus --- .bugs/2310 | 7 +++++-- .werks/2967 | 9 +++++++++ ChangeLog | 1 + web/plugins/icons/builtin.py | 4 ++++ web/plugins/views/painters.py | 10 +++++++--- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.bugs/2310 b/.bugs/2310 index 2cc09dc..fa0760f 100644 --- a/.bugs/2310 +++ b/.bugs/2310 @@ -1,11 +1,14 @@ Title: Quicksearch: service list of host not sorted Component: multisite -State: open +Class: nastiness +State: done Date: 2015-04-07 10:31:05 Targetversion: future -Class: nastiness When you enter h:somehost s:... then you will see a list of the service of the host. This list is not but should be sorted alphabetically. Might be the case that only with CMC it's not sorted... + +2016-01-27 10:45:51: changed state open -> done +solved. diff --git a/.werks/2967 b/.werks/2967 new file mode 100644 index 0000000..281143e --- /dev/null +++ b/.werks/2967 @@ -0,0 +1,9 @@ +Title: Hosts/Services: Hiding action menu trigger for empty menus +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1453888557 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d29ea7f..b45faa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -267,6 +267,7 @@ * 2956 FIX: Fixed exception on "Availability of Single-Host Aggregations view * 2965 FIX: Fixed HTML code shown in filter selection of favorite hosts filter * 2966 FIX: Quicksearch: Fixed sorting of results when not only searching for hosts + * 2967 FIX: Hosts/Services: Hiding action menu trigger for empty menus WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index be68384..e39837a 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -84,6 +84,10 @@ def paint_action_menu(what, row, tags, host_custom_vars): if html.has_var('_display_options'): url_vars.append(('_display_options', html.var('_display_options'))) + icons = get_icons(what, row, toplevel=False) + if not icons: + return # Don't paint the menu trigger when the menu would be empty + return html.render_popup_trigger( html.render_icon('menu', _('Open the action menu'), cssclass="iconbutton"), 'action_menu', 'action_menu', url_vars=url_vars) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 04a5598..22ebc66 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -308,6 +308,10 @@ def paint_icons(what, row): return "icons", output +# toplevel may be +# True to get only columns for top level icons +# False to get only columns for dropdown menu icons +# None to get columns for all active icons def iconpainter_columns(what, toplevel): cols = set(['site', 'host_name', @@ -323,7 +327,7 @@ def iconpainter_columns(what, toplevel): ]) for icon_id, icon in get_multisite_icons().items(): - if toplevel == icon['toplevel']: + if toplevel == None or toplevel == icon['toplevel']: if 'columns' in icon: cols.update([ what + '_' + c for c in icon['columns'] ]) cols.update([ "host_" + c for c in icon.get("host_columns", [])]) @@ -336,7 +340,7 @@ multisite_painters["service_icons"] = { "title" : _("Service icons"), "short" : _("Icons"), "printable" : False, # does not contain printable text - "columns" : lambda: iconpainter_columns("service", toplevel=True), + "columns" : lambda: iconpainter_columns("service", toplevel=None), "groupby" : lambda row: "", # Do not account for in grouping "paint" : lambda row: paint_icons("service", row) } @@ -345,7 +349,7 @@ multisite_painters["host_icons"] = { "title" : _("Host icons"), "short" : _("Icons"), "printable" : False, # does not contain printable text - "columns" : lambda: iconpainter_columns("host", toplevel=True), + "columns" : lambda: iconpainter_columns("host", toplevel=None), "groupby" : lambda row: "", # Do not account for in grouping "paint" : lambda row: paint_icons("host", row) }

8 years, 7 months

#2966 FIX Quicksearch: Fixed sorting of results when not only searching for hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 3a19e6051b940f81d12ca147660bc8aeb3e19180 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a19e6051b940f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 10:45:43 2016 +0100 #2966 FIX Quicksearch: Fixed sorting of results when not only searching for hosts --- .bugs/2285 | 7 +++++-- .werks/2966 | 9 +++++++++ ChangeLog | 1 + web/htdocs/sidebar.py | 3 ++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.bugs/2285 b/.bugs/2285 index 953d192..e9a4ca3 100644 --- a/.bugs/2285 +++ b/.bugs/2285 @@ -1,8 +1,11 @@ Title: "Add to visual" in views does not honor user provided filter vars Component: multisite -State: open +Class: nastiness +State: done Date: 2015-01-19 16:04:58 Targetversion: 1.2.5i1 -Class: nastiness It only cares about the filter values configured in the view. + +2016-01-27 10:34:29: changed state open -> done +has already been fixed. diff --git a/.werks/2966 b/.werks/2966 new file mode 100644 index 0000000..41fae1d --- /dev/null +++ b/.werks/2966 @@ -0,0 +1,9 @@ +Title: Quicksearch: Fixed sorting of results when not only searching for hosts +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1453887925 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3f059b5..d29ea7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -266,6 +266,7 @@ * 2947 FIX: LDAP: Simplified automatic sync logic... * 2956 FIX: Fixed exception on "Availability of Single-Host Aggregations view * 2965 FIX: Fixed HTML code shown in filter selection of favorite hosts filter + * 2966 FIX: Quicksearch: Fixed sorting of results when not only searching for hosts WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 0e4fc88..67de2f0 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -841,7 +841,8 @@ def search_livestatus(used_filters): data.sort(cmp = sort_fctn) return sorted_data - if len(used_filters) == 1 and used_filters[0][0] != "hosts": + search_types = list(set(map(lambda x: x[0], used_filters))) + if len(used_filters) > 1 and search_types != ["hosts"]: data = sort_data(data) return data

8 years, 7 months

#2969 FIX Fixed folding of sidebar in Google Chrome

by Lars Michelsen

Module: check_mk Branch: master Commit: 17b52225c6cfb678c6cb988e8bc46f39d31abb02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17b52225c6cfb6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 11:24:39 2016 +0100 #2969 FIX Fixed folding of sidebar in Google Chrome --- .werks/2969 | 9 +++++++++ ChangeLog | 1 + web/htdocs/js/sidebar.js | 29 ++++++++++++++++------------- web/htdocs/sidebar.py | 6 +++--- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/.werks/2969 b/.werks/2969 new file mode 100644 index 0000000..b76203a --- /dev/null +++ b/.werks/2969 @@ -0,0 +1,9 @@ +Title: Fixed folding of sidebar in Google Chrome +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1453890266 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index dfc730c..6cae073 100644 --- a/ChangeLog +++ b/ChangeLog @@ -269,6 +269,7 @@ * 2966 FIX: Quicksearch: Fixed sorting of results when not only searching for hosts * 2967 FIX: Hosts/Services: Hiding action menu trigger for empty menus * 2968 FIX: Closing quicksearch results when moving mouse out of sidebar area + * 2969 FIX: Fixed folding of sidebar in Google Chrome WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index e5330d5..4b199cd 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -403,13 +403,13 @@ function debug(s) { // but without scrolling. The height of the header and footer divs need // to be treated here. var g_just_resizing = 0; -function setSidebarHeight() { +function set_sidebar_size() { var oHeader = document.getElementById('side_header'); var oContent = document.getElementById('side_content'); var oFooter = document.getElementById('side_footer'); var height = pageHeight(); - // Resize sidebar frame on Chrome (and other webkit browsers) + // Resize sidebar frame on Chrome (and other webkit browsers). if (isWebkit()) { var oldcols = parent.document.body.cols.split(","); var oldwidth = parseInt(oldcols[0]); @@ -417,7 +417,7 @@ function setSidebarHeight() { // Note: previously this was "var width = oHeader.clientWidth;" and worked // fine. It stopped working - probably with new Chrome versions. We do not // know yet if the new way also works on old Chrome versions. - var target_width = parseInt(oldwidth * 280.0 / width); + var target_width = parseInt(oldwidth * sidebar_width() / width); var newcols = target_width.toString() + ",*"; parent.document.body.cols = newcols; } @@ -528,31 +528,34 @@ function dragScroll(event) { return false; } +function sidebar_width() +{ + if (g_sidebar_folded) + return 10; + else + return 280; +} + function fold_sidebar() { g_sidebar_folded = true; document.getElementById('check_mk_sidebar').style.position = "relative"; document.getElementById('check_mk_sidebar').style.left = "-265px"; document.getElementById('side_footer').style.display = "none"; - if (isWebkit()) { - var oldcols = parent.document.body.cols.split(","); - var oldwidth = parseInt(oldcols[0]); - var new_width = 10.0 / 280.0 * oldwidth; - parent.document.body.cols = new_width.toString() + ",*"; - } - else - parent.document.body.cols = "10,*"; + document.getElementById('side_version').style.display = "none"; + parent.document.body.cols = sidebar_width() + ",*"; get_url('sidebar_fold.py?fold=yes'); } function unfold_sidebar() { + g_sidebar_folded = false; document.getElementById('check_mk_sidebar').style.position = ""; document.getElementById('check_mk_sidebar').style.left = "0"; document.getElementById('side_footer').style.display = ""; - parent.document.body.cols = "280,*"; - g_sidebar_folded = false; + document.getElementById('side_version').style.display = ""; + parent.document.body.cols = sidebar_width() + ",*"; get_url('sidebar_fold.py?fold='); } diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 67de2f0..a129a71 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -249,7 +249,7 @@ def page_side(): html.write('<body class="side') if config.screenshotmode: html.write(" screenshotmode") - html.write('" onload="initScrollPos(); setSidebarHeight(); init_messages(%s);" ' + html.write('" onload="initScrollPos(); set_sidebar_size(); init_messages(%s);" ' 'onunload="storeScrollPos()">\n' % interval) html.write('<div id="check_mk_sidebar">\n') @@ -285,11 +285,11 @@ def page_side(): html.write("sidebar_restart_time = %s\n" % time.time()) html.write("sidebar_update_interval = %0.2f;\n" % config.sidebar_update_interval) html.write("registerEdgeListeners();\n") - html.write("setSidebarHeight();\n") + html.write("set_sidebar_size();\n") html.write("refresh_snapins = %r;\n" % refresh_snapins) html.write("restart_snapins = %r;\n" % restart_snapins) html.write("sidebar_scheduler();\n") - html.write("window.onresize = function() { setSidebarHeight(); };\n") + html.write("window.onresize = function() { set_sidebar_size(); };\n") html.write("if (contentFrameAccessible()) { update_content_location(); };\n") html.write("</script>\n")

8 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016