Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 5fc5437bd1ea062de7ca2792e969d9c2138fb406 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fc5437bd1ea06… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 12 10:08:50 2019 +0200 Clang-formatted. Change-Id: Id89264863f97562a07616cd42182937b010dc6b3 --- agents/windows/EventLog.cc | 5 ++--- agents/windows/ModuleControl.h | 6 +++--- agents/windows/check_mk_agent.cc | 4 ++-- agents/windows/sections/SectionWMI.h | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/agents/windows/EventLog.cc b/agents/windows/EventLog.cc index 23d7ce8..b20619e 100644 --- a/agents/windows/EventLog.cc +++ b/agents/windows/EventLog.cc @@ -175,9 +175,8 @@ wstring MessageResolver::resolve(DWORD eventID, LPCWSTR source, result += parameters[i]; } } - std::replace_if( - result.begin(), result.end(), - [](wchar_t ch) { return ch == '\n' || ch == '\r'; }, ' '); + std::replace_if(result.begin(), result.end(), + [](wchar_t ch) { return ch == '\n' || ch == '\r'; }, ' '); return result; } diff --git a/agents/windows/ModuleControl.h b/agents/windows/ModuleControl.h index ff38872..f5fb175 100644 --- a/agents/windows/ModuleControl.h +++ b/agents/windows/ModuleControl.h @@ -55,11 +55,11 @@ Usage: #pragma once #define WINDOWS_LEAN_AND_MEAN -#include <windows.h> #include <sys/stat.h> -#include <string> -#include <fstream> +#include <windows.h> #include <cstdint> +#include <fstream> +#include <string> // MAIN NAMESPACE for C++ based Check MK Agents namespace cma { diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index cf43245..11760f4 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1000,8 +1000,8 @@ void addIPv6Addresses() { // copy pasted from the Environment::determineAgentDirectory // ATM Environment is absent. // ********************************************************* -// We have here here disaster: absolutely universal code -// to obtain location of our folder and plugins had been +// We have here here disaster: absolutely universal code +// to obtain location of our folder and plugins had been // closed into the Environment class and forced to use // persistent data from those class. This was quite bad idea. static const int MAX_PATH_UNICODE = 32767; diff --git a/agents/windows/sections/SectionWMI.h b/agents/windows/sections/SectionWMI.h index 801c501..24066f1 100644 --- a/agents/windows/sections/SectionWMI.h +++ b/agents/windows/sections/SectionWMI.h @@ -58,7 +58,7 @@ private: time_t _disabled_until{0}; std::unique_ptr<wmi::Helper> _helper; - std::string cached_; // last output stored here, may be reused on timeout + std::string cached_; // last output stored here, may be reused on timeout }; #endif // SectionWMI_h

5 years, 5 months

Run C++ unit test under valgrind if possible.

by Sven Panne

Module: check_mk Branch: master Commit: 9c07a3d09c3b6ebaafc5e5e897aa85a2b49207b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c07a3d09c3b6e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 12 09:26:53 2019 +0200 Run C++ unit test under valgrind if possible. Change-Id: I43bbbcac575c86023044852b2515326fce007a38 --- livestatus/src/test/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/src/test/Makefile.am b/livestatus/src/test/Makefile.am index b08b3d9..72e0d0b 100644 --- a/livestatus/src/test/Makefile.am +++ b/livestatus/src/test/Makefile.am @@ -34,6 +34,7 @@ BEAR ?= bear CPPCHECK ?= cppcheck IWYU_TOOL ?= iwyu_tool RUN_CLANG_TIDY ?= run-clang-tidy-$(CLANG_VERSION).py +VALGRIND ?= $(shell valgrind --version > /dev/null 2>&1 && echo "valgrind --quiet") GOOGLETEST :=$(top_srcdir)/omd/packages/googletest @@ -63,7 +64,7 @@ test_neb_LDADD = \ .PHONY: unit-test build_googletest unit-test: test_neb$(EXEEXT) - GTEST_OUTPUT=xml ./test_neb$(EXEEXT) + GTEST_OUTPUT=xml $(VALGRIND) ./test_neb$(EXEEXT) # NOTE: This is a bit of a hack. What we really want is a clean chroot/VM/image # where we just install our build dependencies.

