Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Make all unit tests use the Scenario class

by Lars Michelsen

Module: check_mk Branch: master Commit: faf73a16848dcfcaec82d912d43896fa53a9a129 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faf73a16848dcf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 17 17:48:32 2019 +0200 Make all unit tests use the Scenario class Change-Id: I2b0c05c3624463635f97698deb7d6e5fdb344586 --- cmk_base/config.py | 5 +- tests/unit/cmk_base/test_checks.py | 54 +------ tests/unit/cmk_base/test_config.py | 205 ++++++++++++++------------ tests/unit/cmk_base/test_core_config.py | 19 +-- tests/unit/cmk_base/test_data_sources_unit.py | 28 ++-- tests/unit/cmk_base/test_rulesets.py | 84 ++++------- tests/unit/cmk_base/test_unit_automations.py | 38 +++-- 7 files changed, 178 insertions(+), 255 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=faf73a1684…

5 years, 2 months

local: misc refactoring

by Moritz Kiemer

Module: check_mk Branch: master Commit: 3b4a500f94bed33fab39cffdd5033bd61638a723 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b4a500f94bed3… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 18 21:30:44 2019 +0200 local: misc refactoring some preperations for upcoming changes Change-Id: I5ac974487d5972b3192c4804084d3003172e79fd --- checks/local | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/checks/local b/checks/local index 5ccbc73..0e2cee9 100644 --- a/checks/local +++ b/checks/local @@ -35,6 +35,16 @@ # P No-Text hirn=-8;-20 +def float_ignore_uom(value): + '''16MB -> 16.0''' + while value: + try: + return float(value) + except ValueError: + value = value[:-1] + return 0.0 + + def _is_valid_line(line): return len(line) >= 4 or (len(line) == 3 and line[0] == 'P') @@ -74,15 +84,6 @@ def parse_local(info): def local_compute_state(perfdata): texts = [] - # 16MB -> 16.0 - def float_ignore_uom(value): - while value: - if value[-1] not in "0123456789.-": - value = value[:-1] - else: - return float(value) - return 0.0 - def outof_levels(value, levels): if levels is None: return @@ -137,12 +138,12 @@ def inventory_local(parsed): # Some helper functions -def _parse_local_line(state, line): - perftxt = line[0] +def _parse_local_line(result): + perftxt = result.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[1:]).replace("\\n", "\n") + output = " ".join(result.line[1:]).replace("\\n", "\n") perfdata = [] compute_data = [] @@ -153,13 +154,15 @@ def _parse_local_line(state, line): perfdata.append(new_perf) else: return 3, "Invalid performance data %s in local check output %s" % \ - (perftxt, " ".join(line)), [] + (perftxt, " ".join(result.line)), [] - if state == 'P': + if result.state == 'P': state, texts = local_compute_state(compute_data) if output: - texts = [output] + texts + texts.insert(0, output) output = ", ".join(texts) + else: + state = result.state return state, output, perfdata @@ -190,9 +193,8 @@ def _calculate_local_worst_state(collected_stats): def check_local(_no_item, params, data): collected_stats = {} for result in data: - collected_stats.setdefault(result.node, {}) - collected_stats[result.node].setdefault(result.item, - _parse_local_line(result.state, result.line)) + node_dict = collected_stats.setdefault(result.node, {}) + node_dict.setdefault(result.item, _parse_local_line(result)) if params is not None and params.get("outcome_on_cluster", "worst") == "best": yield _calculate_local_best_state(collected_stats)

5 years, 2 months

local: move parsing of test to parse function

by Moritz Kiemer

