Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

[CMK-2048] - mrpe section is identical to LWA's one

by Sergey Kipnis

Module: check_mk Branch: master Commit: 5b642bfb13fd4bbc5c6389f74c833c7f3ecc87ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b642bfb13fd4b… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri May 3 10:50:31 2019 +0200 [CMK-2048] - mrpe section is identical to LWA's one - added test for mrpe section in yml file - timeout is set to 60 seconds - minor: comments for mrpe in the yml were updated Change-Id: Iab7f7cf267b5aeffca60a02897198d2e94bad28d --- agents/wnx/install/resources/check_mk.yml | 12 ++++----- agents/wnx/watest/test-mrpe.cpp | 42 ++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/agents/wnx/install/resources/check_mk.yml b/agents/wnx/install/resources/check_mk.yml index 6d94e59..aac3203 100644 --- a/agents/wnx/install/resources/check_mk.yml +++ b/agents/wnx/install/resources/check_mk.yml @@ -291,15 +291,15 @@ local: mrpe: - # scripts in plugin enabled: yes - # 10 is default - timeout: 10 + # 60 is default, this is safe value, because mrpe checks are relative fast ergo + # hitting this timeout is virtually not possible + timeout: 60 - # entries and cfg as in the Legacy agent + # entries and cfg are the same as in the Legacy agent config: - - check = Console 'c:\windows\system32\mode.com' CON CP /STATUS - - include sk = @data\mrpe_checks.cfg + # - check = Console 'c:\windows\system32\mode.com' CON CP /STATUS + - include user_name = @data\mrpe_checks.cfg - include = @data\mrpe_checks.cfg diff --git a/agents/wnx/watest/test-mrpe.cpp b/agents/wnx/watest/test-mrpe.cpp index eb4d0b8..684299c 100644 --- a/agents/wnx/watest/test-mrpe.cpp +++ b/agents/wnx/watest/test-mrpe.cpp @@ -10,16 +10,13 @@ #include <future> #include <string_view> -#include "common/cfg_info.h" - -#include "read_file.h" - #include "cfg.h" #include "cfg_details.h" - #include "cma_core.h" - +#include "common/cfg_info.h" #include "providers/mrpe.h" +#include "read_file.h" +#include "test_tools.h" /* Typic output: @@ -31,9 +28,9 @@ Codepage: 437 (chcp.com) sk 1 Geben Sie das Kennwort fuer "sk" ein: namespace cma::provider { // to become friendly for wtools classes -class YamlLoader { +class YamlLoaderMrpe { public: - YamlLoader() { + YamlLoaderMrpe() { using namespace cma::cfg; std::error_code ec; std::filesystem::remove(cma::cfg::GetBakeryFile(), ec); @@ -49,11 +46,11 @@ public: ProcessKnownConfigGroups(); SetupEnvironmentFromGroups(); } - ~YamlLoader() { OnStart(cma::kTest); } + ~YamlLoaderMrpe() { OnStart(cma::kTest); } }; TEST(SectionProviderMrpe, Construction) { - YamlLoader w; + YamlLoaderMrpe w; using namespace cma::cfg; EXPECT_TRUE(cma::cfg::groups::global.allowedSection(groups::kMrpe)); MrpeProvider mrpe; @@ -85,7 +82,7 @@ void replaceYamlSeq(const std::string Group, const std::string SeqName, } TEST(SectionProviderMrpe, SmallApi) { - YamlLoader w; + YamlLoaderMrpe w; std::string s = "a\rb\n\n"; FixCrCnForMrpe(s); EXPECT_EQ(s, "a b\1\1"); @@ -101,7 +98,7 @@ TEST(SectionProviderMrpe, SmallApi) { } TEST(SectionProviderMrpe, ConfigLoad) { - YamlLoader w; + YamlLoaderMrpe w; using namespace cma::cfg; MrpeProvider mrpe; EXPECT_EQ(mrpe.getUniqName(), cma::section::kMrpe); @@ -115,7 +112,7 @@ TEST(SectionProviderMrpe, ConfigLoad) { ASSERT_TRUE(GetVal(mrpe_cfg, vars::kEnabled, false)); auto entries = GetArray<std::string>(mrpe_cfg, vars::kMrpeConfig); - ASSERT_EQ(entries.size(), 3) + ASSERT_EQ(entries.size(), 2) << "check that yml is ok"; // include and check } @@ -149,8 +146,23 @@ TEST(SectionProviderMrpe, ConfigLoad) { EXPECT_EQ(mrpe.entries_.size(), 3); } // namespace cma::provider +TEST(SectionProviderMrpe, YmlCheck) { + using namespace cma::cfg; + tst::YamlLoader w; + auto cfg = cma::cfg::GetLoadedConfig(); + + auto mrpe_node = cfg[groups::kMrpe]; + ASSERT_TRUE(mrpe_node.IsDefined()); + ASSERT_TRUE(mrpe_node.IsMap()); + + auto enabled = GetVal(groups::kMrpe, vars::kEnabled, false); + EXPECT_TRUE(enabled); + auto paths = GetArray<std::string>(groups::kMrpe, vars::kMrpeConfig); + EXPECT_EQ(paths.size(), 2); +} + TEST(SectionProviderMrpe, Run) { - YamlLoader w; + YamlLoaderMrpe w; using namespace cma::cfg; MrpeProvider mrpe; EXPECT_EQ(mrpe.getUniqName(), cma::section::kMrpe); @@ -164,7 +176,7 @@ TEST(SectionProviderMrpe, Run) { ASSERT_TRUE(GetVal(mrpe_cfg, vars::kEnabled, false)); auto entries = GetArray<std::string>(mrpe_cfg, vars::kMrpeConfig); - ASSERT_EQ(entries.size(), 3) + ASSERT_EQ(entries.size(), 2) << "check that yml is ok"; // include and check }

