Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: b0ca6a4f1ed591334d63c5bc56b49ce8a8837a88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0ca6a4f1ed591… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 22 08:34:36 2019 +0100 Moved block of global code to functions Change-Id: I48faa0b31a1674f5176d0a3d1791149bb785a4a0 --- agents/special/agent_netapp | 1370 +++++++++++++++++++++---------------------- 1 file changed, 676 insertions(+), 694 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b0ca6a4f1e…

5 years, 4 months

A bit more compatible py3 omdlib/certs

by Óscar Nájera

Module: check_mk Branch: master Commit: 9f4ede341672ccf411df3569a0fca9102212cf67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f4ede341672cc… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Feb 21 16:56:57 2019 +0100 A bit more compatible py3 omdlib/certs Change-Id: Id47cb22ec5421d7f88f0b80aa844ffd5aff0beba --- omd/packages/omd/omdlib/certs.py | 11 +++++++---- tests/unit/omdlib/test_certs.py | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/omd/packages/omd/omdlib/certs.py b/omd/packages/omd/omdlib/certs.py index 7037786..b91fa16 100644 --- a/omd/packages/omd/omdlib/certs.py +++ b/omd/packages/omd/omdlib/certs.py @@ -27,7 +27,10 @@ import sys from typing import Tuple # pylint: disable=unused-import import random -from pathlib2 import Path # pylint: disable=unused-import +try: + from pathlib import Path # pylint: disable=unused-import +except ImportError: + from pathlib2 import Path # pylint: disable=unused-import from OpenSSL import crypto from OpenSSL.SSL import FILETYPE_PEM # type: ignore @@ -72,9 +75,9 @@ class CertificateAuthority(object): cert.set_issuer(cert.get_subject()) cert.set_pubkey(key) cert.add_extensions([ - crypto.X509Extension("subjectKeyIdentifier", False, "hash", subject=cert), - crypto.X509Extension("basicConstraints", True, "CA:TRUE, pathlen:0"), - crypto.X509Extension("keyUsage", True, "keyCertSign, cRLSign"), + crypto.X509Extension(b"subjectKeyIdentifier", False, b"hash", subject=cert), + crypto.X509Extension(b"basicConstraints", True, b"CA:TRUE, pathlen:0"), + crypto.X509Extension(b"keyUsage", True, b"keyCertSign, cRLSign"), ]) cert.sign(key, "sha512") diff --git a/tests/unit/omdlib/test_certs.py b/tests/unit/omdlib/test_certs.py index 72a0fdd..9c5c92f 100644 --- a/tests/unit/omdlib/test_certs.py +++ b/tests/unit/omdlib/test_certs.py @@ -2,7 +2,10 @@ import OpenSSL import pytest # type: ignore -from pathlib2 import Path +try: + from pathlib import Path +except ImportError: + from pathlib2 import Path import omdlib.certs as certs

5 years, 4 months

A bit more py3 compatible livestatus

by Óscar Nájera

