Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

by Óscar Nájera

Module: check_mk Branch: master Commit: 85e4ba64f19e6f061a9447214048a2406331d1ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85e4ba64f19e6f… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Feb 21 18:07:21 2019 +0100 Perf data translation and normalization CMK-1722 Change-Id: Iebf7a83cd27964d65e955570f5958c686c28df7a --- cmk/gui/plugins/metrics/utils.py | 107 ++++++++++++----------- tests/unit/cmk/gui/plugins/test_metrics_utils.py | 92 ++++++++++++++----- 2 files changed, 126 insertions(+), 73 deletions(-) diff --git a/cmk/gui/plugins/metrics/utils.py b/cmk/gui/plugins/metrics/utils.py index eab13ad..5c55289 100644 --- a/cmk/gui/plugins/metrics/utils.py +++ b/cmk/gui/plugins/metrics/utils.py @@ -210,10 +210,10 @@ def _split_perf_data(perf_data_string): return [s.decode('utf-8') for s in shlex.split(perf_data_string.encode('utf-8'))] -def perfvar_translation(perfvar_nr, perfvar_name, check_command): +def perfvar_translation(perfvar_name, check_command): """Get translation info for one performance var.""" cm = check_metrics.get(check_command, {}) - translation_entry = {} # Default: no translation neccessary + translation_entry = {} # Default: no translation necessary if perfvar_name in cm: translation_entry = cm[perfvar_name] @@ -224,70 +224,72 @@ def perfvar_translation(perfvar_nr, perfvar_name, check_command): translation_entry = te break - metric_name = translation_entry.get("name", perfvar_name) - scale = translation_entry.get("scale", 1.0) - return { - "name": metric_name, - "scale": scale, - "auto_graph": translation_entry.get("auto_graph", True) + "name": translation_entry.get("name", perfvar_name), + "scale": translation_entry.get("scale", 1.0), + "auto_graph": translation_entry.get("auto_graph", True), } +def normalize_perf_data(perf_data, check_command): + translation_entry = perfvar_translation(perf_data[0], check_command) + + new_entry = { + "orig_name": perf_data[0], + "value": perf_data[1] * translation_entry["scale"], + "scalar": {}, + "scale": translation_entry["scale"], # needed for graph recipes + # Do not create graphs for ungraphed metrics if listed here + "auto_graph": translation_entry["auto_graph"], + } + + # Add warn, crit, min, max + for perf_value, name in zip(perf_data[3:], ["warn", "crit", "min", "max"]): + if perf_value is not None: + try: + new_entry["scalar"][name] = perf_value * translation_entry["scale"] + except Exception as exc: + if config.debug: + raise exc + return translation_entry["name"], new_entry + + +def get_metric_info(metric_name, color_index): + + if metric_name not in metric_info: + color_index += 1 + palette_color = get_palette_color_by_index(color_index) + mi = { + "title": metric_name.title(), + "unit": "", + "color": parse_color_into_hexrgb(palette_color), + } + else: + mi = metric_info[metric_name].copy() + mi["color"] = parse_color_into_hexrgb(mi["color"]) + + return mi, color_index + + def translate_metrics(perf_data, check_command): """Convert Ascii-based performance data as output from a check plugin - into floating point numbers, do scaling if neccessary. + into floating point numbers, do scaling if necessary. Simple example for perf_data: [(u'temp', u'48.1', u'', u'70', u'80', u'', u'')] Result for this example: - { "temp" : "value" : 48.1, "warn" : 70, "crit" : 80, "unit" : { ... } } + { "temp" : {"value" : 48.1, "scalar": {"warn" : 70, "crit" : 80}, "unit" : { ... } }} """ translated_metrics = {} color_index = 0 - for nr, entry in enumerate(perf_data): - varname = entry[0] - value = entry[1] - - translation_entry = perfvar_translation(nr, varname, check_command) - metric_name = translation_entry["name"] + for entry in perf_data: + metric_name, new_entry = normalize_perf_data(entry, check_command) if metric_name in translated_metrics: continue # ignore duplicate value - if metric_name not in metric_info: - color_index += 1 - palette_color = get_palette_color_by_index(color_index) - mi = { - "title": metric_name.title(), - "unit": "", - "color": parse_color_into_hexrgb(palette_color), - } - else: - mi = metric_info[metric_name].copy() - mi["color"] = parse_color_into_hexrgb(mi["color"]) - - new_entry = { - "value": value * translation_entry["scale"], - "orig_name": varname, - "scale": translation_entry["scale"], # needed for graph recipes - "scalar": {}, - } - - # Do not create graphs for ungraphed metrics if listed here - new_entry["auto_graph"] = translation_entry["auto_graph"] - - # Add warn, crit, min, max - for index, key in [(3, "warn"), (4, "crit"), (5, "min"), (6, "max")]: - if len(entry) < index + 1: - break - elif entry[index] is not None: - try: - new_entry["scalar"][key] = entry[index] * translation_entry["scale"] - except: - if config.debug: - raise - + mi, color_index = get_metric_info(metric_name, color_index) new_entry.update(mi) + new_entry["unit"] = unit_info[new_entry["unit"]] translated_metrics[metric_name] = new_entry @@ -764,7 +766,8 @@ def _get_hue_by_weight_index(weight_index): def parse_color_into_hexrgb(color_string): if color_string[0] == "#": return color_string - elif "/" in color_string: + + if "/" in color_string: cmk_color_index, color_shading = color_string.split("/") hsv = list(_cmk_color_palette[cmk_color_index]) @@ -783,8 +786,8 @@ def parse_color_into_hexrgb(color_string): color_hexrgb = hsv_to_hexrgb(hsv) return color_hexrgb - else: - return "#808080" + + return "#808080" def hsv_to_hexrgb(hsv): diff --git a/tests/unit/cmk/gui/plugins/test_metrics_utils.py b/tests/unit/cmk/gui/plugins/test_metrics_utils.py index 4fe7ac1..0041fae 100644 --- a/tests/unit/cmk/gui/plugins/test_metrics_utils.py +++ b/tests/unit/cmk/gui/plugins/test_metrics_utils.py @@ -4,31 +4,32 @@ import cmk.gui.config from cmk.gui.plugins.metrics import utils -(a)pytest.mark.parametrize( - "data_string, result", - [ - ("he lo", ["he", "lo"]), - ("'há li'", ["há li"]), - (u"hé ßß", [u"hé", u"ßß"]), - ], -) +(a)pytest.mark.parametrize("data_string, result", [ + ("he lo", ["he", "lo"]), + ("'há li'", ["há li"]), + (u"hé ßß", [u"hé", u"ßß"]), +]) def test_split_perf_data(data_string, result): assert utils._split_perf_data(data_string) == result @pytest.mark.parametrize("perf_str, check_command, result", [ - ('', None, ([], None)), - ('hi ho', None, ([], None)), - ('hi=6 [ihe]', 'ter', ([('hi', 6, '', None, None, None, None)], 'ihe')), - (u'hi=l6 [ihe]', 'ter', ([], 'ihe')), - (u'hi=6 [ihe]', 'ter', ([('hi', 6, '', None, None, None, None)], 'ihe')), - ('hi=5 no=6', 'test', ([('hi', 5, u'', None, None, None, None), - ('no', 6, u'', None, None, None, None)], 'test')), - ('hi=5;6;7;8;9 \'not here\'=6;5.6;;;', 'test', - ([('hi', 5, u'', 6, 7, 8, 9), ('not_here', 6, u'', 5.6, None, None, None)], 'test')), - ('hi=5G;;;; \'not here\'=6M;5.6;;;', 'test', - ([('hi', 5, u'G', None, None, None, None), - ('not_here', 6, u'M', 5.6, None, None, None)], 'test')), + ("", None, ([], None)), + ("hi=6 [ihe]", "ter", ([("hi", 6, "", None, None, None, None)], "ihe")), + (u"hi=l6 [ihe]", "ter", ([], "ihe")), + (u"hi=6 [ihe]", "ter", ([("hi", 6, "", None, None, None, None)], "ihe")), + ("hi=5 no=6", "test", ([ + ("hi", 5, u"", None, None, None, None), + ("no", 6, u"", None, None, None, None), + ], "test")), + ("hi=5;6;7;8;9 'not here'=6;5.6;;;", "test", ([ + ("hi", 5, u"", 6, 7, 8, 9), + ("not_here", 6, u"", 5.6, None, None, None), + ], "test")), + ("hi=5G;;;; 'not here'=6M;5.6;;;", "test", ([ + ("hi", 5, u"G", None, None, None, None), + ("not_here", 6, u"M", 5.6, None, None, None), + ], "test")), ]) def test_parse_perf_data(perf_str, check_command, result): assert utils.parse_perf_data(perf_str, check_command) == result @@ -37,4 +38,53 @@ def test_parse_perf_data(perf_str, check_command, result): def test_parse_perf_data2(monkeypatch): with pytest.raises(ValueError): monkeypatch.setattr(cmk.gui.config, "debug", True) - utils.parse_perf_data('hi ho', None) + utils.parse_perf_data("hi ho", None) + + +(a)pytest.mark.parametrize("perf_name, check_command, result", [ + ("in", "check_mk-lnx_if", { + "scale": 8, + "name": "if_in_bps", + "auto_graph": True + }), + ("memused", "check_mk-hr_mem", { + "auto_graph": False, + "name": "total_used", + "scale": 1024**2 + }), + ("fake", "check_mk-imaginary", { + "auto_graph": True, + "name": "fake", + "scale": 1.0 + }), +]) +def test_perfvar_translation(perf_name, check_command, result): + assert utils.perfvar_translation(perf_name, check_command) == result + + +(a)pytest.mark.parametrize("perf_data, check_command, result", [ + (("in", 496876.200933, "", None, None, 0, 125000000), 'check_mk-lnx_if', ('if_in_bps', { + "orig_name": "in", + "value": 3975009.607464, + "scalar": { + "max": 1000000000, + "min": 0 + }, + "scale": 8, + "auto_graph": True, + })), + (("fast", 5, "", 4, 9, 0, 10), 'check_mk-imaginary', ('fast', { + "orig_name": "fast", + "value": 5.0, + "scalar": { + "warn": 4.0, + "crit": 9.0, + "min": 0.0, + "max": 10.0 + }, + "scale": 1.0, + "auto_graph": True, + })), +]) +def test_normalize_perf_data(perf_data, check_command, result): + assert utils.normalize_perf_data(perf_data, check_command) == result