5 years, 2 months

[CMK-2048] - fileinfo section is identical to the one from LWA

by Sergey Kipnis

Module: check_mk Branch: master Commit: 8bec62f8eb70103286a2c53e69af1b1902bf312f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bec62f8eb7010… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri May 3 09:58:15 2019 +0200 [CMK-2048] - fileinfo section is identical to the one from LWA - added test for fileinfo section in yml file - minor: clang formatter(headers) - minor: test-tools.* renamed to test_tools.*(consistensy) - minor: YamlLoader moved to namespace tst Change-Id: Ic0824341d309c185ef9d106b4d66528d479cb9e3 --- agents/wnx/install/resources/check_mk.yml | 8 +++--- agents/wnx/watest/test-cap.cpp | 15 ++++------- agents/wnx/watest/test-cvt.cpp | 19 +++++--------- agents/wnx/watest/test-install-auto.cpp | 2 +- agents/wnx/watest/test-section_fileinfo.cpp | 30 ++++++++++++++-------- agents/wnx/watest/test-section_logwatchevent.cpp | 27 +++++-------------- agents/wnx/watest/test-section_wmi.cpp | 2 +- agents/wnx/watest/test-spool.cpp | 2 +- agents/wnx/watest/test-upgrade.cpp | 2 +- agents/wnx/watest/test-wtools.cpp | 2 +- .../wnx/watest/{test-tools.cpp => test_tools.cpp} | 2 +- agents/wnx/watest/{test-tools.h => test_tools.h} | 15 +++++++++++ agents/wnx/watest/watest.vcxproj | 3 ++- agents/wnx/watest/watest.vcxproj.filters | 9 ++++--- 14 files changed, 71 insertions(+), 67 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8bec62f8eb…

5 years, 2 months

Revert "Use nexus insted of local store for compiledb"

by Alex Zurhake