Module: check_mk Branch: master Commit: 651311b528f873b1768a04d40bb0575d941c63b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=651311b528f873… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 18 23:28:35 2019 +0200 local: move parsing of test to parse function Change-Id: I764ccead04397fe1d6aae9e0399367b7d1da7b38 --- checks/local | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/checks/local b/checks/local index b1a131a..fb76529 100644 --- a/checks/local +++ b/checks/local @@ -118,7 +118,7 @@ def _parse_perftxt(string): def parse_local(info): LocalResult = collections.namedtuple("LocalResult", - ("node", "item", "state", "line", "perfdata")) + ("node", "item", "state", "text", "perfdata")) parsed = {} for line in info: @@ -130,11 +130,13 @@ def parse_local(info): state, state_msg = _sanitize_state(stripped_line[0]) item = stripped_line[1] perfdata, perf_msg = _parse_perftxt(stripped_line[2]) - stripped_line = stripped_line[3:] + # convert eventually escaped newinfo_line chars to real newinfo_lines + # (will be converted back later individually for the different cores) + text = " ".join(stripped_line[3:]).replace("\\n", "\n") if state_msg or perf_msg: state = 3 - stripped_line.insert(0, "%s%sOutput is:" % (state_msg, perf_msg)) - parsed.setdefault(item, []).append(LocalResult(node, item, state, stripped_line, perfdata)) + text = "%s%sOutput is: %s" % (state_msg, perf_msg, text) + parsed.setdefault(item, []).append(LocalResult(node, item, state, text, perfdata)) return parsed @@ -162,19 +164,14 @@ def inventory_local(parsed): # Some helper functions def _parse_local_line(result): - # convert eventually escaped newinfo_line chars to real newinfo_lines - # (will be converted back later individually for the different cores) - output = " ".join(result.line).replace("\\n", "\n") + if result.state != 'P': + return result.state, result.text, [p.tuple for p in result.perfdata] - if result.state == 'P': - state, texts = local_compute_state(result.perfdata) - if output: - texts.insert(0, output) - output = ", ".join(texts) - else: - state = result.state - - return state, output, [p.tuple for p in result.perfdata] + state, texts = local_compute_state(result.perfdata) + if result.text: + texts.insert(0, result.text) + text = ", ".join(texts) + return state, text, [p.tuple for p in result.perfdata] def _calculate_local_best_state(collected_stats):

5 years, 2 months

