Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

Execute sed version replacements in separate commands

by Lars Michelsen

Module: check_mk Branch: master Commit: 3aebc46bfa001eb1f7c08ca1bf06682624c48932 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3aebc46bfa001e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 14 11:34:28 2018 +0100 Execute sed version replacements in separate commands Change-Id: I0b61029f396c3bc3520b4b59a058868891074257 --- tests/testlib/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d10eb91..2a75d08 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -492,8 +492,11 @@ class Site(object): execute("sudo /bin/cp -pr %s %s" % (src_path, self.version.version_path())) - execute("sudo sed -i \"s|%s|%s|g\" %s/bin/omd %s/share/omd/omd.info" % - (src_version, new_version_name, self.version.version_path(), self.version.version_path())) + execute("sudo sed -i \"s|%s|%s|g\" %s/bin/omd" % + (src_version, new_version_name, self.version.version_path())) + + execute("sudo sed -i \"s|%s|%s|g\" %s/share/omd/omd.info" % + (src_version, new_version_name, self.version.version_path())) # we should use self.version.version_path() in the RPATH, but that is limited to # 32 bytes and our versions exceed this limit. We need to use some hack to make

6 years, 6 months

Also patch omd version in omd.info file

by Lars Michelsen

Module: check_mk Branch: master Commit: b62b25d95056c02a860a89b62e8ecee3d560c54e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b62b25d95056c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 14 11:31:16 2018 +0100 Also patch omd version in omd.info file Change-Id: Ic99928d91e2b26f571b15cf4a55b7356cc0ee3d6 --- tests/testlib/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 88589ee..d10eb91 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -492,8 +492,8 @@ class Site(object): execute("sudo /bin/cp -pr %s %s" % (src_path, self.version.version_path())) - execute("sudo sed -i \"s|%s|%s|g\" %s/bin/omd" % - (src_version, new_version_name, self.version.version_path())) + execute("sudo sed -i \"s|%s|%s|g\" %s/bin/omd %s/share/omd/omd.info" % + (src_version, new_version_name, self.version.version_path(), self.version.version_path())) # we should use self.version.version_path() in the RPATH, but that is limited to # 32 bytes and our versions exceed this limit. We need to use some hack to make

6 years, 6 months

Fixed test environment setting

by Lars Michelsen

Module: check_mk Branch: master Commit: 96375043093bda78984c581cb6e88a51b1c62757 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96375043093bda… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 14 10:43:04 2018 +0100 Fixed test environment setting Change-Id: Ifb3ce565fad05fa187ec4273e8e013fb81e6e16e --- tests/testlib/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 3af7fa7..88589ee 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -750,11 +750,15 @@ class Site(object): # Check_MK is now the site, so all tests that somehow rely on the environment should be # executed this way. def switch_to_site_user(self): - env_var_str = "VERSION='%s' " % self.version._version + env_vars = { + "VERSION": self.version._version, + } for varname in [ "WORKSPACE", "PYTEST_ADDOPTS", "BANDIT_OUTPUT_ARGS", "SHELLCHECK_OUTPUT_ARGS", "PYLINT_ARGS"]: if varname in os.environ: - env_var_str = "%s='%s' " % (varname, os.environ[varname]) + env_vars[varname] = os.environ[varname] + env_var_str = " ".join([ "%s=%s" % (k, pipes.quote(v)) + for k, v in env_vars.items() ]) + " " cmd = env_var_str + subprocess.list2cmdline(["python"] + sys.argv + [ cmk_path() + "/tests" ]) args = [ "/usr/bin/sudo", "--", "/bin/su", "-l", self.id, "-c", cmd ]

6 years, 6 months

5903 FIX Improved handling of CTRL+C in some situations

by Lars Michelsen

