Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 57958a64dac4cb197c8492e18acfe9229e44887f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57958a64dac4cb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 6 10:36:57 2016 +0100 improved filter --- web/plugins/visuals/filters.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 453f135..71ca836 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1244,13 +1244,23 @@ class FilterECServiceLevelRange(Filter): upper_bound = html.var(self.upper_bound_varname) if lower_bound and upper_bound: + match_func = lambda val: int(lower_bound) <= val <= int(upper_bound) + elif lower_bound and not upper_bound: + match_func = lambda val: int(lower_bound) <= val + elif not lower_bound and upper_bound: + match_func = lambda val: val <= int(upper_bound) + else: + match_func = None + + if match_func is not None: filterline = "Filter: %s_custom_variable_names >= EC_SL\n" % self.info filterline_values = [] for value, readable in config.mkeventd_service_levels: - if value >= int(lower_bound) and value <= int(upper_bound): + if match_func(value): filterline_values.append( "Filter: %s_custom_variable_values >= %s" % \ (self.info, lqencode(str(value))) ) + filterline += "%s\n" % "\n".join( filterline_values ) len_filterline_values = len(filterline_values)

7 years, 6 months

Minor cleanup of string casting

by Lars Michelsen

Module: check_mk Branch: master Commit: a29006fc15e3271aac13a44a2ca636eb7d5cb70c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a29006fc15e327… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 09:51:48 2016 +0100 Minor cleanup of string casting --- web/htdocs/valuespec.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8c22978..7c89512 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -388,8 +388,8 @@ class TextAscii(ValueSpec): def render_input(self, varprefix, value, hidden=False): if value == None: value = "" - elif type(value) != unicode: - value = str(value) + else: + value = "%s" % value if self._label: html.write(self._label)

7 years, 6 months

4131 FIX Fixed broken WATO site login when using password containing special characters

by Lars Michelsen

Module: check_mk Branch: master Commit: d86e560c6952d4712930ff427b3de55c9f918f5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d86e560c6952d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 10:12:59 2016 +0100 4131 FIX Fixed broken WATO site login when using password containing special characters Some special characters could confuse the WATO site login and lead to an error message like "HTTP error - None:". --- .werks/4131 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4131 b/.werks/4131 new file mode 100644 index 0000000..3e4715e --- /dev/null +++ b/.werks/4131 @@ -0,0 +1,11 @@ +Title: Fixed broken WATO site login when using password containing special characters +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1481015489 + +Some special characters could confuse the WATO site login and lead to an error +message like "HTTP error - None:". diff --git a/ChangeLog b/ChangeLog index 5145b8b..f161607 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * 4082 FIX: Icon selector: Fixed exception in case non images are saved in icon folder * 4084 FIX: Improved error handling in case of broken hosts.mk files * 4130 FIX: Improved error handling when trying to edit not existant rules + * 4131 FIX: Fixed broken WATO site login when using password containing special characters... Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 3672778..bb514b4 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3359,7 +3359,7 @@ def do_site_login(site_id, name, password): def get_url(url, insecure, user=None, password=None, params = '', post_data = None): cred = '' if user: - cred = ' -u "%s:%s"' % (user, password) + cred = ' -u %s' % quote_shell_string("%s:%s" % (user, password)) insecure = insecure and ' --insecure' or ''

7 years, 6 months

EC history: show tooltip in history "what" column

by Mathias Kettner

