Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Wow, second potential bug found by adding some simple type hints

by Lars Michelsen

Module: check_mk Branch: master Commit: 65de1b164ee1d10867880a9da44d8152f81c39b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65de1b164ee1d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 20:22:47 2019 +0200 Wow, second potential bug found by adding some simple type hints Change-Id: I79235a35bb6175efe8de0045fee071c5aaf9418d --- cmk_base/snmp.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index eea24fc..60c42c2 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -147,10 +147,16 @@ def create_snmp_host_config(hostname): # type: (str) -> cmk_base.snmp_utils.SNMPHostConfig host_config = config.get_config_cache().get_host_config(hostname) - return cmk_base.snmp_utils.SNMPHostConfig( + # ip_lookup.lookup_ipv4_address() returns Optional[str] in general, but for + # all cases that reach the code here we seem to have "str". + address = ip_lookup.lookup_ip_address(hostname) + if address is None: + raise MKGeneralException("Failed to gather IP address of %s" % hostname) + + return cmk_base.snmp_utils.SNMPHostConfig( # type: ignore is_ipv6_primary=host_config.is_ipv6_primary, hostname=hostname, - ipaddress=ip_lookup.lookup_ipv4_address(hostname), + ipaddress=address, credentials=config.snmp_credentials_of(hostname), port=config.snmp_port_of(hostname), is_bulkwalk_host=config.is_bulkwalk_host(hostname),

5 years, 5 months

Fixed linter issue

by Lars Michelsen

Module: check_mk Branch: master Commit: 5f52bcbb50005210a383275c22d1dcc8061fb8ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f52bcbb500052… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 19:19:20 2019 +0200 Fixed linter issue Change-Id: I37c3a7042f41adca8f53043eb146798b7fa505c9 --- cmk_base/default_config/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/default_config/base.py b/cmk_base/default_config/base.py index 3658a4c..ea13432 100644 --- a/cmk_base/default_config/base.py +++ b/cmk_base/default_config/base.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import typing as _typing +import typing as _typing # pylint: disable=unused-import # This file contains the defaults settings for almost all configuration # variables that can be overridden in main.mk. Some configuration

5 years, 5 months

7372 FIX agent_aws: Fixed restriction of services by tags

by Simon Betz