Module: check_mk Branch: master Commit: 5340cec1b2e0ae5ef68e066eb205fccea1121933 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5340cec1b2e0ae… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Feb 21 15:59:09 2019 +0100 A bit more py3 compatible livestatus Change-Id: I0a6df3acf69e860adb6d6d98909f12c9b817f0c9 --- livestatus/api/python/livestatus.py | 31 ++++++++++++++------------- tests/unit/livestatus/test_livestatus_unit.py | 10 ++++++--- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index 20ee562..d36e6d3 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -52,6 +52,12 @@ persistent_connections = {} # type: Dict[str, socket.socket] remove_cache_regex = re.compile("\nCache:[^\n]*") # type: Pattern +def ensure_unicode(text): + if hasattr(text, "decode"): + return text.decode("utf-8") + return text + + class MKLivestatusException(Exception): def __init__(self, value): self.parameter = value @@ -97,7 +103,7 @@ def lqencode(s): # It is not enough to strip off \n\n, because one might submit "\n \n", # which is also interpreted as termination of the last query and beginning # of the next query. - return s.replace('\n', '') + return ensure_unicode(s).replace(u"\n", u"") def site_local_ca_path(): @@ -238,19 +244,13 @@ class Query(object): def __init__(self, query, suppress_exceptions=None): super(Query, self).__init__() - self._query = self._ensure_unicode(query) + self._query = ensure_unicode(query) if suppress_exceptions is None: self.suppress_exceptions = self.default_suppressed_exceptions else: self.suppress_exceptions = suppress_exceptions - def _ensure_unicode(self, thing): - try: - return unicode(thing) - except UnicodeDecodeError: - return thing.decode("utf-8") - def __unicode__(self): return self._query @@ -377,7 +377,7 @@ class SingleSiteConnection(Helpers): if family_txt == "unix": return socket.AF_UNIX, url - elif family_txt in ["tcp", "tcp6"]: + if family_txt in ["tcp", "tcp6"]: try: host, port_txt = url.rsplit(":", 1) port = int(port_txt) @@ -407,16 +407,16 @@ class SingleSiteConnection(Helpers): pass def receive_data(self, size): - result = "" + result = u"" # Timeout is only honored when connecting self.socket.settimeout(None) while size > 0: packet = self.socket.recv(size) - if len(packet) == 0: + if not packet: raise MKLivestatusSocketClosed( "Read zero data from socket, nagios server closed connection") size -= len(packet) - result += packet + result += packet.decode("utf-8") return result def do_query(self, query, add_headers=""): @@ -447,8 +447,7 @@ class SingleSiteConnection(Helpers): try: # socket.send() will implicitely cast to str(), we need ot # convert to UTF-8 in order to avoid exceptions - if isinstance(query, unicode): - query = query.encode("utf-8") + query = query.encode("utf-8") self.socket.send(query) except IOError as e: if self.persist: @@ -641,7 +640,9 @@ class MultiSiteConnection(Helpers): # hosts at the same time. status_hosts = {} # dict from site to list of status_hosts - for sitename, site in sites.items() + extra_status_sites.items(): + sites_dict = sites.copy() + sites_dict.update(extra_status_sites) + for sitename, site in sites_dict.items(): status_host = site.get("status_host") if status_host: if not isinstance(status_host, tuple) or len(status_host) != 2: diff --git a/tests/unit/livestatus/test_livestatus_unit.py b/tests/unit/livestatus/test_livestatus_unit.py index c28002f..24435e4 100644 --- a/tests/unit/livestatus/test_livestatus_unit.py +++ b/tests/unit/livestatus/test_livestatus_unit.py @@ -1,7 +1,11 @@ import socket import ssl from contextlib import closing -from pathlib2 import Path +try: + from pathlib import Path # Py3 first +except ImportError: + from pathlib2 import Path + import pytest # type: ignore import omdlib.certs as certs @@ -25,13 +29,13 @@ def sock_path(monkeypatch, tmpdir): @pytest.mark.parametrize("query_part", [ + "xyz\nabc", u"xyz\nabc", b"xyz\nabc", ]) def test_lqencode(query_part): result = livestatus.lqencode(query_part) - assert isinstance(result, type(query_part)) - assert result == "xyzabc" + assert result == u"xyzabc" def test_livestatus_local_connection_omd_root_not_set(monkeypatch, tmpdir):

5 years, 4 months

