Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

[CMK-2048] - lesser fixes

by Sergey Kipnis

Module: check_mk Branch: master Commit: c9aade3dbe305f9d53bdc37dd719bd93e58eeb0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9aade3dbe305f… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri May 3 17:54:14 2019 +0200 [CMK-2048] - lesser fixes - marked test message with <GTEST> - recovered unit tests(winperf section counting) - minor: cleaned log output from ec.message Change-Id: Ieebd7f63c81bc43c8c709961444edbd7e70b1f92 --- agents/wnx/src/engine/cfg.cpp | 4 ++-- agents/wnx/watest/test-spool.cpp | 11 +++-------- agents/wnx/watest/test-yaml.cpp | 23 ++++++++++------------- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/agents/wnx/src/engine/cfg.cpp b/agents/wnx/src/engine/cfg.cpp index deb89b3..d4d1170 100644 --- a/agents/wnx/src/engine/cfg.cpp +++ b/agents/wnx/src/engine/cfg.cpp @@ -569,8 +569,8 @@ const std::wstring FindConfigFile(std::filesystem::path Dir, if (fs::exists(file_path, ec)) { return file_path.lexically_normal().wstring(); } - XLOG::l("Config file '{}' not found, status [{}] '{}'", - file_path.u8string(), ec.value(), ec.message()); + XLOG::l("Config file '{}' not found, status [{}]: {}", file_path.u8string(), + ec.value(), ec.message()); return {}; } }; // namespace cma::cfg diff --git a/agents/wnx/watest/test-spool.cpp b/agents/wnx/watest/test-spool.cpp index 8784232..513498a 100644 --- a/agents/wnx/watest/test-spool.cpp +++ b/agents/wnx/watest/test-spool.cpp @@ -10,17 +10,12 @@ #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/spool.h" - +#include "read_file.h" #include "test_tools.h" static void CleanFolder(std::filesystem::path Dir) { @@ -68,7 +63,7 @@ TEST(SectionProviderSpool, BaseApi) { namespace fs = std::filesystem; fs::path dir = cma::cfg::GetSpoolDir(); EXPECT_TRUE(cma::provider::IsDirectoryValid(dir)); - EXPECT_FALSE(cma::provider::IsDirectoryValid(dir / "a")); + EXPECT_FALSE(cma::provider::IsDirectoryValid(dir / "<GTEST>")); ASSERT_TRUE(!dir.empty() && dir.u8string().find("\\spool") != std::string::npos); diff --git a/agents/wnx/watest/test-yaml.cpp b/agents/wnx/watest/test-yaml.cpp index f90c251..8c95876 100644 --- a/agents/wnx/watest/test-yaml.cpp +++ b/agents/wnx/watest/test-yaml.cpp @@ -5,22 +5,18 @@ #include <filesystem> +#include "cfg.h" +#include "cfg_details.h" #include "common/cfg_info.h" #include "common/mailslot_transport.h" #include "common/wtools.h" +#include "providers/mrpe.h" +#include "read_file.h" #include "tools/_misc.h" #include "tools/_process.h" #include "tools/_tgt.h" - -#include "read_file.h" #include "yaml-cpp/yaml.h" -#include "cfg_details.h" - -#include "cfg.h" - -#include "providers/mrpe.h" - namespace cma::cfg::details { // to become friendly for cma::cfg classes static std::filesystem::path CreateYamlnInTemp(const std::string& Name, @@ -111,11 +107,12 @@ TEST(AgentConfig, Aggregate) { " - 9999 : the_the\n" " - Terminal Services: ts_sessions\n"); auto r = YAML::LoadFile(cfgs[0].u8string()); - ASSERT_EQ(r[groups::kWinPerf][vars::kWinPerfCounters].size(), 4); + ASSERT_EQ(r[groups::kWinPerf][vars::kWinPerfCounters].size(), 3); auto b = YAML::LoadFile(cfgs[1].u8string()); ASSERT_EQ(b[groups::kWinPerf][vars::kWinPerfCounters].size(), 4); ConfigInfo::smartMerge(r, b); - ASSERT_EQ(r[groups::kWinPerf][vars::kWinPerfCounters].size(), 5); + ASSERT_EQ(r[groups::kWinPerf][vars::kWinPerfCounters].size(), + 6); // three new, 638, 9999 and ts ASSERT_EQ(r["bakery"]["status"].as<std::string>(), "loaded"); } @@ -129,7 +126,7 @@ TEST(AgentConfig, Aggregate) { auto x = yaml["global"]["enabled"].as<bool>(); ASSERT_EQ(yaml["global"]["enabled"].as<bool>(), false); ASSERT_EQ(yaml["global"]["async"].as<bool>(), true); - ASSERT_EQ(yaml[groups::kWinPerf][vars::kWinPerfCounters].size(), 5); + ASSERT_EQ(yaml[groups::kWinPerf][vars::kWinPerfCounters].size(), 6); CreateTestFile(cfgs[2], "user:\n status: 'loaded'\nglobal:\n port: 111"); @@ -141,7 +138,7 @@ TEST(AgentConfig, Aggregate) { ASSERT_EQ(yaml["global"]["enabled"].as<bool>(), false); ASSERT_EQ(yaml["global"]["port"].as<int>(), 111); ASSERT_EQ(yaml["global"]["async"].as<bool>(), true); - ASSERT_EQ(yaml[groups::kWinPerf][vars::kWinPerfCounters].size(), 5); + ASSERT_EQ(yaml[groups::kWinPerf][vars::kWinPerfCounters].size(), 6); EXPECT_TRUE(G_ConfigInfo.isBakeryLoaded()); EXPECT_TRUE(G_ConfigInfo.isUserLoaded()); } @@ -383,7 +380,7 @@ TEST(AgentConfig, WorkScenario) { auto winperf_counters = GetPairArray(groups::kWinPerf, vars::kWinPerfCounters); - EXPECT_EQ(winperf_counters.size(), 4); + EXPECT_EQ(winperf_counters.size(), 3); for (const auto& counter : winperf_counters) { auto id = counter.first; EXPECT_TRUE(id != "");