5 years, 5 months

[CMK-1804] - final commit with API and Unit tests

by Sergey Kipnis

Module: check_mk Branch: master Commit: b796516a3872755032ec55c7a7d686576be9413b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b796516a387275… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Wed Apr 10 13:32:37 2019 +0200 [CMK-1804] - final commit with API and Unit tests - minimal refactoring - added test facility "-rt" - added missed realtime_port - integrated with service and test facility - changed YML file to support real time sections Change-Id: Id833863877c000f842b176349486b241f582a3fc --- agents/wnx/build_watest.cmd | 9 ++- agents/wnx/include/tools/_misc.h | 11 ++++ agents/wnx/install/resources/check_mk.yml | 2 + agents/wnx/src/common/cfg_info.h | 1 + agents/wnx/src/common/cfg_yaml.h | 2 + agents/wnx/src/engine/cfg.h | 35 ++++++++-- agents/wnx/src/engine/groups.cpp | 4 ++ agents/wnx/src/engine/realtime.cpp | 4 +- agents/wnx/src/engine/realtime.h | 6 +- agents/wnx/src/engine/service_processor.cpp | 30 +++++++++ agents/wnx/src/engine/service_processor.h | 11 +++- agents/wnx/src/engine/windows_service_api.cpp | 95 +++++++++++++++++++++++++++ agents/wnx/src/engine/windows_service_api.h | 3 +- agents/wnx/src/main/check_mk_service.cpp | 72 +++++++++++++------- agents/wnx/src/main/check_mk_service.h | 1 + agents/wnx/watest/test-realtime.cpp | 26 +++++++- agents/wnx/watest/test-yaml.cpp | 10 ++- 17 files changed, 281 insertions(+), 41 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b796516a38…

5 years, 5 months

[CMK-1804] - base and intermediate commit with API and Unit tests

by Sergey Kipnis

Module: check_mk Branch: master Commit: f075bce56f6392dd2565ed74605ecf2668edba91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f075bce56f6392… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Wed Apr 10 13:31:35 2019 +0200 [CMK-1804] - base and intermediate commit with API and Unit tests - encryption is integrated in the cma::rt::Device Change-Id: I636e3465377d9507f6d22f9f7cc00eeb6b3ed791 --- agents/wnx/include/tools/_misc.h | 2 +- agents/wnx/src/common/cfg_info.h | 4 +- agents/wnx/src/engine/encryption.cpp | 23 ++- agents/wnx/src/engine/encryption.h | 5 +- agents/wnx/src/engine/engine.vcxproj | 3 + agents/wnx/src/engine/realtime.cpp | 286 ++++++++++++++++++++++++++++++++++- agents/wnx/src/engine/realtime.h | 84 +++++++++- agents/wnx/watest/test-realtime.cpp | 206 +++++++++++++++++++++++++ 8 files changed, 600 insertions(+), 13 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f075bce56f…

5 years, 5 months

Bump tagify version

by Lars Michelsen

Module: check_mk Branch: master Commit: 3b16ba86b649a4510a0ea8ce672857a8b68382dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b16ba86b649a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 11 09:45:56 2019 +0200 Bump tagify version Change-Id: I8f1f2dbf9b25d1dd275e96219964292badcba497 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21d4f9a..ad2b462 100644 --- a/package-lock.json +++ b/package-lock.json @@ -907,9 +907,9 @@ "dev": true }, "@yaireo/tagify": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/@yaireo/tagify/-/tagify-2.15.1.tgz", - "integrity": "sha512-fi8EAna+Z6HWISbkWEEydToMgCJtdNiLWN5zzFMLCBPCGw4PCcnS0FHRY44dDCr7dDiP9CYbHzceC6rl4JZBpw==" + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/@yaireo/tagify/-/tagify-2.16.0.tgz", + "integrity": "sha512-lEsxCLqJzheTOKozn4FVbpnR5eg0cV76MPJPkKqDlbRgmSO4ZRwGRxasphwsPuhtpiot0RxIZspHCzy5NryuUA==" }, "abbrev": { "version": "1.1.1", diff --git a/package.json b/package.json index dbe3821..af4d9d6 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "webpack-fix-style-only-entries": "^0.2.0" }, "dependencies": { - "@yaireo/tagify": "^2.15.1", + "@yaireo/tagify": "^2.16.0", "jquery": "^3.3.1", "select2": "^4.0.6-rc.1" }