Module: check_mk Branch: master Commit: 320b6c709d68d07a330370f6e9be490623491851 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=320b6c709d68d0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 16 14:12:16 2019 +0200 7372 FIX agent_aws: Fixed restriction of services by tags Wow, what a rookie mistake... :( Change-Id: I0740ab3d80b36fc59e6ba37af14c1cfd5eab3abd --- .werks/7372 | 13 +++++++++++++ cmk/special_agents/agent_aws.py | 23 +++++++++++++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/.werks/7372 b/.werks/7372 new file mode 100644 index 0000000..89f1bd7 --- /dev/null +++ b/.werks/7372 @@ -0,0 +1,13 @@ +Title: agent_aws: Fixed restriction of services by tags +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1555416683 +Class: fix + +If tags were configured in the special agent {{Amazon Web Services (AWS)}} +and began or ended with 't', 'a', 'g' or ':' in the related tag key, the +special agent stripped these characters away. These tagged AWS resources +were not discovered. diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 6db2ef1..6845a72 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -678,7 +678,15 @@ class AWSSection(object): """ if not tags: return - return [{'Key': e['Name'].strip("tag:"), 'Value': v} for e in tags for v in e['Values']] + prepared_tags = [] + for tag in tags: + tag_name = tag['Name'] + if tag_name.startswith('tag:'): + tag_key = tag_name[4:] + else: + tag_key = tag_name + prepared_tags.extend([{'Key': tag_key, 'Value': v} for v in tag['Values']]) + return prepared_tags class AWSSectionLimits(AWSSection): @@ -2708,6 +2716,14 @@ class AWSConfig(object): self.service_config = {} def add_service_tags(self, tags_key, tags): + """Convert commandline input + from + ([['foo'], ['aaa'], ...], [['bar', 'baz'], ['bbb', 'ccc'], ...]) + to + Filters=[{'Name': 'tag:foo', 'Values': ['bar', 'baz']}, + {'Name': 'tag:aaa', 'Values': ['bbb', 'ccc']}, ...] + as we need in API methods if and only if keys AND values are set. + """ self.service_config.setdefault(tags_key, None) if tags != (None, None): self.service_config[tags_key] = self._prepare_tags(tags) @@ -2715,11 +2731,6 @@ class AWSConfig(object): self.service_config[tags_key] = self._overall_tags def _prepare_tags(self, tags): - """ - Prepare tags format as needed in API methods: - Filters=[{'Name': 'tag:KEY', 'Values': [VAL,...]}, ...] - Keys AND values must be set for filtering. - """ keys, values = tags if keys and values: return [{

5 years, 5 months

Spread some more type hints

by Lars Michelsen

Module: check_mk Branch: master Commit: 428b82daf44cc87c63e9befb45851be4f4e877a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=428b82daf44cc8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 17:25:39 2019 +0200 Spread some more type hints Change-Id: I0de62bd4554f11617eb42be4cb8f92ca6dc310ba --- cmk_base/default_config/base.py | 4 +++- cmk_base/ip_lookup.py | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cmk_base/default_config/base.py b/cmk_base/default_config/base.py index bb7ae96..3658a4c 100644 --- a/cmk_base/default_config/base.py +++ b/cmk_base/default_config/base.py @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import typing as _typing + # This file contains the defaults settings for almost all configuration # variables that can be overridden in main.mk. Some configuration # variables are preset in checks/* as well. @@ -54,7 +56,7 @@ piggyback_max_cachefile_age = 3600 # secs piggyback_translation = [] # Ruleset for translating piggyback host names service_description_translation = [] # Ruleset for translating service descriptions simulation_mode = False -fake_dns = False +fake_dns = None # type: _typing.Optional[str] agent_simulator = False perfdata_format = "pnp" # also possible: "standard" check_mk_perfdata_with_times = True diff --git a/cmk_base/ip_lookup.py b/cmk_base/ip_lookup.py index f90aede..e0580f8 100644 --- a/cmk_base/ip_lookup.py +++ b/cmk_base/ip_lookup.py @@ -27,6 +27,7 @@ import socket import errno import os +from typing import Optional # pylint: disable=unused-import import cmk.utils.paths import cmk.utils.debug @@ -37,7 +38,7 @@ import cmk_base.console as console import cmk_base.config as config from cmk_base.exceptions import MKIPAddressLookupError -_fake_dns = False +_fake_dns = None # type: Optional[str] _enforce_localhost = False @@ -52,10 +53,12 @@ def enforce_localhost(): def lookup_ipv4_address(hostname): + # type: (str) -> Optional[str] return lookup_ip_address(hostname, 4) def lookup_ipv6_address(hostname): + # type: (str) -> Optional[str] return lookup_ip_address(hostname, 6) @@ -66,6 +69,7 @@ def lookup_ipv6_address(hostname): # returns None instead of raising an exception. # FIXME: This different handling is bad. Clean this up! def lookup_ip_address(hostname, family=None): + # type: (str, Optional[int]) -> Optional[str] # Quick hack, where all IP addresses are faked (--fake-dns) if _fake_dns: return _fake_dns @@ -105,6 +109,7 @@ def lookup_ip_address(hostname, family=None): # Variables needed during the renaming of hosts (see automation.py) def cached_dns_lookup(hostname, family): + # type: (str, int) -> Optional[str] cache = cmk_base.config_cache.get_dict("cached_dns_lookup") cache_id = hostname, family

5 years, 5 months

Fix issue in recent refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: d5abd058d8385286b54d6ae1f9429af37d2fc341 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5abd058d83852… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 17:04:49 2019 +0200 Fix issue in recent refactoring Change-Id: I9f6822a75ba76c925ee3afe52435be7b0d6ad640 --- cmk_base/core_config.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 16c679e..1eb1dc6 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -546,19 +546,19 @@ def _verify_cluster_address_family(config_cache, host_config): (host_config.hostname, ", ".join(address_families))) -def _ip_address_of(hostname, family=None): - # type: (str, Optional[int]) -> Optional[str] +def _ip_address_of(host_config, family=None): + # type: (config.HostConfig, Optional[int]) -> Optional[str] try: - return ip_lookup.lookup_ip_address(hostname, family) + return ip_lookup.lookup_ip_address(host_config.hostname, family) except Exception as e: - if config.is_cluster(hostname): + if config.is_cluster(host_config.hostname): return "" else: - _failed_ip_lookups.append(hostname) + _failed_ip_lookups.append(host_config.hostname) if not _ignore_ip_lookup_failures: warning("Cannot lookup IP address of '%s' (%s). " - "The host will not be monitored correctly." % (hostname, e)) - return fallback_ip_for(hostname, family) + "The host will not be monitored correctly." % (host_config.hostname, e)) + return fallback_ip_for(host_config.hostname, family) def ignore_ip_lookup_failures():

5 years, 5 months

typing would have prevented the latest refactoring issue :)

by Lars Michelsen

Module: check_mk Branch: master Commit: 31711bc76776ef93b38b0460dd2df249cab9bdcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31711bc76776ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 17:03:40 2019 +0200 typing would have prevented the latest refactoring issue :) Change-Id: Ia63be64228d5a8fb6ff521486f0511480d028899 --- cmk_base/config.py | 2 ++ cmk_base/core_config.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 42f7db2..08a44f7 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2857,6 +2857,7 @@ class ConfigCache(object): self._host_configs = {} def get_host_config(self, hostname): + # type: (str) -> HostConfig """Returns a HostConfig instance for the given host It lazy initializes the host config object and caches the objects during the livetime @@ -3411,6 +3412,7 @@ class ConfigCache(object): def get_config_cache(): + # type: () -> ConfigCache config_cache = cmk_base.config_cache.get_dict("config_cache") if not config_cache: config_cache["cache"] = ConfigCache() diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index be57b96..16c679e 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -29,7 +29,7 @@ import numbers import os import sys import itertools -from typing import Any, List, Dict # pylint: disable=unused-import +from typing import Optional, Any, List, Dict # pylint: disable=unused-import import cmk.utils.paths import cmk.utils.tty as tty @@ -547,6 +547,7 @@ def _verify_cluster_address_family(config_cache, host_config): def _ip_address_of(hostname, family=None): + # type: (str, Optional[int]) -> Optional[str] try: return ip_lookup.lookup_ip_address(hostname, family) except Exception as e:

5 years, 5 months

7438 Perf-O-Meter & Graphs for CPU Utilization in statgrab_cpu check

by Óscar Nájera

Module: check_mk Branch: master Commit: 32fdecfe83f374d54fe881dc0c841f7fbaedb01f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32fdecfe83f374… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Apr 16 16:30:02 2019 +0200 7438 Perf-O-Meter & Graphs for CPU Utilization in statgrab_cpu check For consistency with other CPU Utilization checks now statgrab_cpu also includes the same perf-O-meter and graphs CMK-1621 Change-Id: I388be692bbb806935a2f378572d1bd11af62c56c --- .werks/7438 | 11 +++++++++++ cmk/gui/plugins/metrics/check_mk.py | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/7438 b/.werks/7438 new file mode 100644 index 0000000..6a7b7f4 --- /dev/null +++ b/.werks/7438 @@ -0,0 +1,11 @@ +Title: Perf-O-Meter and Graphs for CPU Utilization in statgrab_cpu check +Level: 1 +Component: checks +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1555422905 + +For consistency with other CPU Utilization checks now statgrab_cpu also includes the same perf-O-meter and graphs diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 21c1b0c..64d73c1 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -6648,7 +6648,7 @@ check_metrics["check_mk-apc_symmetra.elphase"] = { }, } -check_metrics["check_mk-kernel.util"] = { +cpu_util_unix_translate = { "wait": { "name": "io_wait" }, @@ -6660,6 +6660,9 @@ check_metrics["check_mk-kernel.util"] = { }, } +check_metrics["check_mk-kernel.util"] = cpu_util_unix_translate +check_metrics["check_mk-statgrab_cpu"] = cpu_util_unix_translate + check_metrics["check_mk-lparstat_aix.cpu_util"] = { "wait": { "name": "io_wait"

5 years, 5 months

Thread an addition long output field from the monitoring log through to Livestatus.

by Sven Panne

Module: check_mk Branch: master Commit: 6b57bc2d11f5fa28285a082cee1dd373a308b4a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b57bc2d11f5fa… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 16 10:13:05 2019 +0200 Thread an addition long output field from the monitoring log through to Livestatus. This adds a "long_plugin_output" column to the "log" table and a "long_log_output" column to the "statehist" table. These columns are filled from an additional field at the end of the following monitoring log entries: INITIAL HOST STATE INITIAL SERVICE STATE CURRENT HOST STATE CURRENT SERVICE STATE HOST ALERT SERVICE ALERT HOST NOTIFICATION SERVICE NOTIFICATION Line breaks in the long output are represented as "\n" (i.e. a backslash followed by the letter "n") in the monitoring log. This is the same encoding as is used for e.g. the UPDATE_SHADOW_HOST_STATE command. CMK-1364 Change-Id: Idbaf12ed0d50611a9b9d70b6ad60f15310d3c4f4 --- livestatus/src/HostServiceState.h | 1 + livestatus/src/LogEntry.cc | 58 ++++++++++++++++++++++++------------- livestatus/src/LogEntry.h | 7 +++-- livestatus/src/StringUtils.cc | 9 ++++++ livestatus/src/StringUtils.h | 3 ++ livestatus/src/TableLog.cc | 5 ++++ livestatus/src/TableStateHistory.cc | 17 ++++++----- 7 files changed, 71 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6b57bc2d11…

5 years, 5 months

Trigger Jenkins Build by central script

by Alex Zurhake

Module: check_mk Branch: master Commit: c012137674278ade9632f04bdbc84acca39fa243 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c012137674278a… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Apr 16 10:48:09 2019 +0200 Trigger Jenkins Build by central script Earlier script would contain the information which, by which build it would be triggered. Whith this decentralized aproach it is hard to keep an overview. Therfore a job is created, which triggers the other builds. Change-Id: I3ad9ef43a4d14dd64aa34c48fdc4ef1dcf865a87 --- .../scripts/integration-daily-master.jenkins | 7 ++--- buildscripts/scripts/nightly-build.jenkins | 3 -- buildscripts/scripts/nightly-cmk-container.jenkins | 6 ---- buildscripts/scripts/nightly-master.jenkins | 35 ++++++++++++++++++++++ 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/buildscripts/scripts/integration-daily-master.jenkins b/buildscripts/scripts/integration-daily-master.jenkins index 2d7c46c..c1ecb0e 100644 --- a/buildscripts/scripts/integration-daily-master.jenkins +++ b/buildscripts/scripts/integration-daily-master.jenkins @@ -3,9 +3,6 @@ import java.text.SimpleDateFormat properties([ parameters([ string(name: 'DISTROS', defaultValue: DISTRO_LIST_MASTER, description: 'List of targeted distros' ) - ]), - pipelineTriggers([ - upstream(upstreamProjects: 'cmk_master/nightly_build_containerized', threshold: hudson.model.Result.SUCCESS) ]) ]) @@ -101,7 +98,7 @@ try { rm -rf \$SYSCTL ln -s \$(which true) \$SYSCTL fi - + case $DISTRO in centos-6) rm -f /etc/mtab @@ -132,7 +129,7 @@ try { } finally { sh """ - rm -rf $DISTRO + rm -rf $DISTRO mkdir -p $DISTRO cp /omd/sites/int_master/junit.xml $DISTRO/ cp -r /omd/sites/int_master/var/log $DISTRO/ diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index ffd4fe5..94ab3d0 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -4,9 +4,6 @@ properties([ parameters([ string(name: 'DISTROS', defaultValue: DISTRO_LIST_MASTER, description: 'List of targeted distros' ), string(name: 'EDITION', defaultValue: 'enterprise', description: 'Edition: raw, enterprise or managed' ) - ]), - pipelineTriggers([ - cron('H 0 * * *') ]) ]) diff --git a/buildscripts/scripts/nightly-cmk-container.jenkins b/buildscripts/scripts/nightly-cmk-container.jenkins index 7e9b719..756e722 100644 --- a/buildscripts/scripts/nightly-cmk-container.jenkins +++ b/buildscripts/scripts/nightly-cmk-container.jenkins @@ -1,11 +1,5 @@ import java.text.SimpleDateFormat -properties([ - pipelineTriggers([ - upstream(upstreamProjects: 'cmk_master/nightly_build_containerized', threshold: hudson.model.Result.SUCCESS) - ]) -]) - currentBuild.description = '\nBuilding the CMK docker container\n' def dateFormat = new SimpleDateFormat("yyyy.MM.dd") diff --git a/buildscripts/scripts/nightly-master.jenkins b/buildscripts/scripts/nightly-master.jenkins new file mode 100644 index 0000000..3e80057 --- /dev/null +++ b/buildscripts/scripts/nightly-master.jenkins @@ -0,0 +1,35 @@ +properties([ + parameters([ + string(name: 'DISTROS', defaultValue: DISTRO_LIST_MASTER, description: 'List of targeted distros' ), + string(name: 'EDITION', defaultValue: 'enterprise', description: 'Edition: raw, enterprise or managed' ) + ]), + pipelineTriggers([ + cron('H 0 * * *') + ]) +]) + +node: { + stage('Build Packages') { + build job: 'cmk_master/nightly_build_containerized', + parameters: [ + [$class: 'StringParameterValue', name: 'DISTROS', value: DISTROS], + [$class: 'StringParameterValue', name: 'EDITION', value: EDITION] + ] + } + stage('Build CMK Container') { + build job: 'cmk_master/nightly_cmk_container' + } + parallel 'Integration Test for Packages': { + stage('Integration Test for Packages') { + build job: 'cmk_master/nightly_test_integration-pipeline', + parameters: [ + [$class: 'StringParameterValue', name: 'DISTROS', value: DISTROS], + [$class: 'StringParameterValue', name: 'EDITION', value: EDITION] + ] + } + }, 'Integration Test for Docker Container': { + stage('Integration Test for Docker Container') { + build job: 'cmk_master/docker_integration' + } + } +}

5 years, 5 months

Reserved 20 Werk IDS

by Óscar Nájera

Module: check_mk Branch: master Commit: 1e9bd59787be1be9e8607346ceffeac1e0f7a380 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e9bd59787be1b… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Apr 16 15:53:18 2019 +0200 Reserved 20 Werk IDS Change-Id: I1109a4bb1a2b56fb44bf47685eb92beea9ca5a41 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 516f51d..4e81df2 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7434 +7454

5 years, 5 months

← Newer
1
...
19
20
21
22
23
24
25
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019