Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

compiledb understands the C locale only.

by Sven Panne

Module: check_mk Branch: master Commit: ded677ec8a41e5ee1a0c622617c73f08d290703c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ded677ec8a41e5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 6 15:18:56 2019 +0200 compiledb understands the C locale only. Change-Id: I48a5f52ad133b4c6cabc6ba1112268fa23e58b5d --- livestatus/src/Makefile.am | 2 +- livestatus/src/test/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index f011256..759e63e 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -178,7 +178,7 @@ livestatus.o: $(liblivestatus_a_OBJECTS) compile_commands.json: Makefile $(wildcard *.cc *.h) $(MAKE) -C $(top_srcdir) .venv - $(MAKE) -Bnwk | pipenv run compiledb + LANG=C $(MAKE) -Bnwk | pipenv run compiledb tidy: compile_commands.json $(RUN_CLANG_TIDY) -quiet -j6 $(FILES_TO_CHECK) diff --git a/livestatus/src/test/Makefile.am b/livestatus/src/test/Makefile.am index ced6ea9..1b13e39 100644 --- a/livestatus/src/test/Makefile.am +++ b/livestatus/src/test/Makefile.am @@ -79,7 +79,7 @@ build_googletest: compile_commands.json: Makefile $(wildcard *.cc *.h) $(MAKE) -C $(top_srcdir) .venv $(MAKE) -j4 -C .. - $(MAKE) -Bnwk | PIPENV_MAX_DEPTH=4 pipenv run compiledb + LANG=C $(MAKE) -Bnwk | PIPENV_MAX_DEPTH=4 pipenv run compiledb tidy: compile_commands.json $(RUN_CLANG_TIDY) -quiet -j6 $(FILES_TO_CHECK)

5 years, 2 months

aws_elbv2_network: new checks which monitor cloudwatch metrics of AWS/ NetworkELB

by Simon Betz

Module: check_mk Branch: master Commit: a3a9427cb4f4b4f4269c4fc7f35d4a7d5555f9ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3a9427cb4f4b4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu May 2 13:29:10 2019 +0200 aws_elbv2_network: new checks which monitor cloudwatch metrics of AWS/NetworkELB Change-Id: I714678416f2978d309acd640e4a992c87e542fca --- checkman/aws_elbv2_network | 15 ++ checkman/aws_elbv2_network.connections | 13 ++ checkman/aws_elbv2_network.healthy_hosts | 14 ++ checkman/aws_elbv2_network.rst_packets | 12 ++ checkman/aws_elbv2_network.statistics | 13 ++ checkman/aws_elbv2_network.tls_handshakes | 15 ++ checks/aws_elbv2_network | 327 ++++++++++++++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 42 ++++ 8 files changed, 451 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a3a9427cb4…

5 years, 2 months

Add some AWS/ELBv2 tests

by Simon Betz

Module: check_mk Branch: master Commit: f8947293a06916ac99c2386ce142499e09e9ad6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8947293a06916… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 3 16:17:03 2019 +0200 Add some AWS/ELBv2 tests Change-Id: I43645178624f58514e4f8140349a0ea2d085a055 --- .../agent_aws/test_agent_aws_elbv2.py | 227 ++++++++++++++++++--- 1 file changed, 200 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f8947293a0…

5 years, 2 months

Added missing import.

by Sven Panne

Module: check_mk Branch: master Commit: 8a46226e52bd0862d5f85a8e6d9b95079b0ff822 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a46226e52bd08… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 6 14:34:08 2019 +0200 Added missing import. Change-Id: Ia6e5a43bd95e83b292798ef2c95a3eb4c6ecf05a --- cmk_base/discovery.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 90b9918..d32aae2 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -36,6 +36,7 @@ import cmk.utils.tty as tty import cmk.utils.debug import cmk.utils.paths from cmk.utils.exceptions import MKGeneralException, MKTimeout +import cmk.utils.store as store import cmk_base.crash_reporting import cmk_base.config as config

5 years, 2 months

aws_elbv2_application: New checks which monitor cloudwatch metrics of AWS/ ApplicationELB

by Simon Betz