Module: check_mk Branch: master Commit: c9684e84130f7fdc484f5fb8a06806daeb41d804 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9684e84130f7f… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri May 3 08:49:31 2019 +0200 Revert "Use nexus insted of local store for compiledb" This reverts commit c9d371a6e5f0f8496d9bba9dc046a5b16b1478c4. --- Pipfile | 2 +- Pipfile.lock | 18 +++++++++--------- .../python-modules/src/compiledb-1604e14.tar.gz | Bin 0 -> 26748 bytes 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Pipfile b/Pipfile index 44dd9bc9..e8dcf8c 100644 --- a/Pipfile +++ b/Pipfile @@ -23,7 +23,7 @@ isort = "*" pdbpp = "*" freezegun = "*" # We have to use a snapshot, a version which works for us has not been released yet. :-/ -compiledb = {file = "http://nexus.lan.tribe29.com/repository/archives/compiledb-1604e14.tar.gz"} +compiledb = {path = "./omd/packages/python-modules/src/compiledb-1604e14.tar.gz"} [packages] setuptools_scm = "==3.1.0" diff --git a/Pipfile.lock b/Pipfile.lock index 48e64c8..10ee1d5 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "9efcaf0f8f7170fc275250fcf3e68dbc34480276627ba78d9de6528ef880d554" + "sha256": "db23de596318955f08951a87dca949d06ee2387f1aecfbc2903377c576fa5f6b" }, "pipfile-spec": 6, "requires": { @@ -1054,7 +1054,7 @@ "version": "==3.0.4" }, "compiledb": { - "file": "http://nexus.lan.tribe29.com/repository/archives/compiledb-1604e14.tar.gz" + "path": "./omd/packages/python-modules/src/compiledb-1604e14.tar.gz" }, "configparser": { "hashes": [ @@ -1156,7 +1156,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.3'", + "markers": "python_version < '3.0'", "version": "==1.0.2" }, "futures": { @@ -1199,11 +1199,11 @@ }, "isort": { "hashes": [ - "sha256:1349c6f7c2a0f7539f5f2ace51a9a8e4a37086ce4de6f78f5f53fb041d0a3cd5", - "sha256:f09911f6eb114e5592abe635aded8bf3d2c3144ebcfcaf81ee32e7af7b7d1870" + "sha256:01cb7e1ca5e6c5b3f235f0385057f70558b70d2f00320208825fa62887292f43", + "sha256:268067462aed7eb2a1e237fcb287852f22077de3fb07964e87e00f829eea2d1a" ], "index": "pypi", - "version": "==4.3.18" + "version": "==4.3.17" }, "lazy-object-proxy": { "hashes": [ @@ -1280,11 +1280,11 @@ }, "mock": { "hashes": [ - "sha256:5eda46efb363128828d6fd2bf8d16f6ebb66f5b543b9f7f8f4eb224c5cb503fe", - "sha256:d659f8ef8810ff4c3f8f973d113a05d291a08ab0f7ed17bd60887983b93a0f9a" + "sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1", + "sha256:b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba" ], "markers": "python_version < '3.0'", - "version": "==3.0.3" + "version": "==2.0.0" }, "mockldap": { "hashes": [ diff --git a/omd/packages/python-modules/src/compiledb-1604e14.tar.gz b/omd/packages/python-modules/src/compiledb-1604e14.tar.gz new file mode 100644 index 0000000..48fb963 Binary files /dev/null and b/omd/packages/python-modules/src/compiledb-1604e14.tar.gz differ

5 years, 2 months

Revert "f"

by Alex Zurhake

Module: check_mk Branch: master Commit: d386a1033961f578f85f0784e50502f836e12ddb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d386a1033961f5… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri May 3 08:49:25 2019 +0200 Revert "f" This reverts commit 424328910db74ada2ad6b121d58c9b5113121b0d. --- Pipfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Pipfile b/Pipfile index d248fb1..44dd9bc9 100644 --- a/Pipfile +++ b/Pipfile @@ -23,7 +23,6 @@ isort = "*" pdbpp = "*" freezegun = "*" # We have to use a snapshot, a version which works for us has not been released yet. :-/ -# Workaround: We need to upload the Archive and cannot use it from our Git due to a Pipenv bug compiledb = {file = "http://nexus.lan.tribe29.com/repository/archives/compiledb-1604e14.tar.gz"} [packages]

5 years, 2 months

Use nexus insted of local store for compiledb

by Alex Zurhake

