Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

Fix integration tests ensuring correct conversion utf8 and bytestr

by Óscar Nájera

Module: check_mk Branch: master Commit: a7b244bc7ea8fbd0f75b2d5340fb51c5cdcd4441 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7b244bc7ea8fb… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Feb 22 17:17:48 2019 +0100 Fix integration tests ensuring correct conversion utf8 and bytestr Change-Id: I87f4b849cbbae76194e1d0cb71a682df910c63cd --- livestatus/api/python/livestatus.py | 17 +++++++++++++---- tests/unit/livestatus/test_livestatus_unit.py | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index d36e6d3..53a8b62 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -54,10 +54,20 @@ remove_cache_regex = re.compile("\nCache:[^\n]*") # type: Pattern def ensure_unicode(text): if hasattr(text, "decode"): - return text.decode("utf-8") + try: + return text.decode("utf-8") + except UnicodeEncodeError: + return text return text +def ensure_bytestr(text): + try: + return text.encode("utf-8") + except UnicodeDecodeError: + return text + + class MKLivestatusException(Exception): def __init__(self, value): self.parameter = value @@ -445,9 +455,8 @@ class SingleSiteConnection(Helpers): query += "\n" try: - # socket.send() will implicitely cast to str(), we need ot - # convert to UTF-8 in order to avoid exceptions - query = query.encode("utf-8") + # socket.send() only works with byte strings + query = ensure_bytestr(query) self.socket.send(query) except IOError as e: if self.persist: diff --git a/tests/unit/livestatus/test_livestatus_unit.py b/tests/unit/livestatus/test_livestatus_unit.py index 24435e4..f6b13c7 100644 --- a/tests/unit/livestatus/test_livestatus_unit.py +++ b/tests/unit/livestatus/test_livestatus_unit.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- import socket import ssl from contextlib import closing @@ -12,6 +13,24 @@ import omdlib.certs as certs import livestatus +(a)pytest.mark.parametrize("source, utf8str", [ + ('hi', u'hi'), + ("há li", u"há li"), + (u"hé ßß", u"hé ßß"), +]) +def test_ensure_unicode(source, utf8str): + assert livestatus.ensure_unicode(source) == utf8str + + +(a)pytest.mark.parametrize("source, bytestr", [ + ('hi', b'hi'), + ("há li", b"h\xc3\xa1 li"), + (u"hé ßß", b"h\xc3\xa9 \xc3\x9f\xc3\x9f"), +]) +def test_ensure_bytestr(source, bytestr): + assert livestatus.ensure_bytestr(source) == bytestr + + @pytest.fixture def ca(tmpdir, monkeypatch): p = Path("%s" % tmpdir) / "etc" / "ssl"

5 years, 4 months