7061 FIX mbg_lantime_ng_refclock.gps: only apply satellite levels if required

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b1c498e0bdeaecbfe8df890b6e27c8e339c35c21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1c498e0bdeaec… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Feb 22 09:23:16 2019 +0100 7061 FIX mbg_lantime_ng_refclock.gps: only apply satellite levels if required The check now only applies levels for the number of connected satellites if the device substate indicates that a satellite connection is necessary. Substates that require a satellite connection are "GPS sync", "GPS tracking", "GPS antenna disconnected", "GPS warm boot", "GPS cold boot", "GPS antenna short circuit" and "MRS GPS sync". Change-Id: Ife770bc1aa278d41962c0eba6f4b132fcd0c41b3 --- .werks/7061 | 14 ++++++ checkman/mbg_lantime_ng_refclock | 1 - checkman/mbg_lantime_ng_refclock.gps | 7 ++- checks/mbg_lantime_ng_refclock | 31 ++++++------ tests/unit/checks/test_mbg_lantime_ng_refclock.py | 60 ++++++++++++++++------- 5 files changed, 78 insertions(+), 35 deletions(-) diff --git a/.werks/7061 b/.werks/7061 new file mode 100644 index 0000000..8ccf6e3 --- /dev/null +++ b/.werks/7061 @@ -0,0 +1,14 @@ +Title: mbg_lantime_ng_refclock.gps: only apply satellite levels if required +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1550756859 + +The check now only applies levels for the number of connected satellites if the device +substate indicates that a satellite connection is necessary. Substates that require +a satellite connection are "GPS sync", "GPS tracking", "GPS antenna disconnected", +"GPS warm boot", "GPS cold boot", "GPS antenna short circuit" and "MRS GPS sync". diff --git a/checkman/mbg_lantime_ng_refclock b/checkman/mbg_lantime_ng_refclock index 603f25e..6b03d7f 100644 --- a/checkman/mbg_lantime_ng_refclock +++ b/checkman/mbg_lantime_ng_refclock @@ -14,7 +14,6 @@ description: When the refclock state is "not available" CRIT is raised and a WARN state is issued if the refclock state is "not synchronized". - If the number of good satellites drops below 3, a CRIT state is raised. inventory: One service per non-gps refclock is created. diff --git a/checkman/mbg_lantime_ng_refclock.gps b/checkman/mbg_lantime_ng_refclock.gps index 7f94c44..0ca7493 100644 --- a/checkman/mbg_lantime_ng_refclock.gps +++ b/checkman/mbg_lantime_ng_refclock.gps @@ -14,7 +14,12 @@ description: When the refclock state is "not available" CRIT is raised and a WARN state is issued if the refclock state is "not synchronized". - If the number of good satellites drops below 3, a CRIT state is raised. + If the number of good satellites drops below 3 and the device substate indicates that + a satellite connection is necessary, a CRIT state is raised. If the substate indicates + that no satellite connection is necessary no information about satellites is shown. + Substates that require a satellite connection are "GPS sync", "GPS tracking", + "GPS antenna disconnected", "GPS warm boot", "GPS cold boot", + "GPS antenna short circuit" and "MRS GPS sync". inventory: One service per GPS refclock is created. diff --git a/checks/mbg_lantime_ng_refclock b/checks/mbg_lantime_ng_refclock index 9141d09..f4478b7 100644 --- a/checks/mbg_lantime_ng_refclock +++ b/checks/mbg_lantime_ng_refclock @@ -187,22 +187,21 @@ def check_lantime_ng_refclock_gps(item, params, info): if substate not in ("1", "2"): yield 0, "Next leap second: %s" % str(leapsecond_date) - good_sats = int(status_a) - total_sats = int(max_status_a) - # levels are not "at" but "below" because we must be - # compatible with old mbg_lantime_refclock check - warn, crit = params - if good_sats < crit: - state = 2 - levels_txt = " (warn/crit below %d/%d)" % params - elif good_sats < warn: - state = 1 - levels_txt = " (warn/crit below %d/%d)" % params - else: - state = 0 - levels_txt = "" - - yield state, "Satellites: %d/%d%s" % (good_sats, total_sats, levels_txt) + # Levels for satellites are checked only if we have a substate + # that indicates that a GPS connection is needed. For the + # LANTIME M600/MRS the GPS antenna is e.g. optional. + if substate in ("1", "2", "3", "4", "5", "6", "150"): + state, levels_txt = 0, "" + good_sats, total_sats = int(status_a), int(max_status_a) + warn, crit = params + if good_sats < crit: + state = 2 + levels_txt = " (warn/crit below %d/%d)" % params + elif good_sats < warn: + state = 1 + levels_txt = " (warn/crit below %d/%d)" % params + + yield state, "Satellites: %d/%d%s" % (good_sats, total_sats, levels_txt) check_info["mbg_lantime_ng_refclock.gps"] = { diff --git a/tests/unit/checks/test_mbg_lantime_ng_refclock.py b/tests/unit/checks/test_mbg_lantime_ng_refclock.py index 7737cb6..fe73831 100644 --- a/tests/unit/checks/test_mbg_lantime_ng_refclock.py +++ b/tests/unit/checks/test_mbg_lantime_ng_refclock.py @@ -9,6 +9,9 @@ meinberg_lantime_2 = [[u'1', u'28', u'3', u'1', u'52', u'62', u'100', u'101', u' meinberg_lantime_5 = [[ u'1', u'14', u'3', u'1', u'150', u'6', u'8', u'0', u'0', u'1', u'not announced' ]] +meinberg_lantime_6 = [[ + u'1', u'30', u'3', u'1', u'155', u'0', u'8', u'0', u'0', u'0', u'2016-12-31' +]] @pytest.mark.parametrize( @@ -43,6 +46,7 @@ def test_check_mbg_lantime_ng_refclock(check_manager, info, item, params, expect (meinberg_lantime_1, DiscoveryResult([('1', 'mbg_lantime_refclock_default_levels')])), (meinberg_lantime_2, DiscoveryResult([])), # don't discover GPS clocks (meinberg_lantime_5, DiscoveryResult([('1', 'mbg_lantime_refclock_default_levels')])), + (meinberg_lantime_6, DiscoveryResult([('1', 'mbg_lantime_refclock_default_levels')])), ]) def test_discovery_mbg_lantime_ng_refclock_gps(check_manager, info, expected): check = check_manager.get_check("mbg_lantime_ng_refclock.gps") @@ -50,23 +54,45 @@ def test_discovery_mbg_lantime_ng_refclock_gps(check_manager, info, expected): assertDiscoveryResultsEqual(check, discovery, expected) -(a)pytest.mark.parametrize("info,item,params,expected", [ - (meinberg_lantime_1, '1', (3, 3), - CheckResult([ - BasicCheckResult( - 1, 'Type: gps170, Usage: primary, State: not synchronized (GPS antenna disconnected)', - None), - BasicCheckResult(0, 'Next leap second: 2012-06-30', None), - BasicCheckResult(2, 'Satellites: 0/12 (warn/crit below 3/3)', None) - ])), - (meinberg_lantime_5, '1', (3, 3), - CheckResult([ - BasicCheckResult(0, 'Type: gps170, Usage: primary, State: synchronized (MRS GPS sync)', - None), - BasicCheckResult(0, 'Next leap second: not announced', None), - BasicCheckResult(0, 'Satellites: 6/8', None) - ])), -]) +(a)pytest.mark.parametrize( + "info,item,params,expected", + [ + ( + meinberg_lantime_1, + '1', + (3, 3), + CheckResult([ + BasicCheckResult( + 1, + 'Type: gps170, Usage: primary, State: not synchronized (GPS antenna disconnected)', + None), + BasicCheckResult(0, 'Next leap second: 2012-06-30', None), + BasicCheckResult(2, 'Satellites: 0/12 (warn/crit below 3/3)', None) + ]), + ), + ( + meinberg_lantime_5, + '1', + (3, 3), + CheckResult([ + BasicCheckResult( + 0, 'Type: gps170, Usage: primary, State: synchronized (MRS GPS sync)', None), + BasicCheckResult(0, 'Next leap second: not announced', None), + BasicCheckResult(0, 'Satellites: 6/8', None) + ]), + ), + ( + meinberg_lantime_6, + '1', + (3, 3), + CheckResult([ + BasicCheckResult( + 0, 'Type: gps180, Usage: primary, State: synchronized (MRS NTP sync)', None), + BasicCheckResult(0, 'Next leap second: 2016-12-31', None), + # satellites are not checked here + ]), + ), + ]) def test_check_mbg_lantime_ng_refclock_gps(check_manager, info, item, params, expected): check = check_manager.get_check("mbg_lantime_ng_refclock.gps") result = CheckResult(check.run_check(item, params, info))