Module: check_mk Branch: master Commit: 8029fa2ae014b620630dd2049dc60ff8c296f0c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8029fa2ae014b6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu May 2 13:22:11 2019 +0200 aws_elbv2_application: New checks which monitor cloudwatch metrics of AWS/ApplicationELB Change-Id: I5f87790264553c851886c6da8a6b10ef467b7bb8 --- checkman/aws_elbv2_application | 15 + checkman/aws_elbv2_application.connections | 14 + checkman/aws_elbv2_application.http_elb | 15 + checkman/aws_elbv2_application.http_redirects | 13 + checkman/aws_elbv2_application.statistics | 13 + checks/aws_elb | 12 +- checks/aws_elbv2_application | 302 +++++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 78 ++++++ cmk/gui/plugins/wato/check_parameters/aws.py | 31 +++ cmk/special_agents/agent_aws.py | 26 +- .../agent_aws/test_agent_aws_elbv2.py | 2 +- 11 files changed, 504 insertions(+), 17 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8029fa2ae0…

5 years, 2 months

Make RulesetMatchObject() repr output useful information

by Lars Michelsen

Module: check_mk Branch: master Commit: 0b52ebac696933f14e852910ad395415c29d18af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b52ebac696933… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 6 13:39:09 2019 +0200 Make RulesetMatchObject() repr output useful information Change-Id: Ica87c17aeeb5e354e087b8fcb9c8e9843c503ddc --- cmk/utils/rulesets/ruleset_matcher.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmk/utils/rulesets/ruleset_matcher.py b/cmk/utils/rulesets/ruleset_matcher.py index 5fbbce4..6683373 100644 --- a/cmk/utils/rulesets/ruleset_matcher.py +++ b/cmk/utils/rulesets/ruleset_matcher.py @@ -54,6 +54,10 @@ class RulesetMatchObject(object): def copy(self): return RulesetMatchObject(**self.to_dict()) + def __repr__(self): + kwargs = ", ".join(["%s=%r" % e for e in self.to_dict().iteritems()]) + return "RulesetMatchObject(%s)" % kwargs + class RulesetMatcher(object): def __init__(self):

5 years, 2 months

[CMK-1971] - internal winperf section provider call is relocated at the beginning of the futures ' "queue"

by Sergey Kipnis