Module: check_mk Branch: master Commit: 646295da7824c5fa75e9f61381192181cb91fe7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=646295da7824c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 14 08:27:17 2018 +0100 5903 FIX Improved handling of CTRL+C in some situations When performing longer interactive tasks, e.g. during checking, the interrupt of users (CTRL+C) was not handled in a good way in some prominent places. Change-Id: I2d934cf9e2122dfdf2ba1d4ccd0088e1e7a81944 --- .werks/5903 | 12 ++++++++++++ bin/check_mk | 26 +++++++++++++------------- cmk_base/checks.py | 8 +++++++- cmk_base/data_sources/abstract.py | 6 +++++- cmk_base/data_sources/tcp.py | 4 ++++ 5 files changed, 41 insertions(+), 15 deletions(-) diff --git a/.werks/5903 b/.werks/5903 new file mode 100644 index 0000000..f23d0a6 --- /dev/null +++ b/.werks/5903 @@ -0,0 +1,12 @@ +Title: Improved handling of CTRL+C in some situations +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521012379 +Class: fix + +When performing longer interactive tasks, e.g. during checking, the +interrupt of users (CTRL+C) was not handled in a good way in some +prominent places. diff --git a/bin/check_mk b/bin/check_mk index 3591bd7..f071448 100755 --- a/bin/check_mk +++ b/bin/check_mk @@ -75,20 +75,20 @@ except getopt.GetoptError, err: # First load the general modifying options modes.process_general_options(opts) -# At least in case the config is needed, the checks are needed too, because -# the configuration may refer to check config variable names. -if len(set.intersection(set(modes.non_checks_options()), - [o[0] for o in opts])) == 0: - checks.load() - -# Read the configuration files (main.mk, autochecks, etc.), but not for -# certain operation modes that does not need them and should not be harmed -# by a broken configuration -if len(set.intersection(set(modes.non_config_options()), - [o[0] for o in opts])) == 0: - config.load() - try: + # At least in case the config is needed, the checks are needed too, because + # the configuration may refer to check config variable names. + if len(set.intersection(set(modes.non_checks_options()), + [o[0] for o in opts])) == 0: + checks.load() + + # Read the configuration files (main.mk, autochecks, etc.), but not for + # certain operation modes that does not need them and should not be harmed + # by a broken configuration + if len(set.intersection(set(modes.non_config_options()), + [o[0] for o in opts])) == 0: + config.load() + # Now find the requested mode and execute it done, exit_status = False, 0 for o, a in opts: diff --git a/cmk_base/checks.py b/cmk_base/checks.py index f99fa80..134d6ec 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -31,7 +31,7 @@ import ast from collections import OrderedDict import cmk.paths -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTerminate import cmk_base import cmk_base.utils @@ -152,6 +152,9 @@ def load_checks(filelist): execfile(f, check_context) loaded_files.add(file_name) + except MKTerminate: + raise + except Exception, e: console.error("Error in plugin file %s: %s\n", f, e) if cmk.debug.enabled(): @@ -246,6 +249,9 @@ def load_check_includes(check_file_path, check_context): include_file_path = check_include_file_path(include_file_name) try: execfile(include_file_path, check_context) + except MKTerminate: + raise + except Exception, e: console.error("Error in check include file %s: %s\n", include_file_path, e) if cmk.debug.enabled(): diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 2fa932b..c30b54c 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -35,7 +35,7 @@ import cmk.paths import cmk.store as store import cmk.tty as tty import cmk.cpu_tracking as cpu_tracking -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTerminate import cmk_base.utils import cmk_base.console as console @@ -135,6 +135,10 @@ class DataSource(object): self._host_sections = host_sections return host_sections + + except MKTerminate: + raise + except Exception, e: self._logger.verbose("ERROR: %s" % e) if cmk.debug.enabled(): diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index 2fe0a20..085fcc2 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -30,6 +30,7 @@ import socket import subprocess import cmk.debug +from cmk.exceptions import MKTerminate import cmk_base.console as console import cmk_base.config as config @@ -117,6 +118,9 @@ class TCPDataSource(CheckMKAgentDataSource): output.append(data) else: break + except MKTerminate: + raise + except socket.error, e: if cmk.debug.enabled(): raise

6 years, 6 months

Hand over new needed vars to site processes

by Lars Michelsen

Module: check_mk Branch: master Commit: 19971dbd1c58899794c6ebf5dc3718959d0de65f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19971dbd1c5889… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 14 08:55:46 2018 +0100 Hand over new needed vars to site processes Change-Id: I153daf756eb82be6fb4aaf07f8e21a0fe8ebdcd1 --- tests/testlib/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 560e6a0..3af7fa7 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -751,8 +751,10 @@ class Site(object): # executed this way. def switch_to_site_user(self): env_var_str = "VERSION='%s' " % self.version._version - if "WORKSPACE" in os.environ: - env_var_str = "WORKSPACE='%s' " % os.environ["WORKSPACE"] + for varname in [ "WORKSPACE", "PYTEST_ADDOPTS", "BANDIT_OUTPUT_ARGS", "SHELLCHECK_OUTPUT_ARGS", "PYLINT_ARGS"]: + if varname in os.environ: + env_var_str = "%s='%s' " % (varname, os.environ[varname]) + cmd = env_var_str + subprocess.list2cmdline(["python"] + sys.argv + [ cmk_path() + "/tests" ]) args = [ "/usr/bin/sudo", "--", "/bin/su", "-l", self.id, "-c", cmd ]

