Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: FIX: Improved handling of error messages in bulk inventory

by Lars Michelsen

Module: check_mk Branch: master Commit: 349feaaf2862f7ab54724f9a03fdd9b33a8f82f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=349feaaf2862f7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 16:21:47 2013 +0100 FIX: Improved handling of error messages in bulk inventory --- ChangeLog | 1 + web/htdocs/js/wato.js | 5 ++++- web/htdocs/wato.css | 8 +++++++- web/htdocs/wato.py | 9 +++++---- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27915ab..3408605 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ Multisite: * FIX: Fixed problem with error during localization scanning * FIX: Fixed wrong localization right after a user changed its language + * FIX: Improved handling of error messages in bulk inventory Checks & Agents: * Linux agent: limit netstat to 10 seconds diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 759451d..93bd678 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -279,7 +279,10 @@ function progress_handle_response(data, code, http_code) { header.push(0); } } - body = 'HTTP-Request failed (' + http_code + ', ' + data + ')' + body = 'Inventory of ' + item + ' failed\n' + +'<div class=exc><h1>HTTP-Request failed</h1>' + +'HTTP-Code: ' + http_code + '<br />' + +'Parameters: ' + data + '</div>\n'; } else { // Regular response processing try { diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 0f04c6b..4b34f30 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -894,7 +894,7 @@ div.varname { } /* Log window */ -.wato table.progress td.log div { +.wato table.progress td.log > div { background-image: url("images/form_background.png"); background-repeat: repeat; border: 1px solid #fff; @@ -909,6 +909,12 @@ div.varname { padding: 12px 12px 0px 12px; } +.wato table.progress td.log div.exc { + border: 1px solid #ff0000; + margin: 10px; + padding: 5px; +} + /* progress bar */ .wato table.progress td.bar { padding: 0 12px 0 12px; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8b920ca..d37b07d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2563,12 +2563,13 @@ def mode_bulk_inventory(phase): except Exception, e: result = repr([ 'failed', 1, 1, 0, 0, 0, 0, ]) + "\n" if site_id: - msg = _("Error during inventory of %s on site %s: %s") % (hostname, site_id, e) + msg = _("Error during inventory of %s on site %s<div class=exc>%s</div") % \ + (hostname, site_id, e) else: - msg = _("Error during inventory of %s: %s") % (hostname, e) + msg = _("Error during inventory of %s<div class=exc>%s</div>") % (hostname, e) if config.debug: - msg += "<br><pre>%s</pre>" % format_exception().replace("\n", "<br>") - result += msg + "\n<br>" + msg += "<br><pre>%s</pre><br>" % format_exception().replace("\n", "<br>") + result += msg if not host.get("inventory_failed"): host["inventory_failed"] = True save_hosts(folder)

11 years, 7 months

Check_MK Git: check_mk: Updated changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: cf9aa0ec1cbbe5113a67013f1067f69bb5fee363 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf9aa0ec1cbbe5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 14:53:39 2013 +0100 Updated changelog --- ChangeLog | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7618ec..b880071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ * New editor for Business Intelligence rules 1.2.2b4: + Multisite: + * FIX: Fixed problem with error during localization scanning + Checks & Agents: * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows

11 years, 7 months

Check_MK Git: check_mk: FIX: Fixed problem with error during localization scanning

by Lars Michelsen

Module: check_mk Branch: master Commit: 8515d3185ad8fd83b8b4f2bd1473ab29a0b73c29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8515d3185ad8fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 14:52:34 2013 +0100 FIX: Fixed problem with error during localization scanning --- web/htdocs/wato.py | 2 +- web/plugins/wato/check_parameters.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b9bec13..9be34bf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11342,7 +11342,7 @@ def mode_bi_rules(phase): delete_url = make_action_link([("mode", "bi_rules"), ("_del_aggr", nr)]) html.icon_button(delete_url, _("Delete this aggregation"), "delete") table.cell(_("Nr."), nr+1, css="number") - table.cell(_(""), css="buttons") + table.cell("", css="buttons") if aggregation["disabled"]: html.icon(_("This aggregation is currently disabled."), "disabled") if aggregation["single_host"]: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 334a725..b11f698 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1491,7 +1491,7 @@ checkgroups.append(( Checkbox( title = _("Autoextend"), label = _("Autoextension is expected"), - help = _(""))), + help = "")), ]), TextAscii( title = _("Explicit tablespaces"),

11 years, 7 months

Check_MK Git: check_mk: FIX: Fixed wrong localization right after a user changed its language

by Lars Michelsen

Module: check_mk Branch: master Commit: fba269828c767fddb02b5fd1c7a215f66c36587a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fba269828c767f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 15:10:42 2013 +0100 FIX: Fixed wrong localization right after a user changed its language --- ChangeLog | 1 + web/htdocs/index.py | 1 + web/htdocs/wato.py | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b880071..f41bdf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ 1.2.2b4: Multisite: * FIX: Fixed problem with error during localization scanning + * FIX: Fixed wrong localization right after a user changed its language Checks & Agents: * Linux agent: limit netstat to 10 seconds diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 4eb1506..ffd836c 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -186,6 +186,7 @@ def load_all_plugins(): pass except Exception: raise +__builtin__.load_all_plugins = load_all_plugins # Main entry point for all HTTP-requests (called directly by mod_apache) def handler(req, profiling = True): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9be34bf..8b920ca 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10863,6 +10863,7 @@ def page_user_profile(): # load the new language load_language(config.get_language()) + load_all_plugins() user = users.get(config.user_id) if config.may('general.edit_notifications') and user.get("notifications_enabled"):

11 years, 7 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 8c6167780077f9c03340fd00e6c8a98551ac49cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c6167780077f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 15:50:48 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: smart - not trying to parse unhandled lines to prevent errors

by Lars Michelsen

Module: check_mk Branch: master Commit: 56cd26bb1b9170563f076a9e8d8ddea2f7b8b207 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56cd26bb1b9170… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 15:50:32 2013 +0100 FIX: smart - not trying to parse unhandled lines to prevent errors --- ChangeLog | 3 +++ checks/smart | 29 ++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index f41bdf3..e91cf4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ * New editor for Business Intelligence rules 1.2.2b4: + Checks & Agents: + * FIX: smart - not trying to parse unhandled lines to prevent errors + Multisite: * FIX: Fixed problem with error during localization scanning * FIX: Fixed wrong localization right after a user changed its language diff --git a/checks/smart b/checks/smart index b2f8361..a605e86 100644 --- a/checks/smart +++ b/checks/smart @@ -86,21 +86,20 @@ def check_smart_stats(item, params, info): if len(line) != 13 or line[0] != item: continue - value = int(line[12].split("/", 1)[0]) - for val, uom, lab, txt, thresh in [ - (value, ' hours', 'Power_On_Hours', 'Powered on', None), - (value, '', 'Power_Cycle_Count', 'Power cycles', None), - (value, '', 'Reallocated_Sector_Ct', 'Reallocated sectors', 'realloc_sectors'), - (value, '', 'Reallocated_Event_Count', 'Reallocated events', 'realloc_events'), - (value, '', 'Spin_Retry_Count', 'Spin retries', 'spin_retries'), - (value, '', 'Current_Pending_Sector', 'Pending sectors', 'pending_sectors'), - (value, '', 'Command_Timeout', 'Command timeouts', 'cmd_timeouts'), - (value, '', 'End-to-End_Error', 'End-to-End errors', 'e2e_errs'), - (value, '', 'Reported_Uncorrect', 'Uncorrectable errors', 'uncorr_errs'), - (value, '', 'UDMA_CRC_Error_Count', 'UDMA CRC errors', 'udma_crcs'), + for uom, lab, txt, thresh in [ + (' hours', 'Power_On_Hours', 'Powered on', None), + ('', 'Power_Cycle_Count', 'Power cycles', None), + ('', 'Reallocated_Sector_Ct', 'Reallocated sectors', 'realloc_sectors'), + ('', 'Reallocated_Event_Count', 'Reallocated events', 'realloc_events'), + ('', 'Spin_Retry_Count', 'Spin retries', 'spin_retries'), + ('', 'Current_Pending_Sector', 'Pending sectors', 'pending_sectors'), + ('', 'Command_Timeout', 'Command timeouts', 'cmd_timeouts'), + ('', 'End-to-End_Error', 'End-to-End errors', 'e2e_errs'), + ('', 'Reported_Uncorrect', 'Uncorrectable errors', 'uncorr_errs'), + ('', 'UDMA_CRC_Error_Count', 'UDMA CRC errors', 'udma_crcs'), ]: - if line[4] == lab: + value = int(line[12].split("/", 1)[0]) warn, crit, cur_status, thresh_out = None, None, 0, '' if thresh in params and value >= params[thresh][1]: cur_status = 2 @@ -109,8 +108,8 @@ def check_smart_stats(item, params, info): cur_status = 1 thresh_out = '(!)' - perfdata.append((lab, val, thresh and params[thresh][0] or None, thresh and params[thresh][1] or None)) - output.append('%s: %d%s%s' % (txt, val, uom, thresh_out)) + perfdata.append((lab, value, thresh and params[thresh][0] or None, thresh and params[thresh][1] or None)) + output.append('%s: %d%s%s' % (txt, value, uom, thresh_out)) status = max(status, cur_status) if not output:

11 years, 7 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 730d5ae06cc91dcb7052b79b5cfbce47531fdb6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=730d5ae06cc91d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 19 14:47:48 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: Several BI display fixes

by Mathias Kettner

Module: check_mk Branch: master Commit: b0f44d092bcc29ded4cdca73209e768123d2d785 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0f44d092bcc29… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 19 14:47:33 2013 +0100 FIX: Several BI display fixes --- ChangeLog | 3 +++ web/htdocs/bi.css | 9 ++++++++- web/htdocs/bi.py | 2 +- web/htdocs/js/bi.js | 3 +++ web/plugins/views/bi.py | 6 +++--- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7618ec..1680d81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,9 @@ BI: * FIX: fixed invalid links to hosts and services in BI tree view + * FIX: fix exception in top/down and bottom/up views + * FIX: fix styling of top/down and bottom/up views (borders, padding) + * Make titles of non-leaf tree nodes klickable 1.2.2b3: Checks & Agents: diff --git a/web/htdocs/bi.css b/web/htdocs/bi.css index 65f7e3b..473ecb1 100644 --- a/web/htdocs/bi.css +++ b/web/htdocs/bi.css @@ -63,6 +63,10 @@ tr.even0 .aggrtree ul.subtree { padding-bottom: 1px; } +.aggrtree span.title span.content.name { + cursor: pointer; +} + .aggrtree span.state { margin-right: 3px; width: 34px; @@ -148,4 +152,7 @@ td.aggrtree_box { .bibox { padding: 0px; } - +table.aggrtree.ltr td { + border: 1px solid #ccc; + padding: 3px; +} diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 05fe2f0..671410d 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1483,7 +1483,7 @@ def aggr_render_node(tree, title, mousecode, show_host): % (effective_state["state"], addclass, render_bi_state(effective_state["state"])) if mousecode: h += '<img class=opentree %s>' % mousecode - h += '<span class="content name">%s</span>' % title + h += '<span class="content name" %s>%s</span>' % (mousecode, title) else: h += title diff --git a/web/htdocs/js/bi.js b/web/htdocs/js/bi.js index 1b93ce7..5427f69 100644 --- a/web/htdocs/js/bi.js +++ b/web/htdocs/js/bi.js @@ -24,6 +24,9 @@ function bi_toggle_subtree(oImg, lazy) { + if (oImg.tagName == "SPAN") { // clicked on title, + oImg = oImg.previousSibling; + } var oSubtree = oImg.parentNode.childNodes[6]; var url = "bi_save_treestate.py?path=" + escape(oSubtree.id); var do_open; diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 921f8e1..1afe686 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -218,14 +218,14 @@ def paint_aggr_tree_ltr(row, mirror): return gen_node(tree, height, show_host) def gen_leaf(tree, height, show_host): - return [(aggr_render_leaf(tree, show_host), height, [])] + return [(bi.aggr_render_leaf(tree, show_host), height, [])] def gen_node(tree, height, show_host): leaves = [] for node in tree[3]: if not node[2].get("hidden"): leaves += gen_table(node, height - 1, show_host) - h = '<div class="aggr tree">' + aggr_render_node(tree, tree[2]["title"], '', show_host) + "</div>" + h = '<div class="aggr tree">' + bi.aggr_render_node(tree, tree[2]["title"], '', show_host) + "</div>" if leaves: leaves[0][2].append((len(leaves), h)) return leaves @@ -235,7 +235,7 @@ def paint_aggr_tree_ltr(row, mirror): tree = filter_tree_only_problems(tree) depth = bi.status_tree_depth(tree) leaves = gen_table(tree, depth, row["aggr_hosts"] > 1) - h = '<table class="aggrtree">' + h = '<table class="aggrtree ltr">' odd = "odd" for code, colspan, parents in leaves: h += '<tr>\n'

11 years, 7 months

Check_MK Git: check_mk: Make custom notification labels localizable

by Lars Michelsen

Module: check_mk Branch: master Commit: 203977a22b77719d76766a380ecfb7124a0aae60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=203977a22b7771… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 14:39:22 2013 +0100 Make custom notification labels localizable --- web/htdocs/wato.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index eb18733..b9bec13 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7575,6 +7575,8 @@ def load_notification_scripts(): choices = scripts.items() choices.append((None, _("Plain Text Email (using configured templates)"))) choices.sort(cmp = lambda a,b: cmp(a[1], b[1])) + # Make choices localizable + choices = [ (k, _(v)) for k, v in choices ] return choices def notification_script_title(name):

11 years, 7 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 3767b52283cf28fdc8bdaad86540c72cec11f4d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3767b52283cf28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 14:39:29 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013