Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: Fix display of timeline bar in availability

by Mathias Kettner

Module: check_mk Branch: master Commit: 6e9a6cd683083a41775270488f7f67bb991ea5e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e9a6cd683083a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 8 10:07:22 2015 +0200 Fix display of timeline bar in availability Add choords, fix unmonitored ranges of that time is excluded --- web/htdocs/availability.py | 125 ++++++++++++++++-- web/htdocs/lib.py | 12 ++ web/htdocs/valuespec.py | 12 -- web/plugins/views/availability.py | 254 ++----------------------------------- 4 files changed, 135 insertions(+), 268 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6e9a6cd683…

9 years, 1 month

Check_MK Git: check_mk: #2264 WATO Web API: new function get_all_hosts ( returns all host attributes)

by Andreas Boesl

Module: check_mk Branch: master Commit: a318bcf5e1243a81f503dc6cf1abe03d9e96b64d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a318bcf5e1243a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 8 09:40:06 2015 +0200 #2264 WATO Web API: new function get_all_hosts (returns all host attributes) --- .werks/2264 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 16 ++++++++++++++++ web/plugins/webapi/webapi.py | 14 ++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/.werks/2264 b/.werks/2264 new file mode 100644 index 0000000..d08b943 --- /dev/null +++ b/.werks/2264 @@ -0,0 +1,9 @@ +Title: WATO Web API: new function get_all_hosts (returns all host attributes) +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1431070771 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a642624..6c1a3ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -441,6 +441,7 @@ * 2136 Unify headers of Host/Service rules, EC rules and notification rules... * 2176 One custom icon or action can be configured per process/service... * 2250 Added download page for shipped agents and plugins... + * 2264 WATO Web API: new function get_all_hosts (returns all host attributes) * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 932b5a4..39a3f03 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -18231,6 +18231,22 @@ class API: else: raise MKUserError(None, ", ".join(errors)) + def get_all_hosts(self, effective_attr = False): + self.__prepare_folder_info() + all_hosts = self.__get_all_hosts() + return_hosts = {} + + for hostname in all_hosts.keys(): + self.__validate_host_parameters(None, hostname, {}, all_hosts, True, ["host_missing", "permissions_read"]) + + the_host = all_hosts[hostname] + if effective_attr: + the_host = effective_attributes(the_host, the_host[".folder"]) + cleaned_host = dict([(k, v) for (k, v) in the_host.iteritems() if not k.startswith('.') ]) + + return_hosts[hostname] = { "attributes": cleaned_host, "path": the_host[".folder"][".path"], "hostname": hostname } + + return return_hosts # internal helper functions for API def collect_hosts(folder): diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index eea3cb9..0b3921c 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -137,3 +137,17 @@ api_actions["activate_changes"] = { "locking" : True, } +############### + +def action_get_all_hosts(request): + if html.var("effective_attributes"): + effective_attributes = bool(int(html.var("effective_attributes"))) + else: + effective_attributes = False + return g_api.get_all_hosts(effective_attr = effective_attributes) + +api_actions["get_all_hosts"] = { + "handler": action_get_all_hosts, + "locking": False, +} +

9 years, 1 month

Check_MK Git: check_mk: Fixed graph hover error in IE<8

by Lars Michelsen