5 years, 2 months

[CMK-2048] - rotated file log

by Sergey Kipnis

Module: check_mk Branch: master Commit: 25e4ac825766afc6354d70f12ca422dd5fed040c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25e4ac825766af… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri May 3 17:13:16 2019 +0200 [CMK-2048] - rotated file log Change-Id: I8def3d9f9ee2debe75cfa4048018de2d18e1bb55 --- agents/wnx/src/common/cfg_info.h | 3 + agents/wnx/src/engine/cfg.cpp | 8 +++ agents/wnx/src/engine/cfg.h | 4 +- agents/wnx/src/engine/cfg_details.h | 11 +++- agents/wnx/src/engine/logger.cpp | 64 ++++++++++++++++++- agents/wnx/src/engine/logger.h | 17 +++-- agents/wnx/watest/test-log.cpp | 120 +++++++++++++++++++++++++++++++++++- 7 files changed, 217 insertions(+), 10 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=25e4ac8257…

5 years, 2 months

agent_azure: refactor collection of metrics

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6776fc929310a8174e28f5ece5a32b5c40b578c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6776fc929310a8… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri May 3 06:58:31 2019 +0200 agent_azure: refactor collection of metrics Change-Id: I929dcbeba9b64da1c118a9992a93f06db471c122 --- agents/special/agent_azure | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index 0a1d2c9..77751d9 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -608,15 +608,14 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes return metrics - def get_metrics(self, resource, err): + # TODO: adding the metrics as a side effect is not good. + # I'll get the caching right, then change this back. (mo) + def collect_metrics(self, resource, err): metric_params = METRICS_SELECTED.get(resource.info["type"], []) - metrics = [] for metricnames, interval, aggregation, filter_ in metric_params: - metrics += self._fetch_specific_metrics(resource, metricnames, interval, aggregation, - filter_, err) - - return metrics + resource.metrics += self._fetch_specific_metrics(resource, metricnames, interval, + aggregation, filter_, err) def process_resource(args): @@ -625,8 +624,7 @@ def process_resource(args): client.process_specific(resource) err = IssueCollecter() # pass this to methods to collect issues - for metric in client.get_metrics(resource, err): - resource.metrics.append(metric) + client.collect_metrics(resource, err) agent_info_section = AzureSection('agent_info') agent_info_section.add(('remaining-reads', client.remaining_reads))

5 years, 2 months

agent_azure: make sure we always get the same timespans

by Moritz Kiemer