Module: check_mk Branch: master Commit: c9d371a6e5f0f8496d9bba9dc046a5b16b1478c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9d371a6e5f0f8… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri May 3 07:40:46 2019 +0200 Use nexus insted of local store for compiledb Change-Id: I67dff3efac8bfcaa254396685bcdfe8718098e68 --- Pipfile | 2 +- Pipfile.lock | 18 +++++++++--------- .../python-modules/src/compiledb-1604e14.tar.gz | Bin 26748 -> 0 bytes 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Pipfile b/Pipfile index e8dcf8c..44dd9bc9 100644 --- a/Pipfile +++ b/Pipfile @@ -23,7 +23,7 @@ isort = "*" pdbpp = "*" freezegun = "*" # We have to use a snapshot, a version which works for us has not been released yet. :-/ -compiledb = {path = "./omd/packages/python-modules/src/compiledb-1604e14.tar.gz"} +compiledb = {file = "http://nexus.lan.tribe29.com/repository/archives/compiledb-1604e14.tar.gz"} [packages] setuptools_scm = "==3.1.0" diff --git a/Pipfile.lock b/Pipfile.lock index 10ee1d5..48e64c8 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "db23de596318955f08951a87dca949d06ee2387f1aecfbc2903377c576fa5f6b" + "sha256": "9efcaf0f8f7170fc275250fcf3e68dbc34480276627ba78d9de6528ef880d554" }, "pipfile-spec": 6, "requires": { @@ -1054,7 +1054,7 @@ "version": "==3.0.4" }, "compiledb": { - "path": "./omd/packages/python-modules/src/compiledb-1604e14.tar.gz" + "file": "http://nexus.lan.tribe29.com/repository/archives/compiledb-1604e14.tar.gz" }, "configparser": { "hashes": [ @@ -1156,7 +1156,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.0'", + "markers": "python_version < '3.3'", "version": "==1.0.2" }, "futures": { @@ -1199,11 +1199,11 @@ }, "isort": { "hashes": [ - "sha256:01cb7e1ca5e6c5b3f235f0385057f70558b70d2f00320208825fa62887292f43", - "sha256:268067462aed7eb2a1e237fcb287852f22077de3fb07964e87e00f829eea2d1a" + "sha256:1349c6f7c2a0f7539f5f2ace51a9a8e4a37086ce4de6f78f5f53fb041d0a3cd5", + "sha256:f09911f6eb114e5592abe635aded8bf3d2c3144ebcfcaf81ee32e7af7b7d1870" ], "index": "pypi", - "version": "==4.3.17" + "version": "==4.3.18" }, "lazy-object-proxy": { "hashes": [ @@ -1280,11 +1280,11 @@ }, "mock": { "hashes": [ - "sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1", - "sha256:b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba" + "sha256:5eda46efb363128828d6fd2bf8d16f6ebb66f5b543b9f7f8f4eb224c5cb503fe", + "sha256:d659f8ef8810ff4c3f8f973d113a05d291a08ab0f7ed17bd60887983b93a0f9a" ], "markers": "python_version < '3.0'", - "version": "==2.0.0" + "version": "==3.0.3" }, "mockldap": { "hashes": [ diff --git a/omd/packages/python-modules/src/compiledb-1604e14.tar.gz b/omd/packages/python-modules/src/compiledb-1604e14.tar.gz deleted file mode 100644 index 48fb963..0000000 Binary files a/omd/packages/python-modules/src/compiledb-1604e14.tar.gz and /dev/null differ

5 years, 2 months

by Alex Zurhake

Module: check_mk Branch: master Commit: 424328910db74ada2ad6b121d58c9b5113121b0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=424328910db74a… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri May 3 07:42:10 2019 +0200 f Change-Id: Ifc7cc81753d8e112d056eb48d62eeaa6246c32e5 --- Pipfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Pipfile b/Pipfile index 44dd9bc9..d248fb1 100644 --- a/Pipfile +++ b/Pipfile @@ -23,6 +23,7 @@ isort = "*" pdbpp = "*" freezegun = "*" # We have to use a snapshot, a version which works for us has not been released yet. :-/ +# Workaround: We need to upload the Archive and cannot use it from our Git due to a Pipenv bug compiledb = {file = "http://nexus.lan.tribe29.com/repository/archives/compiledb-1604e14.tar.gz"} [packages]

5 years, 2 months

