Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: #2142 FIX Fix non-working option for disabling column headers in grouped boxed views

by Mathias Kettner

Module: check_mk Branch: master Commit: efaf392e40073c70e4a0d464363e1611f925e786 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efaf392e40073c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 09:13:34 2015 +0100 #2142 FIX Fix non-working option for disabling column headers in grouped boxed views For example the pages showing graphs after a graph search would show <i>Service graphs</i> above each graph. This has been fixed. --- .werks/2142 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/layouts.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2142 b/.werks/2142 new file mode 100644 index 0000000..ab052ed --- /dev/null +++ b/.werks/2142 @@ -0,0 +1,11 @@ +Title: Fix non-working option for disabling column headers in grouped boxed views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427443957 + +For example the pages showing graphs after a graph search would show <i>Service graphs</i> +above each graph. This has been fixed. diff --git a/ChangeLog b/ChangeLog index d612ee4..0ed7757 100644 --- a/ChangeLog +++ b/ChangeLog @@ -346,6 +346,7 @@ * 1953 FIX: Fixed processing of html processing in input fields... * 2157 FIX: LDAP: Fixed group-to-role/group-to-contactgroup sync with OpenLDAP (using posixGroup) * 2141 FIX: Fix computation of explicit time ranges with time of day... + * 2142 FIX: Fix non-working option for disabling column headers in grouped boxed views... WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index f9d6f39..3ef7df8 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -184,7 +184,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show html.write("</tr>\n") column_headers = view.get("column_headers") - if column_headers: + if column_headers != "off": show_header_line() visible_row_number = 0

9 years, 6 months

Check_MK Git: check_mk: Remove useless CSS styles, they moved into another file

by Mathias Kettner