Module: check_mk Branch: master Commit: a35cfefca128a3b5d19cbe188a42b46b2a523ff2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a35cfefca128a3… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Mon May 6 13:00:48 2019 +0200 [CMK-1971] - internal winperf section provider call is relocated at the beginning of the futures' "queue" - this is done to achieve compatibility with existing buggy servers(mandatory for beta) - minor: added tags to the yml to have better control over automatic update process Change-Id: I67ba0cc4fb259fe5be6eced3d545c110a672e4e6 --- agents/wnx/install/resources/check_mk.yml | 3 ++- agents/wnx/src/engine/service_processor.cpp | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/agents/wnx/install/resources/check_mk.yml b/agents/wnx/install/resources/check_mk.yml index c577d33..4298eda 100644 --- a/agents/wnx/install/resources/check_mk.yml +++ b/agents/wnx/install/resources/check_mk.yml @@ -1,6 +1,7 @@ # Default Check MK configuration file # Copyright Mathias Kettner GmbH -# version 10008 +# version 10009 +# tag '06.05.2019' # global must be presented # IMPORTANT notes diff --git a/agents/wnx/src/engine/service_processor.cpp b/agents/wnx/src/engine/service_processor.cpp index d95f62b..5ef3394 100644 --- a/agents/wnx/src/engine/service_processor.cpp +++ b/agents/wnx/src/engine/service_processor.cpp @@ -235,6 +235,18 @@ int ServiceProcessor::startProviders(AnswerId Tp, std::string Ip) { preLoadConfig(); // sections to be kicked out tryToKick(uptime_provider_, Tp, Ip); + + // #TODO remove the warning and relocate this block back at the end after beta-testing + // We have RElocated winperf here just to be compatible with older servers to avoid + // winperf_if check crash. We have no 100% guarantee, that winperf comes before plugin winperf + // but it's good enough for beta with older servers(which we're not going to support in release) + // + // WinPerf Processing + if (groups::winperf.enabledInConfig() && + groups::global.allowedSection(vars::kWinPerfPrefixDefault)) { + kickWinPerf(Tp, Ip); + } + tryToKick(df_provider_, Tp, Ip); tryToKick(mem_provider_, Tp, Ip); tryToKick(services_provider_, Tp, Ip); @@ -262,12 +274,6 @@ int ServiceProcessor::startProviders(AnswerId Tp, std::string Ip) { ohm_process_.start(cma::provider::GetOhmCliPath().wstring()); } - // WinPerf Processing - if (groups::winperf.enabledInConfig() && - groups::global.allowedSection(vars::kWinPerfPrefixDefault)) { - kickWinPerf(Tp, Ip); - } - // Plugins Processing #if 0 // we do not use anymore separate plugin process(player)

5 years, 2 months

WK7259: Fixed bug with host discovery causing steadily increasing CPU load on the monitoring system

by Andreas Boesl

Module: check_mk Branch: master Commit: e71c79b6899e1ad95d3a4a03eed6973ca118dd23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e71c79b6899e1a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 6 13:15:16 2019 +0200 WK7259: Fixed bug with host discovery causing steadily increasing CPU load on the monitoring system Change-Id: I34b120ddf0ebd37c4836cd90adc425a1ec6e35a8 --- .werks/7259 | 16 ++++++++++++++++ cmk_base/discovery.py | 14 ++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.werks/7259 b/.werks/7259 new file mode 100644 index 0000000..8a857cb --- /dev/null +++ b/.werks/7259 @@ -0,0 +1,16 @@ +Title: Fixed bug with host discovery causing steadily increasing CPU load on the monitoring system. +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1557135736 + +A host service discovery could modify the monitoring cores live configuration. +The monitoring core detects this deviation and restarts the Check_MK helper. +However, the restarted helper uses the new configuration, whereas the core still uses the old configuration - causing another restart... + +This has been fixed. + diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index f915759..90b9918 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -29,6 +29,7 @@ import socket import time import signal from typing import Callable, List, Text, Optional, Dict, Tuple # pylint: disable=unused-import +import pathlib2 as pathlib from cmk.utils.regex import regex import cmk.utils.tty as tty @@ -1332,16 +1333,17 @@ def _remove_autochecks_file(hostname): pass -# FIXME TODO: Consolidate with automation.py automation_write_autochecks_file() def _save_autochecks_file(hostname, items): if not os.path.exists(cmk.utils.paths.autochecks_dir): os.makedirs(cmk.utils.paths.autochecks_dir) - filepath = "%s/%s.mk" % (cmk.utils.paths.autochecks_dir, hostname) - out = file(filepath, "w") - out.write("[\n") + + filepath = pathlib.Path() / cmk.utils.paths.autochecks_dir / ("%s.mk" % hostname) + content = [] + content.append("[") for check_plugin_name, item, paramstring in items: - out.write(" (%r, %r, %s),\n" % (check_plugin_name, item, paramstring)) - out.write("]\n") + content.append(" (%r, %r, %s)," % (check_plugin_name, item, paramstring)) + content.append("]\n") + store.save_file(str(filepath), "\n".join(content)) def set_autochecks_of(host_config, new_items):

5 years, 2 months

7398 FIX heartbeat_crm: Inconsistent parameter format

by Moritz Kiemer

Module: check_mk Branch: master Commit: dc9d8c14fc849f9afd2ca578b398061173d279e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc9d8c14fc849f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 11 08:18:37 2019 +0200 7398 FIX heartbeat_crm: Inconsistent parameter format Due to an inconsistent parameter format, the default parameters could not be displayed during discovery. Change-Id: I2f029f23d750e4ccea49daa03862e94465f5b492 --- .werks/7398 | 11 ++++ checks/heartbeat_crm | 56 ++++++++-------- .../plugins/wato/check_parameters/heartbeat_crm.py | 74 ++++++++++++++-------- 3 files changed, 90 insertions(+), 51 deletions(-) diff --git a/.werks/7398 b/.werks/7398 new file mode 100644 index 0000000..1b0b2f6 --- /dev/null +++ b/.werks/7398 @@ -0,0 +1,11 @@ +Title: heartbeat_crm: Inconsistent parameter format +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1554962632 + +Due to an inconsistent parameter format, the default parameters could not be displayed during discovery. diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index 5372cae..157b5bc 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -125,9 +125,9 @@ def inventory_heartbeat_crm(info): settings = host_extra_conf_merged(host_name(), inventory_heartbeat_crm_rules) try: _last_updated, dc, num_nodes, num_resources = heartbeat_crm_parse_general(info) - except: + except Exception: # pylint: disable=broad-except # In the case that CRM is not working, add it as a service and show the error later - dc, num_nodes, num_resources = 0, 0, 0 + _last_updated, dc, num_nodes, num_resources = 0, 0, 0, 0 params = { 'num_nodes': num_nodes, 'num_resources': num_resources, @@ -137,9 +137,22 @@ def inventory_heartbeat_crm(info): return [(None, params)] -def check_heartbeat_crm(item, params, info): - if not len(info) > 0: - return +def _transform_heartbeat_crm(params): + if isinstance(params, dict): + return params + par_dict = {'max_age': params[0]} + if params[1]: + par_dict['dc'] = params[1] + if params[2] > -1: + par_dict['num_nodes'] = params[2] + if params[3] > -1: + par_dict['num_resources'] = params[3] + return par_dict + + +def check_heartbeat_crm(_no_item, params, info): + if not info: + return None first_line = ' '.join(info[0]) if first_line.lower().startswith( @@ -148,14 +161,8 @@ def check_heartbeat_crm(item, params, info): last_updated, dc, numNodes, numResources = heartbeat_crm_parse_general(info) - # Convert old tuple params (pre 1.2.5i6) - if isinstance(params, tuple): - params = { - 'max_age': params[0], - 'dc': params[1] != "" and params[1] or None, - 'num_nodes': params[2] != -1 and params[2] or None, - 'num_resources': params[3] != -1 and params[3] or None, - } + # Convert old tuple params (pre 1.5.0p14) + params = _transform_heartbeat_crm(params) # Check the freshness of the crm_mon output and terminate with CRITICAL # when too old information are found @@ -241,24 +248,23 @@ def heartbeat_crm_parse_resources(info): resources[parts[2]] = [] resource = parts[2] mode = 'masterslaveset' - elif line.startswith('_'): - # consider inconsistent agent output in clone set lines - fixed_parts = parts[1:] + elif line[0] == '_': + # Cleanup inconsistent agent output in clone set lines if parts[0] != "_": - fixed_parts.insert(0, parts[0].lstrip('_')) + parts.insert(1, parts[0][1:]) + parts[0] = "_" # Resource group or set member if mode == 'resourcegroup': - resources[resource].append(fixed_parts) + resources[resource].append(parts[1:]) elif mode == 'cloneset': - if fixed_parts[0] == 'Started:': - resources[resource].append( - [resource, 'Clone', 'Started', fixed_parts[2:-1]]) + if parts[1] == 'Started:': + resources[resource].append([resource, 'Clone', 'Started', parts[3:-1]]) elif mode == 'masterslaveset': - if fixed_parts[0] == 'Masters:': - resources[resource].append([resource, 'Master', 'Started', fixed_parts[2]]) - if fixed_parts[0] == 'Slaves:': - resources[resource].append([resource, 'Slave', 'Started', fixed_parts[2]]) + if parts[1] == 'Masters:': + resources[resource].append([resource, 'Master', 'Started', parts[3]]) + if parts[1] == 'Slaves:': + resources[resource].append([resource, 'Slave', 'Started', parts[3]]) else: # Single resource resources[parts[0]] = [parts] diff --git a/cmk/gui/plugins/wato/check_parameters/heartbeat_crm.py b/cmk/gui/plugins/wato/check_parameters/heartbeat_crm.py index b07f38f..8412098 100644 --- a/cmk/gui/plugins/wato/check_parameters/heartbeat_crm.py +++ b/cmk/gui/plugins/wato/check_parameters/heartbeat_crm.py @@ -29,9 +29,8 @@ from cmk.gui.valuespec import ( Checkbox, Dictionary, Integer, - Optional, TextAscii, - Tuple, + Transform, ) from cmk.gui.plugins.wato import ( @@ -100,27 +99,50 @@ class RulespecCheckgroupParametersHeartbeatCrm(CheckParameterRulespecWithoutItem @property def parameter_valuespec(self): - return Tuple( - elements=[ - Integer( - title=_("Maximum age"), - help=_("Maximum accepted age of the reported data in seconds"), - unit=_("seconds"), - default_value=60, - ), - Optional( - TextAscii(allow_empty=False), - title=_("Expected DC"), - help=_("The hostname of the expected distinguished controller of the cluster"), - ), - Optional( - Integer(min_value=2, default_value=2), - title=_("Number of Nodes"), - help=_("The expected number of nodes in the cluster"), - ), - Optional( - Integer(min_value=0,), - title=_("Number of Resources"), - help=_("The expected number of resources in the cluster"), - ), - ],) + return Transform( + Dictionary( + elements=[ + ("max_age", + Integer( + title=_("Maximum age"), + help=_("Maximum accepted age of the reported data in seconds"), + unit=_("seconds"), + default_value=60, + )), + ("dc", + TextAscii( + allow_empty=False, + title=_("Expected DC"), + help=_( + "The hostname of the expected distinguished controller of the cluster" + ), + )), + ("num_nodes", + Integer( + min_value=0, + default_value=2, + title=_("Number of Nodes"), + help=_("The expected number of nodes in the cluster"), + )), + ("num_resources", + Integer( + min_value=0, + title=_("Number of Resources"), + help=_("The expected number of resources in the cluster"), + )), + ], + optional_keys=["dc", "num_nodes", "num_resources"], + ), + forth=self._transform_heartbeat_crm) + + def _transform_heartbeat_crm(self, params): + if isinstance(params, dict): + return params + par_dict = {'max_age': params[0]} + if params[1]: + par_dict['dc'] = params[1] + if params[2] > -1: + par_dict['num_nodes'] = params[2] + if params[3] > -1: + par_dict['num_resources'] = params[3] + return par_dict

5 years, 2 months

oracle_dataguard_stats: Fix flaky test by making infotext order deterministic

by Florian Kromer

Module: check_mk Branch: master Commit: 96496bd6cbe8ef69de23b117d1670f2d382521ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96496bd6cbe8ef… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon May 6 12:46:10 2019 +0200 oracle_dataguard_stats: Fix flaky test by making infotext order deterministic Change-Id: Id9d74f4d0a130e2482c49e167c3488ed9a271e40 --- checks/oracle_dataguard_stats | 2 +- .../checks/generictests/datasets/oracle_dataguard_stats.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/checks/oracle_dataguard_stats b/checks/oracle_dataguard_stats index 272328d..971b705 100644 --- a/checks/oracle_dataguard_stats +++ b/checks/oracle_dataguard_stats @@ -160,7 +160,7 @@ def check_oracle_dataguard_stats(item, params, parsed): else: yield 2, "Managed Recovery Process not started" - for dgstat_param in dgdata['dgstat'].keys(): + for dgstat_param in sorted(dgdata['dgstat'].keys()): if dgstat_param in ('apply lag', 'transport lag') and dgdata['dgstat'][dgstat_param]: seconds = get_seconds(dgdata['dgstat'][dgstat_param]) diff --git a/tests/unit/checks/generictests/datasets/oracle_dataguard_stats.py b/tests/unit/checks/generictests/datasets/oracle_dataguard_stats.py index 951596d..82151bc 100644 --- a/tests/unit/checks/generictests/datasets/oracle_dataguard_stats.py +++ b/tests/unit/checks/generictests/datasets/oracle_dataguard_stats.py @@ -37,13 +37,15 @@ checks = {'': [('TESTDB.TESTDBU2', (0, 'Broker maximum', [])]), ('TUX12C.TUXSTDB', {'apply_lag': (3600, 14400)}, - [(0, 'Database Role physical standby', []), + [ + (0, 'Database Role physical standby', []), (0, 'apply finish time 17.0 s', [('apply_finish_time', 17, None, None, None, None)]), (0, + 'apply lag 28 m', + [('apply_lag', 1737, 3600, 14400, None, None)]), + (0, 'transport lag 0.00 s', [('transport_lag', 0, None, None, None, None)]), - (0, - 'apply lag 28 m', - [('apply_lag', 1737, 3600, 14400, None, None)])])]} \ No newline at end of file +])]}

5 years, 2 months

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