5 years, 4 months

New generic item input validation method

by Lars Michelsen

Module: check_mk Branch: master Commit: f3d2f550993f8a3bbe9e453b954cae3e2f798cbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3d2f550993f8a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 25 08:02:34 2019 +0100 New generic item input validation method When a dialog takes a parameter from HTTP variables that represents an item of a collection, it normally searches for the item before proceeding and raises an error in case it does not exist in the collection. This is done individually in many places with individual error messages that all have to be localized individually. This new function does this in a generic way and should reduce page individual code a bit. Change-Id: I4b515f5d9c86a4e233d646fe3a22b4ad498d85e8 --- cmk/gui/htmllib.py | 8 ++++++++ cmk/gui/views.py | 14 +++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 9de825f..ab54b33 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1151,6 +1151,14 @@ class html(HTMLGenerator): _("The given text is wrong encoded. " "You need to provide a UTF-8 encoded text.")) + def get_item_input(self, varname, collection): + """Helper to get an item from the given collection + Raises a MKUserError() in case the requested item is not available.""" + item = self.get_ascii_input(varname) + if item not in collection: + raise MKUserError(varname, _("The requested item %s does not exist") % item) + return collection[item], item + def get_integer_input(self, varname, deflt=None): if deflt is not None and not self.request.has_var(varname): return deflt diff --git a/cmk/gui/views.py b/cmk/gui/views.py index e53c389..effe3f3 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -451,13 +451,10 @@ def page_create_view(next_url=None): @cmk.gui.pages.register("create_view_infos") def page_create_view_infos(): - ds_name = html.request.var('datasource') - if ds_name not in data_source_registry: - raise MKGeneralException(_('The given datasource is not supported')) - + ds_class, ds_name = html.get_item_input("datasource", data_source_registry) visuals.page_create_visual( 'views', - data_source_registry[ds_name]().infos, + ds_class().infos, next_url='edit_view.py?mode=create&datasource=%s&single_infos=%%s' % ds_name) @@ -907,12 +904,7 @@ def show_filter_form(is_open, filters): @cmk.gui.pages.register("view") def page_view(): - view_name = html.get_ascii_input("view_name") - if view_name is None: - raise MKUserError("view_name", _("Missing the variable view_name in the URL.")) - view = get_permitted_views().get(view_name) - if not view: - raise MKUserError("view_name", _("No view defined with the name '%s'.") % view_name) + view, view_name = html.get_item_input("view_name", get_permitted_views()) # Gather the page context which is needed for the "add to visual" popup menu # to add e.g. views to dashboards or reports

