Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Fix missing availability / combined graphs context buttons

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e49822189a3041af04bb00dcce6193c2be2a1ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e49822189a304… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 17:09:54 2019 +0200 Fix missing availability / combined graphs context buttons CMK-2014 Change-Id: I1478df99c615abf2b84a3f362fe1e415eddd7040 --- cmk/gui/plugins/views/utils.py | 2 +- cmk/gui/views.py | 39 +++++++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/cmk/gui/plugins/views/utils.py b/cmk/gui/plugins/views/utils.py index 5d892d7..72bed9f 100644 --- a/cmk/gui/plugins/views/utils.py +++ b/cmk/gui/plugins/views/utils.py @@ -518,7 +518,7 @@ class DataSource(object): @abc.abstractproperty def table(self): # type: () -> RowTable - """Returns a table objec that can provide a list of rows for the provided + """Returns a table object that can provide a list of rows for the provided query using the query() method.""" raise NotImplementedError() diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 19f1b5a..d837617 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -355,23 +355,14 @@ class GUIViewRenderer(ViewRenderer): weblib.init_selection() if self._show_buttons: - show_combined_graphs_button = \ - ("host" in self.view.datasource.infos or "service" in self.view.datasource.infos) and \ - (isinstance(self.view.datasource.table, str)) and \ - ("host" in self.view.datasource.table or "service" in self.view.datasource.table) _show_context_links( - view_spec, + self.view, show_filters, # Take into account: permissions, display_options row_count > 0 and command_form, # Take into account: layout capabilities layout.can_display_checkboxes and not view_spec.get("force_checkboxes"), show_checkboxes, - # Show link to availability - self.view.datasource.table in ["hosts", "services"] or - "aggr" in self.view.datasource.infos, - # Show link to combined graphs - show_combined_graphs_button, ) # User errors in filters html.show_user_errors() @@ -1665,11 +1656,13 @@ def ajax_set_viewoption(): painter_options.save_to_config(view_name) -def _show_context_links(thisview, show_filters, enable_commands, enable_checkboxes, show_checkboxes, - show_availability, show_combined_graphs): +def _show_context_links(view, show_filters, enable_commands, enable_checkboxes, show_checkboxes): if html.output_format != "html": return + # TODO: Clean this up + thisview = view.spec + html.begin_context_buttons() # That way if no button is painted we avoid the empty container @@ -1790,10 +1783,11 @@ def _show_context_links(thisview, show_filters, enable_commands, enable_checkbox _("Edit View"), url, "edit", id_="edit", bestof=config.context_buttons_to_show) if display_options.enabled(display_options.E): - if show_availability and config.user.may("general.see_availability"): + if _show_availability_context_button(view): html.context_button( _("Availability"), html.makeuri([("mode", "availability")]), "availability") - if show_combined_graphs and config.combined_graphs_available(): + + if _show_combined_graphs_context_button(view): html.context_button( _("Combined graphs"), html.makeuri( @@ -1811,6 +1805,23 @@ def _show_context_links(thisview, show_filters, enable_commands, enable_checkbox html.end_context_buttons() +def _show_availability_context_button(view): + if not config.user.may("general.see_availability"): + return False + + if "aggr" in view.datasource.infos: + return True + + return view.datasource.ident in ["hosts", "services"] + + +def _show_combined_graphs_context_button(view): + if not config.combined_graphs_available(): + return False + + return view.datasource.ident in ["hosts", "services", "hostsbygroup", "servicesbygroup"] + + def _link_to_folder_by_path(path): # type: (str) -> str """Return an URL to a certain WATO folder when we just know its path"""

5 years, 2 months

Fix the fix. We must go deeper...

by Sven Panne

