Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

3917 FIX Fixed broken dicttable rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: 88734532c3627608974a67eb1915ce32a2cbd90e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88734532c36276… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 14 20:13:26 2016 +0100 3917 FIX Fixed broken dicttable rendering --- .werks/3917 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/inventory.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/3917 b/.werks/3917 new file mode 100644 index 0000000..56f0935 --- /dev/null +++ b/.werks/3917 @@ -0,0 +1,9 @@ +Title: Fixed broken dicttable rendering +Level: 1 +Component: inv +Compatible: compat +Version: 1.4.0i3 +Date: 1479150792 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index b51bf51..0dbdeeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 3916 FIX: History view: Only showing removed/added entries tables when there are entries * 4066 FIX: Fixed broken titles of nodes in inventory views * 4067 FIX: Fixed broken inventory history view in current master... + * 3917 FIX: Fixed broken dicttable rendering 1.4.0i2: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index a354bfa..a2e79df 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -310,8 +310,8 @@ def render_inv_dicttable(hostname, tree_id, invpath, node): ("view_name", hint["view"] ), ("host", hostname)], filename="view.py") - html.open_div(class_="invtablelink") - html.a(_("Open this table for filtering / sorting"), href=url) + html.div(html.render_a(_("Open this table for filtering / sorting"), href=url), + class_="invtablelink") # We cannot use table here, since html.plug() does not work recursively html.open_table(class_="data")

7 years, 10 months

3916 FIX History view: Only showing removed/ added entries tables when there are entries

by Lars Michelsen

Module: check_mk Branch: master Commit: 739c9bfccbf5f9b7750c78eb5b1370c64f4aa2e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=739c9bfccbf5f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 14 20:11:46 2016 +0100 3916 FIX History view: Only showing removed/added entries tables when there are entries --- .werks/3916 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/inventory.py | 40 +++++++++++++++++++++++----------------- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/.werks/3916 b/.werks/3916 new file mode 100644 index 0000000..08e514e --- /dev/null +++ b/.werks/3916 @@ -0,0 +1,9 @@ +Title: History view: Only showing removed/added entries tables when there are entries +Level: 1 +Component: inv +Compatible: compat +Version: 1.4.0i3 +Date: 1479072597 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2e585ef..b51bf51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * 3651 FIX: Fixed potential segfault with Nagios core when accessing log/commands table via Livestatus.... HW/SW-Inventory: + * 3916 FIX: History view: Only showing removed/added entries tables when there are entries * 4066 FIX: Fixed broken titles of nodes in inventory views * 4067 FIX: Fixed broken inventory history view in current master... diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 53da4bd..a354bfa 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -134,11 +134,13 @@ def render_inv_subtree_foldable(hostname, tree_id, invpath, node): def render_inv_subtree_container(hostname, tree_id, invpath, node): hint = inv_display_hint(invpath) + if "render" in hint: try: hint["render"](hostname, invpath, node) except: hint["render"](hostname, tree_id, invpath, node) + elif type(node) == dict: render_inv_subtree_dict(hostname, tree_id, invpath, node) else: @@ -194,15 +196,17 @@ def render_inv_subtree_list(hostname, tree_id, invpath, node): return elif type(node) == tuple: - html.write(_("Removed entries") + ":<br>") - html.open_span(class_="invold") - render_inv_subtree_list(hostname, tree_id, invpath, node[0]) - html.close_span() + if node[0]: + html.write(_("Removed entries") + ":<br>") + html.open_span(class_="invold") + render_inv_subtree_list(hostname, tree_id, invpath, node[0]) + html.close_span() - html.write(_("New entries") + ":<br>") - html.open_span(class_="invnew") - render_inv_subtree_list(hostname, tree_id, invpath, node[1]) - html.close_span() + if node[1]: + html.write(_("New entries") + ":<br>") + html.open_span(class_="invnew") + render_inv_subtree_list(hostname, tree_id, invpath, node[1]) + html.close_span() else: for nr, value in enumerate(node): @@ -261,15 +265,17 @@ def render_inv_subtree_leaf_value(hostname, tree_id, invpath, node): def render_inv_dicttable(hostname, tree_id, invpath, node): # In delta mode node is a pair of (old_items, new_items) if type(node) == tuple: - html.write_text(_("Removed entries") + ":") - html.open_span(class_="invold") - render_inv_dicttable(hostname, tree_id, invpath, node[0]) - html.close_span() - - html.write(_("New entries") + ":") - html.open_span(class_="invnew") - render_inv_dicttable(hostname, tree_id, invpath, node[1]) - html.close_span() + if node[0]: + html.write_text(_("Removed entries") + ":") + html.open_span(class_="invold") + render_inv_dicttable(hostname, tree_id, invpath, node[0]) + html.close_span() + + if node[1]: + html.write(_("New entries") + ":") + html.open_span(class_="invnew") + render_inv_dicttable(hostname, tree_id, invpath, node[1]) + html.close_span() return hint = inv_display_hint(invpath)