5 years, 4 months

Fixed new bulk discovery API call

by Lars Michelsen

Module: check_mk Branch: master Commit: 34c17265f9b07d4a0719c20480e6a6415944caa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34c17265f9b07d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Feb 23 20:43:13 2019 +0100 Fixed new bulk discovery API call The call did not work with hosts that are located in subfolders. CMK-1700 Change-Id: I84f95f2a03e23409f8f3c95149b9f2d295148da7 --- cmk/gui/plugins/webapi/bulk_discovery.py | 4 +-- tests/integration/cmk/gui/test_webapi.py | 56 ++++++++++++++++++++++---------- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/cmk/gui/plugins/webapi/bulk_discovery.py b/cmk/gui/plugins/webapi/bulk_discovery.py index 32588f7..c73a108 100644 --- a/cmk/gui/plugins/webapi/bulk_discovery.py +++ b/cmk/gui/plugins/webapi/bulk_discovery.py @@ -42,7 +42,7 @@ from cmk.gui.watolib.bulk_discovery import ( vs_bulk_discovery, get_tasks, ) -from cmk.gui.watolib.hosts_and_folders import Folder +from cmk.gui.watolib.hosts_and_folders import Host @api_call_collection_registry.register @@ -121,7 +121,7 @@ class APICallBulkDiscovery(APICallCollection): hosts_to_discover = [] for host_name in request["hostnames"]: - host = Folder.current().host(host_name) + host = Host.host(host_name) if host is None: raise MKUserError(None, _("The host '%s' does not exist") % host_name) host.need_permission("write") diff --git a/tests/integration/cmk/gui/test_webapi.py b/tests/integration/cmk/gui/test_webapi.py index 1341aae..340c5e2 100644 --- a/tests/integration/cmk/gui/test_webapi.py +++ b/tests/integration/cmk/gui/test_webapi.py @@ -16,25 +16,29 @@ from testlib import web, APIError, wait_until, repo_path # pylint: disable=unus @pytest.fixture -def local_test_host(web, site): - web.add_host( - "test-host", attributes={ - "ipaddress": "127.0.0.1", - }) +def local_test_hosts(web, site): + site.makedirs("var/check_mk/agent_output/") - site.write_file( - "etc/check_mk/conf.d/test-host.mk", - "datasource_programs.append(('cat ~/var/check_mk/agent_output/<HOST>', [], ['test-host']))\n" - ) + web.add_hosts([ + ("test-host", "", { + "ipaddress": "127.0.0.1", + }), + ("test-host2", "xy/zzz", { + "ipaddress": "127.0.0.1", + }), + ]) - site.makedirs("var/check_mk/agent_output/") - site.write_file( - "var/check_mk/agent_output/test-host", - file("%s/tests/integration/cmk_base/test-files/linux-agent-output" % repo_path()).read()) + for hostname in ["test-host", "test-host2"]: + site.write_file( + "var/check_mk/agent_output/%s.mk" % hostname, + file( + "%s/tests/integration/cmk_base/test-files/linux-agent-output" % repo_path()).read()) yield - web.delete_host("test-host") - site.delete_file("etc/check_mk/conf.d/test-host.mk") + + for hostname in ["test-host", "test-host2"]: + web.delete_host(hostname) + site.delete_file("var/check_mk/agent_output/%s.mk" % hostname) def test_global_settings(site, web): @@ -553,7 +557,7 @@ def _wait_for_bulk_discovery_job(web): wait_until(job_completed, timeout=15, interval=1) -def test_bulk_discovery_start_with_defaults(web, local_test_host): +def test_bulk_discovery_start_with_defaults(web, local_test_hosts): result = web.bulk_discovery_start({ "hostnames": ["test-host"], }) @@ -571,7 +575,7 @@ def test_bulk_discovery_start_with_defaults(web, local_test_host): assert "discovery successful" in status["job"]["output"] -def test_bulk_discovery_start_with_parameters(web, local_test_host): +def test_bulk_discovery_start_with_parameters(web, local_test_hosts): result = web.bulk_discovery_start({ "hostnames": ["test-host"], "mode": "new", @@ -589,6 +593,24 @@ def test_bulk_discovery_start_with_parameters(web, local_test_host): assert status["job"]["state"] == "finished" +def test_bulk_discovery_start_multiple_with_subdir(web, local_test_hosts): + result = web.bulk_discovery_start({ + "hostnames": ["test-host", "test-host2"], + "mode": "new", + "use_cache": True, + "do_scan": True, + "bulk_size": 5, + "ignore_single_check_errors": True, + }) + assert result["started"] is True + + _wait_for_bulk_discovery_job(web) + + status = web.bulk_discovery_status() + assert status["is_running"] is False + assert status["job"]["state"] == "finished" + + def test_activate_changes(web, site): try: web.add_host(