6 years, 6 months

CI jobs now execute tests using 1:1 make targets

by Lars Michelsen

Module: check_mk Branch: master Commit: 94f024d8698c39004fef8bf80f0c9b87fbcf3cbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94f024d8698c39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 13 20:10:32 2018 +0100 CI jobs now execute tests using 1:1 make targets * The CI specific make targets have been removed CI specific arguments are set via environment variables. * Developers may now call these commands to run the tests that CI is executing locally: make test-integration -> run Integrationstests job make test-pylint -> run pylint job make test-gui-crawl -> run GUI crawl job make test-bandit -> run bandit job make test-shellcheck -> run shellcheck job Change-Id: Id1247709396f37811f651c7c244a942c8d510222 --- tests/Makefile | 47 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 88a1dac..3dacf87 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,32 +1,31 @@ SHELL=/bin/bash -e -.PHONY: help test test-pylint test-pylint-ci test-bandit test-bandit-ci \ - test-shellcheck test-shellcheck-ci setup format test-mypy \ +.PHONY: help test-pylint test-integration test-gui-crawl \ + test-bandit test-shellcheck setup format test-mypy \ test-pylint-simple help: - @echo "test - Run integration and git tests" + @echo "setup - Install dependencies" + @echo "test-integration - Run integration tests" @echo "test-pylint - Run pylint based tests" - @echo "test-pylint-ci - Run pylint based tests from Jenkins" + @echo "test-gui-crawl - Run GUI crawl test" @echo "test-bandit - Run bandit (security) tests" - @echo "test-bandit-ci - Run bandit (security) tests from Jenkins" @echo "test-shellcheck - Run shellcheck tests" - @echo "test-shellcheck-ci - Run shellcheck tests from Jenkins" - @echo "setup - Install dependencies" -test: - py.test +test-integration: + py.test \ + -m "not pylint and not packaging and not git and not html_gentest and not gui_crawl" \ + -s \ + -vv -test-pylint: - py.test -m pylint + +test-gui-crawl: + py.test -s -m gui_crawl -# HACK: We check the manual pages here, too... -test-pylint-ci: - export TERM="linux" ; \ - export PYLINT_ARGS="--output-format=cmk_parseable" ; \ - $(MAKE) test-pylint +test-pylint: + py.test -m pylint test-bandit: @@ -38,7 +37,7 @@ test-bandit: -c "$$CMK_DIR/bandit.yaml" \ -r \ -lll \ - $(OUTPUT_ARGS) \ + $(BANDIT_OUTPUT_ARGS) \ "$$CMK_DIR" \ $$(grep -l python "$$CMK_DIR"/bin/*) \ "$$CMK_DIR"/{checks,inventory}/* \ @@ -47,27 +46,15 @@ test-bandit: "$$ENTERPRISE_DIR"/agents/bakery/* -test-bandit-ci: - OUTPUT_ARGS="-f xml -o \"$$WORKDIR/bandit_results.xml\"" \ - $(MAKE) test-bandit || true - - test-shellcheck: @CMK_DIR="$(realpath ..)" ; \ ENTERPRISE_DIR="$(realpath ../enterprise)" ; \ shellcheck \ - $(OUTPUT_ARGS) \ + $(SHELLCHECK_OUTPUT_ARGS) \ $$(grep -l '^#!/.*sh' $$CMK_DIR/agents/* $$CMK_DIR/agents/plugins/* $$CMK_DIR/agents/special/* 2>/dev/null) \ "$$ENTERPRISE_DIR/agents/mk-remote-alert-handler" -test-shellcheck-ci: - OUTPUT_ARGS="-f gcc" \ - REDIRECT="$$WORKDIR/results.xml" \ - $(MAKE) test-shellcheck || true - - - setup: sudo apt-get install \ python-pip \

6 years, 6 months

Refactored internal helper variable names

by Lars Michelsen