Module: check_mk Branch: master Commit: e386324e46c59ece075cc8120217dc9ed000f134 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e386324e46c59e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 6 09:28:06 2016 +0100 EC history: show tooltip in history "what" column --- web/plugins/views/mkeventd.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index d210f63..c450b3d 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -379,11 +379,15 @@ if mkeventd_enabled: "paint" : lambda row: paint_age(row["history_time"], True, True), } + def paint_ec_history_what(row): + what = row["history_what"] + return "", '<span title="%s">%s</span>' % (mkeventd.action_whats[what], what) + multisite_painters["history_what"] = { "title" : _("Type of event action"), "short" : _("Action"), "columns" : ["history_what" ], - "paint" : lambda row: ("", row["history_what"]), + "paint" : paint_ec_history_what, } multisite_painters["history_what_explained"] = {

7 years, 6 months

Fixed HTML tests after recode

by Lars Michelsen

Module: check_mk Branch: master Commit: aa0f5053504c831b54cdc3efb048c59308e29a83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa0f5053504c83… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 08:30:49 2016 +0100 Fixed HTML tests after recode --- tests/web/tools.py | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/tests/web/tools.py b/tests/web/tools.py index 7a376fe..bd65676 100644 --- a/tests/web/tools.py +++ b/tests/web/tools.py @@ -48,10 +48,7 @@ def timeit(method): def prettify(html_text): - if isinstance(html_text, HTML): - txt = bs(html_text.value, 'html5lib').prettify() - else: - txt = bs(html_text, 'html5lib').prettify() + txt = bs(html_text, 'html5lib').prettify() return re.sub('\n{2,}', '\n', re.sub('>', '>\n', txt)) @@ -96,13 +93,6 @@ def subber(value): re.sub('\n', '', value)))))) def compare_soup(html1, html2): - - if isinstance(html1, HTML): - html1 = html1.value - - if isinstance(html2, HTML): - html2 = html2.value - s1 = bs(prettify(html1), 'html5lib') s2 = bs(prettify(html2), 'html5lib') @@ -136,14 +126,6 @@ def compare_soup(html1, html2): def compare_html(html1, html2): - - if isinstance(html1, HTML): - html1 = html1.value - - if isinstance(html2, HTML): - html2 = html2.value - - # compare tags opening_1 = re.findall(r'<[^<]*>', html1) opening_2 = re.findall(r'<[^<]*>', html2)

7 years, 6 months

4110 netscaler_vserver: health status is now configurable

by Simon Betz