7 years, 10 months

3940 FIX aix_hacmp_services: fixed broken check in case of agent section showing extra information before the "Status(...)" line

by Marcel Schulte

Module: check_mk Branch: master Commit: 2a392e2f63e6f5a05f42c59864951f6815fe73f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a392e2f63e6f5… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Nov 14 15:45:22 2016 +0100 3940 FIX aix_hacmp_services: fixed broken check in case of agent section showing extra information before the "Status(...)" line In case of the agent section showing extra information before the "Status(...)" line like the following, the check crashed. This has been fixed now. Example agent section showing extra information in the first line: ### <<<aix_hacmp_services>>> clshowsrv is a tracked alias for /usr/es/sbin/cluster/utilities/clshowsrv Status of the RSCT subsystems used by PowerHA SystemMirror: (...) ### --- .werks/3940 | 20 ++++++++++++++++++++ ChangeLog | 1 + checks/aix_hacmp_services | 18 +++++++++--------- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/.werks/3940 b/.werks/3940 new file mode 100644 index 0000000..609905b --- /dev/null +++ b/.werks/3940 @@ -0,0 +1,20 @@ +Title: aix_hacmp_services: fixed broken check in case of agent section showing extra information before the "Status(...)" line +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1479134445 + +In case of the agent section showing extra information before the "Status(...)" line like the following, the check crashed. This has been fixed now. + +Example agent section showing extra information in the first line: + +### +<<<aix_hacmp_services>>> +clshowsrv is a tracked alias for /usr/es/sbin/cluster/utilities/clshowsrv +Status of the RSCT subsystems used by PowerHA SystemMirror: +(...) +### + diff --git a/ChangeLog b/ChangeLog index 9cad745..2e585ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * 3750 FIX: cmc_temp: Check now also works when using Nagios core * 3983 FIX: mssql_instance: Be more robust agains missing instance info in case of connection issues * 3963 FIX: check_mk_agent.linux: fixed strayed output of postfix status command + * 3940 FIX: aix_hacmp_services: fixed broken check in case of agent section showing extra information before the "Status(...)" line... Multisite: * 3974 FIX: Sorting comments in hover menu of comments icon by time now diff --git a/checks/aix_hacmp_services b/checks/aix_hacmp_services index 0d19810..8379ca3 100644 --- a/checks/aix_hacmp_services +++ b/checks/aix_hacmp_services @@ -89,21 +89,21 @@ def parse_aix_hacmp_services(info): parsed = {} - subsystem_ty_name = True + check_block = False # are we in the check relevant info block? for line in info: if line[0] == 'Details': - subsystem_ty_name = False + check_block = False - if subsystem_ty_name: - if line[0] == 'Status': - subsystem_ty_name = line[3] - if subsystem_ty_name == 'PowerHA': - subsystem_ty_name += " %s" % line[4] + elif line[0] == 'Status': + check_block = True + subsystem_ty_name = line[3] + if subsystem_ty_name == 'PowerHA': + subsystem_ty_name += " %s" % line[4] - elif line[0] == 'Subsystem': + elif check_block: + if line[0] == 'Subsystem': parsed.setdefault(subsystem_ty_name, []) - else: parsed[subsystem_ty_name].append( (line[0], line[3])

