Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 490323fc67fc84c272dbe22259277dc2cc5821ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=490323fc67fc84… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 7 09:55:26 2019 +0200 Activate passedByValue again. Change-Id: I67bbc7e67fe0fed811856a38edd56dfc2b4a2f29 --- livestatus/src/NagiosCore.cc | 2 +- livestatus/src/NagiosCore.h | 2 +- livestatus/src/cppcheck-suppressions.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/livestatus/src/NagiosCore.cc b/livestatus/src/NagiosCore.cc index 5507a76..d79fc91 100644 --- a/livestatus/src/NagiosCore.cc +++ b/livestatus/src/NagiosCore.cc @@ -44,7 +44,7 @@ void NagiosPaths::dump(Logger *logger) { Notice(logger) << "mkeventd socket path = '" << _mkeventd_socket << "'"; } -NagiosCore::NagiosCore(NagiosPaths paths, NagiosLimits limits, +NagiosCore::NagiosCore(NagiosPaths paths, const NagiosLimits &limits, NagiosAuthorization authorization, Encoding data_encoding) : _logger_livestatus(Logger::getLogger("cmk.livestatus")) diff --git a/livestatus/src/NagiosCore.h b/livestatus/src/NagiosCore.h index bc7daf9..411db20 100644 --- a/livestatus/src/NagiosCore.h +++ b/livestatus/src/NagiosCore.h @@ -67,7 +67,7 @@ struct NagiosAuthorization { class NagiosCore : public MonitoringCore { public: - NagiosCore(NagiosPaths paths, NagiosLimits limits, + NagiosCore(NagiosPaths paths, const NagiosLimits &limits, NagiosAuthorization authorization, Encoding data_encoding); Host *find_host(const std::string &name) override; diff --git a/livestatus/src/cppcheck-suppressions.txt b/livestatus/src/cppcheck-suppressions.txt index 1343c8c..cbb542f 100644 --- a/livestatus/src/cppcheck-suppressions.txt +++ b/livestatus/src/cppcheck-suppressions.txt @@ -1,5 +1,4 @@ missingIncludeSystem -passedByValue redundantAssignment uninitMemberVar unmatchedSuppression

5 years, 5 months

partial and limited tidy refactoring

by Sergey Kipnis

Module: check_mk Branch: master Commit: 94ebcf7d0d981d3af36c134001dec99a172a3fed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94ebcf7d0d981d… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Mon May 6 15:28:28 2019 +0200 partial and limited tidy refactoring Change-Id: I6db8e8ab83a4fbd415b3093cfaeabd9347e9c167 --- agents/wnx/include/tools/_misc.h | 12 +++---- agents/wnx/include/tools/_process.h | 11 +++---- agents/wnx/src/common/cfg_info.h | 6 ++-- agents/wnx/src/common/mailslot_transport.h | 47 +++++++++++++--------------- agents/wnx/src/common/wtools.cpp | 17 +++++----- agents/wnx/src/common/wtools.h | 44 +++++++++++++------------- agents/wnx/src/engine/cfg.cpp | 8 ++--- agents/wnx/src/engine/cfg.h | 5 +-- agents/wnx/src/engine/cfg_details.h | 11 +++---- agents/wnx/src/engine/cvt.cpp | 12 +++---- agents/wnx/src/engine/cvt.h | 16 ++++------ agents/wnx/src/engine/encryption.cpp | 12 +++---- agents/wnx/src/engine/groups.cpp | 4 +-- agents/wnx/src/engine/logger.h | 22 ++++++------- agents/wnx/src/engine/onlyfrom.cpp | 24 +++++++------- agents/wnx/src/engine/onlyfrom.h | 25 +++++---------- agents/wnx/src/engine/providers/internal.cpp | 25 +++++++-------- agents/wnx/src/engine/service_processor.cpp | 8 ++--- agents/wnx/src/lwa/Configuration.cpp | 27 ++++++++-------- 19 files changed, 156 insertions(+), 180 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=94ebcf7d0d…

5 years, 5 months

agent_azure: remove metric names count

by Moritz Kiemer

Module: check_mk Branch: master Commit: f0a90fb04eac266f213ee72ad1ef6b39c59d3eae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0a90fb04eac26… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon May 6 09:22:12 2019 +0200 agent_azure: remove metric names count * remove the count of metric names. This was left over from when the metrics list was created automatically * rename 'rid' to 'resource_id' * add some comments, as the second block will becom longer Change-Id: I7c4ec93dc48653ceb0199f29e8824f65e3212016 --- agents/special/agent_azure | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index a5912f1..a1d659a 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -68,6 +68,7 @@ METRICS_SELECTED = { # to add a new metric, just add a made up name, run the # agent, and you'll get a error listing available metrics! # key: list of (name(s), interval, aggregation, filter) + # NB: Azure API won't have requests with more than 20 metric names at once 'Microsoft.Network/virtualNetworkGateways': [ ('AverageBandwidth,P2SBandwidth', 'PT1M', 'average', None), ('P2SConnectionCount', 'PT1M', 'maximum', None), @@ -572,10 +573,7 @@ class MetricsCollecter(object): 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 = self.resource.info["id"] + resource_id = self.resource.info["id"] start = self.NOW - 3 * self.timedeltas[interval] timespan = "%s/%s" % (start.strftime("%Y-%m-%dT%H:%M:%SZ"), @@ -585,7 +583,7 @@ class MetricsCollecter(object): 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) + err.add("exception", resource_id, exc.message) LOG.exception(exc) return [] @@ -597,7 +595,7 @@ class MetricsCollecter(object): try: metrics.append(create_metric_dict(raw_metric, aggregation, interval, filter_)) except AzureMetricParseError as exc: - err.add(exc[0], rid, exc[1]) + err.add(exc[0], resource_id, exc[1]) LOG.warning(exc.args[1]) return metrics @@ -615,13 +613,21 @@ class MetricsCollecter(object): def process_resource(args): resource, client = args + # + # process the resource with all clients specific to the resource type + # client.process_specific(resource) + # + # gather all metrics of the resource + # err = IssueCollecter() # pass this to methods to collect issues - metrics_collecter = MetricsCollecter(resource, debug=client.args.debug) metrics_collecter.collect_metrics(client.monitor_client, err) + # + # create all sections + # agent_info_section = AzureSection('agent_info') agent_info_section.add(('remaining-reads', metrics_collecter.remaining_reads)) agent_info_section.add(err.dumpinfo())

5 years, 5 months

cmk.special_agents.utils: DataCache: allow more arguments

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6b146239b460c64e28143beb4808a25626ff7c94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b146239b460c6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon May 6 07:35:24 2019 +0200 cmk.special_agents.utils: DataCache: allow more arguments Change-Id: Iff729ae111d5e53619c01f7cfefdc997bff23290 --- cmk/special_agents/utils.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmk/special_agents/utils.py b/cmk/special_agents/utils.py index 60febc6..b0e8ff3 100644 --- a/cmk/special_agents/utils.py +++ b/cmk/special_agents/utils.py @@ -127,14 +127,14 @@ class DataCache(object): pass @abc.abstractmethod - def get_validity_from_args(self, args): + def get_validity_from_args(self, *args): """ Decide whether we need to update the cache due to new arguments """ pass @abc.abstractmethod - def get_live_data(self, args): + def get_live_data(self, *args): """ This is the function that will be called if no cached data can be found. """ @@ -187,8 +187,9 @@ class DataCache(object): raise return content - def get_data(self, args, use_cache=True): - if (use_cache and self.get_validity_from_args(args) and self._cache_is_valid()): + def get_data(self, *args, **kwargs): + use_cache = kwargs.pop('use_cache', True) + if (use_cache and self.get_validity_from_args(*args) and self._cache_is_valid()): try: return self.get_cached_data() except (OSError, IOError, ValueError) as exc: @@ -196,7 +197,7 @@ class DataCache(object): if self.debug: raise - live_data = self.get_live_data(args) + live_data = self.get_live_data(*args) if use_cache: try: self._write_to_cache(live_data)

5 years, 5 months

cmk.special_agents.utils: DataCache: introduce public debug attribute

by Moritz Kiemer

Module: check_mk Branch: master Commit: 83ab9706e71fb4af7d0b7d7d76bd1be75ecec527 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83ab9706e71fb4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri May 3 16:13:33 2019 +0200 cmk.special_agents.utils: DataCache: introduce public debug attribute Change-Id: Idb5d2a98b5397a86c02d86661fd41ea476e4bd1c --- cmk/special_agents/utils.py | 10 +++++++--- tests/unit/cmk/special_agents/test_utils_datacache.py | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmk/special_agents/utils.py b/cmk/special_agents/utils.py index 41cd020..60febc6 100644 --- a/cmk/special_agents/utils.py +++ b/cmk/special_agents/utils.py @@ -117,7 +117,7 @@ class DataCache(object): def __init__(self, cache_file_dir, cache_file_name, debug=False): self._cache_file_dir = Path(cache_file_dir) self._cache_file = self._cache_file_dir / ("%s.cache" % cache_file_name) - self._exceptions = () if debug else (OSError, IOError, ValueError) + self.debug = debug @abc.abstractproperty def cache_interval(self): @@ -191,15 +191,19 @@ class DataCache(object): if (use_cache and self.get_validity_from_args(args) and self._cache_is_valid()): try: return self.get_cached_data() - except self._exceptions as exc: + except (OSError, IOError, ValueError) as exc: logging.info("Getting live data (failed to read from cache: %s).", exc) + if self.debug: + raise live_data = self.get_live_data(args) if use_cache: try: self._write_to_cache(live_data) - except self._exceptions as exc: + except (OSError, IOError, TypeError) as exc: logging.info("Failed to write data to cache file: %s", exc) + if self.debug: + raise return live_data def _write_to_cache(self, raw_content): diff --git a/tests/unit/cmk/special_agents/test_utils_datacache.py b/tests/unit/cmk/special_agents/test_utils_datacache.py index 4f18cd1..38c7aa1 100644 --- a/tests/unit/cmk/special_agents/test_utils_datacache.py +++ b/tests/unit/cmk/special_agents/test_utils_datacache.py @@ -21,10 +21,10 @@ def test_datacache_init(tmpdir): tcache = TestCache(tmpdir, 'test') assert isinstance(tcache._cache_file_dir, Path) assert isinstance(tcache._cache_file, Path) - assert tcache._exceptions == (OSError, IOError, ValueError) + assert not tcache.debug tc_debug = TestCache(tmpdir, 'test', debug=True) - assert tc_debug._exceptions == () + assert tc_debug.debug with pytest.raises(TypeError): DataCache('foo', 'bar') # pylint: disable=abstract-class-instantiated

5 years, 5 months

ceph_status: add test

by Moritz Kiemer

Module: check_mk Branch: master Commit: 08833ef1b086ab01ea37f2b138adc5a6b88c1589 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08833ef1b086ab… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon May 6 15:56:57 2019 +0200 ceph_status: add test Change-Id: I352f05123fa20d09e4d908d5e18924c72b493fb5 --- .../generictests/datasets/ceph_status_new.py | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/ceph_status_new.py b/tests/unit/checks/generictests/datasets/ceph_status_new.py new file mode 100644 index 0000000..abfee2e --- /dev/null +++ b/tests/unit/checks/generictests/datasets/ceph_status_new.py @@ -0,0 +1,59 @@ +# yapf: disable + + +checkname = 'ceph_status' + + +info = [['{'], + ['"fsid":', '"f31a6bb1-27fc-4a47-ba8b-e7e06d0b1efa",'], + ['"health":', '{'], + ['"checks":', '{},'], + ['"status":', '"HEALTH_OK",'], + ['"summary":', '['], + ['{'], + ['"severity":', '"HEALTH_WARN",'], + ['"summary":', + '"\'ceph', + "health'", + 'JSON', + 'format', + 'has', + 'changed', + 'in', + 'luminous.', + 'If', + 'you', + 'see', + 'this', + 'your', + 'monitoring', + 'system', + 'is', + 'scraping', + 'the', + 'wrong', + 'fields.', + 'Disable', + 'this', + 'with', + "'mon", + 'health', + 'preluminous', + 'compat', + 'warning', + '=', + 'false\'"'], + ['}'], + ['],'], + ['"overall_status":', '"HEALTH_WARN"'], + ['},'], + ['"election_epoch":', '2020'], + ['}']] + + +discovery = {'': [(None, {})], 'mgrs': [], 'osds': [], 'pgs': []} + + +checks = {'': [(None, + {'epoch': (1, 3, 30)}, + [(0, 'Status: OK', []), (0, 'Epoch: 0/30 m', [])])]} \ No newline at end of file

5 years, 5 months

agent_azure: Persist metrics with resolution below one minute

by Moritz Kiemer

Module: check_mk Branch: master Commit: f445a8f9e0f03d89489acbf57d94cc00a794e710 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f445a8f9e0f03d… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon May 6 09:03:01 2019 +0200 agent_azure: Persist metrics with resolution below one minute CMK-1437 Change-Id: I5ed88c9317edf26163fddc5730f36426a92e6b80 --- agents/special/agent_azure | 91 ++++++++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 36 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index a1d659a..3308f04 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -38,6 +38,7 @@ Special agent for monitoring azure cloud applications with Check_MK. import json import datetime import calendar +import string import sys import re import argparse @@ -46,6 +47,8 @@ import logging from multiprocessing import Process, Lock, Queue from Queue import Empty as QueueEmpty +from pathlib2 import Path + # We have to set a null handler for logging before importing the azure stuff. # Otherwise a warning will be sent to stderr - and if for some other reason # the agent returns a non-zero exit code this (irrelevant) warning would be @@ -59,6 +62,9 @@ from azure.mgmt.compute import ComputeManagementClient from azure.common.credentials import ServicePrincipalCredentials logging.getLogger().handlers.pop() +from cmk.utils.paths import tmp_dir + +from cmk.special_agents.utils import DataCache import cmk.utils.password_store cmk.utils.password_store.replace_passwords() @@ -83,6 +89,8 @@ METRICS_SELECTED = { 'Microsoft.Web/sites': [('CpuTime,AverageResponseTime,Http5xx', 'PT1M', 'total', None),], } +AZURE_CACHE_FILE_PATH = Path(tmp_dir) / "agents" / "agent_azure" + class AsyncMapper(object): # pylint: disable=too-few-public-methods '''Create an async drop-in replacement for builtin 'map' @@ -536,23 +544,36 @@ class AzureClient(object): return self._cache["resources"] -class MetricsCollecter(object): +class MetricCache(DataCache): NOW = datetime.datetime.utcnow() - def __init__(self, resource, debug=False): - super(MetricsCollecter, self).__init__() - self.debug = debug - self.resource = resource - self.remaining_reads = "unknown (no metrics fetched)" - self.timedeltas = { + def __init__(self, resource, metric_definition, debug=False): + self.metric_definition = metric_definition + metricnames = metric_definition[0] + super(MetricCache, self).__init__(self.get_cache_path(resource), metricnames, debug=debug) + self.remaining_reads = None + self.timedelta = { "PT1M": datetime.timedelta(minutes=1), "PT5M": datetime.timedelta(minutes=5), "PT1H": datetime.timedelta(hours=1), - } + }[metric_definition[1]] + + @staticmethod + def get_cache_path(resource): + valid_chars = "-_.() %s%s" % (string.ascii_letters, string.digits) + subdir = ''.join(c if c in valid_chars else '_' for c in resource.info['id']) + return AZURE_CACHE_FILE_PATH / subdir - def _metric_api_call(self, monitor_client, timespan, interval, metric, aggregation, filter_): - rid = self.resource.info['id'] + @property + def cache_interval(self): + return self.timedelta.seconds + + def get_validity_from_args(self, *args): + return True + + @staticmethod + def _metric_api_call(monitor_client, 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_) @@ -571,17 +592,16 @@ class MetricsCollecter(object): raw_metrics = list(raw.output.value) return raw.response, raw_metrics - def _fetch_specific_metrics(self, monitor_client, metricnames, interval, aggregation, filter_, - err): - resource_id = self.resource.info["id"] + def get_live_data(self, monitor_client, resource_id, err): # pylint: disable=arguments-differ + metricnames, interval, aggregation, filter_ = self.metric_definition - start = self.NOW - 3 * self.timedeltas[interval] + start = self.NOW - 3 * self.timedelta timespan = "%s/%s" % (start.strftime("%Y-%m-%dT%H:%M:%SZ"), self.NOW.strftime("%Y-%m-%dT%H:%M:%SZ")) try: - response, raw_metrics = self._metric_api_call(monitor_client, timespan, interval, - metricnames, aggregation, filter_) + response, raw_metrics = self._metric_api_call( + monitor_client, resource_id, timespan, interval, metricnames, aggregation, filter_) except () if self.debug else ErrorResponseException as exc: err.add("exception", resource_id, exc.message) LOG.exception(exc) @@ -600,36 +620,35 @@ class MetricsCollecter(object): return metrics - # 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, monitor_client, err): - metric_params = METRICS_SELECTED.get(self.resource.info["type"], []) - for metricnames, interval, aggregation, filter_ in metric_params: - self.resource.metrics += self._fetch_specific_metrics( - monitor_client, metricnames, interval, aggregation, filter_, err) +def gather_metrics(client, resource): + ''' + Gather all metrics for a resource. These metrics have different time + resolutions, so every metric needs its own cache. + Along the way collect ocurrring errors and keep track of the remaining + API reads. + ''' + err = IssueCollecter() + metric_definitions = METRICS_SELECTED.get(resource.info["type"], []) + remaining_api_reads = None + for metric_def in metric_definitions: + cache = MetricCache(resource, metric_def, debug=client.args.debug) + resource.metrics += cache.get_data(client.monitor_client, resource.info['id'], err) + remaining_api_reads = (min((remaining_api_reads, cache.remaining_reads)) or + cache.remaining_reads or remaining_api_reads) + remaining_api_reads = remaining_api_reads or "unknown (no metrics fetched)" + return remaining_api_reads, err def process_resource(args): resource, client = args - # - # process the resource with all clients specific to the resource type - # client.process_specific(resource) - # - # gather all metrics of the resource - # - err = IssueCollecter() # pass this to methods to collect issues - metrics_collecter = MetricsCollecter(resource, debug=client.args.debug) - metrics_collecter.collect_metrics(client.monitor_client, err) + remaining_api_reads, err = gather_metrics(client, resource) - # - # create all sections - # agent_info_section = AzureSection('agent_info') - agent_info_section.add(('remaining-reads', metrics_collecter.remaining_reads)) + agent_info_section.add(('remaining-reads', remaining_api_reads)) agent_info_section.add(err.dumpinfo()) sections = [agent_info_section]

5 years, 5 months

agent_azure: change handling of intervals

by Moritz Kiemer

Module: check_mk Branch: master Commit: e34fb4a699951c03c3b47d33f44b0dc042c42997 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e34fb4a699951c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon May 6 07:59:19 2019 +0200 agent_azure: change handling of intervals Another step towards caching. In the future 'timedelta' will double as the caches max age, so make the factor of 3 when fetching the data explicit. Change-Id: Ica62b5abf75e54302bc9fb8eac076b4bd280f206 --- agents/special/agent_azure | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index c004157..a5912f1 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -536,26 +536,18 @@ class AzureClient(object): class MetricsCollecter(object): + + NOW = datetime.datetime.utcnow() + 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""" - - 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), + self.timedeltas = { + "PT1M": datetime.timedelta(minutes=1), + "PT5M": datetime.timedelta(minutes=5), + "PT1H": datetime.timedelta(hours=1), } def _metric_api_call(self, monitor_client, timespan, interval, metric, aggregation, filter_): @@ -584,7 +576,10 @@ class MetricsCollecter(object): raise ValueError("Azure API won't have requests with more than 20 metrics!") rid = self.resource.info["id"] - timespan = self.timespans[interval] + + start = self.NOW - 3 * self.timedeltas[interval] + timespan = "%s/%s" % (start.strftime("%Y-%m-%dT%H:%M:%SZ"), + self.NOW.strftime("%Y-%m-%dT%H:%M:%SZ")) try: response, raw_metrics = self._metric_api_call(monitor_client, timespan, interval,

5 years, 5 months

7476 FIX Allow shell interpreted characters in agent encryption phrase

by Moritz Kiemer

Module: check_mk Branch: master Commit: 65f75562e1d113b29424e4d14337360ab80a0212 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65f75562e1d113… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon May 6 16:44:52 2019 +0200 7476 FIX Allow shell interpreted characters in agent encryption phrase Perviously the passphrase was not properly escaped, such that characters with special meaning to the shell lead to unencrypted agent data. Change-Id: I996831ea8bab5ca91180d4b0f38e3545e9c3c125 --- .werks/7476 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/7476 b/.werks/7476 new file mode 100644 index 0000000..d513894 --- /dev/null +++ b/.werks/7476 @@ -0,0 +1,12 @@ +Title: Allow shell interpreted characters in agent encryption phrase +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1557153675 +Class: fix + +Perviously the passphrase was not properly escaped, such that +characters with special meaning to the shell lead to unencrypted +agent data.

5 years, 5 months

Fixed wrong paths

by Lars Michelsen

Module: check_mk Branch: master Commit: 6bce0b42b091365e87a2c99566cbf69e42cfc4b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bce0b42b09136… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 7 08:22:14 2019 +0200 Fixed wrong paths Change-Id: I4e43c2cee1531bf84dd4773b4ba2dddcad1b24b7 --- omd/debian/postinst.in | 8 ++++---- omd/packages/cma/post-install | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/omd/debian/postinst.in b/omd/debian/postinst.in index baeb084..b954458 100755 --- a/omd/debian/postinst.in +++ b/omd/debian/postinst.in @@ -61,13 +61,13 @@ case "$1" in if [ -f $PROGRAM_PATH ]; then setperm root omd 750 $PROGRAM_PATH - if [ "$PROGRAM" = "nagios/plugins/check_icmp" ]; then + if [ "$PROGRAM" = "lib/nagios/plugins/check_icmp" ]; then CAP="cap_net_raw+ep" - elif [ "$PROGRAM" = "nagios/plugins/check_dhcp" ]; then + elif [ "$PROGRAM" = "lib/nagios/plugins/check_dhcp" ]; then CAP="cap_net_raw,cap_net_bind_service=+ep" - elif [ "$PROGRAM" = "cmc/icmpsender" ]; then + elif [ "$PROGRAM" = "lib/cmc/icmpsender" ]; then CAP="cap_net_raw+ep" - elif [ "$PROGRAM" = "cmc/icmpreceiver" ]; then + elif [ "$PROGRAM" = "lib/cmc/icmpreceiver" ]; then CAP="cap_net_raw+ep" elif [ "$PROGRAM" = "bin/mkeventd_open514" ]; then CAP="cap_net_bind_service+ep" diff --git a/omd/packages/cma/post-install b/omd/packages/cma/post-install index 4eefcae..1807b94 100755 --- a/omd/packages/cma/post-install +++ b/omd/packages/cma/post-install @@ -11,13 +11,13 @@ for PROGRAM in $CAP_PROGRAMS; do chgrp omd $PROGRAM_PATH chmod 750 $PROGRAM_PATH - if [ "$PROGRAM" = "nagios/plugins/check_icmp" ]; then + if [ "$PROGRAM" = "lib/nagios/plugins/check_icmp" ]; then CAP="cap_net_raw+ep" - elif [ "$PROGRAM" = "nagios/plugins/check_dhcp" ]; then + elif [ "$PROGRAM" = "lib/nagios/plugins/check_dhcp" ]; then CAP="cap_net_raw,cap_net_bind_service=+ep" - elif [ "$PROGRAM" = "cmc/icmpsender" ]; then + elif [ "$PROGRAM" = "lib/cmc/icmpsender" ]; then CAP="cap_net_raw+ep" - elif [ "$PROGRAM" = "cmc/icmpreceiver" ]; then + elif [ "$PROGRAM" = "lib/cmc/icmpreceiver" ]; then CAP="cap_net_raw+ep" elif [ "$PROGRAM" = "bin/mkeventd_open514" ]; then CAP="cap_net_bind_service+ep"

5 years, 5 months

← Newer
1
...
18
19
20
21
22
23
24
...
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