Module: check_mk Branch: master Commit: 65b4a4937ea5062b8edcfce35f9cdac21535cdda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65b4a4937ea506… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 5 18:17:39 2016 +0100 4110 netscaler_vserver: health status is now configurable --- .werks/4110 | 9 +++ ChangeLog | 1 + checks/netscaler_vserver | 121 +++++++++++++++++++---------------- web/plugins/wato/check_parameters.py | 14 ++++ 4 files changed, 90 insertions(+), 55 deletions(-) diff --git a/.werks/4110 b/.werks/4110 new file mode 100644 index 0000000..f5591d6 --- /dev/null +++ b/.werks/4110 @@ -0,0 +1,9 @@ +Title: netscaler_vserver: health status is now configurable +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i3 +Date: 1480958242 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3965d1a..5145b8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 3996 agent_netapp clustermode: now uses a fallback query to determine the node name if the intial query fails * 4108 ipmi_sensors: new options available... * 4109 websphere_mq_instance, websphere_mq_instance.manager: new checks for Websphere MQ + * 4110 netscaler_vserver: health status is now configurable * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... diff --git a/checks/netscaler_vserver b/checks/netscaler_vserver index 1d22391..557c61f 100644 --- a/checks/netscaler_vserver +++ b/checks/netscaler_vserver @@ -26,55 +26,55 @@ # netscaler_vserver_states = { - "0": ("unknown", 1), - "1": ("down", 2), - "2": ("unknown", 1), - "3": ("busy", 1), - "4": ("out of service", 1), - "5": ("transition to out of service", 1), - "7": ("up", 0), + "0" : (1, "unknown"), + "1" : (2, "down"), + "2" : (1, "unknown"), + "3" : (1, "busy"), + "4" : (1, "out of service"), + "5" : (1, "transition to out of service"), + "7" : (0, "up"), } netscaler_vserver_types = { - "0" :"http", - "1" :"ftp", - "2" :"tcp", - "3" :"udp", - "4" :"sslBridge", - "5" :"monitor", - "6" :"monitorUdp", - "7" :"nntp", - "8" :"httpserver", - "9" :"httpclient", - "10" :"rpcserver", - "11" :"rpcclient", - "12" :"nat", - "13" :"any", - "14" :"ssl", - "15" :"dns", - "16" :"adns", - "17" :"snmp", - "18" :"ha", - "19" :"monitorPing", - "20" :"sslOtherTcp", - "21" :"aaa", - "23" :"secureMonitor", - "24" :"sslvpnUdp", - "25" :"rip", - "26" :"dnsClient", - "27" :"rpcServer", - "28" :"rpcClient", - "62" :"serviceUnknown", - "69" :"tftp", + "0" : "http", + "1" : "ftp", + "2" : "tcp", + "3" : "udp", + "4" : "ssl bridge", + "5" : "monitor", + "6" : "monitor udp", + "7" : "nntp", + "8" : "http server", + "9" : "http client", + "10" : "rpc server", + "11" : "rpc client", + "12" : "nat", + "13" : "any", + "14" : "ssl", + "15" : "dns", + "16" : "adns", + "17" : "snmp", + "18" : "ha", + "19" : "monitor ping", + "20" : "sslOther tcp", + "21" : "aaa", + "23" : "secure monitor", + "24" : "ssl vpn udp", + "25" : "rip", + "26" : "dns client", + "27" : "rpc server", + "28" : "rpc client", + "62" : "service unknown", + "69" : "tftp", } netscaler_vserver_entitytypes = { - "0" :"unknown", - "1" :"loadbalancing", - "2" :"loadbalancinggroup", - "3" :"sslvpn", - "4" :"contentswitching", - "5" :"cacheredirection", + "0" : "unknown", + "1" : "loadbalancing", + "2" : "loadbalancing group", + "3" : "ssl vpn", + "4" : "content switching", + "5" : "cache redirection", } @@ -83,27 +83,37 @@ def inventory_netscaler_vserver(info): if line[0]: yield line[0], None -def check_netscaler_vserver(item, _no_params, info): - for line in info: - if line[0] == item: - state = 0 - name, ip, port, svr_type, svr_state, svr_health, svr_entitytype = line - svr_state_info = netscaler_vserver_states.get(svr_state, ("unknown", 1)) - yield svr_state_info[1], "State: %s" % svr_state_info[0] +def check_netscaler_vserver(item, params, info): + if params is None: + params = {} + + for name, ip, port, svr_type, svr_state,\ + svr_health, svr_entitytype in info: + if name == item: + svr_state, svr_state_readable = netscaler_vserver_states.get(svr_state, ("unknown", 1)) + yield svr_state, "Status: %s" % svr_state_readable if svr_entitytype in [ "1", "2" ]: - health_perc = int(svr_health) + health_perc = int(svr_health) health_state = 0 + if health_perc == 0: health_state = 2 elif health_perc < 100: health_state = 1 - yield health_state, "Health at: %s%%" % health_perc, [("health_perc", health_perc, None, None, 0, 100)] - yield 0, "Type: %s" % netscaler_vserver_entitytypes.get(svr_entitytype , "unknown (%s)" % svr_entitytype) - yield 0, "Protocol: %s" % netscaler_vserver_types.get(svr_type, "serviceUnknown (%s)" % svr_type) - yield 0, "Socket: %s:%s" % (ip, port) + if "map_health_status" in params: + health_state = params["map_health_status"] + + yield health_state, "Health: %s" % get_percent_human_readable(health_perc),\ + [("health_perc", health_perc, None, None, 0, 100)] + + yield 0, "Type: %s, Protocol: %s, Socket: %s:%s" % ( + netscaler_vserver_entitytypes.get(svr_entitytype , "unknown (%s)" % svr_entitytype), + netscaler_vserver_types.get(svr_type, "service unknown (%s)" % svr_type), + ip, port) + check_info["netscaler_vserver"] = { "check_function" : check_netscaler_vserver, @@ -120,4 +130,5 @@ check_info["netscaler_vserver"] = { ]), "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5951.1"), + "group" : "netscaler_vserver", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 0861c0c..614d8b0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6688,6 +6688,20 @@ register_check_parameters( register_check_parameters( subgroup_os, + "netscaler_vserver", + _("Netscaler VServer States"), + Dictionary( + elements = [ + ("map_health_status", MonitoringState(title=_("Health Status"))) + ] + ), + TextAscii( title = _("Name of VServer") ), + "dict" +) + + +register_check_parameters( + subgroup_os, "general_flash_usage", _("Flash Space Usage"), Alternative(