Module: check_mk Branch: master Commit: 77fea825818c5aaf02a9a9c82d64eddf04254712 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77fea825818c5a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri May 3 08:23:47 2019 +0200 agent_azure: make sure we always get the same timespans Change-Id: I0829ffc93c1613f2e0650dfbf1c3f4d3ca7bdd98 --- agents/special/agent_azure | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index 77751d9..b7e9325 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -518,20 +518,19 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes self._cache = {} @staticmethod - def _get_timespans(): + def _get_timespans(time_end=datetime.datetime.utcnow()): """compute timespans dict""" - t_end = datetime.datetime.utcnow() def interval(**kwargs): - start = t_end - datetime.timedelta(**kwargs) + start = time_end - datetime.timedelta(**kwargs) return "%s/%s" % (start.strftime("%Y-%m-%dT%H:%M:%SZ"), - t_end.strftime("%Y-%m-%dT%H:%M:%SZ")) + time_end.strftime("%Y-%m-%dT%H:%M:%SZ")) - timespans = {} - timespans["PT1M"] = interval(minutes=3) - timespans["PT5M"] = interval(minutes=15) - timespans["PT1H"] = interval(hours=3) - return timespans + return { + "PT1M": interval(minutes=3), + "PT5M": interval(minutes=15), + "PT1H": interval(hours=3), + } def init_specific(self, resources): r_types = set(r.info["type"] for r in resources)

5 years, 2 months

agent_azure: refactoring I

by Moritz Kiemer

Module: check_mk Branch: master Commit: 631ed3174c7085b19e383e4c23d7bc74f620c047 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=631ed3174c7085… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri May 3 08:47:53 2019 +0200 agent_azure: refactoring I * rename _monitor_client attribute * adjust exception handline * move _get_timespans for readable diff comming up Change-Id: I8eda3bf199bafa9e87d26ae47ef2cf8ec9a25e26 --- agents/special/agent_azure | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index b7e9325..6701bfd 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -509,7 +509,7 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes self._creds = ServicePrincipalCredentials( client_id=args.client, secret=args.secret, tenant=args.tenant) # azure-api-call - self._monitor_client = MonitorManagementClient(self._creds, self.args.subscription) + self.monitor_client = MonitorManagementClient(self._creds, self.args.subscription) # azure-api-call self._resource_client = ResourceManagementClient(self._creds, self.args.subscription) @@ -517,21 +517,6 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes self.timespans = self._get_timespans() self._cache = {} - @staticmethod - def _get_timespans(time_end=datetime.datetime.utcnow()): - """compute timespans dict""" - - def interval(**kwargs): - start = time_end - datetime.timedelta(**kwargs) - return "%s/%s" % (start.strftime("%Y-%m-%dT%H:%M:%SZ"), - time_end.strftime("%Y-%m-%dT%H:%M:%SZ")) - - return { - "PT1M": interval(minutes=3), - "PT5M": interval(minutes=15), - "PT1H": interval(hours=3), - } - def init_specific(self, resources): r_types = set(r.info["type"] for r in resources) for rtp in r_types: @@ -558,11 +543,26 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes self._cache["resources"] = map(AzureResource, raw_resources) return self._cache["resources"] + @staticmethod + def _get_timespans(time_end=datetime.datetime.utcnow()): + """compute timespans dict""" + + def interval(**kwargs): + start = time_end - datetime.timedelta(**kwargs) + return "%s/%s" % (start.strftime("%Y-%m-%dT%H:%M:%SZ"), + time_end.strftime("%Y-%m-%dT%H:%M:%SZ")) + + return { + "PT1M": interval(minutes=3), + "PT5M": interval(minutes=15), + "PT1H": interval(hours=3), + } + def _metric_api_call(self, rid, timespan, interval, metric, aggregation, filter_): LOG.debug( "metrics.list(%r, timespan=%r, interval=%r, metric=%r, aggregation=%r," " filter=%r, raw=True)", rid, timespan, interval, metric, aggregation, filter_) - raw = self._monitor_client.metrics.list( + raw = self.monitor_client.metrics.list( rid, timespan=timespan, interval=interval, @@ -587,9 +587,7 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes try: response, raw_metrics = self._metric_api_call(rid, timespan, interval, metricnames, aggregation, filter_) - except ErrorResponseException as exc: - if self.args.debug: - raise exc + except () if self.args.debug else ErrorResponseException as exc: err.add("exception", rid, exc.message) LOG.exception(exc) return []