mk_jolokia.py: properly differentiate between server and java errors

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6fcbbf9c0e52420bb80124628296e775180df755 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fcbbf9c0e5242… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 21 09:27:59 2019 +0100 mk_jolokia.py: properly differentiate between server and java errors Change-Id: Ib935a9712cb6c173ac58abd76c9bfe90065895ba --- agents/plugins/mk_jolokia.py | 44 +++++++++++++++++-------------- tests/unit/plugins/test_mk_jolokia.py | 49 +++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 19 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index b4d9249..4827f42 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -333,30 +333,36 @@ class JolokiaInstance(object): sys.stderr.write("ERROR: %s\n" % exc) raise SkipMBean(exc) - if raw_response.status_code == 401: - sys.stderr.write("ERROR: Unauthorized (authentication failed/missing)\n") - raise SkipInstance("auth failed") - elif raw_response.status_code != 200: - sys.stderr.write('ERROR: Invalid response when posting %r\n' % post_data) - raise SkipMBean("HTTP Error (%s)" % raw_response.status_code) - - response = raw_response.json() - if VERBOSE: - sys.stderr.write("DEBUG: Result: %r\n" % response) - return response + return validate_response(raw_response) + + +def validate_response(raw): + '''return loaded response or raise exception''' + # check the status of the http server + if not 200 <= raw.status_code < 300: + sys.stderr.write("ERROR: HTTP STATUS: %d" % raw.status_code) + # Unauthorized, Forbidden, Bad Gateway + if raw.status_code in (401, 403, 502): + raise SkipInstance("HTTP STATUS", raw.status_code) + raise SkipMBean("HTTP STATUS", raw.status_code) + + response = raw.json() + # check the status of the jolokia response + if response.status != 200: + sys.stderr.write("ERROR: JAVA: %s" % response.error) + raise SkipMBean("JAVA", response.error) + + if "value" not in response: + sys.stderr.write("ERROR: missing 'value': %r\n" % response) + raise SkipMBean("ERROR", "missing 'value'") + + return response def fetch_var(inst, function, path, use_target=False): data = inst.get_post_data(path, function, use_target=use_target) obj = inst.post(data) - - try: - return obj['value'] - except KeyError: - msg = "not found: %s" % path - if VERBOSE: - sys.stderr.write("ERROR: %s\n" % msg) - raise SkipMBean(msg) + return obj['value'] # convert single values into lists of items in diff --git a/tests/unit/plugins/test_mk_jolokia.py b/tests/unit/plugins/test_mk_jolokia.py index 09c88e5..65b829d 100644 --- a/tests/unit/plugins/test_mk_jolokia.py +++ b/tests/unit/plugins/test_mk_jolokia.py @@ -99,3 +99,52 @@ def test_jolokia_yield_configured_instances(): assert next(yci) == {"server": "s1", "port": 1234} assert next(yci) == {"server": "s2", "port": 1234} + + + +class _MockHttpResponse(object): + def __init__(self, status, jolo=None): + self.status_code = status + self._jolo = jolo + + def json(self): + return self._jolo + + +class _MockJolokiaResponse(dict): + def __init__(self, status): + super(_MockJolokiaResponse, self).__init__() + self.status = status + self.error = "you are thinking too much" + + +def test_jolokia_validate_response_skip_mbean(): + for status in (199, 300): + with pytest.raises(mk_jolokia.SkipMBean): + mk_jolokia.validate_response(_MockHttpResponse(status)) + + # MBean not found + with pytest.raises(mk_jolokia.SkipMBean): + joresp = _MockJolokiaResponse(404) + mk_jolokia.validate_response(_MockHttpResponse(200, joresp)) + + # value not found in MBean + with pytest.raises(mk_jolokia.SkipMBean): + joresp = _MockJolokiaResponse(200) + 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): + mk_jolokia.validate_response(_MockHttpResponse(status)) + + +(a)pytest.mark.parametrize("data", [ + {"value": 23}, +]) +def test_jolokia_validate_response_ok(data): + joresp = _MockJolokiaResponse(200) + joresp.update(data) + assert joresp == mk_jolokia.validate_response(_MockHttpResponse(200, joresp))

5 years, 4 months

mssql_tablespaces: add test

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4990cb5732b3223689c1fb2452a1f9437ae415e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4990cb5732b322… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 22 11:12:52 2019 +0100 mssql_tablespaces: add test Change-Id: I3cd4bb34e26b265dcc0a6b551269923f7f386eea --- .../datasets/mssql_tablespaces_regression.py | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/mssql_tablespaces_regression.py b/tests/unit/checks/generictests/datasets/mssql_tablespaces_regression.py new file mode 100644 index 0000000..0595dbd --- /dev/null +++ b/tests/unit/checks/generictests/datasets/mssql_tablespaces_regression.py @@ -0,0 +1,30 @@ +# yapf: disable + +checkname = 'mssql_tablespaces' + + +info = [ + ['MSSQL_SQLEXPRESS', 'master', '5.25', 'MB', '1.59', 'MB', '2464', + 'KB', '1096', 'KB', '1024', 'KB', '344', 'KB'], +] + + +discovery = { + '': [ + ('MSSQL_SQLEXPRESS master', {}), + ], +} + + +checks = { + '': [ + ('MSSQL_SQLEXPRESS master', {}, [ + (0, 'Size: 5.25 MB', [('size', 5505024.0, None, None, None, None)]), + (0, 'Unallocated space: 1.59 MB, 30.3%', []), + (0, 'Reserved space: 2.41 MB, 45.8%', []), + (0, 'Data: 1.07 MB, 20.4%', []), + (0, 'Indexes: 1.00 MB, 19.0%', []), + (0, 'Unused: 344.00 kB, 6.4%', []), + ]), + ], +}

5 years, 4 months

7041 ucs_c_rack_server_temp: Temperatures

by Florian Kromer