Fix locale:

by Alex Zurhake

Module: check_mk Branch: master Commit: 73119cccc485b8412709119331fe5be04d1fc4c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73119cccc485b8… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri May 3 08:20:55 2019 +0200 Fix locale: `msgid' and `msgstr' entries do not both begin with '\n' Removed trailling newline Change-Id: Ia279aee62d823e636cab8bb50fe1069da25b1bdc --- locale/de/LC_MESSAGES/multisite.po | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/locale/de/LC_MESSAGES/multisite.po b/locale/de/LC_MESSAGES/multisite.po index 1d6798d..a1e2aa6 100644 --- a/locale/de/LC_MESSAGES/multisite.po +++ b/locale/de/LC_MESSAGES/multisite.po @@ -20456,9 +20456,7 @@ msgid "Immediately toggle this setting" msgstr "Einstellung sofort umschalten" msgid "Impact" -msgstr "" -"\n" -"Auswirkung" +msgstr "Auswirkung" msgid "Import" msgstr "Importieren" @@ -24978,9 +24976,7 @@ msgid "MediationServer - Load Call Failure Index" msgstr "Mediation Server - Fehlerindex für Leseaufrufe" msgid "Medium" -msgstr "" -"\n" -"Mittel" +msgstr "Mittel" msgid "MegaRAID monitoring (Windows)" msgstr "MegaRAID-Überwachung (Windows)"

5 years, 2 months

Fix some cleanup make targets

by Lars Michelsen

Module: check_mk Branch: master Commit: 6499b04a030a20a81ce720c40e209b483356e19b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6499b04a030a20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 21:03:25 2019 +0200 Fix some cleanup make targets Change-Id: Ifd5b8a2d200ac645d100ec22e9d9684c318282b5 --- omd/packages/check_multi/check_multi.make | 2 +- omd/packages/nagvis/nagvis.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/omd/packages/check_multi/check_multi.make b/omd/packages/check_multi/check_multi.make index d03d709..20aa13d 100644 --- a/omd/packages/check_multi/check_multi.make +++ b/omd/packages/check_multi/check_multi.make @@ -101,7 +101,7 @@ $(CHECK_MULTI_INSTALL): $(CHECK_MULTI_BUILD) $(TOUCH) $@ $(CHECK_MULTI)-clean: - rm -rf $(CHECK_MULTI_DIR) $(BUILD_HELPER_DIR)/$(CHECK_MULTI)* + rm -rf $(CHECK_MULTI_DIR) check_multi $(BUILD_HELPER_DIR)/$(CHECK_MULTI)* $(CHECK_MULTI)-get: #wget --no-clobber my-plugin.de/check_multi/check_multi-stable-$(CHECK_MULTI_VERS).tar.gz diff --git a/omd/packages/nagvis/nagvis.make b/omd/packages/nagvis/nagvis.make index fd0fa1e..772c696 100644 --- a/omd/packages/nagvis/nagvis.make +++ b/omd/packages/nagvis/nagvis.make @@ -57,4 +57,4 @@ $(NAGVIS_INSTALL): $(NAGVIS_BUILD) $(NAGVIS)-skel: $(NAGVIS)-clean: - $(RM) -r $(NAGVIS)-*.*.[0-9] $(NAGVIS)-*.*-nightly $(BUILD_HELPER_DIR)/$(NAGVIS)* + $(RM) -r $(NAGVIS)-*.*.*[0-9] $(NAGVIS)-*.*-nightly $(BUILD_HELPER_DIR)/$(NAGVIS)*

5 years, 2 months

[CMK-2048] - few log messages has decreased level of severity

by Sergey Kipnis