5 years, 5 months

Add specific visualization for labels depending on their source

by Lars Michelsen

Module: check_mk Branch: master Commit: 719ad392751e205a3599cbbc3dd24dad15e46e1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=719ad392751e20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 11 12:13:07 2019 +0200 Add specific visualization for labels depending on their source Labels can be created explicit by host config, rulesets and can be discovered automatically by Check_MK. Depending on the source of a label it is now colorized in different ways to make the origin of the label transparent to the user. We may need to work a bit on the colors. That will be the difficult part ;-). CMK-1817 Change-Id: I4c52509408159ffd97c61150126f9ea94f1863c0 --- cmk/gui/plugins/views/__init__.py | 1 + cmk/gui/plugins/views/inventory.py | 5 ++- cmk/gui/plugins/views/painters.py | 17 +++++++--- cmk/gui/plugins/views/utils.py | 8 ++++- cmk/gui/plugins/wato/builtin_attributes.py | 2 +- cmk/gui/plugins/wato/check_mk_configuration.py | 2 ++ cmk/gui/valuespec.py | 16 ++++++++-- cmk/gui/view_utils.py | 17 ++++++---- cmk/gui/wato/pages/folders.py | 7 +++- cmk/gui/wato/pages/object_parameters.py | 11 ++++--- cmk_base/automations/check_mk.py | 21 +++++++++--- cmk_base/config.py | 10 ++++++ tests/unit/cmk_base/test_config.py | 12 +++++++ tests/unit/cmk_base/test_unit_automations.py | 22 +++++++++++-- web/htdocs/themes/classic/scss/_pages.scss | 44 ++++++++++++++++++++------ web/htdocs/themes/facelift/scss/_pages.scss | 44 ++++++++++++++++++++------ 16 files changed, 193 insertions(+), 46 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=719ad39275…

5 years, 5 months

Export label sources to core

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a70d6d4bfad0bb6f5ebae94195bc98b2c0fa04e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a70d6d4bfad0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 11 09:42:07 2019 +0200 Export label sources to core Change-Id: I0935a22215e1dda06dc49c58f11b67a1ec791e2a --- cmk_base/config.py | 11 +++++++++++ cmk_base/core_config.py | 1 + tests/unit/cmk_base/test_core_config.py | 1 + 3 files changed, 13 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index 80e0a6f..ce6136d 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2730,6 +2730,7 @@ class HostConfig(object): self.tags = self._config_cache.tag_list_of_host(self.hostname) self.tag_groups = host_tags.get(hostname, {}) self.labels = self._get_host_labels() + self.label_sources = self._get_host_label_sources() # Basic types self.is_tcp_host = self._config_cache.in_binary_hostlist(hostname, tcp_hosts) @@ -2801,6 +2802,16 @@ class HostConfig(object): labels.update(host_labels.get(self.hostname, {})) return labels + def _get_host_label_sources(self): + """Returns the effective set of host label keys with their source identifier instead of the value + Order and merging logic is equal to _get_host_labels()""" + labels = {} + labels.update({k: "discovered" for k in self._discovered_labels_of_host().keys()}) + labels.update({k : "ruleset" \ + for k in self._config_cache.host_extra_conf_merged(self.hostname, host_label_rules)}) + labels.update({k: "explicit" for k in host_labels.get(self.hostname, {}).keys()}) + return labels + def _discovered_labels_of_host(self): # type: () -> Dict return DiscoveredHostLabelsStore(self.hostname).load() diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 6a258c0..1d1b7c1 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -396,6 +396,7 @@ def get_host_attributes(hostname, config_cache): attrs.update(_get_tag_attributes(config_cache.tags_of_host(hostname), "TAG")) attrs.update(_get_tag_attributes(host_config.labels, "LABEL")) + attrs.update(_get_tag_attributes(host_config.label_sources, "SOURCES")) if "alias" not in attrs: attrs["alias"] = config.alias_of(hostname, hostname) diff --git a/tests/unit/cmk_base/test_core_config.py b/tests/unit/cmk_base/test_core_config.py index ac8e444..6764bb7 100644 --- a/tests/unit/cmk_base/test_core_config.py +++ b/tests/unit/cmk_base/test_core_config.py @@ -44,6 +44,7 @@ def test_get_host_attributes(monkeypatch): '_TAGS': 'abc', '__TAG_tag_group': 'abc', '__LABEL_ding': 'dong', + '__SOURCES_ding': 'explicit', 'address': '0.0.0.0', 'alias': 'test-host', }