local: bring back lost perfdata

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2ae0d4703727e2df8fce3e9f19378891471501f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ae0d4703727e2… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 18 21:31:52 2019 +0200 local: bring back lost perfdata * perfdata validation is now in the parse function * "invalid metric" errors are catched individually * check_levels is used in the check * add test for invalid metric Change-Id: Ia07388be3d6c446d818f7918f8ed05ebec9d97d8 --- checks/local | 133 +++++++++++---------- tests/unit/checks/generictests/datasets/local_1.py | 15 ++- 2 files changed, 82 insertions(+), 66 deletions(-) diff --git a/checks/local b/checks/local index 0e2cee9..b1a131a 100644 --- a/checks/local +++ b/checks/local @@ -59,8 +59,66 @@ def _sanitize_state(state): return state, "" +def _parse_perfentry(entry): + '''parse single perfdata entry + + return a named tuple containing check_levels compatible levels field, as well as + cmk_base compatible perfdata 6-tuple. + + This function may raise Index- or ValueErrors. + ''' + Perfdata = collections.namedtuple("Perfdata", ("name", "value", "levels", "tuple")) + + name, raw = entry.split('=', 1) + raw = raw.split(";") + value = float_ignore_uom(raw[0]) + + # create a check_levels compatible levels quadruple + levels = [None] * 4 + if len(raw) >= 2: + warn = raw[1].split(':', 1) + levels[0] = float(warn[-1]) + if len(warn) > 1: + levels[2] = float(warn[0]) + if len(raw) >= 3: + crit = raw[2].split(':', 1) + levels[1] = float(crit[-1]) + if len(crit) > 1: + levels[3] = float(crit[0]) + + # create valid perfdata 6-tuple + min_ = float(raw[3]) if len(raw) >= 4 else None + max_ = float(raw[4]) if len(raw) >= 5 else None + tuple_ = (name, value, levels[0], levels[1], min_, max_) + + # check_levels won't handle crit=None, if warn is present. + if levels[0] is not None and levels[1] is None: + levels[1] = float('inf') + if levels[2] is not None and levels[3] is None: + levels[3] = float('-inf') + + return Perfdata(name, value, tuple(levels), tuple_) + + +def _parse_perftxt(string): + if string == '-': + return [], "" + + perfdata = [] + msg = [] + for entry in string.split('|'): + try: + perfdata.append(_parse_perfentry(entry)) + except (ValueError, IndexError): + msg.append(entry) + if msg: + return perfdata, "Invalid performance data: %r. " % "|".join(msg) + return perfdata, "" + + def parse_local(info): - LocalResult = collections.namedtuple("LocalResult", ("node", "item", "state", "line")) + LocalResult = collections.namedtuple("LocalResult", + ("node", "item", "state", "line", "perfdata")) parsed = {} for line in info: @@ -71,10 +129,12 @@ def parse_local(info): 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)) + perfdata, perf_msg = _parse_perftxt(stripped_line[2]) + stripped_line = stripped_line[3:] + if state_msg or perf_msg: + state = 3 + stripped_line.insert(0, "%s%sOutput is:" % (state_msg, perf_msg)) + parsed.setdefault(item, []).append(LocalResult(node, item, state, stripped_line, perfdata)) return parsed @@ -83,49 +143,11 @@ def parse_local(info): # performance data. def local_compute_state(perfdata): texts = [] - - def outof_levels(value, levels): - if levels is None: - return - - if ':' in levels: - lower, upper = map(float, levels.split(':')) - else: - lower = None - upper = float(levels) - if value > upper: - return " %s > %s" % (value, upper) - elif lower is not None and value < lower: - return " %s < %s" % (value, lower) - worst = 0 for entry in perfdata: - if len(entry) < 3: - continue # No levels attached - varname = entry[0] - value = float_ignore_uom(entry[1]) - warn = entry[2] - if len(entry) >= 4: - crit = entry[3] - else: - crit = None - - text = outof_levels(value, crit) - if text: - worst = 2 - text = "%s%s(!!)" % (varname, text) - texts.append(text) - - else: - text = outof_levels(value, warn) - if text: - worst = max(worst, 1) - text = "%s%s(!)" % (varname, text) - texts.append(text) - - else: - texts.append("%s is %s(.)" % (varname, value)) - + state, text = check_levels(entry.value, None, entry.levels, infoname=entry.name)[:2] + worst = max(worst, state) + texts.append(text) return worst, texts @@ -139,32 +161,20 @@ def inventory_local(parsed): # Some helper functions def _parse_local_line(result): - perftxt = result.line[0] # convert eventually escaped newinfo_line chars to real newinfo_lines # (will be converted back later individually for the different cores) - output = " ".join(result.line[1:]).replace("\\n", "\n") - - perfdata = [] - compute_data = [] - if perftxt != "-": - for entry in perftxt.split('|'): - new_perf = parse_nagios_perfstring(entry) - if new_perf: - perfdata.append(new_perf) - else: - return 3, "Invalid performance data %s in local check output %s" % \ - (perftxt, " ".join(result.line)), [] + output = " ".join(result.line).replace("\\n", "\n") if result.state == 'P': - state, texts = local_compute_state(compute_data) + state, texts = local_compute_state(result.perfdata) if output: texts.insert(0, output) output = ", ".join(texts) else: state = result.state - return state, output, perfdata + return state, output, [p.tuple for p in result.perfdata] def _calculate_local_best_state(collected_stats): @@ -212,5 +222,4 @@ check_info["local"] = { 'has_perfdata': True, 'node_info': True, 'group': 'local', - 'includes': ['parse_nagios.include'] } diff --git a/tests/unit/checks/generictests/datasets/local_1.py b/tests/unit/checks/generictests/datasets/local_1.py index ca8afd7..7d3f3a9 100644 --- a/tests/unit/checks/generictests/datasets/local_1.py +++ b/tests/unit/checks/generictests/datasets/local_1.py @@ -15,6 +15,7 @@ info = [ ['node_1', 'P', 'Some_yet_other_Service', 'temp=40;30;50|humidity=28;50:100;0:50;0;100'], ['node_2', 'P', 'Has-no-var', '-', 'This', 'has', 'no', 'variable'], ['node_2', 'P', 'No-Text', 'hirn=-8;-20'], + ['rougue', 'P', 'D\'oh!', 'this is an invalid metric|isotopes=0', 'I', 'messed', 'up!'] ] @@ -28,6 +29,7 @@ discovery = { ('Some_other_Service', {}), ('Some_yet_other_Service', {}), ('This_is_OK', {}), + ('D\'oh!', {}) ], } @@ -41,7 +43,7 @@ checks = { (0, 'On node node_2: This has no variable', []), ]), ('No-Text', {}, [ - (0, 'On node node_2: ', [ + (1, 'On node node_2: hirn: -8.00 (warn/crit at -20.00/inf)', [ ('hirn', -8, -20, None, None, None), ]), ]), @@ -56,21 +58,26 @@ checks = { ]), ]), ('Some_other_Service', {}, [ - (0, 'On node node_1: Result is computed from two values', [ + (1, 'On node node_1: Result is computed from two values, value1: 10.00, value2: 20.00 (warn/crit at 20.00/50.00)', [ ('value1', 10, 30, 50, None, None), ('value2', 20, 20, 50, 0, 100), ]), ]), ('Some_yet_other_Service', {}, [ - (0, 'On node node_1: ', [ + (1, 'On node node_1: temp: 40.00 (warn/crit at 30.00/50.00), humidity: 28.00 (warn/crit below 50.00/0.00)', [ ('temp', 40, 30, 50, None, None), ('humidity', 28, 100, 50, 0, 100), ]), ]), ('This_is_OK', {}, [ - (0, 'On node node_1: ', [ + (0, 'On node node_1: foo: 18.00', [ ('foo', 18, 20, 50, None, None), ]), ]), + ('D\'oh!', {}, [ + (3, "On node rougue: Invalid performance data: 'this is an invalid metric'. Output is: I messed up!", [ + ('isotopes', 0, None, None, None, None), + ]), + ]), ], }

