Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

cups_queues: Add generic data regression test

by Florian Kromer

Module: check_mk Branch: master Commit: 4e253b324b8d6cf929842435c44abea22a741e63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e253b324b8d6c… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Fri Jan 11 14:53:03 2019 +0100 cups_queues: Add generic data regression test FEED-3234 Change-Id: I04cced4f36dd0af6ef15b5228eaf79bf78d11f4a --- .../checks/generictests/datasets/cups_queues.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/cups_queues.py b/tests/unit/checks/generictests/datasets/cups_queues.py new file mode 100644 index 0000000..7eb0bbf --- /dev/null +++ b/tests/unit/checks/generictests/datasets/cups_queues.py @@ -0,0 +1,37 @@ +checkname = 'cups_queues' + +info = [[ + 'printer', 'spr1', 'is', 'idle.', 'enabled', 'since', 'Thu', 'Mar', '11', '14:28:23', '2010' +], + [ + 'printer', 'lpr2', 'now', 'printing', 'lpr2-3.', 'enabled', 'since', 'Tue', 'Jun', '29', + '09:22:04', '2010' + ], + [ + 'Wiederherstellbar:', 'Der', 'Netzwerk-Host', 'lpr2', 'ist', 'beschaeftigt,', + 'erneuter', 'Versuch', 'in', '30', 'Sekunden' + ], ['---'], ['lpr2-2', 'root', '1024', 'Tue', 'Jun', '29', '09:02:35', '2010'], + ['lpr2-3', 'root', '1024', 'Tue', 'Jun', '29', '09:05:54', '2010']] + +discovery = {'': [('lpr2', {}), ('spr1', {})]} + +checks = { + '': [('lpr2', { + 'disabled_since': 2, + 'is_idle': 0, + 'job_age': (360, 720), + 'job_count': (5, 10), + 'now_printing': 0 + }, [( + 0, + 'now printing lpr2-3. enabled since Tue Jun 29 09:22:04 2010 (Wiederherstellbar: Der Netzwerk-Host lpr2 ist beschaeftigt, erneuter Versuch in 30 Sekunden)', + []), (0, 'Jobs: 2', [('jobs', 2, 5, 10, 0, None)]), + (2, 'Oldest job is from Tue Jun 29 09:02:35 2010', [])]), + ('spr1', { + 'disabled_since': 2, + 'is_idle': 0, + 'job_age': (360, 720), + 'job_count': (5, 10), + 'now_printing': 0 + }, [(0, 'is idle. enabled since Thu Mar 11 14:28:23 2010', [])])] +}

5 years, 8 months

agent_netapp: Filter out invalid output

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8cd550cc0516e1f020be1f796014168bdbe06ea4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cd550cc0516e1… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Oct 18 14:25:04 2018 +0200 agent_netapp: Filter out invalid output In case the xml parsing fails, filter out invalid XML characters and try again. Change-Id: I73c6493e4d877186f5176419f50b30ad36fa7248 --- agents/special/agent_netapp | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 543e6c5..6fc10b5 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import re import sys import time import getopt @@ -292,7 +293,7 @@ else: print "Error: Unable to parse content of response:\n%s" % netapp_response.results_reason( ) if netapp_response.results_status() == "parse-exception": - print "Raw response text:\n%s" % netapp_response.raw_response_text + print "Raw response text:\n%r" % netapp_response.raw_response_text else: print prettify(netapp_response.get_results().get_node()) @@ -374,6 +375,14 @@ else: # NetApp Response Oject, holds the actual content in the NetAppNode member variable class NetAppResponse(object): + + # We have seen devices (NetApp Release 8.3.2P9) occasionally send + # invalid XML characters, leading to an exception during parsing. + # In that case replace them and try again. + # According to https://www.w3.org/TR/xml/#charsets + # these should never be in an XML output: + INVALID_XML = re.compile(u'[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F]') + def __init__(self, response): self.content = None self.reason = None @@ -389,9 +398,13 @@ else: # We except an XML answer (not HTML) try: self.content = NetAppNode(ET.fromstring(self.raw_response_text)) - except ET.ParseError, exc: - self.status = "parse-exception" - self.reason = str(exc) + except ET.ParseError: + try: + clean = NetAppResponse.INVALID_XML.sub('', self.raw_response_text) + self.content = NetAppNode(ET.fromstring(clean)) + except ET.ParseError, exc: + self.status = "parse-exception" + self.reason = str(exc) return self.status = self.content.child_get("results").node.attrib["status"]