Module: check_mk Branch: master Commit: 0b291b50fb9fec80de0f8cca30c7650edc3b6576 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b291b50fb9fec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 8 08:59:03 2015 +0200 Fixed graph hover error in IE<8 --- web/htdocs/metrics.py | 119 +++++++++++++++++++++++------------------ web/plugins/views/painters.py | 13 +---- 2 files changed, 68 insertions(+), 64 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 7ad8800..26ff2cf 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1011,67 +1011,80 @@ def render_graph_pnp(graph_template, translated_metrics): # | |_| | # '----------------------------------------------------------------------' +def try_time_graph(): + # Filter cases where our graphing is not possible: + # - mobile GUI + # - for example IE < 8 + try_time_graph = not html.is_mobile() + + user_agent = html.get_user_agent() + if 'MSIE' in user_agent: + matches = regex('MSIE ([0-9]{1,}[\.0-9]{0,})').search(user_agent) + try_time_graph = not matches or float(matches.group(1)) >= 9.0 + return try_time_graph + def page_show_graph(): site = html.var('site') host_name = html.var('host_name') service = html.var('service') - # FIXME HACK TODO We don't have the current perfata and check command - # here, but we only need it till metrics.render_svc_time_graph() does - # not need these information anymore. - if service == "_HOST_": - query = "GET hosts\n" \ - "Filter: host_name = %s\n" \ - "Columns: perf_data metrics check_command\n" % host_name - - else: - query = "GET services\n" \ - "Filter: host_name = %s\n" \ - "Filter: service_description = %s\n" \ - "Columns: perf_data metrics check_command\n" % (host_name, service) - - html.live.set_only_sites([site]) - try: - data = html.live.query_row(query) - except livestatus.MKLivestatusNotFoundError: - html.write('<div class="error">%s</div>' % - _('Failed to fetch data for graph. Maybe the site is not reachable?')) - return - html.live.set_only_sites(None) - - if service == "_HOST_": - row = { - 'site' : site, - 'host_name' : host_name, - 'host_perf_data' : data[0], - 'host_metrics' : data[1], - 'host_check_command' : data[2], - } - else: - row = { - 'site' : site, - 'host_name' : host_name, - 'service_description' : service, - 'service_perf_data' : data[0], - 'service_metrics' : data[1], - 'service_check_command' : data[2], - } + if try_time_graph(): + # FIXME HACK TODO We don't have the current perfata and check command + # here, but we only need it till metrics.render_svc_time_graph() does + # not need these information anymore. + if service == "_HOST_": + query = "GET hosts\n" \ + "Filter: host_name = %s\n" \ + "Columns: perf_data metrics check_command\n" % host_name - # now try to render the graph with our graphing. If it is not possible, - # add JS code to let browser fetch the PNP graph - try: - # Currently always displaying 24h graph - end_time = time.time() - start_time = end_time - 8 * 3600 + else: + query = "GET services\n" \ + "Filter: host_name = %s\n" \ + "Filter: service_description = %s\n" \ + "Columns: perf_data metrics check_command\n" % (host_name, service) - htmlcode = render_time_graph(row, start_time, end_time, size=(30, 10), font_size=8, show_legend=False, graph_id_prefix="hover") - if htmlcode: - html.write(htmlcode) + html.live.set_only_sites([site]) + try: + data = html.live.query_row(query) + except livestatus.MKLivestatusNotFoundError: + html.write('<div class="error">%s</div>' % + _('Failed to fetch data for graph. Maybe the site is not reachable?')) return - except NameError: - if config.debug: - raise - pass + html.live.set_only_sites(None) + + if service == "_HOST_": + row = { + 'site' : site, + 'host_name' : host_name, + 'host_perf_data' : data[0], + 'host_metrics' : data[1], + 'host_check_command' : data[2], + } + else: + row = { + 'site' : site, + 'host_name' : host_name, + 'service_description' : service, + 'service_perf_data' : data[0], + 'service_metrics' : data[1], + 'service_check_command' : data[2], + } + + # now try to render the graph with our graphing. If it is not possible, + # add JS code to let browser fetch the PNP graph + try: + # Currently always displaying 24h graph + end_time = time.time() + start_time = end_time - 8 * 3600 + + htmlcode = render_time_graph(row, start_time, end_time, size=(30, 10), font_size=8, show_legend=False, graph_id_prefix="hover") + if htmlcode: + html.write(htmlcode) + return + except NameError: + if config.debug: + raise + pass # Fallback to PNP graph rendering host = pnp_cleanup(host_name) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 1de3115..0aa3e92 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -827,17 +827,8 @@ multisite_painters["svc_group_memberlist"] = { } def paint_graph(row): - # Filter cases where our graphing is not possible: - # - mobile GUI - # - for example IE < 8 - try_time_graph = not html.is_mobile() - - user_agent = html.get_user_agent() - if 'MSIE' in user_agent: - matches = regex('MSIE ([0-9]{1,}[\.0-9]{0,})').search(user_agent) - try_time_graph = not matches or float(matches.group(1)) >= 9.0 - - if try_time_graph: + import metrics + if metrics.try_time_graph(): try: css, htmlcode = paint_time_graph(row) if htmlcode:

9 years, 1 month

Check_MK Git: check_mk: check_bi_aggr-Icon: Be more robust against tailing slashes in paths

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b75643a0b6e16409873f9bf91a016184572615c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b75643a0b6e16… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 7 15:37:14 2015 +0200 check_bi_aggr-Icon: Be more robust against tailing slashes in paths --- web/plugins/icons/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 3cb15ac..22635e3 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -719,7 +719,7 @@ def paint_icon_check_bi_aggr(what, row, tags, host_custom_vars): args = row['service_check_command'] start = args.find('-b \'') + 4 end = args.find('\' ', start) - base_url = args[start:end] + base_url = args[start:end].rstrip('/') base_url = base_url.replace('$HOSTADDRESS$', row['host_address']) base_url = base_url.replace('$HOSTNAME$', row['host_name'])

9 years, 1 month

Check_MK Git: check_mk: #2251 FIX Adding views to dashboards /

by Lars Michelsen

reports is now respecing all set filters Message-ID: <554b78ba.NjMIMiWRRUWyOrr8%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 4fea7878a071df1b1ff68f7c27e77b36eabf7b9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fea7878a071df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 7 16:37:25 2015 +0200 #2251 FIX Adding views to dashboards / reports is now respecing all set filters In previous versions only the filters used by single contexts were used. This has been cleaned up now to get the exact same context information on the view which is being added. --- .werks/2251 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- web/htdocs/js/checkmk.js | 16 ++-------------- web/htdocs/views.py | 7 ++++++- web/htdocs/visuals.py | 16 +++++++--------- 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/.werks/2251 b/.werks/2251 new file mode 100644 index 0000000..ffb8c31 --- /dev/null +++ b/.werks/2251 @@ -0,0 +1,11 @@ +Title: Adding views to dashboards / reports is now respecing all set filters +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i1 +Date: 1431009374 +Class: fix + +In previous versions only the filters used by single contexts were used. This +has been cleaned up now to get the exact same context information on the view +which is being added. diff --git a/ChangeLog b/ChangeLog index c70a930..0f6b50a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -425,6 +425,7 @@ * 1957 FIX: Fixed default value for text input fields in notification plugins... * 2233 FIX: Fixed WATO folder view and Host Tags search with HTML Entity encoding... * 2074 FIX: pnptemplate netapp_api_volume: fixed title + * 2251 FIX: Adding views to dashboards / reports is now respecing all set filters... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5510ec4..64d9ac2 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -984,7 +984,7 @@ class html: encoded_vars[k] = v self.popup_trigger( - '<img class=statusicon src="images/status_add_dashlet.png" title="%s">\n' % _("Add this view to..."), + '<img class=statusicon src="images/icon_menu.png" title="%s">\n' % _("Add this view to..."), 'add_visual', 'add_visual', data='[\'%s\', %s, {\'name\': \'%s\'}]' % (mode_name, self.attrencode(repr(encoded_vars)), self.var('view_name'))) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index f531836..a0db9da 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2472,23 +2472,11 @@ function add_to_visual(visual_type, visual_name) { close_popup(); - var context_txt = []; - for (var key in popup_data[1]) { - var ty = typeof(popup_data[1][key]); - context_txt.push(key+':'+ty+':'+popup_data[1][key]); - } - - var params_txt = []; - for (var key in popup_data[2]) { - var ty = typeof(popup_data[2][key]); - params_txt.push(key+':'+ty+':'+popup_data[2][key]); - } - response = get_url_sync('ajax_add_visual.py?visual_type=' + visual_type + '&visual_name=' + visual_name + '&type=' + popup_data[0] - + '&context=' + encodeURIComponent(context_txt.join('|')) - + '&params=' + encodeURIComponent(params_txt.join('|'))); + + '&context=' + encodeURIComponent(JSON.stringify(popup_data[1])) + + '&params=' + encodeURIComponent(JSON.stringify(popup_data[2]))); popup_data = null; // After adding a dashlet, go to the choosen dashboard diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ee0fcb3..8ab1507 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -786,7 +786,12 @@ def page_view(): if not view: raise MKGeneralException(_("No view defined with the name '%s'.") % html.attrencode(view_name)) - html.set_page_context(visuals.get_singlecontext_html_vars(view)) + # Gather the page context which is needed for the "add to visual" popup menu + # to add e.g. views to dashboards or reports + datasource = multisite_datasources[view['datasource']] + context = visuals.get_context_from_uri_vars(datasource['infos']) + context.update(visuals.get_singlecontext_html_vars(view)) + html.set_page_context(context) show_view(view, True, True, True) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 60208a2..573c5c9 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -26,6 +26,11 @@ import os, copy +try: + import simplejson as json +except ImportError: + import json + from lib import * from valuespec import * import config, table @@ -1366,14 +1371,7 @@ def ajax_add_visual(): extra_data = [] for what in [ 'context', 'params' ]: value = html.var(what) - data = {} - extra_data.append(data) - if value == '': - continue - for entry in value.split('|'): - key, vartype, value = entry.split(':', 2) - if vartype == 'number': - value = int(value) - data[key] = value + if value: + extra_data.append(json.loads(value)) handler(visual_name, element_type, *extra_data)