7 years, 10 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 0a6c17d381faec28ccbd8b395ac9e47363a2e98d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a6c17d381faec… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 14 15:11:08 2016 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6ed4d10..801c306 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4086 +4096

7 years, 10 months

updated werk 3963

by Simon Betz

Module: check_mk Branch: master Commit: 0fea81a45dbef088f6022e74657fb24eeb6a50f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fea81a45dbef0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 14 14:46:53 2016 +0100 updated werk 3963 --- agents/check_mk_agent.linux | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 81e5180..fef4c13 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -678,13 +678,14 @@ if type postfix >/dev/null ; then do if [ -n "$queue_dir" ]; then postfix_out=$(script -qfc "postfix -c $queue_dir status" /dev/null) + echo $postfix_out fi done else postfix_out=$(script -qfc 'postfix status' /dev/null) + echo $postfix_out fi - echo $postfix_out fi

7 years, 10 months

4067 FIX Fixed broken inventory history view in current master

by Lars Michelsen

Module: check_mk Branch: master Commit: 8381f47fdef366deb95a840b6bc91b18a3466cd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8381f47fdef366… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 14 11:42:02 2016 +0100 4067 FIX Fixed broken inventory history view in current master An exception "TypeError: 'NoneType' object is not callable" could happend while rendering a inventory history page. --- .werks/4067 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- web/plugins/views/inventory.py | 4 ++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/4067 b/.werks/4067 new file mode 100644 index 0000000..962c601 --- /dev/null +++ b/.werks/4067 @@ -0,0 +1,10 @@ +Title: Fixed broken inventory history view in current master +Level: 1 +Component: inv +Compatible: compat +Version: 1.4.0i3 +Date: 1479120067 +Class: fix + +An exception "TypeError: 'NoneType' object is not callable" could happend while +rendering a inventory history page. diff --git a/ChangeLog b/ChangeLog index ed18094..9cad745 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ HW/SW-Inventory: * 4066 FIX: Fixed broken titles of nodes in inventory views + * 4067 FIX: Fixed broken inventory history view in current master... 1.4.0i2: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 758df70..63acf26 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -367,7 +367,7 @@ class HTMLGenerator(OutputFunnel): # these tags can be called by open_name(), close_name() and render_name(), e.g. 'self.open_html()' _tag_names = set(['html', 'head', 'body', 'header', 'footer', 'a', 'b',\ 'script', 'form', 'button', 'p', 'select',\ - 'table', 'tbody', 'row', 'ul', 'li', 'br', 'nobr', 'input']) + 'table', 'tbody', 'row', 'ul', 'li', 'br', 'nobr', 'input', 'span']) # Of course all shortcut tags can be used as well. _tag_names.update(_shortcut_tags) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 38e4de9..53da4bd 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -262,12 +262,12 @@ def render_inv_dicttable(hostname, tree_id, invpath, node): # In delta mode node is a pair of (old_items, new_items) if type(node) == tuple: html.write_text(_("Removed entries") + ":") - html.write_span(class_="invold") + html.open_span(class_="invold") render_inv_dicttable(hostname, tree_id, invpath, node[0]) html.close_span() html.write(_("New entries") + ":") - html.write_span(class_="invnew") + html.open_span(class_="invnew") render_inv_dicttable(hostname, tree_id, invpath, node[1]) html.close_span() return

7 years, 10 months

4066 FIX Fixed broken titles of nodes in inventory views

by Lars Michelsen

