Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

Host attributes: Refactored host tag host attributes to valuespecs

by Lars Michelsen

Module: check_mk Branch: master Commit: 86bf4abd5d23d37604a725759e2db244197f720f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86bf4abd5d23d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 13 14:33:04 2018 +0100 Host attributes: Refactored host tag host attributes to valuespecs * The host attributes that are represented by dropdowns and checkboxes in the host, cluster, folder edit dialog are now implemented based on the ValueSpecAttribute class. * Dynamic showing / hiding of attributes in the host / folder edit dialogs makes the change a bit more complicated. Some of the specific things have been cleaned up. * Implicit encoding of the auxiliary tags in the values of the tag choices has been cleaned up. The auxiliary tags are now looked up dynamically by the javascript code. CMK-1421 Change-Id: I565dab0e67d918b3306248a48bb7f59a900851ef --- cmk/gui/plugins/wato/utils/__init__.py | 16 +++- cmk/gui/valuespec.py | 14 ++- cmk/gui/watolib.py | 167 ++++++++++++--------------------- web/htdocs/js/wato.js | 14 ++- 4 files changed, 90 insertions(+), 121 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=86bf4abd5d…

5 years, 6 months

Improved background job logging a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: be67092b1cbf5ed1375585a9eb88d7ffc26ff53e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be67092b1cbf5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Dec 15 20:31:44 2018 +0100 Improved background job logging a bit Change-Id: I01144058f1eeacffb86eddf353f95ad52a64b185 --- cmk/gui/background_job.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/cmk/gui/background_job.py b/cmk/gui/background_job.py index 4812b81..631b6f7 100644 --- a/cmk/gui/background_job.py +++ b/cmk/gui/background_job.py @@ -135,13 +135,15 @@ class BackgroundProcess(BackgroundProcessInterface, multiprocessing.Process): self._job_parameters["logger"] = self._logger def _register_signal_handlers(self): + self._logger.debug("Register signal handler %d", os.getpid()) signal.signal(signal.SIGTERM, self._handle_sigterm) def _handle_sigterm(self, signum, frame): + self._logger.debug("Received SIGTERM") status = self._jobstatus.get_status() if not status.get("stoppable", True): self._logger.warning("Skip termination of background job (Job ID: %s, PID: %d)", - self._job_parameters["job_id"], status["pid"]) + self._job_parameters["job_id"], os.getpid()) return raise MKTerminate() @@ -366,6 +368,8 @@ class BackgroundJob(object): return # Send SIGTERM + self._logger.debug("Stopping job using SIGTERM \"%s\" (PID: %d)", self._job_id, + job_status["pid"]) try: process = psutil.Process(job_status["pid"]) if not self._is_correct_process(job_status, process): @@ -374,7 +378,7 @@ class BackgroundJob(object): except (psutil.NoSuchProcess, psutil.AccessDenied): return - # Give the jobs some time to terminate + self._logger.debug("Waiting for job") start_time = time.time() while time.time() - start_time < 10: # 10 seconds SIGTERM grace period job_still_running = False @@ -390,11 +394,11 @@ class BackgroundJob(object): break time.sleep(0.1) - # Kill unresponsive jobs - # Send SIGKILL try: p = psutil.Process(job_status["pid"]) if self._is_correct_process(job_status, process): + # Kill unresponsive jobs + self._logger.debug("Killing job") p.send_signal(signal.SIGKILL) except (psutil.NoSuchProcess, psutil.AccessDenied): return @@ -457,8 +461,9 @@ class BackgroundJob(object): p.start() p.join() - job_status = self.get_status() - self._logger.debug("Started job \"%s\" (PID: %d)" % (self._job_id, job_status["pid"])) + if p.exitcode == 0: + job_status = self.get_status() + self._logger.debug("Started job \"%s\" (PID: %s)", self._job_id, job_status.get("pid")) def _prepare_work_dir(self): self._delete_work_dir() @@ -470,7 +475,7 @@ class BackgroundJob(object): p.start() self._jobstatus.update_status({"pid": p.pid}) except Exception as e: - self._logger.error("Error while starting subprocess: %s" % e) + self._logger.error("Error while starting subprocess: %s", e, exc_info=True) os._exit(1) os._exit(0)

5 years, 6 months

Host attributes: Extracted current tag gathering to dedicated function

by Lars Michelsen