5 years, 2 months

agent_azure: refactoring II

by Moritz Kiemer

Module: check_mk Branch: master Commit: f5a3b7dcf858ba0153a961fd009bc2c4e92bb99f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5a3b7dcf858ba… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri May 3 09:01:27 2019 +0200 agent_azure: refactoring II Factor out the collection of metrics to move towards implementation of caching. Change-Id: Ic96301b3dd97740399dccdc13fb7a3c0da269bd2 --- agents/special/agent_azure | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index 6701bfd..8e6afdc 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -495,7 +495,7 @@ class AzureComputeClient(object): vmach.piggytargets.append(vmach.info["name"]) -class AzureClient(object): # pylint: disable=too-many-instance-attributes +class AzureClient(object): SPECIFIC_CLIENTS = { 'Microsoft.Compute/virtualMachines': AzureComputeClient, @@ -504,7 +504,6 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes def __init__(self, args): super(AzureClient, self).__init__() self.args = args - self.remaining_reads = "unknown (no metrics fetched)" self._creds = ServicePrincipalCredentials( client_id=args.client, secret=args.secret, tenant=args.tenant) @@ -514,7 +513,6 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes self._resource_client = ResourceManagementClient(self._creds, self.args.subscription) self.specific_clients = {} - self.timespans = self._get_timespans() self._cache = {} def init_specific(self, resources): @@ -543,6 +541,15 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes self._cache["resources"] = map(AzureResource, raw_resources) return self._cache["resources"] + +class MetricsCollecter(object): + def __init__(self, resource, debug=False): + super(MetricsCollecter, self).__init__() + self.debug = debug + self.resource = resource + self.remaining_reads = "unknown (no metrics fetched)" + self.timespans = self._get_timespans() + @staticmethod def _get_timespans(time_end=datetime.datetime.utcnow()): """compute timespans dict""" @@ -558,11 +565,12 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes "PT1H": interval(hours=3), } - def _metric_api_call(self, rid, timespan, interval, metric, aggregation, filter_): + def _metric_api_call(self, monitor_client, timespan, interval, metric, aggregation, filter_): + rid = self.resource.info['id'] LOG.debug( "metrics.list(%r, timespan=%r, interval=%r, metric=%r, aggregation=%r," " filter=%r, raw=True)", rid, timespan, interval, metric, aggregation, filter_) - raw = self.monitor_client.metrics.list( + raw = monitor_client.metrics.list( rid, timespan=timespan, interval=interval, @@ -577,17 +585,18 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes raw_metrics = list(raw.output.value) return raw.response, raw_metrics - def _fetch_specific_metrics(self, resource, metricnames, interval, aggregation, filter_, err): + def _fetch_specific_metrics(self, monitor_client, metricnames, interval, aggregation, filter_, + err): if metricnames.count(',') >= 20: raise ValueError("Azure API won't have requests with more than 20 metrics!") - rid = resource.info["id"] + rid = self.resource.info["id"] timespan = self.timespans[interval] try: - response, raw_metrics = self._metric_api_call(rid, timespan, interval, metricnames, - aggregation, filter_) - except () if self.args.debug else ErrorResponseException as exc: + response, raw_metrics = self._metric_api_call(monitor_client, timespan, interval, + metricnames, aggregation, filter_) + except () if self.debug else ErrorResponseException as exc: err.add("exception", rid, exc.message) LOG.exception(exc) return [] @@ -607,12 +616,12 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes # TODO: adding the metrics as a side effect is not good. # I'll get the caching right, then change this back. (mo) - def collect_metrics(self, resource, err): - metric_params = METRICS_SELECTED.get(resource.info["type"], []) + def collect_metrics(self, monitor_client, err): + metric_params = METRICS_SELECTED.get(self.resource.info["type"], []) for metricnames, interval, aggregation, filter_ in metric_params: - resource.metrics += self._fetch_specific_metrics(resource, metricnames, interval, - aggregation, filter_, err) + self.resource.metrics += self._fetch_specific_metrics( + monitor_client, metricnames, interval, aggregation, filter_, err) def process_resource(args): @@ -621,10 +630,12 @@ def process_resource(args): client.process_specific(resource) err = IssueCollecter() # pass this to methods to collect issues - client.collect_metrics(resource, err) + + metrics_collecter = MetricsCollecter(resource, debug=client.args.debug) + metrics_collecter.collect_metrics(client.monitor_client, err) agent_info_section = AzureSection('agent_info') - agent_info_section.add(('remaining-reads', client.remaining_reads)) + agent_info_section.add(('remaining-reads', metrics_collecter.remaining_reads)) agent_info_section.add(err.dumpinfo()) sections = [agent_info_section]

