Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

5742 windows_tasks: show the hexadecimal representation of the status code

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 6c3c210261c5660be6706d99b9394c4d639d1dde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c3c210261c566… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Feb 22 16:00:48 2018 +0100 5742 windows_tasks: show the hexadecimal representation of the status code schtasks.exe used by the check plugin windows_tasks.ps1 returns a signed integer value as the last result of a task. However, the status codes (e.g. on MSDN) are usually represented as a hexadecimal value. To make it easier to lookup a status code the hexadecimal value is now shown by the check plugin. Change-Id: I591eb397c172446e7312cf43ed077227ae47cd47 --- .werks/5742 | 14 ++++++++++++++ checks/windows_tasks | 12 ++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.werks/5742 b/.werks/5742 new file mode 100644 index 0000000..11ee6cd --- /dev/null +++ b/.werks/5742 @@ -0,0 +1,14 @@ +Title: windows_tasks: show the hexadecimal representation of the status code +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519374443 +Class: feature + +schtasks.exe used by the check plugin windows_tasks.ps1 returns a signed +integer value as the last result of a task. However, the status codes +(e.g. on MSDN) are usually represented as a hexadecimal value. To make +it easier to lookup a status code the hexadecimal value is now shown by +the check plugin. diff --git a/checks/windows_tasks b/checks/windows_tasks index 20fb62f..29f5137 100644 --- a/checks/windows_tasks +++ b/checks/windows_tasks @@ -82,6 +82,8 @@ def check_windows_tasks(item, _no_params, parsed): return map_codes = { + "0": "operation completed successfully", + "1": "task containing a popup action", "267009": "currently running", "267014": "terminated by user", "267045": "queued", @@ -91,10 +93,16 @@ def check_windows_tasks(item, _no_params, parsed): data = parsed[item] last_result = data['Last Result'] + # schtasks.exe (used by the check plugin) returns a signed integer + # e.g. -2147024629. However, error codes are unsigned integers. + # To make it easier for the user to lookup the error code (e.g. on + # MSDN) we convert the negative numbers to the hexadecimal + # representation. + last_result_hex = hex(int(last_result) & 0xffffffff) if last_result in map_codes: - infotext = "Service Status: %s (%s)" % (map_codes[last_result], last_result) + infotext = "Service Status: %s (%s)" % (map_codes[last_result], last_result_hex) else: - infotext = "Service status: %s" % last_result + infotext = "Service status: Got exit code %s" % last_result_hex state = 0 if last_result not in [

6 years, 3 months

5777 FIX ucs_bladecenter_fans.temp: Made item name unique

by Simon Betz

Module: check_mk Branch: master Commit: 5351cf3c4b12e0c24883693027ddf655d5e23454 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5351cf3c4b12e0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 21 11:23:45 2018 +0100 5777 FIX ucs_bladecenter_fans.temp: Made item name unique The check plugins {{ucs_bladecenter_fans.temp}} and {{ucs_bladecenter_psu.chassis_temp}} created same item names and both use the WATO ruleset {{Temperature}}. That means that if a rule applied to a service generated by one of these check plugins, this rule automatically applied to the related one, too. No distinction was possible. You have to perform a rediscovery on the affected hosts. Performance data will be preserved. Example: ucs_bladecenter_fans.temp generated the services - Temperature Ambient Chassis 1 FAN - Temperature Ambient Chassis 2 FAN and ucs_bladecenter_psu.chassis_temp generated the services - Temperature Ambient Chassis 1 - Temperature Ambient Chassis 2 the item names were {{Ambient Chassis 1}} and {{Ambient Chassis 2}} in both cases. The temperature rule matching the sensor ID {{Ambient Chassis.*}} automatically applied to all four services. Now the item names for ucs_bladecenter_fans.temp look like - {{Ambient Chassis 1 FAN}} - {{Ambient Chassis 2 FAN}} and for ucs_bladecenter_psu.chassis_temp - {{Ambient Chassis 1}} - {{Ambient Chassis 2}} Independent rules may be created in the following order: - {{Ambient Chassis.*FAN}} - {{Ambient Chassis.*}} Change-Id: I9aaa7a23f9d09b08c3b6ef6526ac5e09185ff584 --- .werks/5777 | 44 ++++++++++++++++++++++++++++++++++++++++++++ checks/ucs_bladecenter_fans | 6 +++--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/.werks/5777 b/.werks/5777 new file mode 100644 index 0000000..d38479d --- /dev/null +++ b/.werks/5777 @@ -0,0 +1,44 @@ +Title: ucs_bladecenter_fans.temp: Made item name unique +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i4 +Date: 1521625999 +Class: fix + +The check plugins {{ucs_bladecenter_fans.temp}} and +{{ucs_bladecenter_psu.chassis_temp}} created same +item names and both use the WATO ruleset {{Temperature}}. +That means that if a rule applied to a service generated +by one of these check plugins, this rule automatically +applied to the related one, too. No distinction was possible. + +You have to perform a rediscovery on the affected hosts. +Performance data will be preserved. + +Example: +ucs_bladecenter_fans.temp generated the services +- Temperature Ambient Chassis 1 FAN +- Temperature Ambient Chassis 2 FAN + +and ucs_bladecenter_psu.chassis_temp generated the services +- Temperature Ambient Chassis 1 +- Temperature Ambient Chassis 2 + +the item names were {{Ambient Chassis 1}} and {{Ambient Chassis 2}} +in both cases. The temperature rule matching the sensor ID +{{Ambient Chassis.*}} automatically applied to all four services. + +Now the item names for +ucs_bladecenter_fans.temp look like +- {{Ambient Chassis 1 FAN}} +- {{Ambient Chassis 2 FAN}} + +and for ucs_bladecenter_psu.chassis_temp +- {{Ambient Chassis 1}} +- {{Ambient Chassis 2}} + +Independent rules may be created in the following order: +- {{Ambient Chassis.*FAN}} +- {{Ambient Chassis.*}} diff --git a/checks/ucs_bladecenter_fans b/checks/ucs_bladecenter_fans index e512bd4..fc56348 100644 --- a/checks/ucs_bladecenter_fans +++ b/checks/ucs_bladecenter_fans @@ -114,11 +114,11 @@ factory_settings["ucs_bladecenter_fans_temp_default_levels"] = { def inventory_ucs_bladecenter_fans_temp(parsed): for key, values in parsed.items(): if "AmbientTemp" in values: - yield "Ambient " + " ".join(key.split()[:2]), {} + yield "Ambient %s FAN" % " ".join(key.split()[:2]), {} def check_ucs_bladecenter_fans_temp(item, params, parsed): - sensor_item = item[8:] # drop "Ambient " + sensor_item = item[8:-4] # drop "Ambient " and " FAN" sensor_list = [] for key, values in parsed.items(): if key.startswith(sensor_item) and "AmbientTemp" in values: @@ -133,7 +133,7 @@ def check_ucs_bladecenter_fans_temp(item, params, parsed): check_info["ucs_bladecenter_fans.temp"] = { 'inventory_function' : inventory_ucs_bladecenter_fans_temp, 'check_function' : check_ucs_bladecenter_fans_temp, - 'service_description' : 'Temperature %s FAN', + 'service_description' : 'Temperature %s', 'group' : 'temperature', 'has_perfdata' : True, 'includes' : [ 'ucs_bladecenter.include', 'temperature.include' ],

6 years, 3 months

Move directoy calculations where they belong.

by Sven Panne

Module: check_mk Branch: master Commit: 61bdfbd778634d01e9a5b022791c79652f362f8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61bdfbd778634d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 21 10:41:14 2018 +0100 Move directoy calculations where they belong. Change-Id: Id1b22ff79b49e1624d10f28fd48e6f398cb63784 --- cmk/ec/export.py | 4 ++-- cmk/ec/settings.py | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index fc8f04d..47fa629 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -164,7 +164,7 @@ def rule_pack_dir(): """ Returns the default WATO directory of the Event Console. """ - return _default_settings().paths.config_dir.value / "wato" + return _default_settings().paths.rule_pack_dir.value def mkp_rule_pack_dir(): @@ -173,7 +173,7 @@ def mkp_rule_pack_dir(): Returns the default directory for rule pack exports of the Event Console. """ - return _default_settings().paths.config_dir.value / "mkp" / "rule_packs" + return _default_settings().paths.mkp_rule_pack_dir.value def read_rule_packs(context): diff --git a/cmk/ec/settings.py b/cmk/ec/settings.py index fa837c3..5ca9f7d 100644 --- a/cmk/ec/settings.py +++ b/cmk/ec/settings.py @@ -51,6 +51,8 @@ AnnotatedPath = NamedTuple( Paths = NamedTuple( 'Paths', [('main_config_file', AnnotatedPath), ('config_dir', AnnotatedPath), + ('rule_pack_dir', AnnotatedPath), + ('mkp_rule_pack_dir', AnnotatedPath), ('unix_socket', AnnotatedPath), ('event_socket', AnnotatedPath), ('event_pipe', AnnotatedPath), @@ -78,6 +80,10 @@ def _default_paths(omd_root, default_config_dir): 'main configuration', default_config_dir / 'mkeventd.mk'), config_dir=AnnotatedPath( 'configuration directory', default_config_dir / 'mkeventd.d'), + rule_pack_dir=AnnotatedPath( + 'rule pack directory', default_config_dir / 'mkeventd.d' / 'wato'), + mkp_rule_pack_dir=AnnotatedPath( + 'rule pack export directory', default_config_dir / 'mkeventd.d' / 'mkp' / 'rule_packs'), unix_socket=AnnotatedPath('Unix socket', run_dir / 'status'), event_socket=AnnotatedPath('event socket', run_dir / 'eventsocket'), event_pipe=AnnotatedPath('event pipe', run_dir / 'events'),

6 years, 3 months

Make some EC settings helper functions private.

by Sven Panne

Module: check_mk Branch: master Commit: 5372821c794d8d21e95a9ccc50c9502a0d495658 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5372821c794d8d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 21 10:32:10 2018 +0100 Make some EC settings helper functions private. Change-Id: Ic39755c4a365601dc1d4149beb1582585ecdcfc1 --- cmk/ec/export.py | 17 +++++++++++------ cmk/ec/settings.py | 8 ++++---- web/htdocs/mkeventd.py | 8 +++++--- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index 3f196e6..fc8f04d 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -150,14 +150,21 @@ class RulePackType(Enum): # pylint: disable=too-few-public-methods return RulePackType.modified_mkp +def _default_settings(): + # type: () -> cmk.ec.settings.Settings + """Returns default EC settings. This function should vanish in the long run!""" + return cmk.ec.settings.settings('', + Path(cmk.paths.omd_root), + Path(cmk.paths.default_config_dir), + ['']) + + def rule_pack_dir(): # type: () -> Path """ Returns the default WATO directory of the Event Console. """ - paths = cmk.ec.settings.default_paths(Path(cmk.paths.omd_root), - Path(cmk.paths.default_config_dir)) - return paths.config_dir.value / "wato" + return _default_settings().paths.config_dir.value / "wato" def mkp_rule_pack_dir(): @@ -166,9 +173,7 @@ def mkp_rule_pack_dir(): Returns the default directory for rule pack exports of the Event Console. """ - paths = cmk.ec.settings.default_paths(Path(cmk.paths.omd_root), - Path(cmk.paths.default_config_dir)) - return paths.config_dir.value / "mkp" / "rule_packs" + return _default_settings().paths.config_dir.value / "mkp" / "rule_packs" def read_rule_packs(context): diff --git a/cmk/ec/settings.py b/cmk/ec/settings.py index e878040..fa837c3 100644 --- a/cmk/ec/settings.py +++ b/cmk/ec/settings.py @@ -68,7 +68,7 @@ Paths = NamedTuple( ('mongodb_config_file', AnnotatedPath)]) -def default_paths(omd_root, default_config_dir): +def _default_paths(omd_root, default_config_dir): # type: (Path, Path) -> Paths """Returns all default filesystem paths related to the event console""" run_dir = omd_root / 'tmp/run/mkeventd' @@ -112,7 +112,7 @@ PortNumbers = NamedTuple( ('snmptrap_udp', PortNumber)]) -def default_port_numbers(): +def _default_port_numbers(): # type: () -> PortNumbers """Returns all port numbers related to the event console""" return PortNumbers(syslog_udp=PortNumber(514), @@ -227,8 +227,8 @@ Settings = NamedTuple( def settings(version, omd_root, default_config_dir, argv): # type: (str, Path, Path, List[str]) -> Settings """Returns all event console settings""" - paths = default_paths(omd_root, default_config_dir) - port_numbers = default_port_numbers() + paths = _default_paths(omd_root, default_config_dir) + port_numbers = _default_port_numbers() parser = ECArgumentParser(Path(argv[0]).name, version, paths, port_numbers) args = parser.parse_args(argv[1:]) options = Options( diff --git a/web/htdocs/mkeventd.py b/web/htdocs/mkeventd.py index 5301fe6..4cec8d2 100644 --- a/web/htdocs/mkeventd.py +++ b/web/htdocs/mkeventd.py @@ -155,9 +155,11 @@ def eventd_configuration(): "debug_rules": False, } - ec_paths = cmk.ec.settings.default_paths(Path(cmk.paths.omd_root), - Path(cmk.paths.default_config_dir)) - for path in [ec_paths.main_config_file.value] + sorted(ec_paths.config_dir.value.glob('**/*.mk')): + settings = cmk.ec.settings.settings('', + Path(cmk.paths.omd_root), + Path(cmk.paths.default_config_dir), + ['']) + for path in [settings.paths.main_config_file.value] + sorted(settings.paths.config_dir.value.glob('**/*.mk')): cmk.store.load_mk_file(str(path), config) cached_config = (html, config)

6 years, 3 months

cmk-update-agent: Fix Make procedure (Windows and Linux)

by Andreas Umbreit

Module: check_mk Branch: master Commit: afcd78dda70cf4323b7d850a337d1e8d4a9475a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afcd78dda70cf4… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Mar 20 16:34:35 2018 +0100 cmk-update-agent: Fix Make procedure (Windows and Linux) - Don't download sources - Fail when sources are missing (before starting the build target) - Add targets for manual download Change-Id: I1721463602c4a5567bb444be3b0fd1044d77b0ff --- agents/windows/.gitignore | 4 +- .../windows/frozen_binaries/pyinstaller-deps.make | 117 +++++++++++++-------- .../windows/frozen_binaries/src/python-2.7.12.msi | Bin 0 -> 18907136 bytes .../windows/frozen_binaries/src/vcredist_x86.exe | Bin 0 -> 4479832 bytes 4 files changed, 78 insertions(+), 43 deletions(-) diff --git a/agents/windows/.gitignore b/agents/windows/.gitignore index 72a756e..3f77551 100644 --- a/agents/windows/.gitignore +++ b/agents/windows/.gitignore @@ -16,7 +16,7 @@ testtools *.d *.o chroot -*.exe -*.msi +/*.exe +/*.msi Makefile.in junit.xml diff --git a/agents/windows/frozen_binaries/pyinstaller-deps.make b/agents/windows/frozen_binaries/pyinstaller-deps.make index 1b0530a..e46f3dd 100644 --- a/agents/windows/frozen_binaries/pyinstaller-deps.make +++ b/agents/windows/frozen_binaries/pyinstaller-deps.make @@ -1,33 +1,40 @@ -.PHONY: new_packages actual_packages - # Python 2.7.13 yields a bug concerning the LoadLibrary() function on windows, # see http://bugs.python.org/issue29082 . Use 2.7.12 instead. PYTHON_VERSION = 2.7.12 -BUILD_DIR = $(shell realpath ./../../winbuild) -PLUGINS_DIR = $(shell realpath ./../../plugins) +BUILD_DIR := $(shell realpath ./../../winbuild) +PLUGINS_DIR := $(shell realpath ./../../plugins) + +ifndef SRC_DIR # Don't overwrite SRC_DIR if specified by calling Makefile + SRC_DIR := $(shell realpath src) +endif + # This package list originates from resolving the dependencies of the packages # pyinstaller, pyopenssl, requests. The required packages are explicitly listed # in favor of providing a working setup for a pyinstaller build with python 2.7 -asn1crypto = src/pip/asn1crypto-0.22.0-py2.py3-none-any.whl -certifi = src/pip/certifi-2017.7.27.1-py2.py3-none-any.whl -cffi = src/pip/cffi-1.10.0-cp27-cp27m-win32.whl -chardet = src/pip/chardet-3.0.4-py2.py3-none-any.whl -crytography = src/pip/cryptography-2.0.3-cp27-cp27m-win32.whl -enum34 = src/pip/enum34-1.1.6-py2-none-any.whl -future = src/pip/future-0.16.0.tar.gz -idna = src/pip/idna-2.6-py2.py3-none-any.whl -ipaddress = src/pip/ipaddress-1.0.18-py2-none-any.whl -pycparser = src/pip/pycparser-2.18.tar.gz -PyInstaller = src/pip/PyInstaller-3.2.1.tar.bz2 -pyOpenSSL = src/pip/pyOpenSSL-17.2.0-py2.py3-none-any.whl -pypiwin32 = src/pip/pypiwin32-219-cp27-none-win32.whl -requests = src/pip/requests-2.18.4-py2.py3-none-any.whl -setuptools = src/pip/setuptools-36.2.7-py2.py3-none-any.whl -six = src/pip/six-1.10.0-py2.py3-none-any.whl -urllib3 = src/pip/urllib3-1.22-py2.py3-none-any.whl +# Match package names with their filenames in order to reference them +asn1crypto = $(SRC_DIR)/pip/asn1crypto-0.22.0-py2.py3-none-any.whl +certifi = $(SRC_DIR)/pip/certifi-2017.7.27.1-py2.py3-none-any.whl +cffi = $(SRC_DIR)/pip/cffi-1.10.0-cp27-cp27m-win32.whl +chardet = $(SRC_DIR)/pip/chardet-3.0.4-py2.py3-none-any.whl +crytography = $(SRC_DIR)/pip/cryptography-2.0.3-cp27-cp27m-win32.whl +enum34 = $(SRC_DIR)/pip/enum34-1.1.6-py2-none-any.whl +future = $(SRC_DIR)/pip/future-0.16.0.tar.gz +idna = $(SRC_DIR)/pip/idna-2.6-py2.py3-none-any.whl +ipaddress = $(SRC_DIR)/pip/ipaddress-1.0.18-py2-none-any.whl +pycparser = $(SRC_DIR)/pip/pycparser-2.18.tar.gz +PyInstaller = $(SRC_DIR)/pip/PyInstaller-3.2.1.tar.bz2 +pyOpenSSL = $(SRC_DIR)/pip/pyOpenSSL-17.2.0-py2.py3-none-any.whl +pypiwin32 = $(SRC_DIR)/pip/pypiwin32-219-cp27-none-win32.whl +requests = $(SRC_DIR)/pip/requests-2.18.4-py2.py3-none-any.whl +setuptools = $(SRC_DIR)/pip/setuptools-36.2.7-py2.py3-none-any.whl +six = $(SRC_DIR)/pip/six-1.10.0-py2.py3-none-any.whl +urllib3 = $(SRC_DIR)/pip/urllib3-1.22-py2.py3-none-any.whl -PYTHON_PACKAGES = \ +# This list expands to filenames and is meant to be used +# as depencencie(s). There must not be matching targets in order +# to prevent automatic download +PYTHON_PACKAGE_FILES = \ $(asn1crypto) \ $(certifi) \ $(cffi) \ @@ -46,6 +53,30 @@ PYTHON_PACKAGES = \ $(six) \ $(urllib3) +# This list is meant to be used as target(s) for manual download +PYTHON_PACKAGES = \ + asn1crypto \ + certifi \ + cffi \ + chardet \ + crytography \ + enum34 \ + future \ + idna \ + ipaddress \ + pycparser \ + PyInstaller \ + pyOpenSSL \ + pypiwin32 \ + requests \ + setuptools \ + six \ + urllib3 + +# Matching from filename to download-string. +# When used as target, the target variable +# must be extended two times in order to obtain the desired download-string. +# E.g. make PyInstaller -> pip download $($($@)) $(asn1crypto) := asn1crypto==0.22.0 $(certifi) := certifi==2017.7.27.1 $(cffi) := cffi==1.10.0 @@ -64,19 +95,20 @@ $(setuptools) := setuptools==36.2.7 $(six) := six==1.10.0 $(urllib3) := urllib3==1.22 -src/python-$(PYTHON_VERSION).msi: - mkdir -p src && \ - cd src && \ - curl -O https://www.python.org/ftp/python/$(PYTHON_VERSION)/python-$(PYTHON_VERSION… -$(BUILD_DIR)/drive_c/Python27/python.exe: src/python-$(PYTHON_VERSION).msi +$(BUILD_DIR)/drive_c/Python27/python.exe: $(SRC_DIR)/python-$(PYTHON_VERSION).msi mkdir -p $(BUILD_DIR) && \ export WINEPREFIX=$(BUILD_DIR) && \ cd $(BUILD_DIR) && \ - cp $(CURDIR)/src/python-$(PYTHON_VERSION).msi . && \ + cp $(SRC_DIR)/python-$(PYTHON_VERSION).msi . && \ wine msiexec /qn /i python-$(PYTHON_VERSION).msi && \ touch $(BUILD_DIR)/drive_c/Python27/python.exe +.PHONY: setup new_packages download_packages \ +download_vcredist download_python $(PYTHON_PACKAGES) + +download_packages: $(PYTHON_PACKAGES) + $(PYTHON_PACKAGES): $(BUILD_DIR)/drive_c/Python27/python.exe # Download needed python packages including depencencies. This has to be done # from within wine to obtain the correct win32 packages. @@ -88,21 +120,21 @@ $(PYTHON_PACKAGES): $(BUILD_DIR)/drive_c/Python27/python.exe cd $(BUILD_DIR) && \ mkdir -p pip && \ cd pip && \ - wine c:\\Python27\\python.exe -m pip download --no-deps $($@) && \ - mkdir -p $(CURDIR)/src/pip && \ - cp --no-clobber -r * $(CURDIR)/src/pip + wine c:\\Python27\\python.exe -m pip download --no-deps $($($@)) && \ + mkdir -p $(SRC_DIR)/pip && \ + cp --no-clobber -r * $(SRC_DIR)/pip -current_packages: $(PYTHON_PACKAGES) +download_python: + mkdir -p $(SRC_DIR) && \ + cd $(SRC_DIR) && \ + curl -O https://www.python.org/ftp/python/$(PYTHON_VERSION)/python-$(PYTHON_VERSION… -src/vcredist_x86.exe: - mkdir -p src && \ - cd src && \ +download_vcredist: + mkdir -p $(SRC_DIR) && \ + cd $(SRC_DIR) && \ curl -O https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966… -download_sources: src/python-$(PYTHON_VERSION).msi current_packages src/vcredist_x86.exe - -setup: - sudo apt-get install scons upx-ucl wine +download_sources: download_python download_packages download_vcredist new_packages: $(BUILD_DIR)/drive_c/Python27/python.exe # Use this target to obtain the newest versions of the needed packages. @@ -117,5 +149,8 @@ new_packages: $(BUILD_DIR)/drive_c/Python27/python.exe wine c:\\Python27\\python.exe -m pip download requests && \ wine c:\\Python27\\python.exe -m pip download pyinstaller && \ wine c:\\Python27\\python.exe -m pip download pyOpenSSL && \ - mkdir -p $(CURDIR)/src/pip && \ - cp -r * $(CURDIR)/src/pip \ No newline at end of file + mkdir -p $(SRC_DIR)/pip && \ + cp -r * $(SRC_DIR)/pip + +setup: + sudo apt-get install scons upx-ucl wine \ No newline at end of file diff --git a/agents/windows/frozen_binaries/src/python-2.7.12.msi b/agents/windows/frozen_binaries/src/python-2.7.12.msi new file mode 100644 index 0000000..c4669ec Binary files /dev/null and b/agents/windows/frozen_binaries/src/python-2.7.12.msi differ diff --git a/agents/windows/frozen_binaries/src/vcredist_x86.exe b/agents/windows/frozen_binaries/src/vcredist_x86.exe new file mode 100644 index 0000000..4170330 Binary files /dev/null and b/agents/windows/frozen_binaries/src/vcredist_x86.exe differ

6 years, 3 months

Unbreak "Recent Event History".

by Sven Panne

Module: check_mk Branch: master Commit: 66caa3a4cc2f1a27174d35af72af625e90d8a65d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66caa3a4cc2f1a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 21 09:24:56 2018 +0100 Unbreak "Recent Event History". Change-Id: I90352ba236e3b383f0abea03ae745f6dc0ec32e1 --- cmk/ec/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index c36f3ac..1e17751 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3466,9 +3466,9 @@ class StatusTableHistory(StatusTable): def _enumerate(self, query): if g_config['archive_mode'] == 'mongodb': - return get_event_history_from_mongodb(settings, query) + return get_event_history_from_mongodb(self.settings, query) else: - return get_event_history_from_file(settings, query) + return get_event_history_from_file(self.settings, query) class StatusTableRules(StatusTable):

6 years, 3 months

Log filters in a more compact form.

by Sven Panne

Module: check_mk Branch: master Commit: 163919743dcb72cb828ab00592c98d3c0e0286d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=163919743dcb72… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 20 16:49:55 2018 +0100 Log filters in a more compact form. Change-Id: I1acaac48f7281345f954456e15805fa2b082fc94 --- livestatus/src/AndingFilter.cc | 4 ++-- livestatus/src/ColumnFilter.cc | 3 +-- livestatus/src/OringFilter.cc | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index 876020e..2b7726b 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -149,7 +149,7 @@ Filters AndingFilter::conjuncts() const { std::ostream &AndingFilter::print(std::ostream &os) const { for (const auto &filter : _subfilters) { - os << *filter; + os << *filter << "\\n"; } switch (kind()) { case Kind::row: @@ -162,5 +162,5 @@ std::ostream &AndingFilter::print(std::ostream &os) const { os << "WaitConditionAnd"; break; } - return os << ": " << _subfilters.size() << "\n"; + return os << ": " << _subfilters.size(); } diff --git a/livestatus/src/ColumnFilter.cc b/livestatus/src/ColumnFilter.cc index 22dbcac..858464f 100644 --- a/livestatus/src/ColumnFilter.cc +++ b/livestatus/src/ColumnFilter.cc @@ -47,6 +47,5 @@ Filters ColumnFilter::conjuncts() const { } std::ostream &ColumnFilter::print(std::ostream &os) const { - return os << "Filter: " << columnName() << " " << oper() << " " << value() - << "\n"; + return os << "Filter: " << columnName() << " " << oper() << " " << value(); } diff --git a/livestatus/src/OringFilter.cc b/livestatus/src/OringFilter.cc index b731a94..492a48d 100644 --- a/livestatus/src/OringFilter.cc +++ b/livestatus/src/OringFilter.cc @@ -156,7 +156,7 @@ Filters OringFilter::conjuncts() const { std::ostream &OringFilter::print(std::ostream &os) const { for (const auto &filter : _subfilters) { - os << *filter; + os << *filter << "\\n"; } switch (kind()) { case Kind::row: @@ -169,5 +169,5 @@ std::ostream &OringFilter::print(std::ostream &os) const { os << "WaitConditionOr"; break; } - return os << ": " << _subfilters.size() << "\n"; + return os << ": " << _subfilters.size(); }

6 years, 3 months

Make IWYU happy again.

by Sven Panne

Module: check_mk Branch: master Commit: 3adeabbaec56e28a380363aed3d2a48d2b3d17bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3adeabbaec56e2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 20 16:54:49 2018 +0100 Make IWYU happy again. Change-Id: I65c6fb04f143e940be06fe9c4c37438560616663 --- livestatus/src/StringUtils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/src/StringUtils.h b/livestatus/src/StringUtils.h index 1a92325..2f86db4 100644 --- a/livestatus/src/StringUtils.h +++ b/livestatus/src/StringUtils.h @@ -27,6 +27,7 @@ #include "config.h" // IWYU pragma: keep #include <bitset> +#include <cstddef> #include <ostream> #include <string> #include <utility>

6 years, 3 months

Make clang-tidy happy again.

by Sven Panne

Module: check_mk Branch: master Commit: 81725f5f420fe6f3d3f961e142b1a8c6e1ed27ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81725f5f420fe6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 20 16:53:24 2018 +0100 Make clang-tidy happy again. Change-Id: I10fac1f6dc9c24985a06649105de86ddad0deae9 --- livestatus/src/Query.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index d2e8528..00a8752 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -715,7 +715,7 @@ void Query::finish(QueryRenderer &q) { std::unique_ptr<Filter> Query::partialFilter( const std::string &message, std::function<bool(const Column &)> predicate) const { - auto result = _filter->partialFilter(predicate); + auto result = _filter->partialFilter(std::move(predicate)); Debug(_logger) << "partial filter for " << message << ": " << *result; return result; }

6 years, 3 months

Updated werk level

by Lars Michelsen

Module: check_mk Branch: master Commit: 4aeca96d171e6157802339853200be6bb58a513f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aeca96d171e61… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 20 13:31:34 2018 +0100 Updated werk level Change-Id: I0f003f71e9af89652e7ce38bfb11f906019591ed --- .werks/5605 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/5605 b/.werks/5605 index 32d2204..e2f0705 100644 --- a/.werks/5605 +++ b/.werks/5605 @@ -1,5 +1,5 @@ Title: HW/SW Inventory: Status data can be integrated into HW/SW Inventory tree -Level: 1 +Level: 2 Component: inv Compatible: compat Edition: cre

6 years, 3 months

← Newer
1
...
6
7
8
9
10
11
12
...
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