Module: check_mk Branch: master Commit: 2ff09c0cb7e4f50b95067d1b7ac444ea62da8e60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ff09c0cb7e4f5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 23 17:08:09 2019 +0200 Fix the fix. We must go deeper... Change-Id: I9a5bee2839c2395a401651d38f047085dc85c13d --- omd/packages/omd/omd.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/omd/omd.make b/omd/packages/omd/omd.make index 1a0bcda..a0de0d2 100644 --- a/omd/packages/omd/omd.make +++ b/omd/packages/omd/omd.make @@ -30,7 +30,7 @@ $(OMD_INSTALL): sed -i 's|###DEFAULT_RUNLEVELS###|$(DEFAULT_RUNLEVELS)|g' $(DESTDIR)$(OMD_ROOT)/share/omd/omd.init install -m 644 $(PACKAGE_DIR)/$(OMD)/omd.service $(DESTDIR)$(OMD_ROOT)/share/omd/omd.service $(MKDIR) $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME) - install -m 644 $(PACKAGE_DIR)/$(OMD)/README.md $(PACKAGE_DIR)/$(OMD)/COPYING $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME) + install -m 644 $(PACKAGE_DIR)/$(OMD)/README $(PACKAGE_DIR)/$(OMD)/COPYING $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME) $(MKDIR) $(DESTDIR)$(OMD_ROOT)/lib/omd install -m 644 $(PACKAGE_DIR)/$(OMD)/init_profile $(DESTDIR)$(OMD_ROOT)/lib/omd/ install -m 755 $(PACKAGE_DIR)/$(OMD)/port_is_used $(DESTDIR)$(OMD_ROOT)/lib/omd/

5 years, 2 months

Reserved 20 Werk IDS

by Moritz Kiemer

Module: check_mk Branch: master Commit: d50efd1fbf026758f1e0c606714d5e76cf3aba81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d50efd1fbf0267… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Apr 23 16:37:40 2019 +0200 Reserved 20 Werk IDS Change-Id: I0eec4e6c991b1bb652c0781006c1c6736ce59efe --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 0f8012e..c6d0f89 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7474 +7494

5 years, 2 months

netapp_api_vs_status: add vserver_subtype to special agent output

by Florian Kromer

Module: check_mk Branch: master Commit: 8a3d53d5b612f0ff3d0495ff7f2dbed9b6aafc20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a3d53d5b612f0… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Apr 16 14:31:06 2019 +0200 netapp_api_vs_status: add vserver_subtype to special agent output CMK-1864 Change-Id: Ifa080181c0d86e75871dc62bf64d753600ccf826 --- agents/special/agent_netapp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index a39c4a5..5db0247 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -1073,15 +1073,16 @@ def process_clustermode(server, netapp_mode, licenses): def process_vserver_status(server): vservers = query(server, "vserver-get-iter") - if vservers: - print "<<<netapp_api_vs_status:sep(9)>>>" - vserver_dict = create_dict(vservers, custom_key=["vserver-name"], is_counter=False) - - vserver_info = {} - for key, values in vserver_dict.items(): - if "state" in values: - vserver_info[key] = values.get("state") - print format_dict(vserver_info) + if not vservers: + return + vserver_dict = create_dict(vservers, custom_key=["vserver-name"], is_counter=False) + print "<<<netapp_api_vs_status:sep(9)>>>" + for vserver, vserver_data in vserver_dict.iteritems(): + words = [vserver] + for key in ("state", "vserver-subtype"): + if vserver_data.get(key): + words += [key, str(vserver_data[key])] + print '\t'.join(words) def process_vserver_traffic(server, netapp_mode):

5 years, 2 months

7294 netapp_api_vs_status: Subtype dependent check status

by Florian Kromer