5 years, 2 months

agent_azure: rework metric to be JSON serializable

by Moritz Kiemer

Module: check_mk Branch: master Commit: a41c17f94b381187dc9e00b2c07a0f784080e585 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a41c17f94b3811… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri May 3 13:13:04 2019 +0200 agent_azure: rework metric to be JSON serializable Change-Id: I8f81ed1548ca52eb7bad500bac0d5b318bfe347f --- agents/special/agent_azure | 75 ++++++------ checks/azure.include | 17 ++- .../generictests/datasets/azure_databases.py | 31 +++-- .../checks/generictests/datasets/azure_sites.py | 127 ++++++++++----------- .../generictests/datasets/azure_storageaccounts.py | 30 +++-- .../datasets/azure_virtualmachines_1.py | 25 ++-- .../azure_virtualmachines_1_on_grouphost.py | 25 ++-- .../datasets/azure_virtualnetworkgateways.py | 10 +- 8 files changed, 150 insertions(+), 190 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a41c17f94b…

5 years, 2 months

Use nexus insted of local store for compiledb

by Alex Zurhake

Module: check_mk Branch: master Commit: d18bf2af3b61f6d6e1f4f850fabfbe626bde0ae0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d18bf2af3b61f6… 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 | 3 ++- Pipfile.lock | 26 ++++++++++----------- .../python-modules/src/compiledb-1604e14.tar.gz | Bin 26748 -> 0 bytes 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Pipfile b/Pipfile index e8dcf8c..e660f5e 100644 --- a/Pipfile +++ b/Pipfile @@ -23,7 +23,8 @@ 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"} +# Workaround: We need to upload the Archive and cannot use it from our Git due to a Pipenv bug +compiledb = {file = "http://nexus:8081/repository/archives/compiledb-1604e14.tar.gz"} [packages] setuptools_scm = "==3.1.0" diff --git a/Pipfile.lock b/Pipfile.lock index 10ee1d5..0096c14 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "db23de596318955f08951a87dca949d06ee2387f1aecfbc2903377c576fa5f6b" + "sha256": "9f48473f7896536f450eb385c041745c6028ebadb0ae29b516b1b678d4e0fc7b" }, "pipfile-spec": 6, "requires": { @@ -1010,7 +1010,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version < '3.2'", + "markers": "python_version == '2.7'", "version": "==1.5" }, "backports.ssl-match-hostname": { @@ -1054,7 +1054,7 @@ "version": "==3.0.4" }, "compiledb": { - "path": "./omd/packages/python-modules/src/compiledb-1604e14.tar.gz" + "file": "http://nexus:8081/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": [ @@ -1396,11 +1396,11 @@ }, "pytest-cov": { "hashes": [ - "sha256:0ab664b25c6aa9716cbf203b17ddb301932383046082c081b9848a0edf5add33", - "sha256:230ef817450ab0699c6cc3c9c8f7a829c34674456f2ed8df1fe1d39780f7c87f" + "sha256:2b097cde81a302e1047331b48cadacf23577e431b61e9c6f49a1170bbe3d3da6", + "sha256:e00ea4fdde970725482f1f35630d12f074e121a23801aabf2ae154ec6bdd343a" ], "index": "pypi", - "version": "==2.6.1" + "version": "==2.7.1" }, "pytest-mock": { "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

[CMK-2048] - winperf sections are identical to LWA's one

by Sergey Kipnis