7 years, 6 months

4130 FIX Improved error handling when trying to edit not existant rules

by Lars Michelsen

Module: check_mk Branch: master Commit: 97acc7884e35788a6fe6f5df2e1e7213303e0b3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97acc7884e3578… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 14:29:15 2016 +0100 4130 FIX Improved error handling when trying to edit not existant rules --- .werks/4130 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 14 ++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/4130 b/.werks/4130 new file mode 100644 index 0000000..0e838c8 --- /dev/null +++ b/.werks/4130 @@ -0,0 +1,10 @@ +Title: Improved error handling when trying to edit not existant rules +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480944530 + + diff --git a/ChangeLog b/ChangeLog index b6ed499..3965d1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ * 4079 FIX: Improved error handling in case a WATO folder can not be written * 4082 FIX: Icon selector: Fixed exception in case non images are saved in icon folder * 4084 FIX: Improved error handling in case of broken hosts.mk files + * 4130 FIX: Improved error handling when trying to edit not existant rules Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5fb22d8..c8d3d47 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12411,7 +12411,13 @@ def mode_edit_ruleset(phase): rulesets = load_rulesets(rule_folder) rules = rulesets.get(varname, []) - rulenr = int(html.var("_rulenr")) # rule number relativ to folder + try: + rulenr = int(html.var("_rulenr")) # rule number relativ to folder + rule = rules[rulenr] + except (IndexError, TypeError, ValueError): + raise MKUserError("rulenr", _("You are trying to edit a rule which does not exist " + "anymore.")) + action = html.var("_action") if action == "delete": @@ -12441,7 +12447,7 @@ def mode_edit_ruleset(phase): else: if not html.check_transaction(): return None # browser reload - rule = rules[rulenr] + del rules[rulenr] if action == "up": rules[rulenr-1:rulenr-1] = [ rule ] @@ -13103,10 +13109,10 @@ def mode_edit_rule(phase, new = False): return rulenr = len(rules) else: - rulenr = int(html.var("rulenr")) try: + rulenr = int(html.var("rulenr")) rule = rules[rulenr] - except IndexError: + except (TypeError, ValueError, IndexError): if phase == "action": raise MKUserError("rulenr", _("You are trying to edit a rule which does not exist " "anymore."))

7 years, 7 months

improved filter

by Simon Betz

Module: check_mk Branch: master Commit: 881c60920a6d175b525158d60f3b5780334d8937 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=881c60920a6d17… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 5 14:13:23 2016 +0100 improved filter --- web/plugins/visuals/filters.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 60a9d3c..bde981c 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1216,10 +1216,8 @@ declare_filter(302, FilterHostAuxTags()) # choices = [ (value, "readable"), .. ] -class FilterCustomVarChoice(Filter): - def __init__(self, name, title, info, custom_var, choices): - self.custom_var = custom_var - self.choices = choices +class FilterMKEventDServiceLevelRange(Filter): + def __init__(self, name, title, info): self.lower_bound_varname = "%s_lower" % name self.upper_bound_varname = "%s_upper" % name @@ -1229,7 +1227,8 @@ class FilterCustomVarChoice(Filter): def _prepare_choices(self): - return map( lambda x: ( str(x[0]), "%s - %s" % (x[0], x[1]) ), self.choices ) + return map( lambda x: ( str(x[0]), "%s - %s" % (x[0], x[1]) ), + config.mkeventd_service_levels ) def display(self): @@ -1245,11 +1244,10 @@ class FilterCustomVarChoice(Filter): upper_bound = html.var(self.upper_bound_varname) if lower_bound and upper_bound: - filterline = "Filter: %s_custom_variable_names >= %s\n" % \ - ( self.info, self.custom_var ) + filterline = "Filter: %s_custom_variable_names >= EC_SL\n" % self.info filterline_values = [] - for value, readable in self.choices: + for value, readable in config.mkeventd_service_levels: if value >= int(lower_bound) and value <= int(upper_bound): filterline_values.append( "Filter: %s_custom_variable_values >= %s" % \ (self.info, lqencode(str(value))) ) @@ -1270,14 +1268,12 @@ class FilterCustomVarChoice(Filter): -declare_filter(310, FilterCustomVarChoice( - "svc_service_level", _("Service service level"), - "service", "EC_SL", config.mkeventd_service_levels )) +declare_filter(310, FilterMKEventDServiceLevelRange( + "svc_service_level", _("Service service level"), "service")) -declare_filter(310, FilterCustomVarChoice( - "hst_service_level", _("Host service level"), - "host", "EC_SL", config.mkeventd_service_levels )) +declare_filter(310, FilterMKEventDServiceLevelRange( + "hst_service_level", _("Host service level"), "host"))