Module: check_mk Branch: master Commit: e8c470c82a11f09e3de916f6a9573526e78524bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8c470c82a11f0… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Apr 16 14:19:50 2019 +0200 7294 netapp_api_vs_status: Subtype dependent check status Previously the check status was dependent on the vServer status only. Beginning with this werk vServers of subtype dp_destination are considered OK even if their status is stopped. CMK-1864 Change-Id: Ib193dd90a33305aac29b0f830deb52d26bac33f3 --- .werks/7294 | 13 ++++++++ checkman/netapp_api_vs_status | 6 ++++ checks/netapp_api_vs_status | 35 +++++++++++++++------ .../generictests/datasets/netapp_api_vs_status.py | 36 +++++++++++++++++----- .../datasets/netapp_api_vs_status_old.py | 14 +++++++++ 5 files changed, 87 insertions(+), 17 deletions(-) diff --git a/.werks/7294 b/.werks/7294 new file mode 100644 index 0000000..a594283 --- /dev/null +++ b/.werks/7294 @@ -0,0 +1,13 @@ +Title: netapp_api_vs_status: Subtype dependent check status +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1555416936 +Class: feature + +Previously the check status was dependent on the vServer status only. +Beginning with this werk vServers of subtype dp_destination are +considered OK even if their status is stopped. + diff --git a/checkman/netapp_api_vs_status b/checkman/netapp_api_vs_status index 6128bbf..54b1815 100644 --- a/checkman/netapp_api_vs_status +++ b/checkman/netapp_api_vs_status @@ -8,6 +8,12 @@ description: Possible states are {running}, {stopped}, {inconsistent} or {defunct}. If vServer state is not {running} the check goes {CRIT}. + Check status: + + - {OK} if the vServer status is {running}. + - {OK} if the vServer status is {stopped} but the vServer subtype is {dp_destination}. + - {CRIT} if the vServer status is not {running} and has not vServer subtype {dp_destination}. + inventory: One check is created per vServer diff --git a/checks/netapp_api_vs_status b/checks/netapp_api_vs_status index 0e7a2aa..6d8c70e 100644 --- a/checks/netapp_api_vs_status +++ b/checks/netapp_api_vs_status @@ -32,21 +32,38 @@ # cdefs1v running -def inventory_netapp_api_vs_status(info): - return [(x[0], None) for x in info] +def parse_netapp_api_vs_status(info): + parsed = {} + for line in info: + if len(line) == 2: + # pre v1.6.0 agent output + name, state = line + parsed[name] = {'state': state} + else: + parsed[line[0]] = dict(zip(line[1::2], line[2::2])) + return parsed -def check_netapp_api_vs_status(item, _no_params, info): - filer_states = dict(info) - if item not in filer_states: +@get_parsed_item_data +def check_netapp_api_vs_status(item, _no_params, data): + server_state = data.get('state') + if not server_state: return - - state = 0 if filer_states[item] in ['running'] else 2 - return state, "State is %s" % filer_states[item] + subtype = data.get('vserver-subtype') + if server_state == 'running': + state = 0 + elif server_state == 'stopped' and subtype == 'dp_destination': + state = 0 + else: + state = 2 + yield state, "State: %s" % server_state + if subtype: + yield 0, "Subtype: %s" % subtype check_info["netapp_api_vs_status"] = { + 'parse_function': parse_netapp_api_vs_status, + 'inventory_function': discover(lambda k, values: 'state' in values), 'check_function': check_netapp_api_vs_status, - 'inventory_function': inventory_netapp_api_vs_status, 'service_description': 'vServer Status %s', } diff --git a/tests/unit/checks/generictests/datasets/netapp_api_vs_status.py b/tests/unit/checks/generictests/datasets/netapp_api_vs_status.py index e5be4e1..ef40bb8 100644 --- a/tests/unit/checks/generictests/datasets/netapp_api_vs_status.py +++ b/tests/unit/checks/generictests/datasets/netapp_api_vs_status.py @@ -4,11 +4,31 @@ checkname = 'netapp_api_vs_status' -info = [['kermit1_ng-mc', 'running'], ['bill_vm', 'stopped']] - - -discovery = {'': [('bill_vm', None), ('kermit1_ng-mc', None)]} - - -checks = {'': [('bill_vm', {}, [(2, 'State is stopped', [])]), - ('kermit1_ng-mc', {}, [(0, 'State is running', [])])]} \ No newline at end of file +info = [['kermit1_ng-mc', 'state', 'running', 'vserver-subtype', 'default'], + ['kermit2_ng-mc', 'state', 'stopped', 'vserver-subtype', 'default'], + ['kermit3_ng-mc', 'state', 'running', 'vserver-subtype', 'dp_destination'], + ['kermit4_ng-mc', 'state', 'stopped', 'vserver-subtype', 'dp_destination'], + ['kermit5_ng-mc'], + ['kermit6_ng-mc', 'running']] + + +discovery = {'': [('kermit1_ng-mc', {}), + ('kermit2_ng-mc', {}), + ('kermit3_ng-mc', {}), + ('kermit4_ng-mc', {}), + ('kermit6_ng-mc', {})]} + + +checks = {'': [('kermit1_ng-mc', + {}, + [(0, 'State: running', []), (0, 'Subtype: default', [])]), + ('kermit2_ng-mc', + {}, + [(2, 'State: stopped', []), (0, 'Subtype: default', [])]), + ('kermit3_ng-mc', + {}, + [(0, 'State: running', []), (0, 'Subtype: dp_destination', [])]), + ('kermit4_ng-mc', + {}, + [(0, 'State: stopped', []), (0, 'Subtype: dp_destination', [])]), + ('kermit6_ng-mc', {}, [(0, 'State: running', [])])]} \ No newline at end of file diff --git a/tests/unit/checks/generictests/datasets/netapp_api_vs_status_old.py b/tests/unit/checks/generictests/datasets/netapp_api_vs_status_old.py new file mode 100644 index 0000000..d8f5522 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/netapp_api_vs_status_old.py @@ -0,0 +1,14 @@ +# yapf: disable + + +checkname = 'netapp_api_vs_status' + + +info = [['kermit1_ng-mc', 'running'], ['bill_vm', 'stopped']] + + +discovery = {'': [('bill_vm', {}), ('kermit1_ng-mc', {})]} + + +checks = {'': [('bill_vm', {}, [(2, 'State: stopped', [])]), + ('kermit1_ng-mc', {}, [(0, 'State: running', [])])]} \ No newline at end of file

