Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: Fixed renamed function call

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ea9634be75ea0236672931a4c222f7126a027dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ea9634be75ea0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 16 16:10:21 2015 +0200 Fixed renamed function call --- web/htdocs/html_mod_python.py | 2 +- web/htdocs/js/dashboard.js | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index f7e422a..89b937f 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -119,7 +119,7 @@ class html_mod_python(htmllib.html): if config.pagetitle_date_format: self.write('   <b id=headerdate format="%s"></b>' % config.pagetitle_date_format) self.write(' <b id=headertime></b>') - self.write("<script language=\"javascript\" type=\"text/javascript\">updateHeaderTime()</script>") + self.javascript('update_header_timer()') self.top_heading_right() def omd_mode(self): diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 04882e8..90557af 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -340,16 +340,14 @@ function dashboard_scheduler(initial) { // Update timestamp every minute // Required if there are no refresh_dashlets present or all refresh times are > 60sec - if (timestamp % 60 == 0) { - updateHeaderTime(); - } + if (timestamp % 60 == 0) + update_header_timer(); setTimeout(function() { dashboard_scheduler(0); }, 1000); } function dashboard_update_contents(id, response_text) { - // Update the header time - updateHeaderTime(); + update_header_timer(); // Call the generic function to replace the dashlet inner code updateContents(id, response_text);

9 years, 5 months

Check_MK Git: check_mk: Started cleaning up and restructuring JS code

by Lars Michelsen

Module: check_mk Branch: master Commit: b6cbb95e59ff0160f9b7b7c0ba3b2945df263f8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6cbb95e59ff01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 16 16:06:55 2015 +0200 Started cleaning up and restructuring JS code --- doc/helpers/figheader | 7 + web/htdocs/htmllib.py | 6 +- web/htdocs/js/checkmk.js | 956 ++++++++++++++++++++++++---------------------- web/htdocs/js/wato.js | 2 +- 4 files changed, 516 insertions(+), 455 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b6cbb95e59…

9 years, 5 months

Check_MK Git: check_mk: if.include: check function no longer uses inventory rules

by Andreas Boesl

Module: check_mk Branch: master Commit: 1d6852c15b90995bb9a258182b03da31f6b95130 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d6852c15b9099… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 16 15:31:47 2015 +0200 if.include: check function no longer uses inventory rules --- checks/if.include | 59 +++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/checks/if.include b/checks/if.include index 518635f..6cb11ab 100644 --- a/checks/if.include +++ b/checks/if.include @@ -324,9 +324,16 @@ def inventory_if_common(info, has_nodeinfo = False): group_operStatus = one_up and "1" or "2" if group_operStatus in portstates: - params = { "iftype": values["iftype"], - "include_items": values["include_items"], - "aggregate": True } + params = { "iftype" : values["iftype"], + "include_items": values["include_items"], + "aggregate" : True } + + if uses_description: + params["aggr_member_item"] = "description" + elif uses_alias: + params["aggr_member_item"] = "alias" + else: + params["aggr_member_item"] = "index" if if_inventory_monitor_state: params["state"] = [group_operStatus] @@ -354,28 +361,19 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou if params.get("aggregate"): group_members = [] matching_interfaces = [] - - settings = host_extra_conf_merged(g_hostname, inventory_if_rules) - uses_description = settings.get('use_desc', if_inventory_uses_description) - uses_alias = settings.get('use_alias', if_inventory_uses_alias) - node_offset = has_nodeinfo and 1 or 0 - def get_interface_item(line): + + def get_interface_item(line, what): ifIndex = line[ 0 + node_offset] if type(ifIndex) == tuple: ifGroup, ifIndex = ifIndex - ifDescr = line[ 1 + node_offset] - ifAlias = line[18 + node_offset] - if uses_description and ifDescr: - if_item = ifDescr - elif uses_alias and ifAlias: - if_item = ifAlias - else: - if_item = if_pad_with_zeroes(info, ifIndex, has_nodeinfo) - return if_item - - + if what == "description": + return line[ 1 + node_offset] + elif what == "alias": + return line[18 + node_offset] + else: # index + return if_pad_with_zeroes(info, ifIndex, has_nodeinfo) for element in info: ifIndex = element[0 + node_offset] @@ -383,13 +381,13 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou if type(ifIndex) == tuple: ifGroup, ifIndex = ifIndex + if_member_item = get_interface_item(element, params.get("aggr_member_item")) + if ifGroup and ifGroup == item: - matching_interfaces.append(element) - else: - match_item = not params.get("include_items") or (get_interface_item(element) in params["include_items"]) - match_type = not params.get("iftype") or (params["iftype"] == saveint(element[2 + node_offset])) - if match_item and match_type: - matching_interfaces.append(element) + matching_interfaces.append((if_member_item, element)) + elif if_member_item in params.get("include_items", []) or\ + saveint(element[2 + node_offset]) == params.get("iftype"): + matching_interfaces.append((if_member_item, element)) # Accumulate info over matching_interfaces wrapped = False @@ -401,7 +399,7 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou "outbcast" : 0, "ifOutDiscards" : 0, "ifOutErrors" : 0, "ifOutQLen" : 0 } - for element in matching_interfaces: + for (if_member_item, element) in matching_interfaces: node, line = if_extract_node(element, has_nodeinfo) ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ @@ -419,8 +417,7 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou if type(ifIndex) == tuple: ifGroup, ifIndex = ifIndex - if_item = get_interface_item(element) - group_members.append({"name": if_item, "state": ifOperStatus, "state_name" : ifOperStatusName}) + group_members.append({"name": if_member_item, "state": ifOperStatus, "state_name" : ifOperStatusName}) perfdata = [] # Only these values are packed into counters @@ -441,7 +438,7 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou ( "outdisc", ifOutDiscards), ( "outerr", ifOutErrors) ]: try: - get_rate("if.%s.%s.%s" % (name, item, if_item), this_time, saveint(counter), onwrap=RAISE) + get_rate("if.%s.%s.%s" % (name, item, if_member_item), this_time, saveint(counter), onwrap=RAISE) except MKCounterWrapped: wrapped = True # continue, other counters might wrap as well @@ -466,7 +463,7 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou # Append an additional entry to the info table containing the calculated group_info num_up = 0 - for element in matching_interfaces: + for (if_member_item, element) in matching_interfaces: if element[4] == '1' or ( type(element[4]) == tuple and element[4][0] == '1'): num_up += 1

9 years, 5 months

Check_MK Git: check_mk: mknotifyd parameter: moved help text to correct valuespec

by Andreas Boesl

Module: check_mk Branch: master Commit: dd13accc09e39167449c2712e8398a569cf2fcd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd13accc09e391… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 16 15:16:00 2015 +0200 mknotifyd parameter: moved help text to correct valuespec --- web/plugins/wato/mknotifyd.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/plugins/wato/mknotifyd.py b/web/plugins/wato/mknotifyd.py index 5f21afd..b1dcf96 100644 --- a/web/plugins/wato/mknotifyd.py +++ b/web/plugins/wato/mknotifyd.py @@ -53,13 +53,13 @@ if mknotifyd_enabled: ( "both", _("Asynchronous local delivery plus remote forwarding" ) ), ], default_value = False, - help = _("This option dedices how notifications will be processed. Without the " - "notification spooler (<tt>mknotifyd</tt>) only direct local delivery " - "is possible. Long lasting or excessive notifications might slow down " - "the monitoring. If you select remote forwarding then make sure that " - "your notification spooler is correctly setup for incoming and/or " - "outgoing connections."), ), + help = _("This option dedices how notifications will be processed. Without the " + "notification spooler (<tt>mknotifyd</tt>) only direct local delivery " + "is possible. Long lasting or excessive notifications might slow down " + "the monitoring. If you select remote forwarding then make sure that " + "your notification spooler is correctly setup for incoming and/or " + "outgoing connections."), forth = lambda x: (x == False and "off" or (x == True and "local" or x)), ), domain = "check_mk",