5 years, 2 months

Introduce testlib.base.Scenario() to simplify unit test setups

by Lars Michelsen

Module: check_mk Branch: master Commit: 3deaa9c240245a77b6dae4394736e435d1fcdf84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3deaa9c240245a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 17 17:47:45 2019 +0200 Introduce testlib.base.Scenario() to simplify unit test setups Instead of the many individual monkeypatching calls we now have a standard wrapper class Scenario() that collects all test config settings. Once all needed configurations are made the apply() method is used to apply the config to cmk_base.config and update the config_cache object. Change-Id: I6550d23a52e8f58051e7e6f98066544aa0107262 --- tests/testlib/base.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tests/testlib/base.py b/tests/testlib/base.py new file mode 100644 index 0000000..712c39f --- /dev/null +++ b/tests/testlib/base.py @@ -0,0 +1,49 @@ +import cmk_base.config as config + + +class Scenario(object): + """Helper class to modify the Check_MK base configuration for unit tests""" + + def __init__(self, site_id="unit"): + super(Scenario, self).__init__() + self.config = { + "distributed_wato_site": site_id, + "all_hosts": [], + "host_paths": {}, + "host_tags": {}, + "clusters": {}, + } + self.config_cache = config.get_config_cache() + + def add_host(self, hostname, tags=None, folder="/"): + if tags is None: + tags = [] + + self.config["all_hosts"].append("%s|%s" % (hostname, "|".join(tags))) + self.config["host_paths"][hostname] = folder + #self.config["host_tags"][hostname] = tags + return self + + def add_cluster(self, hostname, tags, folder="/", nodes=None): + if nodes is None: + nodes = [] + name_with_tags = "%s|%s" % (hostname, "|".join(tags)) + self.config["clusters"][name_with_tags] = nodes + self.config["host_paths"][hostname] = folder + #self.config["host_tags"][hostname] = tags + return self + + def set_option(self, varname, option): + self.config[varname] = option + return self + + def set_ruleset(self, varname, ruleset): + self.config[varname] = ruleset + return self + + def apply(self, monkeypatch): + for key, value in self.config.items(): + monkeypatch.setattr(config, key, value) + + self.config_cache.initialize() + return self.config_cache

5 years, 2 months

7401 FIX diskstat: Clean up old item states

by Moritz Kiemer