5 years, 4 months

7182 Improved GUI extension error handling

by Lars Michelsen

Module: check_mk Branch: master Commit: f841b31ae8f57294e238575baddff591f2d4bfed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f841b31ae8f572… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Feb 24 18:44:11 2019 +0100 7182 Improved GUI extension error handling When extending the standard GUI functionality, using either a manually installed <tt>local/share/check_mk/web</tt> plugin or a Check_MK extension package (MKP), exceptions may occur while loading the plugin. In previous versions these exceptions caused the whole GUI to fail making it impossible to repair the problem using the GUI, for example via the extension package manager of the CEE/CME. The extension related loading errors are now all catched and logged to the <tt>var/log/web.log</tt> instead of making the whole application fail. In addition to this, an error message will be shown on the "Extension packages" WATO page. We've also added a new Analyze configuration check "Broken GUI extensions" which will report a CRIT state when broken GUI extensions are found. Change-Id: I8c1230a7c7a5df11242b76c24b0ea107df27546e --- .werks/7182 | 23 +++++++++++++ cmk/gui/plugins/wato/ac_tests.py | 27 +++++++++++++++ cmk/gui/utils.py | 39 +++++++++++++++------- .../cmk/gui/watolib/test_analyze_configuration.py | 1 + 4 files changed, 78 insertions(+), 12 deletions(-) diff --git a/.werks/7182 b/.werks/7182 new file mode 100644 index 0000000..f78b439 --- /dev/null +++ b/.werks/7182 @@ -0,0 +1,23 @@ +Title: Improved GUI extension error handling +Level: 2 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551029903 +Class: feature + +When extending the standard GUI functionality, using either a manually +installed <tt>local/share/check_mk/web</tt> plugin or a Check_MK extension +package (MKP), exceptions may occur while loading the plugin. + +In previous versions these exceptions caused the whole GUI to fail making it +impossible to repair the problem using the GUI, for example via the extension +package manager of the CEE/CME. + +The extension related loading errors are now all catched and logged to the +<tt>var/log/web.log</tt> instead of making the whole application fail. In +addition to this, an error message will be shown on the "Extension packages" +WATO page. We've also added a new Analyze configuration check "Broken GUI +extensions" which will report a CRIT state when broken GUI extensions are +found. diff --git a/cmk/gui/plugins/wato/ac_tests.py b/cmk/gui/plugins/wato/ac_tests.py index ec191fb..f8213c1 100644 --- a/cmk/gui/plugins/wato/ac_tests.py +++ b/cmk/gui/plugins/wato/ac_tests.py @@ -30,6 +30,7 @@ import subprocess import requests import urllib3 +import cmk.gui.utils import cmk.gui.userdb as userdb import cmk.gui.sites as sites import cmk.gui.watolib as watolib @@ -771,6 +772,32 @@ class ACTestSizeOfExtensions(ACTest): @ac_test_registry.register +class ACTestBrokenGUIExtension(ACTest): + def category(self): + return ACTestCategories.deprecations + + def title(self): + return _("Broken GUI extensions") + + def help(self): + return _( + "Since 1.6.0i1 broken GUI extensions don't block the whole GUI initialization anymore. " + "Instead of this, the errors are logged in <tt>var/log/web.log</tt>. In addition to this, " + "the errors are displayed here.") + + def is_relevant(self): + return True + + def execute(self): + errors = cmk.gui.utils.get_failed_plugins() + if not errors: + yield ACResultOK(_("No broken extensions were found.")) + + for plugin_path, e in errors: + yield ACResultCRIT(_("Loading \"%s\" failed: %s") % (plugin_path, e)) + + +(a)ac_test_registry.register class ACTestESXDatasources(ACTest): def category(self): return ACTestCategories.deprecations diff --git a/cmk/gui/utils.py b/cmk/gui/utils.py index 97e2457..a74a581 100644 --- a/cmk/gui/utils.py +++ b/cmk/gui/utils.py @@ -33,10 +33,12 @@ import re import uuid import marshal import urlparse +import itertools import cmk.utils.paths from cmk.gui.i18n import _ +from cmk.gui.log import logger from cmk.gui.exceptions import MKUserError @@ -158,13 +160,17 @@ def gen_id(): return str(uuid.uuid4()) -# Load all files below share/check_mk/web/plugins/WHAT into a -# specified context (global variables). Also honors the -# local-hierarchy for OMD -# TODO: Couldn't we precompile all our plugins during packaging to make loading faster? -# TODO: Replace the execfile thing by some more pythonic plugin structure. But this would -# be a large rewrite :-/ +# This may not be moved to current_app.g, because this needs to be request +# independent +_failed_plugins = {} + + +# Load all files below share/check_mk/web/plugins/WHAT into a specified context +# (global variables). Also honors the local-hierarchy for OMD +# TODO: This is kept for pre 1.6.0i1 plugins def load_web_plugins(forwhat, globalvars): + _failed_plugins[forwhat] = [] + for plugins_path in [ cmk.utils.paths.web_dir + "/plugins/" + forwhat, cmk.utils.paths.local_web_dir + "/plugins/" + forwhat @@ -175,10 +181,19 @@ def load_web_plugins(forwhat, globalvars): for fn in sorted(os.listdir(plugins_path)): file_path = plugins_path + "/" + fn - if fn.endswith(".py") and not os.path.exists(file_path + "c"): - execfile(file_path, globalvars) + try: + if fn.endswith(".py") and not os.path.exists(file_path + "c"): + execfile(file_path, globalvars) + + elif fn.endswith(".pyc"): + code_bytes = file(file_path).read()[8:] + code = marshal.loads(code_bytes) + exec code in globalvars + + except Exception as e: + logger.error("Failed to load plugin %s: %s", file_path, e, exc_info=True) + _failed_plugins[forwhat].append((file_path, e)) + - elif fn.endswith(".pyc"): - code_bytes = file(file_path).read()[8:] - code = marshal.loads(code_bytes) - exec code in globalvars +def get_failed_plugins(): + return itertools.chain(*_failed_plugins.values()) diff --git a/tests/unit/cmk/gui/watolib/test_analyze_configuration.py b/tests/unit/cmk/gui/watolib/test_analyze_configuration.py index f66c44c..8081e21 100644 --- a/tests/unit/cmk/gui/watolib/test_analyze_configuration.py +++ b/tests/unit/cmk/gui/watolib/test_analyze_configuration.py @@ -11,6 +11,7 @@ def test_registered_ac_tests(): 'ACTestApacheProcessUsage', 'ACTestBackupConfigured', 'ACTestBackupNotEncryptedConfigured', + 'ACTestBrokenGUIExtension', 'ACTestCheckMKHelperUsage', 'ACTestESXDatasources', 'ACTestGenericCheckHelperUsage',