Module: check_mk Branch: master Commit: 7545606a440215b8d74247a30f27f7ad0855073d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7545606a440215… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Feb 19 11:37:30 2019 +0100 7041 ucs_c_rack_server_temp: Temperatures This werk adds support for monitoring of Cisco C-Series Rack Server temperatures. This check considers the temperatures of processors, memory units and the motherboards ambient temperature. CMK-1067 Change-Id: I976fc876376aae8e4fe46242767d5315fecaaa88 --- .werks/7041 | 14 ++++ checkman/ucs_c_rack_server_temp | 32 ++++++++ checks/ucs_c_rack_server_temp | 91 ++++++++++++++++++++++ .../datasets/ucs_c_rack_server_temp.py | 46 +++++++++++ 4 files changed, 183 insertions(+) diff --git a/.werks/7041 b/.werks/7041 new file mode 100644 index 0000000..42fbc38 --- /dev/null +++ b/.werks/7041 @@ -0,0 +1,14 @@ +Title: ucs_c_rack_server_temp: Temperatures +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1550572115 +Class: feature + +This werk adds support for monitoring of Cisco UCS C-Series Rack Server +temperatures. This check considers the temperatures of processors, memory +units and the motherboards ambient temperature. + +CMK-1067 diff --git a/checkman/ucs_c_rack_server_temp b/checkman/ucs_c_rack_server_temp new file mode 100644 index 0000000..cdff2be --- /dev/null +++ b/checkman/ucs_c_rack_server_temp @@ -0,0 +1,32 @@ +title: UCS C-Series Rack Server: Processor Temperature +agents: agent_ucs_bladecenter +catalog: hw/server/cisco +license: GPL +distribution: check_mk +description: + This check provides information about the temperatures of processors, motherboards and + memory array dimms of rack units of an UCS C-Series Rack Server compute. + + This check supports the following C-Series Rack Server models providing XML API 2.0 + [Cisco UCS Rack-Mount Servers Cisco IMC XML API 2.0]: + - Cisco UCS C220 M5 Rack Server + - Cisco UCS C240 M5 Rack Server + - Cisco UCS C480 M5 Rack Server + - Cisco UCS C480 ML M5 Rack Server + - Cisco UCS C220 M4 Rack Server + - Cisco UCS C240 M4 Rack Server + - Cisco UCS C460 M4 Rack Server + + This check does not support the C-Series Rack Server model "Cisco UCS C125 M5 Rack Server Node" + which is used as part of a "Cisco UCS C4200 Series Rack Server Chassis". + + Check status: + - {OK} in case the monitored temperature is within the configured valid temperature range. + - {WARN} in case the monitored temperature is equal or higher than the configured warn value. + - {CRIT} in case the monitored temperature is equal or higher than the configured crit value. + +inventory: + All rack units of the rack server are found automatically. + +item: + One service for every rack unit temperature of the rack server. diff --git a/checks/ucs_c_rack_server_temp b/checks/ucs_c_rack_server_temp new file mode 100644 index 0000000..01f9e27 --- /dev/null +++ b/checks/ucs_c_rack_server_temp @@ -0,0 +1,91 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2019 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. + +# exemplary output of special agent agent_ucs_bladecenter (<TAB> is tabulator): +# +# <<<ucsc_server_temp:sep(9)>>> +# processorEnvStats<TAB>dn sys/rack-unit-1/board/cpu-1/env-stats<TAB>id 1<TAB>description blalub<TAB>temperature 58.4 +# processorEnvStats<TAB>dn sys/rack-unit-1/board/cpu-2/env-stats<TAB>id 2<TAB>description blalub<TAB>temperature 50.4 +# memoryUnitEnvStats<TAB>dn sys/rack-unit-1/board/memarray-1/mem-1/dimm-env-stats<TAB>id 1<TAB>description blalub<TAB>temperature 40.4 +# memoryUnitEnvStats<TAB>dn sys/rack-unit-1/board/memarray-1/mem-2/dimm-env-stats<TAB>id 2<TAB>description blalub<TAB>temperature 41.4 +# computeRackUnitMbTempStats<TAB>dn sys/rack-unit-1/board/temp-stats<TAB>ambientTemp 50.0<TAB>frontTemp 50.0<TAB>ioh1Temp 50.0<TAB>ioh2Temp 50.0<TAB>rearTemp 50.0 +# computeRackUnitMbTempStats<TAB>dn sys/rack-unit-2/board/temp-stats<TAB>ambientTemp 50.0<TAB>frontTemp 50.0<TAB>ioh1Temp 50.0<TAB>ioh2Temp 50.0<TAB>rearTemp 50.0 + + +def parse_ucs_c_rack_server_temp(info): + """ + Returns dict with indexed processors, memory units and motherboards mapped to keys and + temperature as value. + """ + parsed = {} + for line in info: + key_value_pairs = [kv.split(" ", 1) for kv in line[1:]] + if "cpu-" in key_value_pairs[0][1]: + cpu = key_value_pairs[0][1].replace("sys/", + "").replace("rack-unit-", "Rack Unit ").replace( + "/board", "").replace("/cpu-", " CPU ").replace( + "/env-stats", "") + try: + parsed[cpu] = float(key_value_pairs[3][1]) + except (ValueError, KeyError): + continue # skip potentially invalid agent output + elif "mem-" in key_value_pairs[0][1]: + mem = key_value_pairs[0][1].replace("sys/", "").replace( + "rack-unit-", "Rack Unit ").replace("/board", "").replace( + "/memarray-", " Memory Array ").replace("/mem-", " Memory DIMM ").replace( + "/dimm-env-stats", "") + try: + parsed[mem] = float(key_value_pairs[3][1]) + except (ValueError, KeyError): + continue # skip potentially invalid agent output + elif "board" in key_value_pairs[0][1]: + mb = key_value_pairs[0][1].replace("sys/", + "").replace("rack-unit-", "Rack Unit ").replace( + "/board/temp-stats", " Motherboard") + try: + parsed[mb] = float(key_value_pairs[2][1]) + except (ValueError, KeyError): + continue # skip potentially invalid agent output + else: + continue # skip potentially invalid agent output + return parsed + + +@get_parsed_item_data +def check_ucs_c_rack_server_temp(item, params, temperature): + yield check_temperature(temperature, params, + 'ucs_c_rack_server_%s' % item.lower().replace(" ", "_")) + + +check_info["ucs_c_rack_server_temp"] = { + 'parse_function': parse_ucs_c_rack_server_temp, + 'inventory_function': discover(), + 'check_function': check_ucs_c_rack_server_temp, + 'group': 'temperature', + 'service_description': 'Temperature %s', + 'has_perfdata': True, + 'includes': ['temperature.include'], +} diff --git a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_temp.py b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_temp.py new file mode 100644 index 0000000..bc5a4c5 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_temp.py @@ -0,0 +1,46 @@ +checkname = 'ucs_c_rack_server_temp' + +info = [[ + 'processorEnvStats', 'dn sys/rack-unit-1/board/cpu-1/env-stats', 'id 1', 'description blalub', + 'temperature 58.4' +], + [ + 'processorEnvStats', 'dn sys/rack-unit-1/board/cpu-2/env-stats', 'id 2', + 'description blalub', 'temperature 60.4' + ], + [ + 'memoryUnitEnvStats', 'dn sys/rack-unit-1/board/memarray-1/mem-1/dimm-env-stats', + 'id 1', 'description blalub', 'temperature 40.4' + ], + [ + 'memoryUnitEnvStats', 'dn sys/rack-unit-1/board/memarray-1/mem-2/dimm-env-stats', + 'id 2', 'description blalub', 'temperature 61.4' + ], + [ + 'computeRackUnitMbTempStats', 'dn sys/rack-unit-1/board/temp-stats', 'ambientTemp 40.0', + 'frontTemp 50.0', 'ioh1Temp 50.0', 'ioh2Temp 50.0', 'rearTemp 50.0' + ], + [ + 'computeRackUnitMbTempStats', 'dn sys/rack-unit-2/board/temp-stats', 'ambientTemp 60.0', + 'frontTemp 50.0', 'ioh1Temp 50.0', 'ioh2Temp 50.0', 'rearTemp 50.0' + ]] + +discovery = { + '': [('Rack Unit 1 CPU 1', {}), ('Rack Unit 1 CPU 2', {}), + ('Rack Unit 1 Memory Array 1 Memory DIMM 1', {}), + ('Rack Unit 1 Memory Array 1 Memory DIMM 2', {}), ('Rack Unit 1 Motherboard', {}), + ('Rack Unit 2 Motherboard', {})] +} + +checks = { + '': [('Rack Unit 1 CPU 1', {}, [(0, u'58.4 \xb0C', [('temp', 58.4, None, None, None, None)])]), + ('Rack Unit 1 CPU 2', {}, [(0, u'60.4 \xb0C', [('temp', 60.4, None, None, None, None)])]), + ('Rack Unit 1 Memory Array 1 Memory DIMM 1', {}, + [(0, u'40.4 \xb0C', [('temp', 40.4, None, None, None, None)])]), + ('Rack Unit 1 Memory Array 1 Memory DIMM 2', {}, + [(0, u'61.4 \xb0C', [('temp', 61.4, None, None, None, None)])]), + ('Rack Unit 1 Motherboard', {}, [(0, u'50.0 \xb0C', [('temp', 50.0, None, None, None, + None)])]), + ('Rack Unit 2 Motherboard', {}, [(0, u'50.0 \xb0C', [('temp', 50.0, None, None, None, + None)])])] +}