Module: check_mk Branch: master Commit: 47d3e7f87fbcdc1e9e4e502d8e158fd57cbb0213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47d3e7f87fbcdc… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Apr 16 14:24:51 2019 +0200 7401 FIX diskstat: Clean up old item states The diskstat checks now clean up counter information that is outdated by a factor of 10 or higher compared to the youngest counter, to avoid growing item state files. Change-Id: I70d0e5bb891a39e9ca74a31b10e29c8edf4dea18 --- .werks/7401 | 11 +++++++++++ checks/diskstat | 1 + checks/diskstat.include | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/.werks/7401 b/.werks/7401 new file mode 100644 index 0000000..046fac1 --- /dev/null +++ b/.werks/7401 @@ -0,0 +1,11 @@ +Title: diskstat: Clean up old item states +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1555417362 +Class: fix + +The diskstat checks now clean up counter information that is more +than ten times older than the youngest one to avoid growing up the item state. diff --git a/checks/diskstat b/checks/diskstat index c286c68..0b5bd46 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -114,6 +114,7 @@ # Consideration for debugging purposes: # Due to check_info['diskstat']['extra_sections']: ["multipath"]) # each info list is prefixed with '<node_name>'. +@with_unused_counter_removal("diskstat") def parse_diskstat(info): timestamp_str, proc_diskstat, name_info = diskstat_extract_name_info(info) # limit diskstat to first elements before actual parsing diff --git a/checks/diskstat.include b/checks/diskstat.include index c6ba358..2d8935c 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -46,6 +46,42 @@ diskstat_inventory = [] diskstat_diskless_pattern = re.compile("x?[shv]d[a-z]*[0-9]+") +def with_unused_counter_removal(plugin_name): + '''Return decorator to clean up unused counters + + The decorated parse function will clean up all couters for that plugin which are more + than ten times older than the youngest one to avoid growing up the item state. + ''' + + def is_plugin_counter_with_age(ident, value): + if not isinstance(value, tuple): + return False + if isinstance(ident, tuple): + return ident[0] == plugin_name + elif hasattr(ident, "startswith"): + return ident.startswith('%s.' % plugin_name) + return False + + def decorator(parse_function): + def wrapped_parse_function(info): + this_time = time.time() + + age_counters = [(this_time - value[0], ident) + for (ident, value) in get_all_item_states().iteritems() + if is_plugin_counter_with_age(ident, value)] + + if age_counters: + age_limit = 10 * min(age_counters)[0] + counters_to_delete = [ident for (age, ident) in age_counters if age >= age_limit] + clear_item_states_by_full_keys(counters_to_delete) + + return parse_function(info) + + return wrapped_parse_function + + return decorator + + def inventory_diskstat_generic(parsed): # Skip over on empty data if not parsed:

5 years, 2 months

lparstat_aix.cpu_util: Robustify inventorization to known agent output

by Florian Kromer