5 years, 4 months

DCD: Cleaned up cross component import

by Lars Michelsen

Module: check_mk Branch: master Commit: bf6add740aa6f6f39189b0e27cf344c57d14a643 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf6add740aa6f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Feb 10 17:04:56 2019 +0100 DCD: Cleaned up cross component import The DCD was previously directly executing a remote automation call to a WATO remote site for gathering information from the remote DCD instance. At the moment this call is used for fetching phase 1 results from remote sites. This was done by using cmk.gui.watolib code, which should not be imported by another component than the GUI. To solve this we now use a new Web API call which makes the DCD cleanly operate on the Web API of the local site. The Web API is then using it's configuration and code to make the connection to the remote site and returns the result to the DCD. Change-Id: I6fe7f76b2b4d66e58a6174e9d7c95005fb9aecae --- .../plugins/webapi/execute_remote_automation.py | 60 ++++++++++++++++++++++ tests/unit/cmk/gui/test_webapi_unit.py | 1 + 2 files changed, 61 insertions(+) diff --git a/cmk/gui/plugins/webapi/execute_remote_automation.py b/cmk/gui/plugins/webapi/execute_remote_automation.py new file mode 100644 index 0000000..0d5ee7b --- /dev/null +++ b/cmk/gui/plugins/webapi/execute_remote_automation.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +from typing import Dict, List # pylint: disable=unused-import + +import cmk.gui.config as config +from cmk.gui.i18n import _ +from cmk.gui.exceptions import MKUserError +from cmk.gui.plugins.webapi import ( + APICallCollection, + api_call_collection_registry, +) + +import cmk.gui.watolib.automations + + +(a)api_call_collection_registry.register +class APICallExecuteRemoteAutomation(APICallCollection): + def get_api_calls(self): + return { + "execute_remote_automation": { + "handler": self._execute_remote_automation, + "required_keys": ["site_id", "command", "command_args"], + # TODO: Add a dedicated permission for this + "required_permissions": ["wato.dcd_connections"], + }, + } + + def _execute_remote_automation(self, request): + if request["site_id"] not in config.sitenames(): + raise MKUserError("site_id", _("This site does not exist.")) + + if request["site_id"] not in dict(config.wato_slave_sites()): + raise MKUserError("site_id", _("This site is not a distributed WATO site.")) + + return cmk.gui.watolib.automations.do_remote_automation( + config.site(request["site_id"]), request["command"], request["command_args"]) diff --git a/tests/unit/cmk/gui/test_webapi_unit.py b/tests/unit/cmk/gui/test_webapi_unit.py index b3319a1..7c15611 100644 --- a/tests/unit/cmk/gui/test_webapi_unit.py +++ b/tests/unit/cmk/gui/test_webapi_unit.py @@ -10,6 +10,7 @@ def test_registered_api_call_collections(): for action in cls().get_api_calls().iterkeys()) assert sorted(registered_api_actions) == sorted([ 'activate_changes', + 'execute_remote_automation', 'add_contactgroup', 'add_folder', 'add_host',