7 years, 7 months

renamed filter

by Simon Betz

Module: check_mk Branch: master Commit: 4cefad93b369708f9fe532fadc7bbc29460687e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cefad93b36970… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 5 14:14:42 2016 +0100 renamed filter --- web/plugins/visuals/filters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index bde981c..453f135 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1216,7 +1216,7 @@ declare_filter(302, FilterHostAuxTags()) # choices = [ (value, "readable"), .. ] -class FilterMKEventDServiceLevelRange(Filter): +class FilterECServiceLevelRange(Filter): def __init__(self, name, title, info): self.lower_bound_varname = "%s_lower" % name self.upper_bound_varname = "%s_upper" % name @@ -1268,11 +1268,11 @@ class FilterMKEventDServiceLevelRange(Filter): -declare_filter(310, FilterMKEventDServiceLevelRange( +declare_filter(310, FilterECServiceLevelRange( "svc_service_level", _("Service service level"), "service")) -declare_filter(310, FilterMKEventDServiceLevelRange( +declare_filter(310, FilterECServiceLevelRange( "hst_service_level", _("Host service level"), "host"))

7 years, 7 months

4129 FIX Fixed possible exception when a view is linking to a not permitted other view

by Lars Michelsen

Module: check_mk Branch: master Commit: 9657f7768fb553180970ade4aac8e51742052fdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9657f7768fb553… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 14:05:13 2016 +0100 4129 FIX Fixed possible exception when a view is linking to a not permitted other view --- .werks/4129 | 9 +++++++++ ChangeLog | 1 + web/htdocs/views.py | 12 ++++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/4129 b/.werks/4129 new file mode 100644 index 0000000..2c8316d --- /dev/null +++ b/.werks/4129 @@ -0,0 +1,9 @@ +Title: Fixed possible exception when a view is linking to a not permitted other view +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i3 +Date: 1480943083 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index be8768d..b6ed499 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * 4080 FIX: Fixed possible exception "unsupported operand type" in matrix views * 4127 FIX: Fixed possible "maximum recursion depth exceeded" error when sorting tables with a lot of text in cells * 4128 FIX: Fixed exception in "Virtual host tree" snapin in case a user tries to access a not existing tree + * 4129 FIX: Fixed possible exception when a view is linking to a not permitted other view WATO: * 3984 Permissions can now be filtered by providing a search term on the "edit role" page... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1215a52..5017b1c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -556,9 +556,10 @@ class Cell(object): if self._has_link(): link_view = self._link_view() - # TODO: Clean this up here - for filt in [ visuals.get_filter(fn) for fn in visuals.get_single_info_keys(link_view) ]: - columns.update(filt.link_columns) + if link_view: + # TODO: Clean this up here + for filt in [ visuals.get_filter(fn) for fn in visuals.get_single_info_keys(link_view) ]: + columns.update(filt.link_columns) if self.has_tooltip(): columns.update(get_painter_columns(self.tooltip_painter())) @@ -579,7 +580,10 @@ class Cell(object): def _link_view(self): - return get_view_by_name(self._link_view_name) + try: + return get_view_by_name(self._link_view_name) + except KeyError: + return None def painter(self):

7 years, 7 months

← Newer
1
...
32
33
34
35
36
37
38
39
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016