9 years, 5 months

Check_MK Git: check_mk: #2068 FIX Filesystem checks: Fix crash when legacy parameters (tuple) were used

by Andreas Boesl

Module: check_mk Branch: master Commit: 26242c3f226d809d519317cbe7679a4e0b4a3ef1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26242c3f226d80… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 16 14:42:18 2015 +0200 #2068 FIX Filesystem checks: Fix crash when legacy parameters (tuple) were used A library function, which is used by many filesystem checks, raised an exception when the check parameters were not specified as dictionary. For example (93, 96). This has been fixed. --- .werks/2068 | 11 +++++++++++ ChangeLog | 1 + checks/df.include | 21 +++++++++++---------- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.werks/2068 b/.werks/2068 new file mode 100644 index 0000000..34b95b7 --- /dev/null +++ b/.werks/2068 @@ -0,0 +1,11 @@ +Title: Filesystem checks: Fix crash when legacy parameters (tuple) were used +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1429187803 +Class: fix + +A library function, which is used by many filesystem checks, raised an exception +when the check parameters were not specified as dictionary. For example (93, 96). +This has been fixed. diff --git a/ChangeLog b/ChangeLog index 9757f2e..b4ad364 100644 --- a/ChangeLog +++ b/ChangeLog @@ -331,6 +331,7 @@ * 2065 FIX: windows agent: now correctly installs service with elevated privileges... * 2179 FIX: apc_symmetra: Fixed regression introduced with last release when output state is empty * 2067 FIX: windows agent: product version is no longer set to 1.0.0... + * 2068 FIX: Filesystem checks: Fix crash when legacy parameters (tuple) were used... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/df.include b/checks/df.include index 6caf03a..7fd2ad1 100644 --- a/checks/df.include +++ b/checks/df.include @@ -338,16 +338,17 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, reserved elif used_mb >= warn_mb: status = max(1, status) - show_levels = params.get("show_levels") - if show_levels == "always" or \ - (show_levels == "onproblem" and status > 0) or \ - (show_levels == "onmagic" and (status > 0 or levels.get("magic", 1.0) != 1.0)): - infotext += ", " + levels["levels_text"] - - if reserved_mb > 0 and params["show_reserved"]: - reserved_perc = 100.0 * float(reserved_mb) / size_mb - infotext += ", therein reserved for root: %.1f%% (%.2f MB)" % (reserved_perc, reserved_mb) - perfdata.append(("reserved", reserved_mb)) + if type(params) == dict: + show_levels = params.get("show_levels") + if show_levels == "always" or \ + (show_levels == "onproblem" and status > 0) or \ + (show_levels == "onmagic" and (status > 0 or levels.get("magic", 1.0) != 1.0)): + infotext += ", " + levels["levels_text"] + + if reserved_mb > 0 and params["show_reserved"]: + reserved_perc = 100.0 * float(reserved_mb) / size_mb + infotext += ", therein reserved for root: %.1f%% (%.2f MB)" % (reserved_perc, reserved_mb) + perfdata.append(("reserved", reserved_mb)) # Trends. The trends are computed in two steps. In the first step we # compute the delta to the last check, using a normal check_mk counter.