5 years, 4 months

regression tests: disable yapf

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4a6663287e90db883ce362989a939a2e5aef65a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a6663287e90db… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 21 15:02:16 2019 +0100 regression tests: disable yapf Change-Id: Ifefe797254cb00266db783f4f0065841ee8e32b5 --- tests/unit/checks/generictests/regression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/checks/generictests/regression.py b/tests/unit/checks/generictests/regression.py index 003100d..4e13861 100644 --- a/tests/unit/checks/generictests/regression.py +++ b/tests/unit/checks/generictests/regression.py @@ -46,7 +46,7 @@ import generictests.run class WritableDataset(object): def __init__(self, filename, init_dict): - self.comments = [''] + self.comments = ['', 'yapf: disable'] self.filename = filename self.writelist = ( 'checkname',

5 years, 4 months

Fixed format

by Lars Michelsen

Module: check_mk Branch: master Commit: d36895a77ceb02118579eb6ed7a6c2a4c9a239f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d36895a77ceb02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 25 08:17:05 2019 +0100 Fixed format Change-Id: Id561a0ea8327deb79c0c161f34a9bb275a19ee6d --- tests/unit/plugins/test_mk_jolokia.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/plugins/test_mk_jolokia.py b/tests/unit/plugins/test_mk_jolokia.py index 65b829d..3a64daf 100644 --- a/tests/unit/plugins/test_mk_jolokia.py +++ b/tests/unit/plugins/test_mk_jolokia.py @@ -101,7 +101,6 @@ def test_jolokia_yield_configured_instances(): assert next(yci) == {"server": "s2", "port": 1234} - class _MockHttpResponse(object): def __init__(self, status, jolo=None): self.status_code = status @@ -134,7 +133,6 @@ def test_jolokia_validate_response_skip_mbean(): mk_jolokia.validate_response(_MockHttpResponse(200, joresp)) - def test_jolokia_validate_response_skip_instance(): for status in (401, 403, 502): with pytest.raises(mk_jolokia.SkipInstance): @@ -142,7 +140,9 @@ def test_jolokia_validate_response_skip_instance(): @pytest.mark.parametrize("data", [ - {"value": 23}, + { + "value": 23 + }, ]) def test_jolokia_validate_response_ok(data): joresp = _MockJolokiaResponse(200)

5 years, 4 months

Translated some new texts

by Lars Michelsen

Module: check_mk Branch: master Commit: 57487daff20ecacb9e4d022371b00aafea13fe3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57487daff20eca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 22 21:22:25 2019 +0100 Translated some new texts Change-Id: Id7ab56d50a4815551cb23d419336f8908fdfafb1 --- cmk/gui/plugins/wato/check_parameters/ps.py | 11 +- locale/de/LC_MESSAGES/multisite.po | 2124 +++++++++++++-------------- 2 files changed, 1027 insertions(+), 1108 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=57487daff2…

5 years, 4 months

Fixed broken snmp_info declaration

by Lars Michelsen

Module: check_mk Branch: master Commit: 952f7affe504ac71ac07dc7141e9f29c84cdde2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=952f7affe504ac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 22 16:10:46 2019 +0100 Fixed broken snmp_info declaration Change-Id: I7a3c37bab2900762ae5e306e6a48261005ad51c8 --- checks/alcatel_cpu_aos7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/alcatel_cpu_aos7 b/checks/alcatel_cpu_aos7 index 2af5eb7..986ab06f 100644 --- a/checks/alcatel_cpu_aos7 +++ b/checks/alcatel_cpu_aos7 @@ -31,7 +31,7 @@ check_info["alcatel_cpu_aos7"] = { "has_perfdata": True, "snmp_scan_function": alcatel_new_networking_products_scan_function, "snmp_info": ( - "1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1.1" # MIB object "healthModuleTable" + ".1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1.1", # MIB object "healthModuleTable" [15] # MIB object "healthModuleCpuLatest" ), "includes": ["alcatel.include"],

5 years, 4 months

Updated werk text

by Lars Michelsen

Module: check_mk Branch: master Commit: cb4e3edacec4b96518f51c9ff9aadc8f655e5336 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb4e3edacec4b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 10:56:20 2019 +0100 Updated werk text Change-Id: If9424ae5a33a7dcca3ca4d07684ee773dc478edd --- .werks/7089 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.werks/7089 b/.werks/7089 index 7231cf9..5b9d2b0f 100644 --- a/.werks/7089 +++ b/.werks/7089 @@ -17,3 +17,6 @@ The werk #7088 made it possible to perform an update without having access to the old version. Once we have this functionality it is now possible to replace one container with a another container. In case the version has changed, the container is performing the update during startup of the new container. + +The simplified update procedure can be used for Docker container updates to +version 1.6 or newer when the previous version is 1.5.0p13 or newer.

5 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019