Module: check_mk Branch: master Commit: d7b51a799ab6379f30983bb2d4a70bfa84121ada URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7b51a799ab637… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 10:08:55 2015 +0100 Remove useless CSS styles, they moved into another file --- web/htdocs/check_mk.css | 115 ----------------------------------------------- 1 file changed, 115 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index b5eccb8..9488480 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -544,121 +544,6 @@ div.popup span { color: white; } -/* Graphs */ -table.graph { - border: 1px solid black; - box-shadow: 0.5px 0.5px 3px #888; - border-spacing: 0px; - background-color: #f8f4f0; - padding: 8px 16px 4px 8px; - margin-bottom: 5px; - position: relative; -} - -table.graph td.title { - text-align: center; - font-weight: bold; -} - -table.graph td.freepos div.time { - position: absolute; - top: 10px; - right: 18px; - text-align: right; - color: #808080; -} - -table.graph td.freepos img.resize { - position: absolute; - bottom: 3px; - right: 3px; - width: 12px; - height: 12px; - cursor: se-resize; -} - - -table.graph canvas { - margin: 0px; -} -table.prediction td { - padding: 0px; -} - -table.graph tr > td.legend { - color: #000000; - padding: 5px; - padding-left: 49px; -} - -table.graph tr > td.legend > table { - border-collapse: collapse; - width: 100%; -} - -table.graph tr > td.legend > table th, -table.graph tr > td.legend > table td { - padding: 2px 8px 2.5px 2px; - white-space: nowrap; - font-size: 11px; - /* background-color: #fdfcf8; */ -} - -table.graph tr > td.legend > table .scalar { - padding: 1px 10px; - width: 80px; -} - -table.graph tr > td.legend > table th, -table.graph tr > td.legend > table th.scalar { - background-color: transparent; - border-style: none; - color: black; - text-align: right; - padding-bottom: 3px; - border-bottom: 1px solid #000; - color: #888; - font-weight: bold; -} - -table.graph tr > td.legend > table > tbody > tr:nth-child(2) td { - padding-top: 4px; -} - -table.graph tr > td.legend > table td.scalar { - text-align: right; -} - -table.graph tr > td.legend > table > tbody > tr.scalar.first { - border-top: 1px solid #000; -} - -table.graph tr > td.legend > table > tbody > tr.scalar.first td { - padding-top: 4px; -} - -table.graph td.legend div { - display: inline-block; - float: none; -} - -table.graph td.legend div.color { - border: 1px solid black; - height: 9px; - width: 9px; - vertical-align: top; - position: relative; - top: 1px; - display: inline-block; - box-shadow: 0.5px 0.5px 1px #888; - margin-right: 2px; -} - -table.graph td.legend div.entry { - margin-right: 20px; - margin-left: 5px; -} - div#hover_menu { position: absolute; width: auto;

9 years, 6 months

Check_MK Git: check_mk: Allow host graphs to use new metric system

by Mathias Kettner

Module: check_mk Branch: master Commit: 5f1a0972567e3f641f30ce95fc1fdf0b92036203 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f1a0972567e3f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 10:18:30 2015 +0100 Allow host graphs to use new metric system --- web/plugins/metrics/check_mk.py | 1 + web/plugins/views/painters.py | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 71a38da..ee7726d 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1061,6 +1061,7 @@ check_metrics["check-mk-ping"] = {} check_metrics["check-mk"] = {} check_metrics["check_mk_active-tcp"] = { "time" : { "name": "response_time" } } +check_metrics["check-mk-host-tcp"] = { "time" : { "name": "response_time" } } check_metrics["check_mk-uptime"] = {} check_metrics["check_mk-esx_vsphere_counters.uptime"] = {} diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index f312bb5..bf64ab5 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -782,15 +782,14 @@ multisite_painters["svc_group_memberlist"] = { def paint_graph(row): # For hosts graphs always use PNP - if row.get("service_description"): - try: - css, htmlcode = paint_svc_time_graph(row) - if htmlcode: - return css, htmlcode - except NameError: - if config.debug: - raise - pass + try: + css, htmlcode = paint_time_graph(row) + if htmlcode: + return css, htmlcode + except NameError: + if config.debug: + raise + pass sitename = row["site"] host = row["host_name"]

9 years, 6 months

Check_MK Git: check_mk: Fixed custom-labels of linear Perf-O-Meters

by Mathias Kettner

Module: check_mk Branch: master Commit: 8b1e8fdc0ec7f143c06bc59010c8e0b0beb80991 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b1e8fdc0ec7f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 11:18:26 2015 +0100 Fixed custom-labels of linear Perf-O-Meters --- web/htdocs/metrics.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 7065034..b6b9235 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -404,7 +404,7 @@ def perfometer_possible(perfometer, translated_metrics): elif perfometer["type"] == "logarithmic": required = [ perfometer["metric"] ] else: - pass # TODO: logarithmic, etc. dual, stacked? + pass # TODO: dual, stacked? if "label" in perfometer and perfometer["label"] != None: required.append(perfometer["label"][0]) @@ -550,19 +550,19 @@ def build_perfometer(perfometer, translated_metrics): # Use unit of first metrics for output of sum. We assume that all # stackes metrics have the same unit anyway - if "label" in perfometer: - if perfometer["label"] == None: - label = "" - else: - expr, unit_name = perfometer["label"] - value, unit, color = evaluate(expr, translated_metrics) - if unit_name: - unit = unit_info[unit_name] - label = unit["render"](summed) - else: # absolute - value, unit, color = evaluate(perfometer["segments"][0], translated_metrics) - - label = unit["render"](summed) + value, unit, color = evaluate(perfometer["segments"][0], translated_metrics) + label = unit["render"](summed) + + # "label" option in all Perf-O-Meters overrides automatic label + if "label" in perfometer: + if perfometer["label"] == None: + label = "" + else: + expr, unit_name = perfometer["label"] + value, unit, color = evaluate(expr, translated_metrics) + if unit_name: + unit = unit_info[unit_name] + label = unit["render"](value) return label, stack

9 years, 6 months

Check_MK Git: check_mk: New function logb and frexpb in lib

by Mathias Kettner

Module: check_mk Branch: master Commit: 62eac04e551c7d908c2fb58aca753929924be1a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62eac04e551c7d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 24 14:29:42 2015 +0100 New function logb and frexpb in lib --- web/htdocs/lib.py | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index cbb16e0..14ddbd8 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -474,14 +474,29 @@ def num_split(s): first_word = regex("[0-9]").split(s)[0] return ( first_word.lower(), ) + num_split(s[len(first_word):]) -def frexp10(x): - exp = int(math.log10(x)) - mantissa = x / 10**exp + # exp = int(math.log10(x)) + # mantissa = x / 10**exp + # if mantissa < 1: + # mantissa *= 10 + # exp -= 1 + # return mantissa, exp + +def logb(x, base): + return math.log(x) / math.log(base) + +def frexpb(x, base): + exp = int(logb(x, base)) + mantissa = x / base**exp if mantissa < 1: - mantissa *= 10 + mantissa *= base exp -= 1 return mantissa, exp +def frexp10(x): + return frexpb(x, 10) + + + # Render a physical value witha precision of p # digits. Use K (kilo), M (mega), m (milli), µ (micro) @@ -582,8 +597,12 @@ def age_human_readable(secs, min_only=False): hours = mins / 60 if hours < 48: return "%d %s" % (hours, _("hours")) - days = hours / 24 - return "%d %s" % (days, _("days")) + days = hours / 24.0 + if days < 6: + d = ("%.1f" % days).rstrip("0").rstrip(".") + return "%s %s" % (d, _("days")) + else: + return "%.0f %s" % (days, _("days")) def bytes_human_readable(b, base=1024.0, bytefrac=True, unit="B"):

9 years, 6 months

Check_MK Git: check_mk: Sessions and Locks are no units, use count instead

by Mathias Kettner

Module: check_mk Branch: master Commit: 244b3f605560884dd45e237ff19e917966beb4b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=244b3f60556088… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 24 14:31:54 2015 +0100 Sessions and Locks are no units, use count instead --- web/plugins/metrics/check_mk.py | 57 +++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 0b0bc97..c53b4c1 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -51,18 +51,6 @@ unit_info["count"] = { "render" : lambda v: "%d" % v, } -unit_info["sessions"] = { - "title" : _("Sessions"), - "symbol" : "", - "render" : lambda v: "%d" % v, -} - -unit_info["locks"] = { - "title" : _("Locks"), - "symbol" : "", - "render" : lambda v: "%d" % v, -} - # value ranges from 0.0 ... 100.0 unit_info["%"] = { "title" : _("%"), @@ -79,9 +67,10 @@ unit_info["ratio"] = { } unit_info["s"] = { - "title" : _("sec"), - "symbol" : _("s"), - "render" : age_human_readable, + "title" : _("sec"), + "symbol" : _("s"), + "render" : age_human_readable, + "stepping" : "time", # for vertical graph labels } unit_info["1/s"] = { @@ -91,22 +80,25 @@ unit_info["1/s"] = { } unit_info["bytes"] = { - "title" : _("Bytes"), - "symbol" : _("B"), - "render" : bytes_human_readable, + "title" : _("Bytes"), + "symbol" : _("B"), + "render" : bytes_human_readable, + "stepping" : "binary", # for vertical graph labels } unit_info["bytes/s"] = { - "title" : _("Bytes per second"), - "symbol" : _("B/s"), - "render" : lambda v: bytes_human_readable(v) + _("/s"), + "title" : _("Bytes per second"), + "symbol" : _("B/s"), + "render" : lambda v: bytes_human_readable(v) + _("/s"), + "stepping" : "binary", # for vertical graph labels } # Output in bytes/days, value is in bytes/s unit_info["bytes/d"] = { - "title" : _("Bytes per day"), - "symbol" : _("B/d"), - "render" : lambda v: bytes_human_readable(v * 86400.0) + _("/d"), + "title" : _("Bytes per day"), + "symbol" : _("B/d"), + "render" : lambda v: bytes_human_readable(v * 86400.0) + _("/d"), + "stepping" : "binary", # for vertical graph labels } unit_info["c"] = { @@ -158,7 +150,6 @@ unit_info["db"] = { } - #. # .--Metrics-------------------------------------------------------------. # | __ __ _ _ | @@ -474,26 +465,26 @@ metric_info["codewords_uncorrectable"] = { } metric_info["total_sessions"] = { - "title" : _("Total"), - "unit" : "sessions", + "title" : _("Total sessions"), + "unit" : "count", "color" : "#94b65a", } metric_info["running_sessions"] = { - "title" : _("Running"), - "unit" : "sessions", + "title" : _("Running sessions"), + "unit" : "count", "color" : "#999b94", } metric_info["shared_locks"] = { - "title" : _("Shared"), - "unit" : "locks", + "title" : _("Shared locks"), + "unit" : "count", "color" : "#92ec89", } metric_info["exclusive_locks"] = { - "title" : _("Exclusive"), - "unit" : "locks", + "title" : _("Exclusive locks"), + "unit" : "count", "color" : "#ca5706", }

9 years, 6 months

Check_MK Git: check_mk: Move browser detection to general JS code

by Mathias Kettner

Module: check_mk Branch: master Commit: e62ff3ee2d137b3fba8890c83550ca80e47c5a51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e62ff3ee2d137b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 24 14:31:12 2015 +0100 Move browser detection to general JS code --- web/htdocs/js/checkmk.js | 19 ++++++++++++++++--- web/htdocs/js/sidebar.js | 7 ++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 9a4678e..9e6c260 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -22,9 +22,22 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// ---------------------------------------------------------------------------- -// general function -// ---------------------------------------------------------------------------- +// .--General-------------------------------------------------------------. +// | ____ _ | +// | / ___| ___ _ __ ___ _ __ __ _| | | +// | | | _ / _ \ '_ \ / _ \ '__/ _` | | | +// | | |_| | __/ | | | __/ | | (_| | | | +// | \____|\___|_| |_|\___|_| \__,_|_| | +// | | +// +----------------------------------------------------------------------+ +// | General functions used in many places | +// '----------------------------------------------------------------------' + +var browser = navigator.userAgent.toLowerCase(); +var weAreOpera = browser.indexOf("opera") != -1; +var weAreFirefox = browser.indexOf("firefox") != -1 || browser.indexOf("namoroka") != -1; + + // Make JS understand Python source code var True = true; diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 5211cb6..358a6e8 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -22,10 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -var browser = navigator.userAgent.toLowerCase(); -var weAreIEF__k = ((browser.indexOf("msie") != -1) && (browser.indexOf("opera") == -1)); -var weAreOpera = browser.indexOf("opera") != -1; -var weAreFirefox = browser.indexOf("firefox") != -1 || browser.indexOf("namoroka") != -1; var g_content_loc = null; var sidebar_folded = false; @@ -51,7 +47,8 @@ if (window.addEventListener) { window.addEventListener('DOMMouseScroll', scrollWheel, false); else window.addEventListener('mousewheel', scrollWheel, false); -} else { +} +else { document.documentElement.onmousemove = function(e) { // snapin drag 'n drop snapinDrag(e);

9 years, 6 months

Check_MK Git: check_mk: Repaired graph hover menu after merge conflict

by Mathias Kettner

Module: check_mk Branch: master Commit: f2fb194911a014a6a7a377716b3d7bb4c4486c27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2fb194911a014… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 26 17:03:13 2015 +0100 Repaired graph hover menu after merge conflict --- web/htdocs/check_mk.css | 1 + web/htdocs/js/checkmk.js | 3 ++- web/htdocs/js/hover.js | 11 ++++++----- web/htdocs/metrics.py | 14 +++++++------- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index aa9a1c4..b5eccb8 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -657,6 +657,7 @@ table.graph td.legend div.color { table.graph td.legend div.entry { margin-right: 20px; margin-left: 5px; +} div#hover_menu { position: absolute; diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index ca879ea..ae4f585 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -638,7 +638,8 @@ function render_pnp_graphs(container, site, host, service, pnpview, base_url, pn get_url(url, pnp_response_handler, data, pnp_error_response_handler, false); } -function hover_graph(site, host_name, service) { +function hover_graph(site, host_name, service) +{ var c = get_url_sync('show_graph.py?site='+encodeURIComponent(site) +'&host_name='+encodeURIComponent(host_name) +'&service='+encodeURIComponent(service)); diff --git a/web/htdocs/js/hover.js b/web/htdocs/js/hover.js index c4077e7..c288474 100644 --- a/web/htdocs/js/hover.js +++ b/web/htdocs/js/hover.js @@ -100,19 +100,19 @@ function hoverShow(x, y, code) { var hoverLeft = parseInt(_hoverMenu.style.left.replace('px', '')); var screenWidth = pageWidth(); var hoverPosAndSizeOk = true; - if(!hoverMenuInScreen(_hoverMenu, hoverSpacer)) + if (!hoverMenuInScreen(_hoverMenu, hoverSpacer)) hoverPosAndSizeOk = false; - if(!hoverPosAndSizeOk) { + if (!hoverPosAndSizeOk) { _hoverMenu.style.left = (x - hoverSpacer - _hoverMenu.clientWidth) + 'px'; - if(hoverMenuInScreen(_hoverMenu, hoverSpacer)) + if (hoverMenuInScreen(_hoverMenu, hoverSpacer)) hoverPosAndSizeOk = true; } // And if the hover menu is still not on the screen move it to the left edge // and fill the whole screen width - if(!hoverMenuInScreen(_hoverMenu, hoverSpacer)) { + if (!hoverMenuInScreen(_hoverMenu, hoverSpacer)) { _hoverMenu.style.left = hoverSpacer + scrollLeft + 'px'; _hoverMenu.style.width = pageWidth() - (2*hoverSpacer) + 'px'; } @@ -120,7 +120,7 @@ function hoverShow(x, y, code) { var hoverTop = parseInt(_hoverMenu.style.top.replace('px', '')); // Only move the menu to the top when the new top will not be // out of sight - if(hoverTop +_hoverMenu.clientHeight > pageHeight() && hoverTop -_hoverMenu.clientHeight >= 0) + if (hoverTop +_hoverMenu.clientHeight > pageHeight() && hoverTop -_hoverMenu.clientHeight >= 0) _hoverMenu.style.top = hoverTop -_hoverMenu.clientHeight - hoverSpacer + 'px'; hoverTop = null; @@ -128,6 +128,7 @@ function hoverShow(x, y, code) { } function hoverMenuInScreen(hoverMenu, hoverSpacer) { + var hoverLeft = parseInt(hoverMenu.style.left.replace('px', '')); var scrollLeft = document.body.scrollLeft ? document.body.scrollLeft : document.documentElement.scrollLeft; diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 82e7e00..dc7af7b 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -926,8 +926,6 @@ def mix_colors(a, b): # | | _ | (_) \ V / __/ | |_____| |_| | | | (_| | |_) | | | | | # | |_| |_|\___/ \_/ \___|_| \____|_| \__,_| .__/|_| |_| | # | |_| | -# +----------------------------------------------------------------------+ -# | | # '----------------------------------------------------------------------' def page_show_graph(): @@ -942,15 +940,17 @@ def page_show_graph(): "Filter: host_name = %s\n" \ "Filter: service_description = %s\n" \ "Columns: perf_data check_command\n" % (host_name, service) + html.live.set_only_sites([site]) data = html.live.query_row(query) html.live.set_only_sites(None) + row = { - 'site': site, - 'host_name': host_name, - 'service_description': service, - 'service_perf_data': data[0], - 'service_check_command': data[1], + 'site' : site, + 'host_name' : host_name, + 'service_description' : service, + 'service_perf_data' : data[0], + 'service_check_command' : data[1], } # now try to render the graph with our graphing. If it is not possible,

9 years, 6 months

Check_MK Git: check_mk: New functions for date in human readable form

by Mathias Kettner

Module: check_mk Branch: master Commit: 5c37fb0b8b991189b24737650a4936b8a06479b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c37fb0b8b9911… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 25 18:03:07 2015 +0100 New functions for date in human readable form --- web/htdocs/lib.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 9e6616a..caedd88 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -620,6 +620,37 @@ def age_human_readable(secs, min_only=False): return "%.0f %s" % (years, _("years")) +def date_human_readable(timestamp): + # This can be localized: + return time.strftime(_("%m/%d/%Y"), time.localtime(timestamp)) + +def date_range_human_readable(start_time, end_time): + start_time_local = time.localtime(start_time) + end_time_local = time.localtime(end_time) + if start_time_local[:3] == end_time_local[:3]: # same day + return date_human_readable(start_time) + + elif start_time_local[:2] == end_time_local[:2]: # same month + date_format = _("%m/%d1-%d2/%Y") + f = date_format.replace("%d2", time.strftime("%d", end_time_local)) + f = f.replace("%d1", "%d") + return time.strftime(f, start_time_local) + + elif start_time_local[0] == end_time_local[0]: # same year + date_format = _("%m1/%d1/%Y - %m2/%d2/%Y") + f = date_format.replace("%d2", time.strftime("%d", end_time_local)) + f = f.replace("%m2", time.strftime("%m", end_time_local)) + f = f.replace("%d1", "%d").replace("%m1", "%m") + return time.strftime(f, start_time_local) + + else: + return date_human_readable(start_time) + " - " + \ + date_human_readable(end_time) + +# Just print year and month, no day +def date_month_human_readable(timestamp): + # TODO: %B will currently not be localized + return time.strftime(_("%B %Y"), time.localtime(timestamp)) def bytes_human_readable(b, base=1024.0, bytefrac=True, unit="B"):

9 years, 6 months

Check_MK Git: check_mk: age_human_readable: fix exception for times < 1 pico second

by Mathias Kettner

Module: check_mk Branch: master Commit: 0f3c1dd6f41e4b827d04c81d10a7f0b07ff24b0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f3c1dd6f41e4b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 24 17:05:19 2015 +0100 age_human_readable: fix exception for times < 1 pico second --- web/htdocs/check_mk.css | 4 ++-- web/htdocs/lib.py | 31 ++++++++++++++++++++----------- web/htdocs/metrics.py | 6 +++++- web/plugins/metrics/check_mk.py | 2 +- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 3716ec6..acfeeb4 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -597,7 +597,7 @@ table.graph tr > td.legend > table th.scalar { color: black; text-align: right; padding-bottom: 3px; - border-bottom: 0.6px solid #000; + border-bottom: 1px solid #000; color: #888; font-weight: bold; } @@ -611,7 +611,7 @@ table.graph tr > td.legend > table td.scalar { } table.graph tr > td.legend > table > tbody > tr.scalar.first { - border-top: 0.6px solid #000; + border-top: 1px solid #000; } table.graph tr > td.legend > table > tbody > tr.scalar.first td { diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 14ddbd8..df64ec7 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -529,32 +529,35 @@ def physical_precision(v, precision, unit_symbol): # Choose a power where no artifical zero (due to rounding) needs to be # placed left of the decimal point. scale_symbols = { + -5 : "f", -4 : "p", -3 : "n", -2 : u"µ", -1 : "m", - 0 : "", - 1 : "K", - 2 : "M", - 3 : "G", - 4 : "T", - 5 : "P", + 0 : "", + 1 : "K", + 2 : "M", + 3 : "G", + 4 : "T", + 5 : "P", } scale = 0 - while exponent < 0: + while exponent < 0 and scale > -5: scale -= 1 exponent += 3 # scale, exponent = divmod(exponent, 3) places_before_comma = exponent + 1 places_after_comma = precision - places_before_comma - while places_after_comma < 0: + while places_after_comma < 0 and scale < 5: scale += 1 exponent -= 3 places_before_comma = exponent + 1 places_after_comma = precision - places_before_comma + value = mantissa * 10**exponent + return u"%%.%df %%s%%s" % places_after_comma % (value, scale_symbols[scale], unit_symbol) @@ -578,8 +581,6 @@ def number_human_readable(n, precision=1, unit="B"): def age_human_readable(secs, min_only=False): if secs < 0: return "- " + age_human_readable(-secs, min_only) - elif secs > 0 and secs < 0.0001: # us - return "%.1f us" % (secs * 1000000) elif secs > 0 and secs < 1: # ms return physical_precision(secs, 3, _("s")) elif min_only: @@ -601,8 +602,16 @@ def age_human_readable(secs, min_only=False): if days < 6: d = ("%.1f" % days).rstrip("0").rstrip(".") return "%s %s" % (d, _("days")) - else: + elif days < 999: return "%.0f %s" % (days, _("days")) + else: + years = days / 365 + if years < 10: + return "%.1f %s" % (years, _("years")) + else: + return "%.0f %s" % (years, _("years")) + + def bytes_human_readable(b, base=1024.0, bytefrac=True, unit="B"): diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 6957e93..0e05b5c 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -94,7 +94,11 @@ scalar_colors = { # Convert perf_data_string into perf_data, extract check_command def parse_perf_data(perf_data_string, check_command=None): + if not perf_data_string: + return {}, check_command + parts = perf_data_string.split() + # Try if check command is appended to performance data # in a PNP like style if parts[-1].startswith("[") and parts[-1].endswith("]"): @@ -312,7 +316,7 @@ def evaluate_rpn(expression, translated_metrics): def evaluate_literal(expression, translated_metrics): if type(expression) == int: - return expression, unit_info["count"], None + return float(expression), unit_info["count"], None elif type(expression) == float: return expression, unit_info[""], None diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index c53b4c1..217fd96 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1097,7 +1097,7 @@ graph_info.append({ ( "user,system,io_wait,+,+#004080", "line", _("Total") ), ], "mirror_legend" : True, - # "range" : (0, 100), + "range" : (0, 100), }) graph_info.append({

9 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015