5 years, 4 months

6761 FIX agent_ipmi_sensors: Fixed crash if ipmi driver or bmc key option is used

by Marcel Arentz

Module: check_mk Branch: master Commit: 23072920c046f585fb14cec5839e36cf840b5962 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23072920c046f5… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Feb 22 09:17:33 2019 +0100 6761 FIX agent_ipmi_sensors: Fixed crash if ipmi driver or bmc key option is used The special agent crashed if the mentioned options has been used because a hidden behaviour in python prevented that these options are interpreted correctly. This bug has been in place, since these options have been introduced in werk #4108. FEED-3426 Change-Id: Ie81106507c30d624ada612ebd15c35968818f176 --- .werks/6761 | 13 +++++++++++++ agents/special/agent_ipmi_sensors | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/6761 b/.werks/6761 new file mode 100644 index 0000000..a0929cd --- /dev/null +++ b/.werks/6761 @@ -0,0 +1,13 @@ +Title: agent_ipmi_sensors: Fixed crash if ipmi driver or bmc key option is used +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1550823224 +Class: fix + +The special agent crashed if the mentioned options has been used because +a hidden behaviour in python prevented that these options are interpreted +correctly. This bug has been in place, since these options have been +introduced. diff --git a/agents/special/agent_ipmi_sensors b/agents/special/agent_ipmi_sensors index b8a0c53..6860993 100755 --- a/agents/special/agent_ipmi_sensors +++ b/agents/special/agent_ipmi_sensors @@ -121,11 +121,11 @@ def agent_ipmi_sensors_main(cmdline_args): # FreeIPMI options elif o in ['-D']: - additional_opts += ["%s %s" % (o, a)] + additional_opts += ["%s" % o, "%s" % a] elif o in ['--driver-type']: additional_opts += ["%s=%s" % (o, a)] elif o in ['-k']: - additional_opts += ["%s %s" % (o, a)] + additional_opts += ["%s" % o, "%s" % a] elif o in ['--quiet-cache']: additional_opts.append(o) elif o in ['--sdr-cache-recreate']:

5 years, 4 months

mssql_counters: prepare parse function to ignore err msg

by Moritz Kiemer

Module: check_mk Branch: master Commit: c35a42b07a9d22771e82ce61e071229209b9e6be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c35a42b07a9d22… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 22 10:09:32 2019 +0100 mssql_counters: prepare parse function to ignore err msg CMK-1570 Change-Id: I541d18f0bafd0e6036c42c78e5bba2d647769308 --- checks/mssql_counters | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/checks/mssql_counters b/checks/mssql_counters index c38fe47..01c0d1f 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -77,16 +77,14 @@ def inventory_mssql_counters_generic(parsed, want_counters, dflt=None): def parse_mssql_counters_base(info): parsed = {} for line in info: - node_name = line[0] - line = line[1:] - if len(line) < 3: + if len(line) < 4 or line[-1].startswith("ERROR: "): continue - obj, counter, instance = line[:3] + (node_name, obj, counter, instance), values = line[:4], line[4:] + if obj.endswith(':Databases'): obj = obj[:-10] - values = line[3:] if len(values) == 1: values = values[0] try: @@ -110,17 +108,16 @@ def parse_mssql_counters_base(info): except ValueError: pass - data = parsed.setdefault((obj, instance), {})\ - .setdefault(node_name, {}) + data = parsed.setdefault((obj, instance), {}).setdefault(node_name, {}) data.setdefault(counter, values) return parsed -def inventory_mssql_counters_base(parsed): - return [] +def inventory_mssql_counters_base(_parsed): + return -def check_mssql_counters_base(item, params, parsed): +def check_mssql_counters_base(_item, _params, _parsed): return 3, 'Not implemented check plugin'