5 years, 8 months

aix_lparstat_i: add some more info to AIX inventory

by Moritz Kiemer

Module: check_mk Branch: master Commit: b3c241ba6e84115df5417b403b016d0f9a5d2032 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3c241ba6e8411… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jan 11 11:36:21 2019 +0100 aix_lparstat_i: add some more info to AIX inventory Change-Id: Ic8984e397e0838eddb4b259f428fd5a92894baca --- agents/plugins/mk_inventory.aix | 5 ++++ inventory/aix_lparstat_inventory | 59 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/agents/plugins/mk_inventory.aix b/agents/plugins/mk_inventory.aix index 602d2ba..f2a0629 100755 --- a/agents/plugins/mk_inventory.aix +++ b/agents/plugins/mk_inventory.aix @@ -58,6 +58,11 @@ then oslevel -sq fi + if type lparstat > /dev/null; then + echo "<<<aix_lparstat_inventory:sep(0):persist($UNTIL)>>>" + lparstat -i + fi + # If you run the prtconf command without any flags, it displays the system model, machine serial, # processor type, number of processors, processor clock speed, cpu type, total memory size, network information, filesystem # information, paging space information, and devices information. diff --git a/inventory/aix_lparstat_inventory b/inventory/aix_lparstat_inventory new file mode 100644 index 0000000..717b98c --- /dev/null +++ b/inventory/aix_lparstat_inventory @@ -0,0 +1,59 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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. + + +def _try_set(node, nkey, parsed, pkey): + try: + node[nkey] = parsed[pkey] + except KeyError: + pass + return + + +def parse_aix_lparstat_inventory(info): + lines = (raw[0] for raw in info if ':' in raw[0]) + pairs = (line.split(':', 1) for line in lines) + parsed = {k.strip(): v.strip() for k, v in pairs} + return parsed + + +def inv_aix_lparstat_inventory(info, inventory_tree): + parsed = parse_aix_lparstat_inventory(info) + + cpu_node = inventory_tree.get_dict('hardware.cpu.') + sys_node = inventory_tree.get_dict('hardware.system.') + + _try_set(cpu_node, "cpu_max_capa", parsed, "Maximum Capacity") + _try_set(cpu_node, "type", parsed, "Type") + + _try_set(sys_node, "node_name", parsed, "Node Name") + _try_set(sys_node, "partition_name", parsed, "Partition Name") + _try_set(sys_node, "partition_number", parsed, "Partition Number") + + +inv_info['aix_lparstat_inventory'] = { + "inv_function": inv_aix_lparstat_inventory, +}

5 years, 8 months

prtconf: add processor implementation mode to inventory

by Moritz Kiemer

Module: check_mk Branch: master Commit: 35efdd64e629180eff6f72570c701fc9eea7b443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35efdd64e62918… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jan 11 15:54:06 2019 +0100 prtconf: add processor implementation mode to inventory Change-Id: I52de9f0c471dde27155e2e1d8e676199dfeca761 --- inventory/prtconf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inventory/prtconf b/inventory/prtconf index 8c4cc6d..f53ebca 100644 --- a/inventory/prtconf +++ b/inventory/prtconf @@ -90,6 +90,10 @@ def inv_prtconf(info, inventory_tree): if proc_type is not None: cpu_dict["model"] = proc_type + proc_impl_mode = parsed.get("Processor Implementation Mode") + if proc_impl_mode is not None: + cpu_dict["implementation_mode"] = proc_impl_mode + max_speed = parsed.get("Processor Clock Speed") if max_speed is not None: cpu_dict["max_speed"] = float(max_speed.split()[0]) * 1000 * 1000

5 years, 8 months