5 years, 5 months

Fixed select2 not working in hidden elements CMK-2001

by Lars Michelsen

Module: check_mk Branch: master Commit: adf668ba09306ba2c5987ff6444e3ea802b0289b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adf668ba09306b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 12 08:18:35 2019 +0200 Fixed select2 not working in hidden elements CMK-2001 Change-Id: I13c6204dfb0aa52b19abfaedc07ce1dbfd518682 --- web/htdocs/js/modules/forms.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/modules/forms.js b/web/htdocs/js/modules/forms.js index 121ac12..def3732 100644 --- a/web/htdocs/js/modules/forms.js +++ b/web/htdocs/js/modules/forms.js @@ -38,11 +38,10 @@ export function enable_dynamic_form_elements(container=null) { // that should use the select2 powered dropdowns function enable_select2_dropdowns(container) { let elements; - if (container) - elements = $(container).find(".select2-enable:visible"); - else - elements = $(".select2-enable:visible"); + if (!container) + container = $(document); + elements = $(container).find(".select2-enable").not("tbody.vlof_prototype .select2-enable"); elements.select2({ dropdownAutoWidth : true, minimumResultsForSearch: 5

5 years, 5 months

Fix: copy the source tarball

by Alex Zurhake

Module: check_mk Branch: master Commit: cd647e7609830641305d649ba412633bff8f9959 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd647e76098306… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Apr 12 08:10:43 2019 +0200 Fix: copy the source tarball Change-Id: I8f1ed36aea95c746a594913b7dca0a577f04d40c --- buildscripts/scripts/nightly-build.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 2b2ea2c..5e1f1b0 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -241,7 +241,7 @@ node { cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*_amd64.deb . || true cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*.x86_64.rpm . || true cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*x86_64.cma . || true - cp ${DAILY_DATA}/git/check-mk--${CMK_VERS}.cee.tar.gz . || true + cp ${DAILY_DATA}/git/check-mk-${EDITION}-${CMK_VERS}.cee.tar.gz . || true """ withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { sh """

5 years, 5 months

Use scm.branches[0].name in all jenkins files

by Alex Zurhake

Module: check_mk Branch: master Commit: 2f2411f3094904e59cb5b5d8b15432c7bff8ba55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f2411f3094904… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Apr 12 08:07:37 2019 +0200 Use scm.branches[0].name in all jenkins files Change-Id: Ie9947f21926dc3cd4e95f60b64cc81d6f4caf762 --- buildscripts/scripts/incremental-build.jenkins | 2 +- buildscripts/scripts/integration-daily-master.jenkins | 2 +- buildscripts/scripts/nightly-build.jenkins | 4 ++-- buildscripts/scripts/nightly-cmk-container.jenkins | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildscripts/scripts/incremental-build.jenkins b/buildscripts/scripts/incremental-build.jenkins index adfaee3..f0adbfd 100644 --- a/buildscripts/scripts/incremental-build.jenkins +++ b/buildscripts/scripts/incremental-build.jenkins @@ -16,7 +16,7 @@ DISTRO_LIST.each { DISTRO -> stage(DISTRO + 'Build something') { dir('dest'){ sh 'git fetch' - sh "git checkout ${BRANCH_NAME}" + sh "git checkout ${scm.branches[0].name}" sh 'make -C omd jmx4perl' } } diff --git a/buildscripts/scripts/integration-daily-master.jenkins b/buildscripts/scripts/integration-daily-master.jenkins index 3b0eca0..2d7c46c 100644 --- a/buildscripts/scripts/integration-daily-master.jenkins +++ b/buildscripts/scripts/integration-daily-master.jenkins @@ -25,7 +25,7 @@ def DOCKER_BUILDS = [:] def dateFormat = new SimpleDateFormat("yyyy.MM.dd") def date = new Date() def CMK_VERSION = dateFormat.format(date) -def TEST_DATA = '/var/jenkins_home/test-data/' + BRANCH_NAME.replaceAll("/","-") + '/' + CMK_VERSION +def TEST_DATA = '/var/jenkins_home/test-data/' + scm.branches[0].name.replaceAll("/","-") + '/' + CMK_VERSION node { docker.withRegistry(DOCKER_REGISTRY, 'nexus') { diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index d24562d..2b2ea2c 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -24,7 +24,7 @@ def DOCKER_BUILDS = [:] def dateFormat = new SimpleDateFormat("yyyy.MM.dd") def date = new Date() def CMK_VERS = dateFormat.format(date) -def DAILY_DATA = '/var/jenkins_home/daily-data/' + env.BRANCH_NAME.replaceAll("/","-") + '/' + CMK_VERS +def DAILY_DATA = '/var/jenkins_home/daily-data/' + env.scm.branches[0].name.replaceAll("/","-") + '/' + CMK_VERS def PACKAGE_DIR = '/bauwelt/download' def GPG_KEY_DIR = '/bauwelt/etc/.gnupg' @@ -234,7 +234,7 @@ node { docker.image(IMAGE).inside("-u 0:0 -v ${DAILY_DATA}:${DAILY_DATA} -v ${PACKAGE_DIR}:${PACKAGE_DIR} -v ${GPG_KEY_DIR}:${GPG_KEY_DIR}:ro -v ${RELEASE_KEY_DIR}:${RELEASE_KEY_DIR}:ro --network ci_local-infra") { stage('Archive artifacts') { // Only master builds should end up on the Website - if (BRANCH_NAME == 'master') { + if (scm.branches[0].name == 'master') { sh """ mkdir -p /bauwelt/download/${CMK_VERS} cd /bauwelt/download/${CMK_VERS} diff --git a/buildscripts/scripts/nightly-cmk-container.jenkins b/buildscripts/scripts/nightly-cmk-container.jenkins index 141409e..7e9b719 100644 --- a/buildscripts/scripts/nightly-cmk-container.jenkins +++ b/buildscripts/scripts/nightly-cmk-container.jenkins @@ -11,7 +11,7 @@ currentBuild.description = '\nBuilding the CMK docker container\n' def dateFormat = new SimpleDateFormat("yyyy.MM.dd") def date = new Date() def CMK_VERS = dateFormat.format(date) -def DAILY_DATA = '/var/jenkins_home/daily-data/' + BRANCH_NAME.replaceAll("/","-") + '/' + CMK_VERS +def DAILY_DATA = '/var/jenkins_home/daily-data/' + scm.branches[0].name.replaceAll("/","-") + '/' + CMK_VERS def PACKAGE_DIR = '/bauwelt/download' def GPG_KEY_DIR = '/bauwelt/etc/.gnupg'

5 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019