Module: check_mk Branch: master Commit: cf93013bd083114c5769472e96c8f9924dba09e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf93013bd08311… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 14 11:35:51 2016 +0100 4066 FIX Fixed broken titles of nodes in inventory views --- .werks/4066 | 9 +++++++++ ChangeLog | 3 +++ web/plugins/views/inventory.py | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4066 b/.werks/4066 new file mode 100644 index 0000000..41728ee --- /dev/null +++ b/.werks/4066 @@ -0,0 +1,9 @@ +Title: Fixed broken titles of nodes in inventory views +Level: 1 +Component: inv +Compatible: compat +Version: 1.4.0i3 +Date: 1479119699 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 0f0c02a..ed18094 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,9 @@ Livestatus: * 3651 FIX: Fixed potential segfault with Nagios core when accessing log/commands table via Livestatus.... + HW/SW-Inventory: + * 4066 FIX: Fixed broken titles of nodes in inventory views + 1.4.0i2: Core & Setup: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 5230fd4..38e4de9 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -168,8 +168,8 @@ def render_inv_subtree_dict(hostname, tree_id, invpath, node): html.open_table() for title, invpath_sub, value in leaf_nodes: html.open_tr() - html.open_th(title=title) - html.write(invpath_sub) + html.open_th(title=invpath_sub) + html.write(title) html.close_th() html.open_td()

7 years, 10 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ebf40a986195c48008f42f231f4cb199bc7f970 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ebf40a986195c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 14 11:34:49 2016 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 696fa2a..6ed4d10 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4066 +4086

7 years, 10 months

WATO roles: improved error handling when trying to edit non existing role

by Lars Michelsen

Module: check_mk Branch: master Commit: 42a6cf64c55480d0d1a2f74e0228ca68f6f1cc08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42a6cf64c55480… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 14 10:27:32 2016 +0100 WATO roles: improved error handling when trying to edit non existing role --- web/htdocs/wato.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 81bd746..5868515 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10793,7 +10793,6 @@ def mode_roles(phase): def mode_edit_role(phase): - role_id = html.var("edit") if phase == "title": @@ -10806,9 +10805,12 @@ def mode_edit_role(phase): # Make sure that all dynamic permissions are available (e.g. those for custom # views) config.load_dynamic_permissions() - roles = userdb.load_roles() - role = roles[role_id] + + try: + role = roles[role_id] + except KeyError: + raise MKGeneralException(_("This role does not exist.")) if phase == "action": alias = html.get_unicode_input("alias")

7 years, 10 months

WATO search: cleaned up duplicate code

by Lars Michelsen

Module: check_mk Branch: master Commit: 77ea3362abc94d3bd328821753eea9ceea4c6527 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77ea3362abc94d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 14 10:35:26 2016 +0100 WATO search: cleaned up duplicate code --- web/htdocs/wato.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5868515..0087151 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6139,9 +6139,7 @@ def mode_edit_ldap_connection(phase): # '----------------------------------------------------------------------' def mode_globalvars(phase): - search = html.get_unicode_input("search") - if search != None: - search = search.strip().lower() + search = get_search_expression() if phase == "title": if search: @@ -9037,9 +9035,7 @@ def mode_edit_site_globals(phase): siteid = html.var("site") site = configured_sites[siteid] - search = html.get_unicode_input("search") - if search != None: - search = search.strip().lower() + search = get_search_expression() if phase == "title": return _("Edit site-specific global settings of %s") % siteid @@ -10857,6 +10853,8 @@ def mode_edit_role(phase): add_change("edit-roles", _("Modified user role '%s'") % new_id, sites=get_login_sites()) return "roles" + search_form(_("Search for permissions: "), "permissions") + html.begin_form("role", method="POST") # ID @@ -11943,6 +11941,13 @@ def search_form(title, mode=None): html.br() +def get_search_expression(): + search = html.get_unicode_input("search") + if search != None: + search = search.strip().lower() + return search + + def rule_is_ineffective(rule, rule_folder, rulespec, hosts): value, tag_specs, host_list, item_list, rule_options = parse_rule(rulespec, rule) found_match = False @@ -12060,9 +12065,7 @@ def mode_rulesets(phase, group=None): show_deprecated = html.var("deprecated") == "1" - search = html.get_unicode_input("search") - if search != None: - search = search.strip().lower() + search = get_search_expression() if group == "used": title = _("Used Rulesets")

7 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016