9 years, 5 months

Check_MK Git: check_mk: #2203 FIX Fix sorting of unselected elements in a list choice with two panes

by Mathias Kettner

Module: check_mk Branch: master Commit: c45c5dc2fadf879a1942ec54b2ac993473c5b472 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c45c5dc2fadf87… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 16 12:21:45 2015 +0200 #2203 FIX Fix sorting of unselected elements in a list choice with two panes --- .werks/2203 | 9 +++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 7 ++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/2203 b/.werks/2203 new file mode 100644 index 0000000..ee67927 --- /dev/null +++ b/.werks/2203 @@ -0,0 +1,9 @@ +Title: Fix sorting of unselected elements in a list choice with two panes +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1429179695 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index eecf934..f965069 100644 --- a/ChangeLog +++ b/ChangeLog @@ -447,6 +447,7 @@ * 2191 FIX: Fixed handling of URL variable 'mode' in web API for discovering services... * 1956 FIX: WATO Web-API: Fixed exception information for single sites... * 2178 FIX: Fixed handling of user erros in WATO when using Python < 2.5 + * 2203 FIX: Fix sorting of unselected elements in a list choice with two panes Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 6945703..3054f8f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1621,7 +1621,8 @@ class DualListChoice(ListChoice): for v in value: if v in allowed_keys: selected.append((v, edict[v])) - for v in allowed_keys: + + for v, name in self._elements: if v not in value: unselected.append((v, edict[v])) else: @@ -1655,7 +1656,8 @@ class DualListChoice(ListChoice): onchange_selected += ';vs_duallist_enlarge(\'selected\', \'%s\')' % varprefix onchange_unselected += ';vs_duallist_enlarge(\'unselected\', \'%s\')' % varprefix - html.sorted_select(varprefix + '_unselected', unselected, + func = self._custom_order and html.select or html.sorted_select + func(varprefix + '_unselected', unselected, attrs = { 'size' : self._rows, 'multiple' : 'multiple', @@ -1664,7 +1666,6 @@ class DualListChoice(ListChoice): }, onchange = onchange_unselected) html.write('</td><td>') - func = self._custom_order and html.select or html.sorted_select func(varprefix + '_selected', selected, attrs = { 'size' : self._rows,

9 years, 5 months