9 years, 1 month

Check_MK Git: check_mk: if64_tplink: Fix discovery of ports

by Mathias Kettner

Module: check_mk Branch: master Commit: 61096ab4a9bfc6287bedecc71e7342b30762c630 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61096ab4a9bfc6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 7 16:10:23 2015 +0200 if64_tplink: Fix discovery of ports --- checks/if64_tplink | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/checks/if64_tplink b/checks/if64_tplink index e958077..8e4c089 100644 --- a/checks/if64_tplink +++ b/checks/if64_tplink @@ -27,14 +27,17 @@ def parse_if64_tplink(info): parsed = [] for line in info: - parsed.append(line[:3] + [ int(line[3]) * 1000000 ] + line[4:]) + parsed.append(line[:3] + [ str(int(line[3]) * 1000000) ] + line[4:]) return parsed +def inventory_if64_tplink(parsed): + return inventory_if_common(parsed) + check_info["if64_tplink"] = { 'parse_function': parse_if64_tplink, 'check_function': check_if_common, - 'inventory_function': inventory_if_common, + 'inventory_function': inventory_if64_tplink, 'service_description': 'Interface %s', 'has_perfdata': True, 'includes': [ 'if.include' ], @@ -61,7 +64,7 @@ check_info["if64_tplink"] = { "2.1.2.2.1.6", # ifPhysAddress 19 ]), 'snmp_scan_function': \ - lambda oid: ".4.1.11863." in oid(".1.3.6.1.2.1.1.2.0") and \ + lambda oid: True or ".4.1.11863." in oid(".1.3.6.1.2.1.1.2.0") and \ oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None, 'group': 'if', 'default_levels_variable': 'if_default_levels',

9 years, 1 month

Check_MK Git: check_mk: Fix missing Perf-O-Meter for IBM SVC Diskgroup checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 681f34810789a7015b0d946ea4829d766c677784 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=681f34810789a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 7 15:59:40 2015 +0200 Fix missing Perf-O-Meter for IBM SVC Diskgroup checks --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 7983984..0c56501 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1149,7 +1149,7 @@ check_metrics["check_mk-tcp_conn_stats"] = { } df_translation = { - "~[_/]" : { "name" : "fs_used", "scale" : MB }, + "~(?!fs_size|growth|trend|fs_provisioning).*" : { "name" : "fs_used", "scale" : MB }, "fs_size" : { "scale" : MB }, "growth" : { "name" : "fs_growth", "scale" : MB / 86400.0 }, "trend" : { "name" : "fs_trend", "scale" : MB / 86400.0 },

9 years, 1 month

Check_MK Git: check_mk: Fix syntax error in wato.py from a couple of minutes ago

by Mathias Kettner

Module: check_mk Branch: master Commit: 90ddc1b3b76361162032fa7cdd0919e52e5863cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90ddc1b3b76361… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 7 15:50:58 2015 +0200 Fix syntax error in wato.py from a couple of minutes ago --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 932b5a4..8124982 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3753,7 +3753,7 @@ def mode_bulk_inventory(phase): _("Inventorized host: %d added, %d removed, %d kept, %d total services") % tuple(counts[hostname])) - if "inventory_failed" in hostand not hosts.get(".folder", {}).get("_lock_hosts"): + if "inventory_failed" in host and not hosts.get(".folder", {}).get("_lock_hosts"): del host["inventory_failed"] save_hosts(folder) # Could be optimized, but difficult here

9 years, 1 month

Check_MK Git: check_mk: #2227 isc_dhcpd: New agent plugin and check for checking IP address pools of ISC DHCP-Daemon

by Mathias Kettner

Module: check_mk Branch: master Commit: e1c18735d3fe6a27edaa01bd72f76510a7756c5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1c18735d3fe6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 7 15:35:09 2015 +0200 #2227 isc_dhcpd: New agent plugin and check for checking IP address pools of ISC DHCP-Daemon --- .werks/2227 | 9 +++ ChangeLog | 1 + agents/plugins/isc_dhcpd | 34 ++++++++ checkman/isc_dhcpd | 16 ++++ checks/isc_dhcpd | 148 ++++++++++++++++++++++++++++++++++ web/htdocs/metrics.py | 2 +- web/plugins/metrics/check_mk.py | 26 +++++- web/plugins/wato/check_parameters.py | 7 +- 8 files changed, 239 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e1c18735d3…

9 years, 1 month

Check_MK Git: check_mk: The bulk service discovery raised an exception when some of the hosts failed

by Andreas Boesl

Module: check_mk Branch: master Commit: cf3d3130896b5e93cae200ece3cba388fa782ea0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf3d3130896b5e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 7 14:35:49 2015 +0200 The bulk service discovery raised an exception when some of the hosts failed during the discovery and the folders of these hosts were locked with the option <tt>_lock</tt>. This has been fixed. --- .werks/2263 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 9 +++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.werks/2263 b/.werks/2263 new file mode 100644 index 0000000..a7a9432 --- /dev/null +++ b/.werks/2263 @@ -0,0 +1,13 @@ +Title: Bulk service discovery: Fixed error when doing bulk inventory on locked folders +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1431001927 + +The bulk service discovery raised an exception when some of the hosts failed +during the discovery and the folders of these hosts were locked with the option <tt>_lock</tt>. +This has been fixed. + diff --git a/ChangeLog b/ChangeLog index c70a930..a642624 100644 --- a/ChangeLog +++ b/ChangeLog @@ -480,6 +480,7 @@ * 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 * 2244 FIX: Fixed sorting of host tag topics in dropdown selections + * 2263 FIX: Bulk service discovery: Fixed error when doing bulk inventory on locked folders... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8d50384..932b5a4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3743,7 +3743,7 @@ def mode_bulk_inventory(phase): host = folder[".hosts"][hostname] if hostname in failed_hosts: result_txt += _("Failed to inventorize %s: %s<br>") % (hostname, failed_hosts[hostname]) - if not host.get("inventory_failed"): + if not host.get("inventory_failed") and not hosts.get(".folder", {}).get("_lock_hosts"): host["inventory_failed"] = True save_hosts(folder) else: @@ -3752,7 +3752,8 @@ def mode_bulk_inventory(phase): log_pending(AFFECTED, hostname, "bulk-inventory", _("Inventorized host: %d added, %d removed, %d kept, %d total services") % tuple(counts[hostname])) - if "inventory_failed" in host: + + if "inventory_failed" in hostand not hosts.get(".folder", {}).get("_lock_hosts"): del host["inventory_failed"] save_hosts(folder) # Could be optimized, but difficult here @@ -18174,12 +18175,12 @@ class API: host = all_hosts[hostname] counts, failed_hosts = check_mk_automation(host[".siteid"], "inventory", [ "@scan", mode ] + [hostname]) if failed_hosts: - if not host.get("inventory_failed"): + if not host.get("inventory_failed") and not host.get(".folder", {}).get(".lock_hosts"): host["inventory_failed"] = True save_hosts(host[".folder"]) raise MKUserError(None, _("Failed to inventorize %s: %s") % (hostname, failed_hosts[hostname])) - if host.get("inventory_failed"): + if host.get("inventory_failed") and not host.get(".folder", {}).get(".lock_hosts"): del host["inventory_failed"] save_hosts(host[".folder"])

9 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015