5 years, 4 months

run-cxx-linter: Fixed failures because of missing Makefiles

by Lars Michelsen

Module: check_mk Branch: master Commit: 671bdddf8d5691e6035b2ab0090ff2dfdac8a558 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=671bdddf8d5691… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 22 13:02:22 2019 +0100 run-cxx-linter: Fixed failures because of missing Makefiles Change-Id: I6c58bc9c635dcb8198dcb1281fae7e535e42b100 --- scripts/run-cxx-linter | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/run-cxx-linter b/scripts/run-cxx-linter index 4c76662..3a4cdfc 100755 --- a/scripts/run-cxx-linter +++ b/scripts/run-cxx-linter @@ -1,8 +1,13 @@ -#! /bin/sh +#!/bin/bash set -e TARGET=$1 PATCHSET_REVISION=$2 +REPO_DIR="$(dirname $(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd))" + +# Prevpare Makefiles, otherwise "make compile_commands.json" will fail +make -C $REPO_DIR config.h + # To really compute *only* the files which need checking, we better make sure # that our project is up-to-date without any further changes first (i.e. target # "all-am"). Having an up-to-date project file before running a linter is a good

5 years, 4 months

mssql_backup: add test

by Moritz Kiemer

Module: check_mk Branch: master Commit: 95492a215896d42e30b08b35cf77c3a81508bb7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95492a215896d4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 22 09:12:52 2019 +0100 mssql_backup: add test Change-Id: Icad36b53a6c2c7bc23f57f4468f1442944737fe7 --- .../datasets/mssql_backup_regression.py | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/mssql_backup_regression.py b/tests/unit/checks/generictests/datasets/mssql_backup_regression.py new file mode 100644 index 0000000..c4edb74 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/mssql_backup_regression.py @@ -0,0 +1,26 @@ +# yapf: disable + +checkname = "mssql_backup" + + +info = [ + ['MSSQL_SQL0x4', 'master', '2016-07-08 20:20:27', 'D'], + ['MSSQL_SQL0x4', 'model', '2016-07-08 20:20:28', 'D'], + ['MSSQL_SQL0x4', 'model', '2016-07-12 09:09:42', 'L'], + ['MSSQL_SQL0x4', 'model', '2016-07-11 20:20:07', 'I'], + ['MSSQL_SQL0x4', 'msdb', '2016-07-08', '20:20:43', 'D'], + ['MSSQL_SQL0x4', 'msdb', '-', '-', '-', 'no backup found'], + ['MSSQL_SQL0x4', 'foo'], + ['MSSQL_SQL0x4', 'bar', '12345678'], +] + + +discovery = { + '': [ + ("MSSQL_SQL0x4 master", {}), + ("MSSQL_SQL0x4 model", {}), + ("MSSQL_SQL0x4 msdb", {}), + ("MSSQL_SQL0x4 bar", {}), + ], + 'per_type': [], +}

5 years, 4 months

Moved globals to central place

by Lars Michelsen

Module: check_mk Branch: master Commit: 5bbe16e73033595026964c0e266b1125d8799e48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bbe16e7303359… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 22 08:11:30 2019 +0100 Moved globals to central place Change-Id: I31754fd3bb0a85e6648a1153b265c0f8a47771f9 --- agents/special/agent_netapp | 607 +++++++++++++++++++++++--------------------- 1 file changed, 312 insertions(+), 295 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5bbe16e730…

5 years, 4 months

More restructuring to cleanup implicit dependencies

by Lars Michelsen

Module: check_mk Branch: master Commit: 85df5e7a37a224fd626a3b30a6e03b6a78a4c545 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85df5e7a37a224… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 22 09:15:54 2019 +0100 More restructuring to cleanup implicit dependencies Change-Id: I8b900dba33d391ef56157677cf0fc40a49ba5be1 --- agents/special/agent_netapp | 534 +++++++++++++++++++++++--------------------- 1 file changed, 280 insertions(+), 254 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=85df5e7a37…

5 years, 4 months

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