5 years, 2 months

lpar_stat_aix: add metric definitions

by Florian Kromer

Module: check_mk Branch: master Commit: 69960a0073a5b10be3ae7898acc5cf9b3365badf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69960a0073a5b1… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Apr 23 14:08:14 2019 +0200 lpar_stat_aix: add metric definitions CMK-1769 Change-Id: I46f2f254f819913cdaacca0ca51f6a0b24d5111d --- cmk/gui/plugins/metrics/check_mk.py | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 388abfa..140f899 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -5475,6 +5475,54 @@ metric_info["open_file_descriptors"] = { "color": "14/a", } +metric_info["app"] = { + "title": _("Available physical processors in shared pool"), + "unit": "count", + "color": "11/a", +} + +metric_info["entc"] = { + "title": _("Entitled capacity consumed"), + "unit": "%", + "color": "12/a", +} + +metric_info["lbusy"] = { + "title": _("Logical processor(s) utilization"), + "unit": "%", + "color": "13/a", +} + +metric_info["nsp"] = { + "title": _("Average processor speed"), + "unit": "%", + "color": "14/a", +} + +metric_info["phint"] = { + "title": _("Phantom interruptions received"), + "unit": "count", + "color": "15/a", +} + +metric_info["physc"] = { + "title": _("Physical processors consumed"), + "unit": "count", + "color": "16/a", +} + +metric_info["utcyc"] = { + "title": _("Unaccounted turbo cycles"), + "unit": "%", + "color": "21/a", +} + +metric_info["vcsw"] = { + "title": _("Virtual context switches"), + "unit": "%", + "color": "22/a", +} + #. # .--Checks--------------------------------------------------------------. # | ____ _ _ |

5 years, 2 months

Fixed build with new README file name

by Lars Michelsen