5 years, 4 months

7039 ucs_c_rack_server_health: Storage controller health

by Florian Kromer

Module: check_mk Branch: master Commit: 37c8b6199a9730f28839136fadb5c18d12a00372 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37c8b6199a9730… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Feb 12 17:01:47 2019 +0100 7039 ucs_c_rack_server_health: Storage controller health This werk adds support for monitoring the storage controller health of an Cisco UCS C-Series Rack Servers racks. CMK-1067 Change-Id: I8b8ccc8d657c3a79577abe8872db996cc575f72d --- .werks/7039 | 11 +++ checkman/ucs_c_rack_server_health | 30 ++++++++ checks/ucs_c_rack_server_health | 87 ++++++++++++++++++++++ .../datasets/ucs_c_rack_server_health.py | 19 +++++ 4 files changed, 147 insertions(+) diff --git a/.werks/7039 b/.werks/7039 new file mode 100644 index 0000000..66d7d93 --- /dev/null +++ b/.werks/7039 @@ -0,0 +1,11 @@ +Title: ucs_c_rack_server_health: Storage controller health +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1549987107 +Class: feature + +This werk adds support for monitoring the storage controller +health of an Cisco UCS C-Series Rack Servers racks. diff --git a/checkman/ucs_c_rack_server_health b/checkman/ucs_c_rack_server_health new file mode 100644 index 0000000..620fc6a --- /dev/null +++ b/checkman/ucs_c_rack_server_health @@ -0,0 +1,30 @@ +title: UCS C-Series Rack Server: Storage controller health +agents: agent_ucs_bladecenter +catalog: hw/server/cisco +license: GPL +distribution: check_mk +description: + This check provides information about the storage controller health of an UCS C-Series Rack Servers racks. + 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". + + Checks status: + - {OK} in case the health value provided by the special agent is {Good} + - {UNKNOW} in case of any other health value than {Good} + +inventory: + All server racks included in the special agent output are found automatically. + +item: + One item per rack. diff --git a/checks/ucs_c_rack_server_health b/checks/ucs_c_rack_server_health new file mode 100644 index 0000000..8ff34da --- /dev/null +++ b/checks/ucs_c_rack_server_health @@ -0,0 +1,87 @@ +#!/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): +# storageControllerHealth<TAB>dn sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0<TAB>health Good +# storageControllerHealth<TAB>dn sys/rack-unit-2/board/storage-SAS-SLOT-HBA/vd-0<TAB>health Good + +# Dict keys are storage controller health strings provided via special agent -> XML +# API of servers. Dict values are corresponding check status. +# For information about the data provided by the special agent +# "storageControllerHealth" refer to Cisco C-Series Rack Server XML 2.0 Schema files: +# [https://community.cisco.com/t5/unified-computing-system/cisco-ucs-c-series-…] +# Note: The possible string values are not defined/documented in the XML schema. +# "Good" is the only value known from exemplary data output. Pre-process the +# data to lowercase only chars. +health_to_status_mapping = { + 'good': 0, +} + + +def parse_ucs_c_rack_server_health(info): + """ + Input: list of lists containing storage controller health data on a per rack basis. + Output: Returns dict with indexed Rack Units mapped to keys and lowercase health string mapped to value + 'health' if rack server has racks attached or empty dict if not. + """ + parsed = {} + for _, dn, health in info: + rack_storage_board = dn.replace("dn sys/", "").replace("rack-unit-", "Rack unit ").replace( + "/board/storage-", " Storage ").replace("-", " ").replace("/", " ") + parsed[rack_storage_board] = health.replace("health ", "").lower() + return parsed + + +def inventory_ucs_c_rack_server_health(parsed): + """ + Input: dict containing items as keys or empty dict. + Output: Yields indexed racks and storage controllers as items (e.g. Rack Unit 1 Storage SAS SLOT HBA vd 0) in case parsed contains items. + """ + for key in parsed.iterkeys(): + yield key, {} + + +@get_parsed_item_data +def check_ucs_c_rack_server_health(item, params, health): + """ + Check function is called only in case parsed is a dict and item exists as key in parsed[item]. + All other potential bad case conditions are handled by @get_parsed_item_data. + """ + try: + status = health_to_status_mapping[health] + status_readable = health + except KeyError: + status = 3 + status_readable = "unknown[%s]" % health + yield status, "Status: %s" % status_readable + + +check_info["ucs_c_rack_server_health"] = { + 'parse_function': parse_ucs_c_rack_server_health, + 'inventory_function': inventory_ucs_c_rack_server_health, + 'check_function': check_ucs_c_rack_server_health, + 'service_description': 'Health %s', +} diff --git a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py new file mode 100644 index 0000000..b5ebb9e --- /dev/null +++ b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py @@ -0,0 +1,19 @@ +checkname = 'ucs_c_rack_server_health' + +info = [[ + 'storageControllerHealth', 'dn sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0', 'health Good' +], + [ + 'storageControllerHealth', 'dn sys/rack-unit-2/board/storage-SAS-SLOT-HBA/vd-0', + 'health AnythingElse' + ]] + +discovery = { + '': [('Rack unit 1 Storage SAS SLOT HBA vd 0', {}), ('Rack unit 2 Storage SAS SLOT HBA vd 0', + {})] +} + +checks = { + '': [('Rack unit 1 Storage SAS SLOT HBA vd 0', {}, [(0, 'Status: good', [])]), + ('Rack unit 2 Storage SAS SLOT HBA vd 0', {}, [(3, 'Status: unknown[anythingelse]', [])])] +}

5 years, 4 months

Revert "Add test debug code"

by Lars Michelsen

Module: check_mk Branch: master Commit: 56aa2566545f150cee7ae2b916238a788a2bf791 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56aa2566545f15… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 21 16:21:19 2019 +0100 Revert "Add test debug code" This reverts commit 314582bc3c1acba44da5d64ff9a115e7ab992bea. --- tests/integration/bin/test_mkbackup.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/integration/bin/test_mkbackup.py b/tests/integration/bin/test_mkbackup.py index 26b1725..a3f0dfa 100644 --- a/tests/integration/bin/test_mkbackup.py +++ b/tests/integration/bin/test_mkbackup.py @@ -4,7 +4,6 @@ import subprocess import re import os import tarfile -import time import fnmatch import fasteners import pytest # type: ignore @@ -130,19 +129,12 @@ def _execute_backup(site, job_id="testjob"): def _execute_restore(site, backup_id, env=None): with BackupLock(): - os.system("ps -ef") - os.system("mount") - os.system("ps -U %s" % site.id) # nosec p = site.execute(["mkbackup", "restore", "test-target", backup_id], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env) stdout, stderr = p.communicate() - try: - assert "Restore completed" in stdout, "Invalid output: %r" % stdout - except AssertionError: - time.sleep(1000) - raise + assert "Restore completed" in stdout, "Invalid output: %r" % stdout assert stderr == "" assert p.wait() == 0

5 years, 4 months

Make Bandit happy again.

by Sven Panne

Module: check_mk Branch: master Commit: 70a35e8416e5e9cb9a857231e19bb95b79a90ac6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70a35e8416e5e9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 21 16:05:55 2019 +0100 Make Bandit happy again. Change-Id: I62fb7f13fd74c3418cb24723a2a4934aae4c0423 --- tests/integration/bin/test_mkbackup.py | 2 +- tests/testlib/__init__.py | 19 ++++++++++--------- tests/unit/agents/plugins/test_mk_logwatch_aix.py | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/integration/bin/test_mkbackup.py b/tests/integration/bin/test_mkbackup.py index c264cb6..26b1725 100644 --- a/tests/integration/bin/test_mkbackup.py +++ b/tests/integration/bin/test_mkbackup.py @@ -132,7 +132,7 @@ def _execute_restore(site, backup_id, env=None): with BackupLock(): os.system("ps -ef") os.system("mount") - os.system("ps -U %s" % site.id) + os.system("ps -U %s" % site.id) # nosec p = site.execute(["mkbackup", "restore", "test-target", backup_id], stdout=subprocess.PIPE, stderr=subprocess.PIPE, diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index f4fb541..895182a 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -206,7 +206,7 @@ class CMKVersion(object): if os.path.exists(self._build_system_package_path()): return True - response = requests.head( + response = requests.head( # nosec self.package_url(), auth=get_cmk_download_credentials(), verify=False) return response.status_code == 200 @@ -226,7 +226,7 @@ class CMKVersion(object): temp_package_path = "/tmp/%s" % self.package_name() print(self.package_url()) - response = requests.get( + response = requests.get( # nosec self.package_url(), auth=get_cmk_download_credentials(), verify=False) if response.status_code != 200: raise Exception("Failed to load package: %s" % self.package_url()) @@ -248,7 +248,7 @@ class CMKVersion(object): cmd = "sudo /usr/bin/gdebi --non-interactive %s" % package_path print(cmd) sys.stdout.flush() - if os.system(cmd) >> 8 != 0: + if os.system(cmd) >> 8 != 0: # nosec raise Exception("Failed to install package: %s" % package_path) assert self.is_installed() @@ -409,10 +409,11 @@ class Site(object): pipes.quote(" ".join([pipes.quote(p) for p in cmd])) ] cmd_txt = " ".join(cmd) - return subprocess.Popen(cmd_txt, shell=True, *args, **kwargs) + return subprocess.Popen(cmd_txt, shell=True, *args, **kwargs) # nosec else: sys.stdout.write("Executing (site): %s\n" % subprocess.list2cmdline(cmd)) - return subprocess.Popen(subprocess.list2cmdline(cmd), shell=True, *args, **kwargs) + return subprocess.Popen( # nosec + subprocess.list2cmdline(cmd), shell=True, *args, **kwargs) def omd(self, mode, *args): if not self._is_running_as_site_user(): @@ -563,7 +564,7 @@ class Site(object): def execute(cmd): print("Executing: %s" % cmd) - rc = os.system(cmd) >> 8 + rc = os.system(cmd) >> 8 # nosec if rc != 0: raise Exception("Failed to execute '%s'. Exit code: %d" % (cmd, rc)) @@ -636,7 +637,7 @@ class Site(object): if os.path.exists("%s/.f12" % path): print("Executing .f12 in \"%s\"..." % path) sys.stdout.flush() - assert os.system( + assert os.system( # nosec "cd \"%s\" ; " "sudo PATH=$PATH ONLY_COPY=1 ALL_EDITIONS=0 SITE=%s " "CHROOT_BASE_PATH=$CHROOT_BASE_PATH CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR " @@ -678,11 +679,11 @@ class Site(object): #if "cffi" in file_name: # continue - assert os.system("sudo rsync -a --chown %s:%s %s %s/local/lib/python/" % + assert os.system("sudo rsync -a --chown %s:%s %s %s/local/lib/python/" % # nosec (self.id, self.id, packages_dir / file_name, self.root)) >> 8 == 0 for file_name in ["py.test", "pytest"]: - assert os.system("sudo rsync -a --chown %s:%s %s %s/local/bin" % + assert os.system("sudo rsync -a --chown %s:%s %s %s/local/bin" % # nosec (self.id, self.id, bin_dir / file_name, self.root)) >> 8 == 0 def rm_if_not_reusing(self): diff --git a/tests/unit/agents/plugins/test_mk_logwatch_aix.py b/tests/unit/agents/plugins/test_mk_logwatch_aix.py index 2840f37..1a275cd 100644 --- a/tests/unit/agents/plugins/test_mk_logwatch_aix.py +++ b/tests/unit/agents/plugins/test_mk_logwatch_aix.py @@ -20,7 +20,7 @@ def _prepare_mock_errpt(tmpdir, errpt_output): errpt_script = ''.join(['#!/bin/sh\n'] + ['echo "%s"\n' % line for line in errpt_output]) with open(errpt_name, 'w') as errpt_file: errpt_file.write(errpt_script) - os.chmod(errpt_name, 0777) + os.chmod(errpt_name, 0777) # nosec def _get_env(tmpdir):

5 years, 4 months

Make test_get_graph integration tests independent of local running Check_MK agent

by Lars Michelsen

Module: check_mk Branch: master Commit: 5710fe2f89bada3cf288a2cbf5351c5c519b8429 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5710fe2f89bada… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 21 16:09:34 2019 +0100 Make test_get_graph integration tests independent of local running Check_MK agent Change-Id: Id2f1a5c6e8c8f1300c17ccb671168406d744a63d --- tests/integration/cmk/gui/test_webapi.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/integration/cmk/gui/test_webapi.py b/tests/integration/cmk/gui/test_webapi.py index 51c28c1..1341aae 100644 --- a/tests/integration/cmk/gui/test_webapi.py +++ b/tests/integration/cmk/gui/test_webapi.py @@ -618,6 +618,18 @@ def graph_test_config(web, site): "test-host-get-graph", attributes={ "ipaddress": "127.0.0.1", }) + + site.write_file( + "etc/check_mk/conf.d/test-host-get-graph.mk", + "datasource_programs.append(('cat ~/var/check_mk/agent_output/<HOST>', [], ['test-host-get-graph']))\n" + ) + + site.makedirs("var/check_mk/agent_output/") + site.write_file( + "var/check_mk/agent_output/test-host-get-graph", + file( + "%s/tests/integration/cmk_base/test-files/linux-agent-output" % repo_path()).read()) + web.discover_services("test-host-get-graph") web.activate_changes() site.schedule_check("test-host-get-graph", "Check_MK", 0) @@ -640,6 +652,7 @@ def graph_test_config(web, site): yield finally: web.delete_host("test-host-get-graph") + site.delete_file("etc/check_mk/conf.d/test-host-get-graph.mk") web.activate_changes() @@ -647,11 +660,12 @@ def test_get_graph_api(web, graph_test_config): # Now we get a graph data = web.get_regular_graph("test-host-get-graph", "Check_MK", 0) - assert len(data["curves"]) == 4 + assert len(data["curves"]) == 5 assert data["curves"][0]["title"] == "CPU time in user space" assert data["curves"][1]["title"] == "CPU time in operating system" assert data["curves"][2]["title"] == "Time spent waiting for Check_MK agent" - assert data["curves"][3]["title"] == "Total execution time" + assert data["curves"][3]["title"] == "Time spent waiting for special agent" + assert data["curves"][4]["title"] == "Total execution time" def test_get_graph_image(web, graph_test_config):

5 years, 4 months

7179 FIX Fixed site filtering when creating availability PDF reports

by Lars Michelsen

Module: check_mk Branch: master Commit: a64037cffd6e9578f640e9527a1eb662f37a7628 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a64037cffd6e95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 21 15:17:28 2019 +0100 7179 FIX Fixed site filtering when creating availability PDF reports When having a filtered availability view which shows information of specific sites in distributed setups, the PDF reports created with "Export as PDF" were not applying the site filter. In this situation a query was sent to all distributed sites for fetching the data. It was not only querying too many sites, the PDFs also contained more hosts / services than intended in this situation. Change-Id: Ia15a5533e4e45b27c97f7f0bd00322b4608c0f9b --- .werks/7179 | 16 ++++++++++++++++ cmk/gui/bi.py | 3 +-- cmk/gui/plugins/views/inventory.py | 3 +-- cmk/gui/visuals.py | 13 ++++++++----- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/.werks/7179 b/.werks/7179 new file mode 100644 index 0000000..a1e2038 --- /dev/null +++ b/.werks/7179 @@ -0,0 +1,16 @@ +Title: Fixed site filtering when creating availability PDF reports +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1550673927 + +When having a filtered availability view which shows information of specific +sites in distributed setups, the PDF reports created with "Export as PDF" were +not applying the site filter. In this situation a query was sent to all +distributed sites for fetching the data. It was not only querying too many +sites, the PDFs also contained more hosts / services than intended in this +situation. diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index 276c1fe..c7e29f1 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -3335,8 +3335,7 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam filter_code = "" for filt in filters: header = filt.filter("bi_host_aggregations") - if not header.startswith("Sites:"): - filter_code += header + filter_code += header log("* Getting status information about hosts...") host_columns = [c for c in columns if c.startswith("host_")] diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index f838ac8..c96a26d 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -1387,8 +1387,7 @@ def inv_multisite_table(infoname, invpath, columns, add_headers, only_sites, lim filter_code = "" for filt in filters: header = filt.filter(infoname) - if not header.startswith("Sites:"): - filter_code += header + filter_code += header host_columns = ["host_name"] + list( {c for c in columns if c.startswith("host_") and c != "host_name"}) diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index 45647e5..e4e1ce3 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -1200,10 +1200,10 @@ def get_context_from_uri_vars(only_infos=None, single_infos=None): # Compute Livestatus-Filters based on a given context. Returns # the only_sites list and a string with the filter headers +# TODO: Untangle only_sites and filter headers def get_filter_headers(table, infos, context): # Prepare Filter headers for Livestatus filter_headers = "" - only_sites = None with html.stashed_vars(): for filter_name, filter_vars in context.items(): # first set the HTML variables. Sorry - the filters need this @@ -1213,15 +1213,18 @@ def get_filter_headers(table, infos, context): else: html.request.set_var(filter_name, filter_vars) + # Apply the site hint / filter (Same logic as in views.py) + if html.request.var("site"): + only_sites = [html.request.var("site")] + else: + only_sites = None + # Now compute filter headers for all infos of the used datasource for filter_name, filter_class in filter_registry.items(): filter_object = filter_class() if filter_object.info in infos: header = filter_object.filter(table) - if header.startswith("Sites:"): - only_sites = header.strip().split(" ")[1:] - else: - filter_headers += header + filter_headers += header return filter_headers, only_sites

5 years, 4 months

test_mk_docker.py: strip c from source file name

by Moritz Kiemer

Module: check_mk Branch: master Commit: 091e209b5401bcd910bbcd3a8c914ffda15b935c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=091e209b5401bc… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 21 10:37:42 2019 +0100 test_mk_docker.py: strip c from source file name Change-Id: I66251fdbbc3cfeaf016fa335e339d50e0ff47797 --- tests/unit/plugins/test_mk_docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/plugins/test_mk_docker.py b/tests/unit/plugins/test_mk_docker.py index 590ec85..af740ad 100644 --- a/tests/unit/plugins/test_mk_docker.py +++ b/tests/unit/plugins/test_mk_docker.py @@ -16,7 +16,7 @@ PLUGIN_CHECKSUMS = { def test_docker_plugin_version(): - with open(mk_docker.__file__) as source: + with open(mk_docker.__file__.rstrip('c')) as source: md5 = hashlib.md5(source.read()).hexdigest() assert md5 == PLUGIN_CHECKSUMS.get(mk_docker.VERSION), """ Plugin source code has changed.

5 years, 4 months

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