Module: check_mk Branch: master Commit: 313877ab651c39327c70b60ba939654eea2d2d6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=313877ab651c39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 13 18:15:04 2018 +0100 Refactored internal helper variable names Change-Id: If1a20bd6cd5a5415fb55a2fbe87adbdc132e043c --- cmk_base/inventory.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 1126979..dd57b4f 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -54,9 +54,9 @@ import cmk_base.discovery as discovery import cmk_base.ip_lookup as ip_lookup import cmk_base.data_sources as data_sources -inventory_output_dir = cmk.paths.var_dir + "/inventory" -inventory_archive_dir = cmk.paths.var_dir + "/inventory_archive" -status_data_dir = cmk.paths.tmp_dir + "/status_data" +_inventory_output_dir = cmk.paths.var_dir + "/inventory" +_inventory_archive_dir = cmk.paths.var_dir + "/inventory_archive" +_status_data_dir = cmk.paths.tmp_dir + "/status_data" #. # .--Inventory-----------------------------------------------------------. @@ -71,8 +71,8 @@ status_data_dir = cmk.paths.tmp_dir + "/status_data" # '----------------------------------------------------------------------' def do_inv(hostnames): - _ensure_directory(inventory_output_dir) - _ensure_directory(inventory_archive_dir) + _ensure_directory(_inventory_output_dir) + _ensure_directory(_inventory_archive_dir) for hostname in hostnames: console.section_begin(hostname) @@ -121,7 +121,7 @@ def do_inv_check(hostname, options): status = max(status, _inv_sw_missing) if old_timestamp: - path = "%s/%s/%d" % (inventory_archive_dir, hostname, old_timestamp) + path = "%s/%s/%d" % (_inventory_archive_dir, hostname, old_timestamp) old_tree = StructuredDataTree().load_from(path) if not old_tree.is_equal(inventory_tree, edges=["software"]): @@ -299,11 +299,11 @@ def inv_tree_list(path): # TODO Remove one day. Deprecated with version 1.5.0i3? def _save_inventory_tree(hostname, inventory_tree): - if not os.path.exists(inventory_output_dir): - os.makedirs(inventory_output_dir) + if not os.path.exists(_inventory_output_dir): + os.makedirs(_inventory_output_dir) old_time = None - filepath = inventory_output_dir + "/" + hostname + filepath = _inventory_output_dir + "/" + hostname if inventory_tree: old_tree = StructuredDataTree().load_from(filepath) if old_tree.is_equal(inventory_tree): @@ -314,11 +314,11 @@ def _save_inventory_tree(hostname, inventory_tree): else: console.verbose("Inventory tree has changed\n") old_time = os.stat(filepath).st_mtime - arcdir = "%s/%s" % (inventory_archive_dir, hostname) + arcdir = "%s/%s" % (_inventory_archive_dir, hostname) if not os.path.exists(arcdir): os.makedirs(arcdir) os.rename(filepath, arcdir + ("/%d" % old_time)) - inventory_tree.save_to(inventory_output_dir, hostname) + inventory_tree.save_to(_inventory_output_dir, hostname) else: if os.path.exists(filepath): # Remove empty inventory files. Important for host inventory icon @@ -330,12 +330,12 @@ def _save_inventory_tree(hostname, inventory_tree): def _save_status_data_tree(hostname, status_data_tree): - if not os.path.exists(status_data_dir): - os.makedirs(status_data_dir) + if not os.path.exists(_status_data_dir): + os.makedirs(_status_data_dir) - filepath = "%s/%s" % (status_data_dir, hostname) + filepath = "%s/%s" % (_status_data_dir, hostname) if status_data_tree and not status_data_tree.is_empty(): - status_data_tree.save_to(status_data_dir, hostname) + status_data_tree.save_to(_status_data_dir, hostname) else: if os.path.exists(filepath): # Remove empty status data files.

6 years, 6 months