Module: check_mk Branch: master Commit: db4296625ff8a18b81d637113bb6a970204b8a04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db4296625ff8a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 15:36:12 2019 +0200 Fixed build with new README file name Change-Id: Ib509cd9dbf861ba815d1e882361697180dcf8531 --- omd/debian/docs | 2 +- omd/packages/omd/omd.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/omd/debian/docs b/omd/debian/docs index e43ef34..91b72c3 100644 --- a/omd/debian/docs +++ b/omd/debian/docs @@ -1,2 +1,2 @@ -../README +../README.md ../COPYING diff --git a/omd/packages/omd/omd.make b/omd/packages/omd/omd.make index a0de0d2..1a0bcda 100644 --- a/omd/packages/omd/omd.make +++ b/omd/packages/omd/omd.make @@ -30,7 +30,7 @@ $(OMD_INSTALL): sed -i 's|###DEFAULT_RUNLEVELS###|$(DEFAULT_RUNLEVELS)|g' $(DESTDIR)$(OMD_ROOT)/share/omd/omd.init install -m 644 $(PACKAGE_DIR)/$(OMD)/omd.service $(DESTDIR)$(OMD_ROOT)/share/omd/omd.service $(MKDIR) $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME) - install -m 644 $(PACKAGE_DIR)/$(OMD)/README $(PACKAGE_DIR)/$(OMD)/COPYING $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME) + install -m 644 $(PACKAGE_DIR)/$(OMD)/README.md $(PACKAGE_DIR)/$(OMD)/COPYING $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME) $(MKDIR) $(DESTDIR)$(OMD_ROOT)/lib/omd install -m 644 $(PACKAGE_DIR)/$(OMD)/init_profile $(DESTDIR)$(OMD_ROOT)/lib/omd/ install -m 755 $(PACKAGE_DIR)/$(OMD)/port_is_used $(DESTDIR)$(OMD_ROOT)/lib/omd/

5 years, 2 months

Updated API call registration test

by Lars Michelsen

Module: check_mk Branch: master Commit: 507c8ed6ac38b4e07aebf241c8fd8588ad1a575e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=507c8ed6ac38b4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 15:18:48 2019 +0200 Updated API call registration test Change-Id: Ib86bdf6b3a3cce4913040624244f38b1097d348f --- tests/unit/cmk/gui/test_webapi_unit.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/unit/cmk/gui/test_webapi_unit.py b/tests/unit/cmk/gui/test_webapi_unit.py index 7c15611..01628b5 100644 --- a/tests/unit/cmk/gui/test_webapi_unit.py +++ b/tests/unit/cmk/gui/test_webapi_unit.py @@ -47,13 +47,17 @@ def test_registered_api_call_collections(): 'get_bi_aggregations', 'get_folder', 'get_graph', + 'get_graph_recipes', 'get_host', + 'get_host_names', 'get_hosttags', 'get_inventory', + 'get_metrics_of_host', 'get_ruleset', 'get_rulesets_info', 'get_site', 'get_sla', + 'get_user_sites', 'login_site', 'logout_site', 'set_all_sites',

5 years, 2 months

7341 Web-API: Add API calls for the new Grafana datasource

by Lars Michelsen

Module: check_mk Branch: master Commit: 9469613aa5a2ba63a45b7371f8340b6df6e84c27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9469613aa5a2ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 11:07:38 2019 +0200 7341 Web-API: Add API calls for the new Grafana datasource We'll release a Grafana datasource for Check_MK shortly. To be able to use the datasource with the current stable version of Check_MK we backport the API calls that are needed for this datasource with this werk. If you are curious, you can have a look at the code of the datasource: https://github.com/tribe29/grafana-checkmk-datasource You could even setup the datasource with a daily build or starting with 1.5.0p16 from now. We are heading to make this plugin directly available via grafana.com as official plugin in the next couple of days. fixes tribe29/grafana-checkmk-datasource#4 Change-Id: I3f11b4a92caf3f283e1a7c445d441a97e6127066 --- .werks/7341 | 22 +++++ cmk/gui/plugins/webapi/grafana.py | 126 ++++++++++++++++++++++++++++ tests/integration/cmk/gui/test_webapi.py | 137 ++++++++++++++++++++++++++++++- tests/testlib/__init__.py | 36 ++++++++ 4 files changed, 319 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9469613aa5…