Module: check_mk Branch: master Commit: 3741a91dd31468d325bcbd76e966e4c2234987e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3741a91dd31468… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Thu May 2 18:38:53 2019 +0200 [CMK-2048] - few log messages has decreased level of severity Change-Id: I59b74feac99e44c8c4cdd18f9e20a790afcc7944 --- agents/wnx/src/engine/cfg.cpp | 17 ++++++----------- agents/wnx/src/engine/providers/spool.cpp | 18 +++++++----------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/agents/wnx/src/engine/cfg.cpp b/agents/wnx/src/engine/cfg.cpp index 8d4093e..019b4ca 100644 --- a/agents/wnx/src/engine/cfg.cpp +++ b/agents/wnx/src/engine/cfg.cpp @@ -2,31 +2,27 @@ #include "stdafx.h" #define WIN32_LEAN_AND_MEAN -#include <windows.h> - #include <direct.h> // known path #include <shellapi.h> #include <shlobj.h> // known path +#include <windows.h> #include <atomic> #include <filesystem> #include <string> +#include "cfg.h" +#include "cfg_details.h" #include "common/cfg_info.h" #include "common/wtools.h" - +#include "logger.h" +#include "read_file.h" #include "tools/_misc.h" // setenv #include "tools/_process.h" // GetSomeFolder... #include "tools/_raii.h" // on out #include "tools/_tgt.h" // we need IsDebug - #include "yaml-cpp/yaml.h" -#include "cfg.h" -#include "cfg_details.h" -#include "logger.h" -#include "read_file.h" - namespace cma { namespace details { // internal and hidden variables @@ -965,8 +961,7 @@ LoadCfgStatus ConfigInfo::loadAggregated(const std::wstring& ConfigFileName, // check root auto& root = yamls[0]; if (!root.exists() || root.data().empty() || root.bad()) { - XLOG::l.crit("Cannot find/read root cfg '{}'. Installation damaged.", - root.path_.u8string()); + XLOG::d("Cannot find/read root cfg '{}'. ", root.path_.u8string()); return LoadCfgStatus::kAllFailed; } diff --git a/agents/wnx/src/engine/providers/spool.cpp b/agents/wnx/src/engine/providers/spool.cpp index 39caa8b..cf07db0 100644 --- a/agents/wnx/src/engine/providers/spool.cpp +++ b/agents/wnx/src/engine/providers/spool.cpp @@ -2,6 +2,8 @@ // provides basic api to start and stop service #include "stdafx.h" +#include "providers/spool.h" + #include <chrono> #include <filesystem> #include <regex> @@ -9,21 +11,15 @@ #include <string_view> #include <tuple> -#include "fmt/format.h" - -#include "tools/_raii.h" -#include "tools/_xlog.h" - -#include "common/wtools.h" - #include "cfg.h" #include "cma_core.h" +#include "common/wtools.h" +#include "fmt/format.h" #include "glob_match.h" - #include "logger.h" #include "read_file.h" - -#include "providers/spool.h" +#include "tools/_raii.h" +#include "tools/_xlog.h" namespace cma::provider { @@ -103,7 +99,7 @@ std::string SpoolProvider::makeBody() const { fs::path dir = cma::cfg::GetSpoolDir(); // check presence of the folder if (!IsDirectoryValid(dir)) { - XLOG::l("Spool directory absent. But spool is requested"); + XLOG::d("Spool directory absent. But spool is requested"); return {}; }

5 years, 2 months

[CMK-2048] - fixed logwatch

by Sergey Kipnis

Module: check_mk Branch: master Commit: 6de579d5f8b83c471c2b226913ffabcd51c354ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6de579d5f8b83c… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Thu May 2 14:13:28 2019 +0200 [CMK-2048] - fixed logwatch - yml is 100% compatible with Legacy Windows Agent - since now "*" makes any entry "presented in config" - "*" set identical to LWA, "warn context" - fixed potential error with missing evenlog data(nullptr in handle). This case is unit tested. Change-Id: I4aff8b97db4c2f180d88d3e03d416f1bab14804c --- agents/wnx/install/resources/check_mk.yml | 20 ++-- agents/wnx/src/engine/eventlog/eventlogvista.cpp | 21 +++- agents/wnx/src/engine/providers/logwatch_event.cpp | 34 +++--- agents/wnx/src/engine/providers/logwatch_event.h | 29 ++++- agents/wnx/watest/test-section_logwatchevent.cpp | 123 +++++++++++++++++++-- 5 files changed, 182 insertions(+), 45 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6de579d5f8…

5 years, 2 months

← Newer
1
...
27
28
29
30
31
32
33
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2019