Check_MK Git: check_mk: HW/SW-Inventory: fix missing tree lables for new unknown paths

by Mathias Kettner

Module: check_mk Branch: master Commit: 3df7f248206ecd7e63de71e87f2ac41be5c1ba58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df7f248206ecd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 15 17:03:31 2015 +0200 HW/SW-Inventory: fix missing tree lables for new unknown paths --- web/plugins/views/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index d69315e..cc08a2a 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -331,7 +331,7 @@ def inv_titleinfo(invpath, node): if type(title) == type(lambda: None): title = title(node) else: - title = invpath.split('.')[-1].split(':')[-1].replace("_", " ").title() + title = invpath.rstrip(".").split('.')[-1].split(':')[-1].replace("_", " ").title() return icon, title # The titles of the last two path components of the node, e.g. "BIOS / Vendor"

9 years, 5 months

Check_MK Git: check_mk: hitachi_hus_dkc, hitachi_hus_dku: small changes to criteria for states

by Goetz Golla

Module: check_mk Branch: master Commit: 080f4dbfbb9cf1173bf7a1ae1c39cd2e59489c52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=080f4dbfbb9cf1… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Apr 16 12:14:20 2015 +0200 hitachi_hus_dkc, hitachi_hus_dku: small changes to criteria for states --- checkman/hitachi_hus_dkc | 7 ++++--- checkman/hitachi_hus_dku | 8 +++++--- checks/hitachi_hus_dkc | 25 ++++++++++++++----------- checks/hitachi_hus_dku | 15 +++++++++------ 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/checkman/hitachi_hus_dkc b/checkman/hitachi_hus_dkc index 51443ad..dc22290 100644 --- a/checkman/hitachi_hus_dkc +++ b/checkman/hitachi_hus_dkc @@ -12,9 +12,10 @@ description: Processor, Internal Bus, Cache, Shared Memory, Power Supply, Battery, Fan, Environment. - The checks gets CRIT if one of the components is not in the state "noError". - In addition, the Environment component is also OK, when it is in the state - "moderate". + The check is {OK} if all of the components are in the state "noError". + It is {WARN} if some of the components are in the states "moderate" or + "service". It is {CRIT} if some of the components are in other states as + the above-mentioned. inventory: One item for every DKC chassis found diff --git a/checkman/hitachi_hus_dku b/checkman/hitachi_hus_dku index 38a9a52..ec1a3e2 100644 --- a/checkman/hitachi_hus_dku +++ b/checkman/hitachi_hus_dku @@ -10,9 +10,11 @@ description: extract state information of the following hardware components of the DKU: Power Supply, Drive, Fan, Environment. - The checks gets CRIT if one of the components is not in the state "noError". - In addition, the Environment component is also OK, when it is in the state - "moderate". + The check is {OK} if all of the components are in the state "noError". + It is {WARN} if some of the components are in the states "moderate" or + "service". It is {CRIT} if some of the components are in other states as + the above-mentioned. + inventory: One service for every DKU chassis found diff --git a/checks/hitachi_hus_dkc b/checks/hitachi_hus_dkc index 727b7b6..5cfac6f 100644 --- a/checks/hitachi_hus_dkc +++ b/checks/hitachi_hus_dkc @@ -31,16 +31,16 @@ def inventory_hitachi_hus_dkc(info): yield line[0], None def check_hitachi_hus_dkc(item, _no_params, info): - # table of end-OIDs, monitored entities and OK states + # table of end-OIDs, monitored entities and OK/Warn states component_map = { - 2: ("Processor", (1, ) ), - 3: ("Internal Bus", (1, ) ), - 4: ("Cache", (1, ) ), - 5: ("Shared Memory", (1, ) ), - 6: ("Power Supply", (1, ) ), - 7: ("Battery", (1, ) ), - 8: ("Fan", (1, ) ), - 9: ("Environment", (1, 4) ), + 2: ("Processor", (1, ), (4, 5) ), + 3: ("Internal Bus", (1, ), (4, 5) ), + 4: ("Cache", (1, ), (4, 5) ), + 5: ("Shared Memory", (1, ), (4, 5) ), + 6: ("Power Supply", (1, ), (4, 5) ), + 7: ("Battery", (1, ), (4, 5) ), + 8: ("Fan", (1, ), (4, 5) ), + 9: ("Environment", (1, ), (4, 5) ), } error_list = [ "unknown", @@ -55,9 +55,12 @@ def check_hitachi_hus_dkc(item, _no_params, info): if line[0] == item: infotext = "" errors = False - for end_oid, (component, ok_states) in component_map.iteritems(): + for end_oid, (component, ok_states, warn_states) in component_map.iteritems(): severity = int(line[end_oid - 1]) - if severity not in ok_states: + if severity in warn_states: + errors = True + yield 1, "%s has errors of severity \"%s\"" % (component, error_list[severity]) + elif severity not in ok_states: errors = True yield 2, "%s has errors of severity \"%s\"" % (component, error_list[severity]) if not errors: diff --git a/checks/hitachi_hus_dku b/checks/hitachi_hus_dku index a766096..ba15a7b 100644 --- a/checks/hitachi_hus_dku +++ b/checks/hitachi_hus_dku @@ -33,10 +33,10 @@ def inventory_hitachi_hus_dku(info): def check_hitachi_hus_dku(item, _no_params, info): # table of end-OIDs, monitored components and OK states component_map = { - 2: ("Power Supply", (1,) ), - 3: ("Fan", (1,) ), - 4: ("Environment", (1, 4,) ), - 5: ("Drive", (1,) ), + 2: ("Power Supply", (1,), (4, 5) ), + 3: ("Fan", (1,), (4, 5) ), + 4: ("Environment", (1,), (4, 5) ), + 5: ("Drive", (1,), (4, 5) ), } error_list = [ "unknown", @@ -51,9 +51,12 @@ def check_hitachi_hus_dku(item, _no_params, info): if line[0] == item: infotext = "" errors = False - for end_oid, (component, ok_states) in component_map.iteritems(): + for end_oid, (component, ok_states, warn_states) in component_map.iteritems(): severity = int(line[end_oid - 1]) - if severity not in ok_states: + if severity in warn_states: + errors = True + yield 1, "%s has errors of severity \"%s\"" % (component, error_list[severity]) + elif severity not in ok_states: errors = True yield 2, "%s has errors of severity \"%s\"" % (component, error_list[severity]) if not errors:

9 years, 5 months

Check_MK Git: check_mk: #2115 bluenet_meter: new check to monitor energy and power related parameters of Bachmann Bluenet PDUs

by Goetz Golla

Module: check_mk Branch: master Commit: b9cac9b748a7e6f2c6daade60bec6bf6c5228079 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9cac9b748a7e6… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Apr 16 11:51:41 2015 +0200 #2115 bluenet_meter: new check to monitor energy and power related parameters of Bachmann Bluenet PDUs --- .werks/2115 | 9 ++++ ChangeLog | 1 + checkman/bluenet_meter | 18 +++++++ checks/bluenet_meter | 57 +++++++++++++++++++++ checks/elphase.include | 4 +- modules/catalog.py | 7 ++- web/plugins/metrics/check_mk.py | 1 + web/plugins/wato/check_parameters.py | 94 +++++++++++++++++----------------- 8 files changed, 141 insertions(+), 50 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b9cac9b748…

9 years, 5 months

Check_MK Git: check_mk: Fixed exception in action menu when views are not yet loaded in apache process

by Lars Michelsen

Module: check_mk Branch: master Commit: a73512cddcef016ad34ebf348c088653a032d525 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a73512cddcef01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 16 08:39:17 2015 +0200 Fixed exception in action menu when views are not yet loaded in apache process --- web/htdocs/views.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ddaedfb..e76af72 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -93,7 +93,13 @@ def load_views(): transform_old_views() def permitted_views(): - return available_views + try: + return available_views + except: + # In some cases, for example when handling AJAX calls the views might + # have not been loaded yet + load_views() + return available_views # Convert views that are saved in the pre 1.2.6-style # FIXME: Can be removed one day. Mark as incompatible change or similar. @@ -794,18 +800,14 @@ def page_view(): def get_needed_columns(view, painters): # Make sure that the information about the available views is present. If # called via the reporting, than this might not be the case - try: - available_views - except: - load_views() - + views = permitted_views() columns = [] for entry in painters: painter = entry[0] linkview_name = entry[1] columns += painter["columns"] if linkview_name: - linkview = available_views.get(linkview_name) + linkview = views.get(linkview_name) if linkview: for filt in [ visuals.get_filter(fn) for fn in visuals.get_single_info_keys(linkview) ]: columns += filt.link_columns @@ -2069,7 +2071,7 @@ def url_to_view(row, view_name): if 'I' not in html.display_options: return None - view = available_views.get(view_name) + view = permitted_views().get(view_name) if view: # Get the context type of the view to link to, then get the parameters of this # context type and try to construct the context from the data of the row

9 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015