5 years, 2 months

local: move state sanity check to parse funciton

by Moritz Kiemer

Module: check_mk Branch: master Commit: f9527f386a722b2be9fe746462ff586f29593b2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9527f386a722b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 18 13:08:23 2019 +0200 local: move state sanity check to parse funciton We will later extend this mechanism of adding the state_msg for the perfdata Change-Id: Ibe16e75b99e3fd8240f6e9c3602d096d7cd0b5a7 --- checks/local | 54 +++++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/checks/local b/checks/local index c401107..5ccbc73 100644 --- a/checks/local +++ b/checks/local @@ -39,17 +39,32 @@ def _is_valid_line(line): return len(line) >= 4 or (len(line) == 3 and line[0] == 'P') +def _sanitize_state(state): + try: + state = int(state) + except ValueError: + pass + if state not in ('P', 0, 1, 2, 3): + return 3, "Invalid plugin status %r. " % state + return state, "" + + def parse_local(info): - LocalResult = collections.namedtuple("LocalResult", ("node", "item", "line")) + LocalResult = collections.namedtuple("LocalResult", ("node", "item", "state", "line")) parsed = {} for line in info: node, stripped_line = line[0], line[1:] - if _is_valid_line(stripped_line): - item = stripped_line[1] - else: - item = None - parsed.setdefault(item, []).append(LocalResult(node, item, stripped_line)) + if not _is_valid_line(stripped_line): + parsed.setdefault(None, []).append(LocalResult(node, None, None, stripped_line)) + continue + + state, state_msg = _sanitize_state(stripped_line[0]) + item = stripped_line[1] + stripped_line = stripped_line[2:] + if state_msg: + stripped_line.insert(0, "%sOutput is:" % state_msg) + parsed.setdefault(item, []).append(LocalResult(node, item, state, stripped_line)) return parsed @@ -122,13 +137,12 @@ def inventory_local(parsed): # Some helper functions -def _parse_local_line(line): - statechar = line[0] - perftxt = line[2] +def _parse_local_line(state, line): + perftxt = line[0] # convert eventually escaped newinfo_line chars to real newinfo_lines # (will be converted back later individually for the different cores) - output = " ".join(line[3:]).replace("\\n", "\n") + output = " ".join(line[1:]).replace("\\n", "\n") perfdata = [] compute_data = [] @@ -141,23 +155,12 @@ def _parse_local_line(line): return 3, "Invalid performance data %s in local check output %s" % \ (perftxt, " ".join(line)), [] - if statechar == 'P': + if state == 'P': state, texts = local_compute_state(compute_data) if output: texts = [output] + texts output = ", ".join(texts) - else: - try: - state = int(statechar) - except: - return 3, "Invalid state %s in local check output %s: must be P, 0, 1, 2 or 3" % \ - (statechar, " ".join(line)), [] - - if state not in range(0, 4): - output += ", local check has sent invalid state %d" % state - state = 3 - return state, output, perfdata @@ -186,9 +189,10 @@ def _calculate_local_worst_state(collected_stats): @get_parsed_item_data def check_local(_no_item, params, data): collected_stats = {} - for output in data: - collected_stats.setdefault(output.node, {}) - collected_stats[output.node].setdefault(output.item, _parse_local_line(output.line)) + for result in data: + collected_stats.setdefault(result.node, {}) + collected_stats[result.node].setdefault(result.item, + _parse_local_line(result.state, result.line)) if params is not None and params.get("outcome_on_cluster", "worst") == "best": yield _calculate_local_best_state(collected_stats)

5 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019