Module: check_mk Branch: master Commit: bca99adc250ce00d148a953187c2acee75451735 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bca99adc250ce0… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri May 3 13:04:03 2019 +0200 [CMK-2048] - winperf sections are identical to LWA's one - added test for winperf section in yml file - minor: comments for mrpe in the yml were updated Change-Id: Idae184bc750294b516bd388ee3cbd7e8094c1244 --- agents/wnx/install/resources/check_mk.yml | 5 ++-- agents/wnx/watest/test-winperf.cpp | 50 ++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/agents/wnx/install/resources/check_mk.yml b/agents/wnx/install/resources/check_mk.yml index aac3203..c577d33 100644 --- a/agents/wnx/install/resources/check_mk.yml +++ b/agents/wnx/install/resources/check_mk.yml @@ -137,8 +137,9 @@ winperf: counters: - 234: phydisk - 510: if - - 638: tcp_conn - - Terminal Services: ts_sessions + - 238: processor + #- 638: tcp_conn + #- Terminal Services: ts_sessions logfiles: enabled: no diff --git a/agents/wnx/watest/test-winperf.cpp b/agents/wnx/watest/test-winperf.cpp index 402778a..31af786 100644 --- a/agents/wnx/watest/test-winperf.cpp +++ b/agents/wnx/watest/test-winperf.cpp @@ -3,22 +3,17 @@ // #include "pch.h" -#include "common/cfg_info.h" -#include "common/mailslot_transport.h" -#include "common/wtools.h" -#include "tools/_misc.h" -#include "tools/_process.h" - #include "carrier.h" -#include "pch.h" -#include "read_file.h" - #include "cfg.h" #include "cfg_details.h" - +#include "common/cfg_info.h" +#include "common/wtools.h" #include "providers/p_perf_counters.h" - +#include "read_file.h" #include "service_processor.h" +#include "test_tools.h" +#include "tools/_misc.h" +#include "tools/_process.h" namespace cma::cfg::details { extern uint64_t RegisteredPerformanceFreq; @@ -38,6 +33,39 @@ TEST(WinPerfTest, Pre) { << "Something wrong and value was not initialized"; } +TEST(WinPerfTest, YmlCheck) { + using namespace cma::cfg; + using namespace cma::tools; + tst::YamlLoader w; + auto cfg = cma::cfg::GetLoadedConfig(); + + auto winperf_node = cfg[groups::kWinPerf]; + ASSERT_TRUE(winperf_node.IsDefined()); + ASSERT_TRUE(winperf_node.IsMap()); + + auto enabled = GetVal(groups::kWinPerf, vars::kEnabled, false); + EXPECT_TRUE(enabled); + auto counters = GetPairArray(groups::kWinPerf, vars::kWinPerfCounters); + ASSERT_EQ(counters.size(), 3); + const StringPairArray base_counters = { + {"238", "processor"}, + {"234", "phydisk"}, + {"510", "if"}, + }; + + int found_count = 0; + for (const auto& counter : counters) { + std::pair<std::string, std::string> counter_low(counter.first, + counter.second); + StringLower(counter_low.first); + StringLower(counter_low.second); + auto found = Find(base_counters, counter_low); + if (found) found_count++; + } + + EXPECT_EQ(found_count, 3) << "not correct counter list in the yml"; +} + TEST(WinPerfTest, RootCalls) { // testing first line stamping // 1548673688.07 510 2156253

5 years, 2 months

[CMK-2048] - during upgrade(migration) some specific for LWA files now skipped

by Sergey Kipnis

Module: check_mk Branch: master Commit: 17f5c2ce9540ab8f4f83ba50f3f333699edb771d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17f5c2ce9540ab… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri May 3 14:45:15 2019 +0200 [CMK-2048] - during upgrade(migration) some specific for LWA files now skipped - *.ini, *.log, *.tmp, *.exe, plugins.cap, unistall_*.bat with foo upgrade::details::IsFileIgnored - unit tested - minor: added word "migration" to upgrade - minor: enum class Force instead of bool - minor: functions are shortened Change-Id: Ie95c6aa7fb34c8dad8043b217e56e17337751870 --- agents/wnx/src/common/wtools.cpp | 5 +- agents/wnx/src/engine/upgrade.cpp | 153 ++++++++++++++++++-------- agents/wnx/src/engine/upgrade.h | 14 ++- agents/wnx/src/engine/windows_service_api.cpp | 2 +- agents/wnx/src/main/check_mk_service.cpp | 5 +- agents/wnx/watest/test-upgrade.cpp | 38 +++++-- 6 files changed, 148 insertions(+), 69 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=17f5c2ce95…

5 years, 2 months

← Newer
1
...
25
26
27
28
29
30
31
...
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