Module: check_mk Branch: master Commit: 802b76bcd71d2280e87f9619dabfeae08f7123a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=802b76bcd71d22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 13 15:51:08 2018 +0100 Host attributes: Extracted current tag gathering to dedicated function CMK-1421 Change-Id: Ib4738d445bba914bdff2af6a3fe2e3b2790878d6 --- web/htdocs/js/wato.js | 121 ++++++++++++++++++++++++++------------------------ 1 file changed, 63 insertions(+), 58 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 81bdd29..21cee50 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -75,63 +75,8 @@ function wato_toggle_attribute(oCheckbox, attrname) { function wato_fix_visibility() { /* First collect the current selection of all host attributes. They are in the same table as we are */ - var currentTags = []; - - var container_ids = [ "wato_host_tags", "data_sources", "address" ]; - - for (var a = 0; a < container_ids.length; a++) { - var container_id = container_ids[a]; - - var oHostTags = document.getElementById(container_id); - - if (!oHostTags) - continue; - - var oTable = oHostTags.childNodes[0]; /* tbody */ - - for (var i = 0; i < oTable.childNodes.length; i++) { - var oTr = oTable.childNodes[i]; - var add_tag_id = null; - if (oTr.tagName == 'TR') { - var oTdLegend = oTr.childNodes[0]; - if (oTdLegend.className != "legend") { - continue; - } - var oTdContent = oTr.childNodes[1]; - /* If the Checkbox is unchecked try to get a value from the inherited_tags */ - var oCheckbox = oTdLegend.getElementsByTagName("input")[0]; - if (oCheckbox.checked == false ){ - var attrname = 'attr_' + oCheckbox.name.replace(/.*_change_/, ''); - if (attrname in inherited_tags && inherited_tags[attrname] !== null){ - add_tag_id = inherited_tags[attrname]; - } - } else { - /* Find the <select>/<checkbox> object in this tr */ - var elements = oTdContent.getElementsByTagName("input"); - if (elements.length == 0) - elements = oTdContent.getElementsByTagName("select"); - - if (elements.length == 0) - continue; - - var oElement = elements[0]; - if (oElement.type == 'checkbox' && oElement.checked) { - add_tag_id = oElement.name.substr(4); - } else if (oElement.tagName == 'SELECT') { - add_tag_id = oElement.value; - } - } - } - - currentTags.push(add_tag_id); - if (wato_aux_tags_by_tag[add_tag_id]) { - currentTags = currentTags.concat(wato_aux_tags_by_tag[add_tag_id]); - } - } - } - - // Skip this function when no tags defined - if (!currentTags) + var current_tags = _get_effective_tags(); + if (!current_tags) return; var hide_topics = volatile_topics.slice(0); @@ -170,7 +115,7 @@ function wato_fix_visibility() { var tag = wato_depends_on_tags[attrname][index]; var negate = tag[0] == '!'; var tagname = negate ? tag.substr(1) : tag; - var have_tag = currentTags.indexOf(tagname) != -1; + var have_tag = current_tags.indexOf(tagname) != -1; if (have_tag == negate) { display = "none"; break; @@ -235,6 +180,66 @@ function wato_fix_visibility() { } } +function _get_effective_tags() +{ + var current_tags = []; + + var container_ids = [ "wato_host_tags", "data_sources", "address" ]; + + for (var a = 0; a < container_ids.length; a++) { + var container_id = container_ids[a]; + + var oHostTags = document.getElementById(container_id); + + if (!oHostTags) + continue; + + var oTable = oHostTags.childNodes[0]; /* tbody */ + + for (var i = 0; i < oTable.childNodes.length; i++) { + var oTr = oTable.childNodes[i]; + var add_tag_id = null; + if (oTr.tagName == 'TR') { + var oTdLegend = oTr.childNodes[0]; + if (oTdLegend.className != "legend") { + continue; + } + var oTdContent = oTr.childNodes[1]; + /* If the Checkbox is unchecked try to get a value from the inherited_tags */ + var oCheckbox = oTdLegend.getElementsByTagName("input")[0]; + if (oCheckbox.checked == false ){ + var attrname = 'attr_' + oCheckbox.name.replace(/.*_change_/, ''); + if (attrname in inherited_tags && inherited_tags[attrname] !== null){ + add_tag_id = inherited_tags[attrname]; + } + } else { + /* Find the <select>/<checkbox> object in this tr */ + var elements = oTdContent.getElementsByTagName("input"); + if (elements.length == 0) + elements = oTdContent.getElementsByTagName("select"); + + if (elements.length == 0) + continue; + + var oElement = elements[0]; + if (oElement.type == 'checkbox' && oElement.checked) { + add_tag_id = oElement.name.substr(4); + } else if (oElement.tagName == 'SELECT') { + add_tag_id = oElement.value; + } + } + } + + current_tags.push(add_tag_id); + if (wato_aux_tags_by_tag[add_tag_id]) { + current_tags = current_tags.concat(wato_aux_tags_by_tag[add_tag_id]); + } + } + } + return current_tags; +} + + function wato_randomize_secret(id, len) { var secret = "";

5 years, 6 months

Host attributes: Split host tag attributes into list / checkbox

by Lars Michelsen

Module: check_mk Branch: master Commit: b0c23b6e52c61c825001724ea1058aa94b1f7ec5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0c23b6e52c61c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 13 13:47:57 2018 +0100 Host attributes: Split host tag attributes into list / checkbox * Split different tag group inputs into two dedicated classes * Whether or not an attribute is a tag attribute is now checked by using an explicit property instead on relying on the class hierarchy CMK-1421 Change-Id: I8364f2ca36f4796617c2dbab8ff407d404ac3493 --- cmk/gui/plugins/wato/utils/__init__.py | 6 +- cmk/gui/watolib.py | 153 ++++++++++++++++++++++----------- 2 files changed, 104 insertions(+), 55 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 27b9592..977e9ce 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -1671,7 +1671,7 @@ def configure_attributes(new, inherited_value = container.attributes()[attrname] has_inherited = True - if isinstance(attr, watolib.HostTagAttribute): + if attr.is_tag_attribute: inherited_tags["attr_%s" % attrname] = '|'.join( attr.get_tag_list(inherited_value)) break @@ -1682,7 +1682,7 @@ def configure_attributes(new, inherited_from = _("Default value") inherited_value = attr.default_value() # Also add the default values to the inherited values dict - if isinstance(attr, watolib.HostTagAttribute): + if attr.is_tag_attribute: inherited_tags["attr_%s" % attrname] = '|'.join( attr.get_tag_list(inherited_value)) @@ -1757,7 +1757,7 @@ def configure_attributes(new, if len(values) == 1: defvalue = values[0] - elif attr.is_checkbox_tag(): + elif attr.is_checkbox_tag: defvalue = True else: defvalue = attr.default_value() diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 54ab44b..e87f81f 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -1710,7 +1710,7 @@ class CREFolder(BaseFolder): # we drop this one day? attributes = {} for attr, _topic in all_host_attributes(): - if isinstance(attr, HostTagAttribute): + if attr.is_tag_attribute: tagvalue = attr.get_tag_value(host_tags) attributes[attr.name()] = tagvalue return attributes @@ -3342,9 +3342,14 @@ class Attribute(object): def get_tag_list(self, value): return [] + @property def is_checkbox_tag(self): return False + @property + def is_tag_attribute(self): + return False + # A simple text attribute. It is stored in # a Python unicode string @@ -3470,7 +3475,17 @@ class EnumAttribute(Attribute): class HostTagAttribute(Attribute): - """A selection dropdown for a host tag""" + __metaclass__ = abc.ABCMeta + + @abc.abstractproperty + def is_checkbox_tag(self): + # type: () -> bool + raise NotImplementedError() + + @abc.abstractmethod + def _default_tag_value(self): + # type: () -> typing.Optional[str] + raise NotImplementedError() def __init__(self, tag_id, title, tag_list): self._taglist = tag_list @@ -3481,34 +3496,11 @@ class HostTagAttribute(Attribute): default_value=self._default_tag_value(), ) - def _default_tag_value(self): - if not self.is_checkbox_tag(): - return self._taglist[0][0] - return None - - def is_checkbox_tag(self): - return len(self._taglist) == 1 - - def paint(self, value, hostname): - # Localize the titles. To make the strings available in the scanned localization - # files the _() function must also be placed in the configuration files - # But don't localize empty strings - This empty string is connected to the header - # of the .mo file - if self.is_checkbox_tag(): - title = self._taglist[0][1] - if title: - title = _u(title) - if value: - return "", title - return "", "%s %s" % (_("Not"), title) - for entry in self._taglist: - if value == entry[0]: - return "", entry[1] and _u(entry[1]) or '' - return "", "" # Should never happen, at least one entry should match - # But case could occur if tags definitions have been changed. + @property + def is_tag_attribute(self): + return True - def render_input(self, varprefix, value): - varname = varprefix + "attr_" + self.name() + def _get_tag_value_and_choices(self, varname, value): if value is None: value = html.var(varname, "") # "" is important for tag groups with an empty tag entry @@ -3527,28 +3519,7 @@ class HostTagAttribute(Attribute): if value != "" and value == tagvalue and secondary_tags: value = value + "|" + "|".join(secondary_tags) - if self.is_checkbox_tag(): - html.checkbox( - varname, - value != "", - label=choices[0][1], - onclick='wato_fix_visibility();', - tags=choices[0][0]) - else: - html.dropdown(varname, choices, value, onchange="wato_fix_visibility();") - - def from_html_vars(self, varprefix): - varname = varprefix + "attr_" + self.name() - if self.is_checkbox_tag(): - if html.get_checkbox(varname): - return self._taglist[0][0] - return None - - # strip of secondary tags - value = html.var(varname).split("|")[0] - if not value: - value = None - return value + return value, choices def get_tag_value(self, tags): """Special function for computing the setting of a specific @@ -3572,6 +3543,79 @@ class HostTagAttribute(Attribute): return [] # No matching tag +class HostTagListAttribute(HostTagAttribute): + """A selection dropdown for a host tag""" + + def _default_tag_value(self): + return self._taglist[0][0] + + @property + def is_checkbox_tag(self): + return False + + @property + def is_tag_attribute(self): + return True + + def paint(self, value, hostname): + for entry in self._taglist: + if value == entry[0]: + return "", entry[1] and _u(entry[1]) or '' + return "", "" + + def render_input(self, varprefix, value): + varname = varprefix + "attr_" + self.name() + value, choices = self._get_tag_value_and_choices(varname, value) + html.dropdown(varname, choices, value, onchange="wato_fix_visibility();") + + def from_html_vars(self, varprefix): + varname = varprefix + "attr_" + self.name() + + # strip of secondary tags + value = html.var(varname).split("|")[0] + if not value: + value = None + return value + + +class HostTagCheckboxAttribute(HostTagAttribute): + """A checkbox for a host tag group""" + + def _default_tag_value(self): + return None + + @property + def is_checkbox_tag(self): + return True + + def paint(self, value, hostname): + title = self._taglist[0][1] + if title: + title = _u(title) + if value: + return "", title + return "", "%s %s" % (_("Not"), title) + + def render_input(self, varprefix, value): + varname = varprefix + "attr_" + self.name() + + value, choices = self._get_tag_value_and_choices(varname, value) + + html.checkbox( + varname, + value != "", + label=choices[0][1], + onclick='wato_fix_visibility();', + tags=choices[0][0]) + + def from_html_vars(self, varprefix): + varname = varprefix + "attr_" + self.name() + if self.is_checkbox_tag: + if html.get_checkbox(varname): + return self._taglist[0][0] + return None + + # An attribute using the generic ValueSpec mechanism class ValueSpecAttribute(Attribute): def __init__(self, name, vs): @@ -3853,8 +3897,13 @@ def declare_host_tag_attributes(): if not topic: topic = _('Host tags') + if len(entry[2]) == 1: + vs = HostTagCheckboxAttribute(*entry[:3]) + else: + vs = HostTagListAttribute(*entry[:3]) + declare_host_attribute( - HostTagAttribute(*entry[:3]), + vs, show_in_table=False, show_in_folder=True, editable=attr_editable,

5 years, 6 months

test_win_license: Add explicit test ids to prevent too long automatically computed IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 7bc569e8f67af1f689ac61ae1bda0843a255170f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bc569e8f67af1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 17 07:46:37 2018 +0100 test_win_license: Add explicit test ids to prevent too long automatically computed IDS Change-Id: I25de70ae7c91d50a299af7b1f8ecd72e13ac0b2a --- tests/unit/checks/test_win_license.py | 102 ++++++++++++++++------------------ 1 file changed, 49 insertions(+), 53 deletions(-) diff --git a/tests/unit/checks/test_win_license.py b/tests/unit/checks/test_win_license.py index 03eecbc..90c6a43 100644 --- a/tests/unit/checks/test_win_license.py +++ b/tests/unit/checks/test_win_license.py @@ -66,27 +66,29 @@ def splitter(text): return [line.split() for line in text.split("\n")] -(a)pytest.mark.parametrize("capture, result", - zip(agent_out, [ - { - "License": "Initial grace period", - "expiration": "12960 minute(s) (9 day(s))", - "expiration_time": 12960 * 60, - }, - { - "License": "Licensed", - "expiration": "253564 minute(s) (177 day(s))", - "expiration_time": 253564 * 60, - }, - { - "License": "Licensed", - "expiration": "251100 minute(s) (174 day(s))", - "expiration_time": 251100 * 60, - }, - { - "License": "Licensed", - }, - ])) +(a)pytest.mark.parametrize( + "capture, result", + zip(agent_out, [ + { + "License": "Initial grace period", + "expiration": "12960 minute(s) (9 day(s))", + "expiration_time": 12960 * 60, + }, + { + "License": "Licensed", + "expiration": "253564 minute(s) (177 day(s))", + "expiration_time": 253564 * 60, + }, + { + "License": "Licensed", + "expiration": "251100 minute(s) (174 day(s))", + "expiration_time": 251100 * 60, + }, + { + "License": "Licensed", + }, + ]), + ids=["win7", "win2012", "win2008", "win10"]) def test_parse_win_license(check_manager, capture, result): check = check_manager.get_check("win_license") assert result == check.run_parse(splitter(capture)) @@ -100,51 +102,45 @@ check_ref = namedtuple('result', ['parameters', 'check_output']) zip(agent_out, [ check_ref({ 'status': ['Licensed', 'Initial grace period'], - 'expiration_time': (8*24*60*60, 5*24*60*60), + 'expiration_time': (8 * 24 * 60 * 60, 5 * 24 * 60 * 60), + }, CheckResult([ + (0, "Software is Initial grace period"), + (0, "License will expire in 9 d"), + ])), + check_ref({ + 'status': ['Licensed', 'Initial grace period'], + 'expiration_time': (180 * 24 * 60 * 60, 90 * 24 * 60 * 60), + }, + CheckResult([ + (0, "Software is Licensed"), + (1, "License will expire in 176 d (warn/crit at 180 d/90 d)"), + ])), + check_ref({ + 'status': ['Licensed', 'Initial grace period'], + 'expiration_time': (360 * 24 * 60 * 60, 180 * 24 * 60 * 60), }, CheckResult([ - (0, "Software is Initial grace period"), - (0, "License will expire in 9 d"), + (0, "Software is Licensed"), + (2, "License will expire in 174 d (warn/crit at 360 d/180 d)"), ])), - check_ref( - { - 'status': ['Licensed', 'Initial grace period'], - 'expiration_time': (180*24*60*60, 90*24*60*60), - }, - CheckResult([ - (0, "Software is Licensed"), - (1, - "License will expire in 176 d (warn/crit at 180 d/90 d)"), - ])), - check_ref( - { - 'status': ['Licensed', 'Initial grace period'], - 'expiration_time': (360*24*60*60, 180*24*60*60), - }, - CheckResult([ - (0, "Software is Licensed"), - (2, - "License will expire in 174 d (warn/crit at 360 d/180 d)" - ), - ])), check_ref({ 'status': ['Licensed', 'Initial grace period'], - 'expiration_time': (14*24*60*60, 7*24*60*60), + 'expiration_time': (14 * 24 * 60 * 60, 7 * 24 * 60 * 60), }, CheckResult([(0, "Software is Licensed")])), ]) + zip(agent_out, [ check_ref({ 'status': ["Registered"], - 'expiration_time': (8*24*60*60, 5*24*60*60), + 'expiration_time': (8 * 24 * 60 * 60, 5 * 24 * 60 * 60), }, CheckResult([(2, "Software is Initial grace period Required: Registered"), (0, 'License will expire in 9 d')])), - check_ref( - None, - CheckResult([(0, "Software is Licensed"), - (0, 'License will expire in 176 d')])), - ])) + check_ref(None, + CheckResult([(0, "Software is Licensed"), (0, 'License will expire in 176 d')])), + ]), + ids=map(str, range(6))) def test_check_win_license(check_manager, capture, result): check = check_manager.get_check("win_license") - output = check.run_check(None, result.parameters or check.default_parameters(), check.run_parse(splitter(capture))) + output = check.run_check(None, result.parameters or check.default_parameters(), + check.run_parse(splitter(capture))) assertCheckResultsEqual(CheckResult(output), result.check_output)