inventory: move bios to software

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6ee6647ca38be5cf47ebd7e5fde2674c1cc64212 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ee6647ca38be5… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jan 11 15:34:35 2019 +0100 inventory: move bios to software Change-Id: I02a3b5aac15ef167564c29ff3cce919ee828b255 --- cmk/gui/plugins/views/inventory.py | 8 ++++---- inventory/dell_idrac_info | 2 +- inventory/dmidecode | 2 +- inventory/esx_vsphere_hostsystem | 2 +- inventory/solaris_prtdiag | 2 +- inventory/win_bios | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index f487ab4..8420186 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -602,10 +602,6 @@ def inv_titleinfo_long(invpath, node): inventory_displayhints.update({ ".": {"title": _("Inventory")}, ".hardware.": {"title": _("Hardware"), "icon": "hardware"}, - ".hardware.bios.": {"title": _("BIOS")}, - ".hardware.bios.vendor": {"title": _("Vendor")}, - ".hardware.bios.version": {"title": _("Version")}, - ".hardware.bios.date": {"title": _("Date"), "paint": "date"}, ".hardware.chassis.": {"title": _("Chassis")}, ".hardware.cpu.": {"title": _("Processor")}, ".hardware.cpu.model": {"title": _("Model"), "short": _("CPU Model")}, @@ -921,6 +917,10 @@ inventory_displayhints.update({ ".hardware.nwadapter:*.ipv6_subnet": {"title": _("IPv6 Subnet")}, ".hardware.nwadapter:*.gateway": {"title": _("Gateway")}, ".software.": {"title": _("Software"), "icon": "software"}, + ".software.bios.": {"title": _("BIOS")}, + ".software.bios.vendor": {"title": _("Vendor")}, + ".software.bios.version": {"title": _("Version")}, + ".software.bios.date": {"title": _("Date"), "paint": "date"}, ".software.firmware.vendor": {"title": _("Vendor")}, ".software.firmware.version": {"title": _("Version")}, ".software.firmware.platform_level": {"title": _("Platform Firmware level")}, diff --git a/inventory/dell_idrac_info b/inventory/dell_idrac_info index b36c8fc..3d388de 100644 --- a/inventory/dell_idrac_info +++ b/inventory/dell_idrac_info @@ -38,7 +38,7 @@ def inv_dell_idrac_info(info): node['serial'] = serial node['expresscode'] = expresscode - node = inv_tree("hardware.bios.") + node = inv_tree("software.bios.") node['version'] = bios_version node['vendor'] = bios_vendor diff --git a/inventory/dmidecode b/inventory/dmidecode index bb998da..74ed0a4 100644 --- a/inventory/dmidecode +++ b/inventory/dmidecode @@ -119,7 +119,7 @@ def inv_dmidecode_parse_date(value): def inv_dmidecode_parse_bios(lines): inv_dmidecode_parse_generic( - "hardware.bios.", lines, { + "software.bios.", lines, { "Vendor": "vendor", "Version": "version", "Release Date": ("date", inv_dmidecode_parse_date), diff --git a/inventory/esx_vsphere_hostsystem b/inventory/esx_vsphere_hostsystem index cc37715..adde46a 100644 --- a/inventory/esx_vsphere_hostsystem +++ b/inventory/esx_vsphere_hostsystem @@ -103,7 +103,7 @@ def inv_esx_vsphere_hostsystem(info): node["bus_speed"] = float(data["hardware.cpuPkg"]["0"]["busHz"]) if "hardware.biosInfo" in data: - node = inv_tree("hardware.bios.") + node = inv_tree("software.bios.") node["version"] = data["hardware.biosInfo"]["biosVersion"] try: diff --git a/inventory/solaris_prtdiag b/inventory/solaris_prtdiag index 01fb8f1..eb4c28f 100644 --- a/inventory/solaris_prtdiag +++ b/inventory/solaris_prtdiag @@ -89,7 +89,7 @@ def inv_solaris_prtdiag(info): for line in info: if line[0].startswith('OBP'): - node = inv_tree("hardware.bios.") + node = inv_tree("software.bios.") bios_info = line[0].split() node["version"] = "%s %s" % (bios_info[0], bios_info[1]) formated_date = bios_info[2] + bios_info[3] diff --git a/inventory/win_bios b/inventory/win_bios index 1c5bd03..fe15827 100644 --- a/inventory/win_bios +++ b/inventory/win_bios @@ -38,7 +38,7 @@ def inv_win_bios(info): - node = inv_tree("hardware.bios.") + node = inv_tree("software.bios.") smbios_version = "" bios_version = "" for line in info:

5 years, 8 months

prtconf: inventory: write firmware info to firmeware node

by Moritz Kiemer

Module: check_mk Branch: master Commit: adf4d1f869f3e8263a478f4418ee6cb24854c70f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adf4d1f869f3e8… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jan 11 15:21:48 2019 +0100 prtconf: inventory: write firmware info to firmeware node Change-Id: I7db227582f76fcdd0cbcf459c6581549bfed55f8 --- cmk/gui/plugins/views/inventory.py | 3 +++ inventory/prtconf | 32 +++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 8d3f142..f487ab4 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -921,6 +921,9 @@ inventory_displayhints.update({ ".hardware.nwadapter:*.ipv6_subnet": {"title": _("IPv6 Subnet")}, ".hardware.nwadapter:*.gateway": {"title": _("Gateway")}, ".software.": {"title": _("Software"), "icon": "software"}, + ".software.firmware.vendor": {"title": _("Vendor")}, + ".software.firmware.version": {"title": _("Version")}, + ".software.firmware.platform_level": {"title": _("Platform Firmware level")}, ".software.os.": {"title": _("Operating System")}, ".software.os.name": {"title": _("Name"), "short": _("Operating System")}, ".software.os.version": {"title": _("Version")}, diff --git a/inventory/prtconf b/inventory/prtconf index 960e32d..8c4cc6d 100644 --- a/inventory/prtconf +++ b/inventory/prtconf @@ -57,19 +57,25 @@ def parse_prtconf(info): if line[0].startswith("========="): break # ignore the rest of the output currently if len(line) == 2: - varname = line[0] - value = line[1].strip() - parsed[varname] = value + k, v = line + parsed[k] = v.strip() return parsed +def _split_vendor(string): + if string.upper().startswith("IBM"): + return "IBM", string[3:].lstrip('., -/') + return "", string + + def inv_prtconf(info, inventory_tree): parsed = parse_prtconf(info) cpu_dict = inventory_tree.get_dict("hardware.cpu.") sys_dict = inventory_tree.get_dict("hardware.system.") mem_dict = inventory_tree.get_dict("hardware.memory.") + fmw_dict = inventory_tree.get_dict("software.firmware.") cpu_type = parsed.get("CPU Type") if cpu_type is not None: @@ -94,19 +100,23 @@ def inv_prtconf(info, inventory_tree): fw_version = parsed.get("Firmware Version") if fw_version is not None: - bios_dict = inventory_tree.get_dict("hardware.bios.") - bios_dict["version"] = fw_version - if fw_version.startswith("IBM"): - bios_dict["vendor"] = "IBM" - sys_dict["manufacturer"] = "IBM" + vendor, fmw_dict["version"] = _split_vendor(fw_version) + if vendor: + fmw_dict["vendor"] = vendor + + fw_platform_level = parsed.get("Platform Firmware level") + if fw_platform_level is not None: + fmw_dict["platform_level"] = fw_platform_level serial = parsed.get("Machine Serial Number") if serial is not None: sys_dict["serial"] = serial - product = parsed.get("System Model") - if product is not None: - sys_dict["product"] = product + model = parsed.get("System Model") + if model is not None: + manufacturer, sys_dict["product"] = _split_vendor(model) + if manufacturer: + sys_dict["manufacturer"] = manufacturer ram = parsed.get("Memory Size") if ram is not None:

5 years, 8 months

Add missing type declaration

by Lars Michelsen

Module: check_mk Branch: master Commit: 649a84189ab9332489754de3d13070220dfefb8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=649a84189ab933… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 14 07:58:01 2019 +0100 Add missing type declaration Change-Id: I1e77ffc0540bf626123736d0cfabdb1b8af78b06 --- cmk/gui/plugins/wato/utils/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index dab6926..1d66b5f 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -33,6 +33,7 @@ import json import re import subprocess import time +from typing import Dict # pylint: disable=unused-import import six @@ -1922,7 +1923,7 @@ def register_hook(name, func): hooks.register_from_plugin(name, func) -_notification_parameters = {} +_notification_parameters = {} # type: Dict[str, Dict] def get_notification_parameters():

5 years, 8 months

Add test for the new no-history option

by Lars Michelsen

Module: check_mk Branch: master Commit: d86a1be083c6aa996973d7f2761018b78d7ea7c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d86a1be083c6aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 14 07:40:14 2019 +0100 Add test for the new no-history option Change-Id: I0cbfa440630fb68f0aeed3cf6d8f6be124564e72 --- tests/integration/bin/test_mkbackup.py | 36 ++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/tests/integration/bin/test_mkbackup.py b/tests/integration/bin/test_mkbackup.py index 17bc584..0ebacb8 100644 --- a/tests/integration/bin/test_mkbackup.py +++ b/tests/integration/bin/test_mkbackup.py @@ -3,19 +3,26 @@ import subprocess import re import os +import tarfile +import fnmatch import lockfile # type: ignore import pytest # type: ignore from testlib import web # pylint: disable=unused-import -(a)pytest.fixture(scope="function") -def test_cfg(web, site, tmpdir): +(a)pytest.fixture() +def backup_path(tmpdir): backup_path = '%s/backup' % tmpdir if not os.path.exists(backup_path): os.makedirs(backup_path) + return backup_path + + +(a)pytest.fixture(scope="function") +def test_cfg(web, site, backup_path): cfg = { 'jobs': { 'testjob': { @@ -25,6 +32,14 @@ def test_cfg(web, site, tmpdir): 'target': 'test-target', 'title': u'T\xe4stjob', }, + 'testjob-no-history': { + 'no_history': True, + 'compress': False, + 'encrypt': None, + 'schedule': None, + 'target': 'test-target', + 'title': u'T\xe4stjob no history', + }, 'testjob-compressed': { 'compress': True, 'encrypt': None, @@ -215,3 +230,20 @@ def test_mkbackup_encrypted_backup_and_restore(site, test_cfg): def test_mkbackup_compressed_backup_and_restore(site, test_cfg): backup_id = _execute_backup(site, job_id="testjob-compressed") _execute_restore(site, backup_id) + + +def test_mkbackup_no_history_backup_and_restore(site, test_cfg, backup_path): + backup_id = _execute_backup(site, job_id="testjob-no-history") + + tar_path = os.path.join(backup_path, backup_id, "site-%s.tar" % site.id) + + member_names = [m.name for m in tarfile.open(tar_path).getmembers()] + history = [n for n in member_names if fnmatch.fnmatch(n, "*/var/check_mk/core/archive/*")] + logs = [n for n in member_names if fnmatch.fnmatch(n, "*/var/log/*.log")] + rrds = [n for n in member_names if n.endswith(".rrd")] + + assert not history, history + assert not rrds, rrds + assert not logs, logs + + _execute_restore(site, backup_id)

5 years, 8 months

Cleanup test file

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a36ad188ff1e33f3b6ab3e18b5b81891bc89b69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a36ad188ff1e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 14 07:35:28 2019 +0100 Cleanup test file Change-Id: Id389d7cf27b2cae68fbe0b080a068d58d3766276 --- tests/integration/bin/test_mkbackup.py | 39 +++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/tests/integration/bin/test_mkbackup.py b/tests/integration/bin/test_mkbackup.py index c6b9024..17bc584 100644 --- a/tests/integration/bin/test_mkbackup.py +++ b/tests/integration/bin/test_mkbackup.py @@ -1,12 +1,13 @@ # encoding: utf-8 -import pytest import subprocess import re import os -import lockfile +import lockfile # type: ignore +import pytest # type: ignore + +from testlib import web # pylint: disable=unused-import -from testlib import web, repo_path @pytest.fixture(scope="function") def test_cfg(web, site, tmpdir): @@ -44,8 +45,7 @@ def test_cfg(web, site, tmpdir): 'remote': ('local', { 'is_mountpoint': False, 'path': backup_path - } - ), + }), 'title': u't\xe4rget' }, }, @@ -82,7 +82,8 @@ def _execute_backup(site, job_id="testjob"): with BackupLock(): # Perform the backup p = site.execute(["mkbackup", "backup", job_id], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) stdout, stderr = p.communicate() assert stderr == "" assert p.wait() == 0 @@ -90,18 +91,21 @@ def _execute_backup(site, job_id="testjob"): # Check successful backup listing p = site.execute(["mkbackup", "list", "test-target"], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) stdout, stderr = p.communicate() assert stderr == "" assert p.wait() == 0 - assert ("%s-complete" % job_id.replace("-", "+")) in stdout + assert "%s-complete" % job_id.replace("-", "+") in stdout if job_id == "testjob-encrypted": assert "C0:4E:D4:4B:B4:AB:8B:3F:B4:09:32:CE:7D:A6:CF:76" in stdout # Extract and return backup id print stdout - matches = re.search("Backup-ID:\s+(Check_MK-[a-zA-Z0-9_+\.-]+-%s-complete)" % job_id.replace("-", "\+"), stdout) + matches = re.search( + r"Backup-ID:\s+(Check_MK-[a-zA-Z0-9_+\.-]+-%s-complete)" % job_id.replace("-", "\\+"), + stdout) assert matches is not None backup_id = matches.groups()[0] @@ -111,14 +115,15 @@ def _execute_backup(site, job_id="testjob"): def _execute_restore(site, backup_id, env=None): with BackupLock(): p = site.execute(["mkbackup", "restore", "test-target", backup_id], - stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env) + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + env=env) stdout, stderr = p.communicate() assert "Restore completed" in stdout, "Invalid output: %r" % stdout assert stderr == "" assert p.wait() == 0 - #. # .--Command line--------------------------------------------------------. # | ____ _ _ _ | @@ -132,6 +137,7 @@ def _execute_restore(site, backup_id, env=None): # | functional test should be implemented in unit tests (see below). | # '----------------------------------------------------------------------' + def test_mkbackup_help(site): p = site.execute(["mkbackup"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = p.communicate() @@ -142,7 +148,7 @@ def test_mkbackup_help(site): def test_mkbackup_list_unconfigured(site): p = site.execute(["mkbackup", "list"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = p.communicate() + stderr = p.communicate()[1] assert stderr.startswith("mkbackup is not configured yet") assert p.wait() == 3 @@ -158,7 +164,8 @@ def test_mkbackup_list_targets(site, test_cfg): def test_mkbackup_list_backups(site, test_cfg): p = site.execute(["mkbackup", "list", "test-target"], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) stdout, stderr = p.communicate() assert stderr == "" assert p.wait() == 0 @@ -167,8 +174,7 @@ def test_mkbackup_list_backups(site, test_cfg): def test_mkbackup_list_backups_invalid_target(site, test_cfg): - p = site.execute(["mkbackup", "list", "xxx"], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p = site.execute(["mkbackup", "list", "xxx"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = p.communicate() assert stderr.startswith("This backup target does not exist") assert p.wait() == 3 @@ -176,8 +182,7 @@ def test_mkbackup_list_backups_invalid_target(site, test_cfg): def test_mkbackup_list_jobs(site, test_cfg): - p = site.execute(["mkbackup", "jobs"], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p = site.execute(["mkbackup", "jobs"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = p.communicate() assert stderr == "" assert p.wait() == 0

5 years, 8 months

Do not purge windows agent during integration test after 03487505

by Lars Michelsen

Module: check_mk Branch: master Commit: 5798b9a48c53c10c7f85a972efdc816239a90947 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5798b9a48c53c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jan 13 19:13:39 2019 +0100 Do not purge windows agent during integration test after 03487505 Change-Id: Iad27599dbe7407b551e0a4684bca9adf30779379 --- agents/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/.f12 b/agents/.f12 index 0d0c278..4c77e05 100755 --- a/agents/.f12 +++ b/agents/.f12 @@ -5,7 +5,7 @@ SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} ROOT=/omd/sites/$SITE -sudo rsync -varx --delete --exclude=.f12* --exclude=.gitignore --exclude=baked* ./ $ROOT/share/check_mk/agents/ +sudo rsync -varx --delete --exclude=.f12* --exclude windows --exclude=.gitignore --exclude=baked* ./ $ROOT/share/check_mk/agents/ if [ -e /etc/check_mk ]; then sudo install -m 644 cfg_examples/logwatch.cfg /etc/check_mk/ fi

5 years, 8 months

← Newer
1
...
26
27
28
29
30
31
32
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019