Improved exception handling of IPMI data source; A bit refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 967e5a174581023010bd7e817aae5b63ed2bf020 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=967e5a17458102… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 9 09:27:05 2018 +0100 Improved exception handling of IPMI data source; A bit refactoring Change-Id: I861e20f4c6478912c840fc5184db43f096232179 --- cmk_base/data_sources/ipmi.py | 48 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/cmk_base/data_sources/ipmi.py b/cmk_base/data_sources/ipmi.py index 07aca2e..b1e148f 100644 --- a/cmk_base/data_sources/ipmi.py +++ b/cmk_base/data_sources/ipmi.py @@ -24,15 +24,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import pyghmi.ipmi.command as ipmi_cmd +import pyghmi.ipmi.sdr as ipmi_sdr +import pyghmi.constants as ipmi_const +from pyghmi.exceptions import IpmiException + +import cmk.debug + import cmk_base.config as config import cmk_base.checks as checks +from cmk_base.exceptions import MKAgentError from .abstract import CheckMKAgentDataSource, ManagementBoardDataSource -import pyghmi.ipmi.command as ipmi_cmd -import pyghmi.ipmi.sdr as ipmi_sdr -import pyghmi.constants as ipmi_const - class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataSource): @@ -61,19 +65,41 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS def _execute(self): + try: + connection = self._create_ipmi_connection() + + output = "" + output += self._fetch_ipmi_sensors_section(connection) + output += self._fetch_ipmi_firmware_section(connection) + + return output + except Exception, e: + if cmk.debug.enabled(): + raise + + # Improve bad exceptions thrown by pyghmi e.g. in case of connection issues + if type(e) == IpmiException and "%s" % e == "None": + raise MKAgentError("IPMI communication failed") + else: + raise + + + def _create_ipmi_connection(self): # Do not use the (custom) ipaddress for the host. Use the management board # address instead credentials = self._credentials() - cmd = ipmi_cmd.Command(bmc=self._ipaddress, + return ipmi_cmd.Command(bmc=self._ipaddress, userid=credentials["username"], password=credentials["password"]) + + def _fetch_ipmi_sensors_section(self, connection): self._logger.debug("[%s] Fetching sensor data via UDP from %s:623" % (self.id(), self._ipaddress)) - sdr = ipmi_sdr.SDR(cmd) + sdr = ipmi_sdr.SDR(connection) sensors = [] for number in sdr.get_sensor_numbers(): - rsp = cmd.raw_command(command=0x2d, netfn=4, data=(number,)) + rsp = connection.raw_command(command=0x2d, netfn=4, data=(number,)) if 'error' in rsp: continue @@ -108,10 +134,14 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS output = "<<<mgmt_ipmi_sensors:sep(124)>>>\n" \ + "".join([ "|".join(sensor) + "\n" for sensor in sensors ]) + return output + + + def _fetch_ipmi_firmware_section(self, connection): self._logger.debug("[%s] Fetching firmware information via UDP from %s:623" % (self.id(), self._ipaddress)) - output += "<<<mgmt_ipmi_firmware:sep(124)>>>\n" - for entity_name, attributes in cmd.get_firmware(): + output = "<<<mgmt_ipmi_firmware:sep(124)>>>\n" + for entity_name, attributes in connection.get_firmware(): for attribute_name, value in attributes.items(): output += "%s|%s|%s\n" % (entity_name, attribute_name, value)

6 years, 6 months

5896 FIX Improved output of Check_MK services

by Lars Michelsen

Module: check_mk Branch: master Commit: 496c3aa029919822c82e24ec0a59bd392abd81ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=496c3aa0299198… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 9 08:34:33 2018 +0100 5896 FIX Improved output of Check_MK services <ul> <li>The result of the different data sources was not visible to the user in the Check_MK service.</li> <li>The Check_MK service is now showing individual status information about each data source (e.g. the agent version).</li> <li>The Check_MK HW/SW Inventory and Check_MK Discovery services are only showing data source related details in case a problem happened for a data source.</li> </ul> Change-Id: I2802cb140f2dd452366bbc259c2e9d5ea1db67be --- .werks/5896 | 23 +++++ cmk_base/automations/check_mk.py | 12 ++- cmk_base/checking.py | 175 +++++++++--------------------------- cmk_base/data_sources/__init__.py | 44 +-------- cmk_base/data_sources/abstract.py | 178 +++++++++++++++++++++++++++++++++++-- cmk_base/data_sources/ipmi.py | 16 ++++ cmk_base/data_sources/piggyback.py | 5 ++ cmk_base/data_sources/programs.py | 2 +- cmk_base/data_sources/tcp.py | 4 +- cmk_base/discovery.py | 83 +++++++++-------- cmk_base/exceptions.py | 10 +-- cmk_base/inventory.py | 108 +++++++++++----------- cmk_base/modes/check_mk.py | 17 ++-- cmk_base/utils.py | 2 - tests/cmk_base/test_modes.py | 23 ++--- 15 files changed, 386 insertions(+), 316 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=496c3aa029…

6 years, 6 months

Fixed broken error message

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ffdea6e098a22e56e3d31f7701e217ae4cc5569 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ffdea6e098a22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 9 10:01:08 2018 +0100 Fixed broken error message Change-Id: I5923c6de9b478668ef7c4fb2862298ea269e0449 --- cmk_base/discovery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index d934b9c..5cfd726 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -746,7 +746,7 @@ def gather_snmp_check_plugin_names(access_data, on_error, do_snmp_scan, for_inve if on_error == "raise": raise elif on_error == "warn": - console.error("SNMP scan failed: %s" % e) + console.error("SNMP scan failed: %s\n" % e) return list(check_plugin_names)

6 years, 6 months

← Newer
1
...
14
15
16
17
18
19
20
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018