5 years, 6 months

Change azure generic test to new structure

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 002987b5f3acec96c55b908518cbddb93338867f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=002987b5f3acec… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Dec 17 09:51:14 2018 +0100 Change azure generic test to new structure Change-Id: I65ad6b70c3fc1fff22fe695063ae923a66035752 --- .../generictests/datasets/azure_storageaccounts.py | 56 ++++++++++++---------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/tests/unit/checks/generictests/datasets/azure_storageaccounts.py b/tests/unit/checks/generictests/datasets/azure_storageaccounts.py index da7e5ed..3f0d4cc 100644 --- a/tests/unit/checks/generictests/datasets/azure_storageaccounts.py +++ b/tests/unit/checks/generictests/datasets/azure_storageaccounts.py @@ -39,52 +39,56 @@ info = [ ['Availability', 'total', '190700.0', 'percent', '1544602380', 'PT1H', 'None'], ] - _common_discovery = [(u'glastonburydiag381', {}), (u'st0ragetestaccount', {})] MB = 1024**2 discovery = {sub: _common_discovery for sub in ('', 'flow', 'performance')} - checks = { '': [ - (u'glastonburydiag381', 'default', [ + (u'glastonburydiag381', {}, [ (0, u'Kind: Storage', []), (0, 'Used capacity: 10.03 GB', [('used_space', 10773519964, None, None, 0, None)]), (0, u'Location: westeurope', []), ]), - (u'st0ragetestaccount', {'used_capacity_levels': (2 * MB, 4 * MB)}, [ + (u'st0ragetestaccount', { + 'used_capacity_levels': (2 * MB, 4 * MB) + }, [ (0, u'Kind: BlobStorage', []), - (1, 'Used capacity: 3.65 MB (warn/crit at 2.00 MB/4.00 MB)', [ - ('used_space', 3822551, 2 * MB, 4 * MB, 0, None)]), + (1, 'Used capacity: 3.65 MB (warn/crit at 2.00 MB/4.00 MB)', + [('used_space', 3822551, 2 * MB, 4 * MB, 0, None)]), (0, u'Location: westeurope', []), (0, u'Monitoring: some value', []), ]), ], - 'flow': [ - (u'glastonburydiag381', 'default', [ - (0, 'Ingress: 41.20 MB', [('ingress', 43202937, None, None, 0, None)]), - (0, 'Egress: 5.57 MB', [('egress', 5835881, None, None, 0, None)]), - (0, 'Transactions: 1907', [('transactions', 1907.0, None, None, 0, None)]), - ]), - (u'st0ragetestaccount', {'egress_levels': (100 * MB, 200 * MB)}, [ - (0, 'Ingress: 30.88 kB', [('ingress', 31620, None, None, 0, None)]), - (2, 'Egress: 226.03 MB (warn/crit at 100.00 MB/200.00 MB)', [ - ('egress', 237007090, 100 * MB, 200 * MB, 0, None), - ]), - (0, 'Transactions: 62', [('transactions', 62.0, None, None, 0, None)]), - ]) - ], + 'flow': [(u'glastonburydiag381', {}, [ + (0, 'Ingress: 41.20 MB', [('ingress', 43202937, None, None, 0, None)]), + (0, 'Egress: 5.57 MB', [('egress', 5835881, None, None, 0, None)]), + (0, 'Transactions: 1907', [('transactions', 1907.0, None, None, 0, None)]), + ]), + (u'st0ragetestaccount', { + 'egress_levels': (100 * MB, 200 * MB) + }, [ + (0, 'Ingress: 30.88 kB', [('ingress', 31620, None, None, 0, None)]), + (2, 'Egress: 226.03 MB (warn/crit at 100.00 MB/200.00 MB)', [ + ('egress', 237007090, 100 * MB, 200 * MB, 0, None), + ]), + (0, 'Transactions: 62', [('transactions', 62.0, None, None, 0, None)]), + ])], 'performance': [ - (u'glastonburydiag381', 'default', [ - (0, 'Success server latency: 20105 ms', [('server_latency', 20.105, None, None, 0, None)]), - (0, 'End-to-end server latency: 37606 ms', [('e2e_latency', 37.606, None, None, 0, None)]), + (u'glastonburydiag381', {}, [ + (0, 'Success server latency: 20105 ms', [('server_latency', 20.105, None, None, 0, + None)]), + (0, 'End-to-end server latency: 37606 ms', [('e2e_latency', 37.606, None, None, 0, + None)]), (0, 'Availability: 190700.0%', [('availability', 190700.0, None, None, 0, None)]), ]), - (u'st0ragetestaccount', 'default', [ - (0, 'Success server latency: 5624 ms', [('server_latency', 5.624, None, None, 0, None)]), - (0, 'End-to-end server latency: 9584 ms', [('e2e_latency', 9.584, None, None, 0, None)]), + (u'st0ragetestaccount', {}, [ + (0, 'Success server latency: 5624 ms', [('server_latency', 5.624, None, None, 0, + None)]), + (0, 'End-to-end server latency: 9584 ms', [('e2e_latency', 9.584, None, None, 0, + None)]), (0, 'Availability: 6200.0%', [('availability', 6200.0, None, None, 0, None)]), ]), ],

5 years, 6 months

Replace the remaining "default" keywords with explicit parameters

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 5db1bbdb5b9fb97c7287a2d8b7b9e2beb1ce5632 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5db1bbdb5b9fb9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Dec 14 19:29:28 2018 +0100 Replace the remaining "default" keywords with explicit parameters Change-Id: I48cf3ad53f9b0c86406b385c506953a2f1c06d6c --- .../datasets/aix_hacmp_resources_regression.py | 99 +- .../datasets/apc_symmetra_regression.py | 6 +- .../generictests/datasets/azure_databases.py | 79 +- .../checks/generictests/datasets/azure_sites.py | 4 +- .../datasets/azure_virtualmachines_1.py | 73 +- .../azure_virtualmachines_1_on_grouphost.py | 81 +- .../datasets/azure_virtualmachines_1_on_vm.py | 40 +- .../datasets/cisco_secure_1_regression.py | 310 +- .../datasets/cisco_secure_2_regression.py | 124 +- .../generictests/datasets/df_lnx_regression.py | 7 +- .../generictests/datasets/df_win_regression.py | 102 +- .../datasets/docker_node_disk_usage_raw_text.py | 8 +- .../datasets/docker_node_disk_usage_regression.py | 10 +- .../docker_node_info_centos6_regression.py | 27 +- .../datasets/docker_node_info_raw_text.py | 4 +- .../datasets/docker_node_info_regression.py | 4 +- .../datasets/emcvnx_storage_pools_regression.py | 10 +- .../datasets/esx_vsphere_objects_1_regression.py | 60 +- .../generictests/datasets/esx_vsphere_sensors_1.py | 53 +- .../generictests/datasets/esx_vsphere_sensors_2.py | 17 +- .../datasets/esx_vsphere_vm_snapshots.py | 53 +- .../generictests/datasets/fileinfo_new_output.py | 8 +- .../datasets/fileinfo_old_output_regression.py | 40 +- .../checks/generictests/datasets/filestats_1.py | 4 +- .../datasets/filestats_broken_sections.py | 25 +- .../checks/generictests/datasets/genua_carp_1.py | 19 +- .../generictests/datasets/hp_msa_fan_regression.py | 69 +- .../datasets/hp_msa_volume_regression.py | 113 +- .../datasets/hp_proliant_psu_regression.py | 6 +- .../generictests/datasets/jolokia_generic.py | 8 +- .../datasets/juniper_bgp_state_1_regression.py | 4 +- .../datasets/juniper_bgp_state_ip_addresses.py | 42 +- .../datasets/k8s_conditions_regression.py | 12 +- .../datasets/k8s_resources_regression.py | 6 +- ...ivesync_server_windows_exchange_1_regression.py | 289 +- ..._server_windows_kaspersky_error_2_regression.py | 4 +- ...ability_server_windows_exchange_1_regression.py | 4 +- .../datasets/msexch_database_de_regression.py | 6 +- ...enttype_server_windows_exchange_1_regression.py | 2966 ++++++-------------- ...isstore_server_windows_exchange_1_regression.py | 767 ++--- ...h_isstore_server_windows_msexch_2_regression.py | 748 ++--- ...xch_owa_server_windows_exchange_1_regression.py | 4 +- ..._server_windows_kaspersky_error_2_regression.py | 136 +- .../datasets/mysql_slave_regression.py | 2 +- .../datasets/netapp_api_aggr_regression.py | 71 +- .../datasets/netapp_api_luns_regression.py | 8 +- .../datasets/netapp_api_qtree_quota_regression.py | 24 +- .../datasets/netapp_api_snapvault_regression.py | 8 +- .../checks/generictests/datasets/nfsmounts_1.py | 4 +- .../generictests/datasets/poseidon_inputs_1.py | 12 +- .../generictests/datasets/poseidon_temp_1.py | 15 +- .../datasets/skype_skype_1_regression.py | 28 +- .../datasets/skype_skype_2_regression.py | 14 +- .../systemd_units_services_1_regression.py | 620 ++-- .../systemd_units_services_2_failed_regression.py | 46 +- .../datasets/ucs_bladecenter_psu_regression.py | 150 +- .../datasets/varnish_new_format_regression.py | 828 ++---- .../datasets/varnish_old_format_regression.py | 22 +- .../checks/generictests/datasets/veritas_vcs_1.py | 912 +++++- .../checks/generictests/datasets/veritas_vcs_2.py | 165 -- .../checks/generictests/datasets/veritas_vcs_3.py | 109 - .../wmi_cpuload_hp_proliant_win_5_regression.py | 241 +- ...ervices_server_windows_exchange_1_regression.py | 477 +--- 63 files changed, 3590 insertions(+), 6617 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5db1bbdb5b…

5 years, 6 months

Simplify parameter handling in generic tests

by Tom Baerwinkel

Module: check_mk Branch: master Commit: ea17045d028962aeef9d91da7e8fe4bb50e154d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea17045d028962… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Dec 14 19:41:06 2018 +0100 Simplify parameter handling in generic tests * the 'default' string parameter is removed * get_check_merged_parameters is removed * get_discovered_merged_parameters is renamed to get_merged_parameters again Change-Id: I205240e6add8926b5a586ddeda133bdb758905cb --- tests/unit/checks/generictests/run.py | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index bffcfc6..11530bf 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -42,32 +42,18 @@ def get_info_argument(dataset, subcheck, fallback_parsed=None): return arg -def get_discovered_merged_parameters(check, provided_p): +def get_merged_parameters(check, provided_p): default_p = check.default_parameters() if not provided_p: - return default_p, "default" + return default_p if isinstance(provided_p, str): if provided_p in check.context: - return check.context[provided_p], check.context[provided_p] + return check.context[provided_p] evaluated_params = literal_eval(provided_p) default_p.update(evaluated_params) - return default_p, default_p - raise DiscoveryParameterTypeError("unhandled: %r/%r" % (default_p, provided_p)) - - -def get_check_merged_parameters(check, provided_p): - default_p = check.default_parameters() - - if provided_p == 'default': return default_p - if provided_p is None: - return provided_p - if isinstance(provided_p, dict): - return provided_p - if isinstance(provided_p, tuple): - return provided_p raise DiscoveryParameterTypeError("unhandled: %r/%r" % (default_p, provided_p)) @@ -145,7 +131,7 @@ def check_discovered_result(check, discovery_result, info_arg, immu): item = discovery_result.item - params, par_str = get_discovered_merged_parameters(check, discovery_result.default_params) + params = get_merged_parameters(check, discovery_result.default_params) immu.register(params, 'params') raw_checkresult = check.run_check(item, params, info_arg) @@ -154,7 +140,7 @@ def check_discovered_result(check, discovery_result, info_arg, immu): cr = CheckResult(raw_checkresult) - return (item, par_str, cr.raw_repr()) + return (item, params, cr.raw_repr()) def check_listed_result(check, list_entry, info_arg, immu): @@ -162,9 +148,7 @@ def check_listed_result(check, list_entry, info_arg, immu): item, params, results_expected_raw = list_entry print("Dataset item %r in check %r" % (item, check.name)) - params = get_check_merged_parameters(check, params) immu.register(params, 'params') - result_raw = check.run_check(item, params, info_arg) check_func = check.info.get("check_function") immu.test(' after check (%s): ' % check_func.__name__)

5 years, 6 months

Add handling of non empty dictionary parameters and a regression test for esx

by Tom Baerwinkel

Module: check_mk Branch: master Commit: c53811c44d19c52d052a7df6e70f2ef4b50a3190 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c53811c44d19c5… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Dec 14 19:46:18 2018 +0100 Add handling of non empty dictionary parameters and a regression test for esx Change-Id: I3df483c6987526dd50b752fb132e3143e303a8e3 --- .../datasets/esx_vsphere_hostsystem_regression.py | 121 +++++++++++++++++++++ tests/unit/checks/generictests/run.py | 3 + 2 files changed, 124 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/esx_vsphere_hostsystem_regression.py b/tests/unit/checks/generictests/datasets/esx_vsphere_hostsystem_regression.py new file mode 100644 index 0000000..c21f70d --- /dev/null +++ b/tests/unit/checks/generictests/datasets/esx_vsphere_hostsystem_regression.py @@ -0,0 +1,121 @@ + + +checkname = 'esx_vsphere_hostsystem' + + +info = [[[u'config.multipathState.path', + u'vmhba0:C2:T0:L0', + u'active', + u'vmhba1:C0:T0:L0', + u'active', + u'vmhba66:C0:T0:L0', + u'active', + u'vmhba66:C0:T1:L0', + u'active', + u'vmhba66:C0:T2:L0', + u'active'], + [u'config.storageDevice.multipathInfo', + u'6e843b6d8f2740bdecbad4676da7a9dd', + u'vmhba66:C0:T2:L0', + u'active', + u'6e843b6bc5cc897d430ad40b7d9172d1', + u'vmhba66:C0:T0:L0', + u'active', + u'6e843b63fcbd92ad8f22d4cf7d8e6cdc', + u'vmhba66:C0:T1:L0', + u'active', + u'766d6862', + u'vmhba1:C0:T0:L0', + u'active', + u'600605b002db9f7018d0a40c2a1444b0', + u'vmhba0:C2:T0:L0', + u'active'], + [u'hardware.biosInfo.biosVersion', u'-[D6E158AUS-1.16]-'], + [u'hardware.biosInfo.releaseDate', u'2012-11-26T00:00:00Z'], + [u'hardware.cpuInfo.hz', u'2933437094'], + [u'hardware.cpuInfo.numCpuCores', u'12'], + [u'hardware.cpuInfo.numCpuPackages', u'2'], + [u'hardware.cpuInfo.numCpuThreads', u'24'], + [u'hardware.cpuPkg.busHz.0', u'133338040'], + [u'hardware.cpuPkg.busHz.1', u'133338015'], + [u'hardware.cpuPkg.description.0', + u'Intel(R)', + u'Xeon(R)', + u'CPU', + u'X5670', + u'@', + u'2.93GHz'], + [u'hardware.cpuPkg.description.1', + u'Intel(R)', + u'Xeon(R)', + u'CPU', + u'X5670', + u'@', + u'2.93GHz'], + [u'hardware.cpuPkg.hz.0', u'2933437152'], + [u'hardware.cpuPkg.hz.1', u'2933437036'], + [u'hardware.cpuPkg.index.0', u'0'], + [u'hardware.cpuPkg.index.1', u'1'], + [u'hardware.cpuPkg.vendor.0', u'intel'], + [u'hardware.cpuPkg.vendor.1', u'intel'], + [u'hardware.memorySize', u'146016378880'], + [u'hardware.systemInfo.model', u'System', u'x3650', u'M3', u'-[7945M2G]-'], + [u'hardware.systemInfo.otherIdentifyingInfo.AssetTag.0', u'none'], + [u'hardware.systemInfo.otherIdentifyingInfo.OemSpecificString.0', + u'IBM', + u'SystemX'], + [u'hardware.systemInfo.otherIdentifyingInfo.ServiceTag.0', u'none'], + [u'hardware.systemInfo.uuid', u'e8a2b8a7-b9d4-3f21-a53a-afca3baa74f2'], + [u'hardware.systemInfo.vendor', u'IBM'], + [u'name', u'esx-w.dhcp.mathias-kettner'], + [u'overallStatus', u'green'], + [u'runtime.inMaintenanceMode', u'false'], + [u'runtime.powerState', u'poweredOn'], + [u'summary.quickStats.overallCpuUsage', u'2946'], + [u'summary.quickStats.overallMemoryUsage', u'110738']], + None] + + +discovery = {'': [], + 'cpu_usage': [(None, {})], + 'cpu_util_cluster': [], + 'maintenance': [(None, {'target_state': 'false'})], + 'mem_usage': [(None, 'esx_host_mem_default_levels')], + 'mem_usage_cluster': [], + 'multipath': [(u'L0 physical', None), (u'L0 pseudo-logical', None)], + 'state': [(None, None)]} + + +checks = {'cpu_usage': [(None, + {}, + [(0, + 'total cpu: 8.4%, 2.95GHz/35.20GHz, 2 sockets, 6 cores/socket, 24 threads', + [('util', 8.369022144778265, None, None, 0, 100)])])], + 'maintenance': [(None, + {'target_state': 'false'}, + [(0, 'System not in Maintenance mode', [])])], + 'mem_usage': [(None, + (80.0, 90.0), + [(0, + '79% used - 108.14 GB/135.99 GB', + [('usage', + 116117209088.0, + 116813103104.0, + 131414740992.0, + 0, + 146016378880.0), + ('mem_total', 146016378880.0, None, None, None, None)])])], + 'multipath': [(u'L0 physical', + {}, + [(0, + u'2 active, 0 dead, 0 disabled, 0 standby, 0 unknown\nIncluded Paths:\nvmhba0:C2:T0:L0\nvmhba1:C0:T0:L0', + [])]), + (u'L0 pseudo-logical', + {}, + [(0, + u'3 active, 0 dead, 0 disabled, 0 standby, 0 unknown\nIncluded Paths:\nvmhba66:C0:T0:L0\nvmhba66:C0:T1:L0\nvmhba66:C0:T2:L0', + [])])], + 'state': [(None, + {}, + [(0, 'Entity state: green', []), + (0, 'Power state: poweredOn', [])])]} \ No newline at end of file diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index 11530bf..86e66c7 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -54,6 +54,9 @@ def get_merged_parameters(check, provided_p): evaluated_params = literal_eval(provided_p) default_p.update(evaluated_params) return default_p + if isinstance(provided_p, dict): + default_p.update(provided_p) + return default_p raise DiscoveryParameterTypeError("unhandled: %r/%r" % (default_p, provided_p))

5 years, 6 months

Replace 'default' placeholder in winperf_if tests

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 69222a4e6fd29d4dc69cf0526852df12fc442aa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69222a4e6fd29d… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Dec 14 14:12:24 2018 +0100 Replace 'default' placeholder in winperf_if tests Change-Id: I77d9dcacb298cd7d8ae1093a3cc6b47e87187c51 --- tests/unit/checks/generictests/datasets/winperf_if_regression.py | 6 +++--- .../checks/generictests/datasets/winperf_if_teaming_regression.py | 8 ++++---- tests/unit/checks/generictests/run.py | 8 ++++++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tests/unit/checks/generictests/datasets/winperf_if_regression.py b/tests/unit/checks/generictests/datasets/winperf_if_regression.py index 1d53c15..3aa8323 100644 --- a/tests/unit/checks/generictests/datasets/winperf_if_regression.py +++ b/tests/unit/checks/generictests/datasets/winperf_if_regression.py @@ -34,8 +34,8 @@ discovery = {'': [('1', "{'state': ['1'], 'speed': 10000000000}"), checks = {'': [('1', - 'default', + {'errors': (0.01, 0.1), 'state': ['1'], 'speed': 10000000000}, [(0, u'[TEAM:F[o]O 123-BAR] (Connected) 10.00 Gbit/s', [])]), ('2', - 'default', - [(0, u'[TEAM:F[o]O 123-BAR 2] (Connected) 10.00 Gbit/s', [])])]} \ No newline at end of file + {'errors': (0.01, 0.1), 'state': ['1'], 'speed': 10000000000}, + [(0, u'[TEAM:F[o]O 123-BAR 2] (Connected) 10.00 Gbit/s', [])])]} diff --git a/tests/unit/checks/generictests/datasets/winperf_if_teaming_regression.py b/tests/unit/checks/generictests/datasets/winperf_if_teaming_regression.py index d3b724a..0696734 100644 --- a/tests/unit/checks/generictests/datasets/winperf_if_teaming_regression.py +++ b/tests/unit/checks/generictests/datasets/winperf_if_teaming_regression.py @@ -183,7 +183,7 @@ discovery = {'': [('1', "{'state': ['1'], 'speed': 10000000000}"), ('4', "{'state': ['1'], 'speed': 1000000000}")]} -checks = {'': [('1', 'default', [(0, u'[A B-C] (Connected) 10.00 Gbit/s', [])]), - ('2', 'default', [(0, u'[FOO B-A-R 53] (Connected) 1 Gbit/s', [])]), - ('3', 'default', [(0, u'[A B-C 3] (Connected) 10.00 Gbit/s', [])]), - ('4', 'default', [(0, u'[FOO B-A-R 52] (Connected) 1 Gbit/s', [])])]} \ No newline at end of file +checks = {'': [('1', {'errors': (0.01, 0.1), 'state': ['1'], 'speed': 10000000000}, [(0, u'[A B-C] (Connected) 10.00 Gbit/s', [])]), + ('2', {'errors': (0.01, 0.1), 'state': ['1'], 'speed': 1000000000}, [(0, u'[FOO B-A-R 53] (Connected) 1 Gbit/s', [])]), + ('3', {'errors': (0.01, 0.1), 'state': ['1'], 'speed': 10000000000}, [(0, u'[A B-C 3] (Connected) 10.00 Gbit/s', [])]), + ('4', {'errors': (0.01, 0.1), 'state': ['1'], 'speed': 1000000000}, [(0, u'[FOO B-A-R 52] (Connected) 1 Gbit/s', [])])]} diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index d10990b..9f6c71a 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -1,4 +1,6 @@ """Submodule providing the `run` function of generictests package""" +from ast import literal_eval + from checktestlib import DiscoveryResult, assertDiscoveryResultsEqual, \ CheckResult, assertCheckResultsEqual, \ MockHostExtraConf, MockItemState, \ @@ -48,8 +50,10 @@ def get_discovered_merged_parameters(check, provided_p): if isinstance(provided_p, str): if provided_p in check.context: return check.context[provided_p], check.context[provided_p] - # TODO: the repr case used e.g. in winperf_if is still not correct - return default_p, "default" + + evaluated_params = literal_eval(provided_p) + default_p.update(evaluated_params) + return default_p, default_p raise DiscoveryParameterTypeError("unhandled: %r/%r" % (default_p, provided_p))

5 years, 6 months

← Newer
1
...
12
13
14
15
16
17
18
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018