Module: check_mk Branch: master Commit: 70545f17cf22d926a4d393c70cec039730381a80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70545f17cf22d9… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Apr 9 16:01:34 2019 +0200 lparstat_aix.cpu_util: Robustify inventorization to known agent output Change-Id: I12b987d757ffb0536441fdcbd0bd913aa7b74d3f --- checks/lparstat_aix | 6 ++++-- .../datasets/lparstat_aix_3_missing_info.py | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/checks/lparstat_aix b/checks/lparstat_aix index e78e5c5..db67f86 100644 --- a/checks/lparstat_aix +++ b/checks/lparstat_aix @@ -91,8 +91,10 @@ check_info["lparstat_aix"] = { def inventory_lparstat_aix_cpu(parsed): - if parsed.get('cpu') or parsed.get('update_required'): - yield None, {} + if parsed.get('update_required'): + return [(None, {})] + if all(k in parsed.get('cpu', {}) for k in ('user', 'sys', 'wait', 'idle')): + return [(None, {})] def check_lparstat_aix_cpu(_no_item, params, parsed): diff --git a/tests/unit/checks/generictests/datasets/lparstat_aix_3_missing_info.py b/tests/unit/checks/generictests/datasets/lparstat_aix_3_missing_info.py new file mode 100644 index 0000000..9305253 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/lparstat_aix_3_missing_info.py @@ -0,0 +1,18 @@ +# yapf: disable +checkname = 'lparstat_aix' + +info = [[ + u'System', u'configuration:', u'type=Shared', u'mode=Uncapped', u'smt=4', u'lcpu=8', + u'mem=16384MB', u'psize=4', u'ent=1.00' +], + [ + u'%user', u'%wait', u'%idle', u'physc', u'%entc', u'lbusy', u'vcsw', u'phint', + u'%nsp', u'%utcyc' + ], + [ + u'-----', u'------', u'------', u'-----', u'-----', u'------', u'-----', + u'-----', u'-----', u'------' + ], + [u'0.4', u'0.0', u'99.3', u'0.02', u'1.7', u'0.0', u'215', u'3', u'101', u'0.64']] + +discovery = {'': [(None, {})], 'cpu_util': []}

5 years, 2 months

move freeze time in front of parse function

by Moritz Kiemer

Module: check_mk Branch: master Commit: ed02da4b71e6c68ba4e13418dab26cfd4085ce75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed02da4b71e6c6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Apr 23 10:13:14 2019 +0200 move freeze time in front of parse function Change-Id: Ia66b54232ec6e71b173789aa5d7c42c51fa7b644 --- tests/unit/checks/generictests/run.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index 9d9bb8e..79ed3b3 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -186,14 +186,15 @@ def run(check_manager, dataset, write=False): assert checklist, "Found no check plugin for %r" % dataset.checkname immu = Immutables() - # test the parse function - parsed = parse(check_manager, dataset) - immu.register(parsed, 'parsed') - - # get the expected check results, if present - checks_expected = getattr(dataset, 'checks', {}) with optional_freeze_time(dataset): + # test the parse function + parsed = parse(check_manager, dataset) + immu.register(parsed, 'parsed') + + # get the expected check results, if present + checks_expected = getattr(dataset, 'checks', {}) + # LOOP OVER ALL (SUB)CHECKS for sname in checklist: subcheck = (sname + '.').split('.')[1]

5 years, 2 months

Updated Boost from 1.68 to 1.70.

by Sven Panne

Module: check_mk Branch: master Commit: 20b6322e7468f0f5e5e303342804762a81ef29db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20b6322e7468f0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 23 11:34:49 2019 +0200 Updated Boost from 1.68 to 1.70. clang-tidy was a bit unhappy with some things in boost::asio, so let's improve things a little bit. Change-Id: I2b235f4d695c6f8250d665fb0193fcce4ae2382d --- omd/packages/boost/boost.make | 2 +- .../{boost_1_68_0.tar.bz2 => boost_1_70_0.tar.bz2} | Bin 92155315 -> 97887058 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/boost/boost.make b/omd/packages/boost/boost.make index 9929a3a..bb2e08a 100644 --- a/omd/packages/boost/boost.make +++ b/omd/packages/boost/boost.make @@ -1,5 +1,5 @@ BOOST := boost -BOOST_VERS := 1_68_0 +BOOST_VERS := 1_70_0 BOOST_DIR := $(BOOST)_$(BOOST_VERS) BOOST_BUILD := $(BUILD_HELPER_DIR)/$(BOOST_DIR)-build diff --git a/omd/packages/boost/boost_1_68_0.tar.bz2 b/omd/packages/boost/boost_1_70_0.tar.bz2 similarity index 82% rename from omd/packages/boost/boost_1_68_0.tar.bz2 rename to omd/packages/boost/boost_1_70_0.tar.bz2 index 8721965..f41c14a 100644 Binary files a/omd/packages/boost/boost_1_68_0.tar.bz2 and b/omd/packages/boost/boost_1_70_0.tar.bz2 differ

5 years, 2 months

Bumped re2 from 2018-10-01 to 2019-04-01, picking up a few fixes.

by Sven Panne

Module: check_mk Branch: master Commit: f108ef702a4927b3b13408a6bd840e287191d8f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f108ef702a4927… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 23 11:40:59 2019 +0200 Bumped re2 from 2018-10-01 to 2019-04-01, picking up a few fixes. Change-Id: I144b8ca1cc15504bebb75d75e979fe8bf56ba4e4 --- omd/packages/re2/re2-2018-10-01.tar.gz | Bin 391254 -> 0 bytes omd/packages/re2/re2-2019-04-01.tar.gz | Bin 0 -> 392382 bytes omd/packages/re2/re2.make | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/re2/re2-2018-10-01.tar.gz b/omd/packages/re2/re2-2018-10-01.tar.gz deleted file mode 100644 index 215a0e9..0000000 Binary files a/omd/packages/re2/re2-2018-10-01.tar.gz and /dev/null differ diff --git a/omd/packages/re2/re2-2019-04-01.tar.gz b/omd/packages/re2/re2-2019-04-01.tar.gz new file mode 100644 index 0000000..b167d52 Binary files /dev/null and b/omd/packages/re2/re2-2019-04-01.tar.gz differ diff --git a/omd/packages/re2/re2.make b/omd/packages/re2/re2.make index 077683a..473d661 100644 --- a/omd/packages/re2/re2.make +++ b/omd/packages/re2/re2.make @@ -2,7 +2,7 @@ # principle we could use any tag by exporting it manually via: # ( TAG=2018-02-01; git archive --prefix=re2-$TAG/ --output=re2-$TAG.tar.gz $TAG ) RE2 := re2 -RE2_VERS := 2018-10-01 +RE2_VERS := 2019-04-01 RE2_DIR := $(RE2)-$(RE2_VERS) RE2_BUILD := $(BUILD_HELPER_DIR)/$(RE2_DIR)-build

5 years, 2 months

← Newer
1
...
12
13
14
15
16
17
18
...
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