Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

60 sec default delay for all types of plugin

by Sergey Kipnis

Module: check_mk Branch: master Commit: f8632a7934f435b276670bddf0e62ff7d3d9bfdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8632a7934f435… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Tue Apr 30 18:49:26 2019 +0200 60 sec default delay for all types of plugin Change-Id: Iab5009e67049d56f0b743de538e974006643293f --- agents/wnx/install/resources/check_mk.yml | 4 ++-- agents/wnx/src/engine/providers/plugins.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/wnx/install/resources/check_mk.yml b/agents/wnx/install/resources/check_mk.yml index c481cd6..5cda3fc 100644 --- a/agents/wnx/install/resources/check_mk.yml +++ b/agents/wnx/install/resources/check_mk.yml @@ -211,7 +211,7 @@ plugins: # default value, you may disable all scripts in local with no player: '' # [-] when empty we wil use default value, i.e. our player - max_wait: 11 # max timeout for every sync plugin. Agen will gather plugins data no more than max_wait time. + max_wait: 60 # max timeout for every sync plugin. Agen will gather plugins data no more than max_wait time. # this is useful to terminate badly written or hanging plugins @@ -268,7 +268,7 @@ local: # default value, you may disable all scripts in local with no player: '' # [-] when empty we wil use default value, i.e. our player - max_wait: 11 # max timeout for every sync plugin. Agen will gather plugins data no more than max_wait time. + max_wait: 60 # max timeout for every sync plugin. Agen will gather plugins data no more than max_wait time. # this is useful to terminate badly written or hanging plugins diff --git a/agents/wnx/src/engine/providers/plugins.cpp b/agents/wnx/src/engine/providers/plugins.cpp index e1288aa..be0b9e2 100644 --- a/agents/wnx/src/engine/providers/plugins.cpp +++ b/agents/wnx/src/engine/providers/plugins.cpp @@ -62,7 +62,7 @@ void PluginsProvider::loadConfig() { GetVal(cfg_name_, vars::kPluginMaxWait, kDefaultPluginTimeout); if (configured_timeout < timeout_) { - XLOG::d("Timeout is corrected fropm {} to {}", timeout_, + XLOG::d("Timeout is corrected from {} to {}", timeout_, configured_timeout); timeout_ = configured_timeout; }

5 years, 1 month

use only one stash insted of many

by Alex Zurhake

Module: check_mk Branch: master Commit: f0f40b865a5b3b48473b1b29e2e75360829014ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0f40b865a5b3b… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Apr 17 15:04:22 2019 +0200 use only one stash insted of many Change-Id: Ic5014d2588a13d575d04c3464dcc8528e6f74cfe --- buildscripts/scripts/nightly-build.jenkins | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 1b1a909..4ec218f 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -91,19 +91,9 @@ node { break } sh "make NEW_VERSION=${CMK_VERS} setversion" - - dir('agents/wnx') { - stash name: 'WinSRC', include: '**/*' - } - dir('agents/windows/dependencies/') { - stash name: 'WinDep', include: '**/*' - } - dir('agents/windows/plugins/') { - stash name: 'WinPlugins', include: '**/*' - } - dir('omd/packages/') { - stash name: 'WinDepOMD', include: 'googletest/*, simpleini/*' - } + + stash name: 'WinDep', include: 'agents/wnx/**/*, agents/windows/dependencies/**/*, agents/windows/plugins/**/*, omd/packages/googletest/*, omd/packages/simpleini/*' + } } } @@ -115,18 +105,7 @@ AGENT_LIST.each { AGENT -> if (AGENT == 'windows') { node('windows') { bat 'powershell Remove-Item .\\* -Recurse -Force' - dir('agents/wnx') { - unstash name: 'WinSRC' - } - dir('agents/windows/dependencies/') { - unstash name: 'WinDep' - } - dir('agents/windows/plugins/') { - unstash name: 'WinPlugins' - } - dir('omd/packages/') { - unstash name: 'WinDepOMD' - } + unstash name: 'WinDep' bat 'cd agents\\wnx && call build_release.cmd' dir('artefacts') { stash name: 'WinMSI', includes: 'check_mk_agent*'

5 years, 1 month

capsulate overlay mount into functions

by Alex Zurhake

Module: check_mk Branch: master Commit: 3d64c456020cc05f7961ee85eaa5ab9fb93c172a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d64c456020cc0… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Apr 17 14:51:43 2019 +0200 capsulate overlay mount into functions Change-Id: Id85cc6f8983f451915e926df43541fdc27252da8 --- buildscripts/scripts/nightly-build.jenkins | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 7ac8f9e..1b1a909 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -43,6 +43,19 @@ if (scm.branches[0].name == 'master' && JOB_BASE_NAME == 'nightly_build_containe ARCHIVE_DIR = DAILY_DATA + '/download' } +def mount_overlay(LOWER_DIR, UPPER_DIR) { + sh """ + mkdir -p ${UPPER_DIR} ${UPPER_DIR}-work + mount -t overlay overlay -o \ + lowerdir=${LOWER_DIR},upperdir=${UPPER_DIR},workdir=${UPPER_DIR}-work \ + ${UPPER_DIR} + """ +} + +def unmount_overlay(UPPER_DIR) { + sh "until umount ${WORKSPACE}/${UPPER_DIR}; do sleep 1; done" +} + node { docker.withRegistry(DOCKER_REGISTRY, 'nexus') { IMAGE = 'ubuntu-18.04-common' @@ -135,8 +148,7 @@ AGENT_LIST.each { AGENT -> } sh 'rm -rf *' - sh "mkdir agent${AGENT}-work agent${AGENT}-dest" - sh "mount -t overlay overlay -o lowerdir=${DAILY_DATA}/git,upperdir=${WORKSPACE}/agent${AGENT}-dest,workdir=${WORKSPACE}/agent${AGENT}-work ${WORKSPACE}/agent${AGENT}-dest" + mount_overlay("${DAILY_DATA}/git","${WORKSPACE}/agent${AGENT}-dest") if (AGENT == '-windows') { sh script: """ mkdir -p ${DAILY_DATA}/agents @@ -167,7 +179,7 @@ AGENT_LIST.each { AGENT -> cp agent${AGENT}-dest/enterprise/agents/plugins/cmk-update-agent${AGENT} ${DAILY_DATA}/agents """ } - sh "until umount agent${AGENT}-dest; do sleep 1; done" + unmount_overlay("agent${AGENT}-dest") } } } @@ -211,7 +223,7 @@ DISTRO_LIST.each { DISTRO -> stage('build' + DISTRO + ' package') { sh 'rm -rf *' sh 'mkdir work dest' - sh "mount -t overlay overlay -o lowerdir=${DAILY_DATA}/git,upperdir=${WORKSPACE}/dest,workdir=${WORKSPACE}/work ${WORKSPACE}/dest" + mount_overlay("${DAILY_DATA}/git", "${WORKSPACE}/dest") dir('dest') { sh """ case $DISTRO in @@ -227,10 +239,10 @@ DISTRO_LIST.each { DISTRO -> esac """ } - sh 'until umount dest; do sleep 1; done' - sh "rm -rf ${DAILY_DATA}/${DISTRO}-{dest,work}" + unmount_overlay('dest') + sh "rm -rf ${DAILY_DATA}/${DISTRO}-{dest,dest-work}" sh "mv dest ${DAILY_DATA}/${DISTRO}-dest" - sh "mv work ${DAILY_DATA}/${DISTRO}-work" + sh "mv dest-work ${DAILY_DATA}/${DISTRO}-dest-work" sh "ls -lah ${DAILY_DATA}" } }

5 years, 1 month

Add packaging tests to nightly build and testbuild

by Alex Zurhake

Module: check_mk Branch: master Commit: e601df31fcb9f861e9ee05f3231abfc25ecc8634 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e601df31fcb9f8… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Apr 17 13:45:08 2019 +0200 Add packaging tests to nightly build and testbuild Change-Id: I85b95ece50c651508756548130b7bce55206fa3f --- buildscripts/scripts/nightly-build.jenkins | 52 ++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 9d754ed..7ac8f9e 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -28,12 +28,21 @@ def DOCKER_BUILDS = [:] def dateFormat = new SimpleDateFormat("yyyy.MM.dd") def date = new Date() def CMK_VERS = dateFormat.format(date) -def DAILY_DATA = '/var/jenkins_home/daily-data/' + scm.branches[0].name.replaceAll("/","-") + '/' + CMK_VERS +def DAILY_DATA = '' def PACKAGE_DIR = '/bauwelt/download' def GPG_KEY_DIR = '/bauwelt/etc/.gnupg' def RELEASE_KEY_DIR = '/bauwelt/git/release/release.key' +def ARCHIVE_DIR = '' +if (scm.branches[0].name == 'master' && JOB_BASE_NAME == 'nightly_build_containerized') { + DAILY_DATA = '/var/jenkins_home/daily-data/' + scm.branches[0].name.replaceAll("/","-") + '/' + CMK_VERS + ARCHIVE_DIR = '/bauwelt/download/' + CMK_VERS +} else { + DAILY_DATA = '/var/jenkins_home/daily-data/testbuild/' + scm.branches[0].name.replaceAll("/","-") + '/' + CMK_VERS + ARCHIVE_DIR = DAILY_DATA + '/download' +} + node { docker.withRegistry(DOCKER_REGISTRY, 'nexus') { IMAGE = 'ubuntu-18.04-common' @@ -236,36 +245,45 @@ node { IMAGE = 'ubuntu-18.04-common' docker.image(IMAGE).pull() docker.image(IMAGE).inside("-u 0:0 -v ${DAILY_DATA}:${DAILY_DATA} -v ${PACKAGE_DIR}:${PACKAGE_DIR} -v ${GPG_KEY_DIR}:${GPG_KEY_DIR}:ro -v ${RELEASE_KEY_DIR}:${RELEASE_KEY_DIR}:ro --network ci_local-infra") { - stage('Archive artifacts') { - // Only master builds should end up on the Website - if (scm.branches[0].name == 'master' && JOB_BASE_NAME == 'nightly_build_containerized') { + stage('Sign artifacts') { sh """ - mkdir -p /bauwelt/download/${CMK_VERS} - cd /bauwelt/download/${CMK_VERS} + mkdir -p ${ARCHIVE_DIR} + cd ${ARCHIVE_DIR} cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*_amd64.deb . || true cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*.x86_64.rpm . || true cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*x86_64.cma . || true cp ${DAILY_DATA}/git/check-mk-${EDITION}-${CMK_VERS}.cee.tar.gz . || true """ withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { + sh """ + cd ${ARCHIVE_DIR} + ${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh ${CMK_VERS} + """ + } + stage('Packaging Tests') { + try { + dir("${DAILY_DATA}/git/tests") { + withEnv(["VERSION_PATH=i${ARCHIVE_DIR}", "PYTEST_ADDOPTS='--junitxml=\"${WORKSPACE}/junit.xml\"'"]) { + sh ". /bauwelt/bin/bw-setup-jenkins-env ; make test-packaging" + } + } + } finally { + step([$class: 'JUnitResultArchiver', testResults: 'junit.xml']) + } + } + stage('Archive Artifacts') { + // Only master builds should end up on the Website + if (scm.branches[0].name == 'master' && JOB_BASE_NAME == 'nightly_build_containerized') { sh """ - cd /bauwelt/download/${CMK_VERS} - ${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh ${CMK_VERS} + cd ${ARCHIVE_DIR} rsync -av -e "ssh -o StrictHostKeyChecking=no -i ${RELEASE_KEY_DIR}" \ ${PACKAGE_DIR}/${CMK_VERS} \ bauwelt@mathias-kettner.de:${PACKAGE_DIR} """ - } } else { - dir("${DAILY_DATA}/download") { - sh "cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*_amd64.deb . || true" - sh "cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*.x86_64.rpm . || true" - sh "cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*x86_64.cma . || true" - sh "cp ${DAILY_DATA}/git/check-mk-${EDITION}-${CMK_VERS}.*.tar.gz . || true" - withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { - sh "${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh ${CMK_VERS}" + dir(ARCHIVE_DIR) { + archiveArtifacts "*" } - archiveArtifacts "*" } } }

5 years, 1 month

Move config.static_checks processing to HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d5eb7842a192680aea8bb1f37f5888439d5909e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d5eb7842a1926… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 25 10:03:05 2019 +0200 Move config.static_checks processing to HostConfig CMK-2030 Change-Id: Icc4d96c1787552132f27c6397f67d51374b5bf35 --- cmk_base/automations/check_mk.py | 32 +++++++++------------------- cmk_base/config.py | 18 ++++++++++++++++ tests/unit/cmk_base/test_config.py | 28 ++++++++++++++++++++++++ tests/unit/cmk_base/test_unit_automations.py | 28 ------------------------ 4 files changed, 56 insertions(+), 50 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index e76b1c3..ea24628 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -613,24 +613,16 @@ class AutomationAnalyseServices(Automation): table = check_table.get_check_table(hostname, remove_duplicates=True) # 1. Manual checks - for checkgroup_name in config.static_checks: - for value in self.static_check_rules_of(checkgroup_name, hostname): - # Parameters are optional - if len(value) == 2: - checktype, item = value - params = None - else: - checktype, item, params = value - - descr = config.service_description(hostname, checktype, item) - if descr == servicedesc: - return { - "origin": "static", - "checkgroup": checkgroup_name, - "checktype": checktype, - "item": item, - "parameters": params, - } + for checkgroup_name, checktype, item, params in host_config.static_checks: + descr = config.service_description(hostname, checktype, item) + if descr == servicedesc: + return { + "origin": "static", + "checkgroup": checkgroup_name, + "checktype": checktype, + "item": item, + "parameters": params, + } # TODO: There is a lot of duplicated logic with discovery.py/check_table.py. Clean this # whole function up. @@ -706,10 +698,6 @@ class AutomationAnalyseServices(Automation): return {} # not found - def static_check_rules_of(self, checkgroup_name, hostname): - config_cache = config.get_config_cache() - return config_cache.host_extra_conf(hostname, config.static_checks.get(checkgroup_name, [])) - automations.register(AutomationAnalyseServices()) diff --git a/cmk_base/config.py b/cmk_base/config.py index 4b40161..177701a 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2680,6 +2680,24 @@ class HostConfig(object): return self._config_cache.host_extra_conf(self.hostname, custom_checks) @property + def static_checks(self): + # type: () -> List[Tuple[str, str, str, Any]] + """Returns a table of all "manual checks" configured for this host""" + matched = [] + for checkgroup_name in static_checks: + for entry in self._config_cache.host_extra_conf(self.hostname, + static_checks.get(checkgroup_name, [])): + if len(entry) == 2: + checktype, item = entry + params = None + else: + checktype, item, params = entry + + matched.append((checkgroup_name, checktype, item, params)) + + return matched + + @property def hostgroups(self): # type: () -> List[str] """Returns the list of hostgroups of this host diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 8044206..d8df3f2 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -657,6 +657,34 @@ def test_host_config_custom_checks(monkeypatch, hostname, result): @pytest.mark.parametrize("hostname,result", [ + ("testhost1", []), + ("testhost2", [ + ('checkgroup', 'checktype1', 'item1', { + 'param1': 1 + }), + ('checkgroup', 'checktype2', 'item2', { + 'param2': 2 + }), + ]), +]) +def test_host_config_static_checks(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_option( + "static_checks", { + "checkgroup": [ + (("checktype1", "item1", { + "param1": 1 + }), [], ["testhost2"], {}), + (("checktype2", "item2", { + "param2": 2 + }), [], ["testhost2"], {}), + ], + }) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).static_checks == result + + +(a)pytest.mark.parametrize("hostname,result", [ ("testhost1", ["check_mk"]), ("testhost2", ["dingdong"]), ]) diff --git a/tests/unit/cmk_base/test_unit_automations.py b/tests/unit/cmk_base/test_unit_automations.py index a959810..1c71f93 100644 --- a/tests/unit/cmk_base/test_unit_automations.py +++ b/tests/unit/cmk_base/test_unit_automations.py @@ -52,34 +52,6 @@ def test_registered_automations(site): assert sorted(needed_automations) == sorted(registered_automations) -def test_static_check_rules_of_host(monkeypatch): - as_automation = automations.AutomationAnalyseServices() - assert as_automation.static_check_rules_of("checkgroup_ding", "test-host") == [] - - ts = Scenario() - ts.add_host("test-host", []) - ts.set_option( - "static_checks", { - "checkgroup_ding": [ - (("ding-check", "item"), [], config.ALL_HOSTS, {}), - (("ding-check", "item2"), [], config.ALL_HOSTS, { - "disabled": True - }), - (("dong-check", "item2", { - "param1": 1 - }), [], config.ALL_HOSTS, {}), - ], - }) - ts.apply(monkeypatch) - - assert as_automation.static_check_rules_of("checkgroup_ding", "test-host") == [ - ('ding-check', 'item'), - ('dong-check', 'item2', { - 'param1': 1 - }), - ] - - def test_get_labels_of_host(monkeypatch): automation = automations.AutomationGetLabelsOf()

5 years, 1 month

Cleanup redundant host_extra_conf related logic

by Lars Michelsen

Module: check_mk Branch: master Commit: 76944178e36a5daa7d4ca03e3ee47b85e33495f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76944178e36a5d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 25 09:52:46 2019 +0200 Cleanup redundant host_extra_conf related logic CMK-2030 Change-Id: Id2c41325574ccc5bcfe8158c8c4fde6902ce3e04 --- cmk_base/core_nagios.py | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index dc96647..9865bc1 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -235,9 +235,11 @@ def _create_nagios_host_spec(cfg, config_cache, hostname, attrs): host_spec["parents"] = ",".join(nodes) # Custom configuration last -> user may override all other values - host_spec.update( - _extra_host_conf_of( - config_cache, hostname, exclude=["parents"] if host_config.is_cluster else [])) + # TODO: Find a generic mechanism for CMC and Nagios + for key, value in host_config.extra_host_attributes.iteritems(): + if host_config.is_cluster and key == "parents": + continue + host_spec[key] = value return host_spec @@ -821,12 +823,6 @@ def _quote_nagios_string(s): return "'" + s.replace('\\', '\\\\').replace("'", "'\"'\"'").replace('!', '\\!') + "'" -def _extra_host_conf_of(config_cache, hostname, exclude=None): - if exclude is None: - exclude = [] - return _extra_conf_of(config_cache, config.extra_host_conf, hostname, None, exclude) - - # Collect all extra configuration data for a service def _extra_service_conf_of(cfg, config_cache, hostname, description): service_spec = {} @@ -850,20 +846,10 @@ def _extra_service_conf_of(cfg, config_cache, hostname, description): return service_spec -def _extra_conf_of(config_cache, confdict, hostname, service, exclude=None): - if exclude is None: - exclude = [] - +def _extra_conf_of(config_cache, confdict, hostname, service): result = {} for key, conflist in confdict.items(): - if service is not None: - values = config_cache.service_extra_conf(hostname, service, conflist) - else: - values = config_cache.host_extra_conf(hostname, conflist) - - if exclude and key in exclude: - continue - + values = config_cache.service_extra_conf(hostname, service, conflist) if values: result[key] = values[0]

5 years, 1 month

Move config.periodic_discovery processing to HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 88e74f5c6c4cfcff9485853792f2a6325c7d9b35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88e74f5c6c4cfc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 25 08:14:46 2019 +0200 Move config.periodic_discovery processing to HostConfig CMK-2030 Change-Id: I16013dfe014483cb510a5e62bd33824d1b10d554 --- cmk_base/config.py | 23 +++++++++++++++++++++++ cmk_base/core_nagios.py | 5 +---- cmk_base/discovery.py | 29 ++--------------------------- tests/unit/cmk_base/test_config.py | 28 ++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 31 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 80469cc..abd9951 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2602,6 +2602,29 @@ class HostConfig(object): attrs[key] = values[0] return attrs + @property + def discovery_check_parameters(self): + # type: () -> Dict + """Compute the parameters for the discovery check for a host + + Note: if the discovery check is disabled for that host, default parameters + will be returned. A "check_interval" of None means the check should not be added. + """ + entries = self._config_cache.host_extra_conf(self.hostname, periodic_discovery) + if not entries: + return self._default_discovery_check_parameters() + + return entries[0] + + def _default_discovery_check_parameters(self): + """Support legacy single value global configurations. Otherwise return the defaults""" + return { + "check_interval": inventory_check_interval, + "severity_unmonitored": inventory_check_severity, + "severity_vanished": 0, + "inventory_check_do_scan": inventory_check_do_scan, + } + def inventory_parameters(self, section_name): # type: (str) -> Dict return self._config_cache.host_extra_conf_merged(self.hostname, diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index feb2442..7676802 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -503,11 +503,8 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): if 'cmk-inventory' in config.use_new_descriptions_for: service_discovery_name = 'Check_MK Discovery' - import cmk_base.discovery as discovery - params = discovery.discovery_check_parameters(hostname) or \ - discovery.default_discovery_check_parameters() - # Inventory checks - if user has configured them. + params = host_config.discovery_check_parameters if params["check_interval"] \ and not config.service_ignored(hostname, None, service_discovery_name) \ and not host_config.is_ping_host: diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 460abc6..f915759 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -326,8 +326,7 @@ def check_discovery(hostname, ipaddress): config_cache = config.get_config_cache() host_config = config_cache.get_host_config(hostname) - params = discovery_check_parameters(hostname) or \ - default_discovery_check_parameters() + params = host_config.discovery_check_parameters status = 0 infotexts = [] @@ -433,30 +432,6 @@ def check_discovery(hostname, ipaddress): return status, infotexts, long_infotexts, perfdata -# Compute the parameters for the discovery check for a host. Note: -# if the discovery check is disabled for that host, default parameters -# will be returned. -def discovery_check_parameters(hostname): - entries = config.get_config_cache().host_extra_conf(hostname, config.periodic_discovery) - if entries: - return entries[0] - - elif config.inventory_check_interval: - # Support legacy global configurations - return default_discovery_check_parameters() - - return None - - -def default_discovery_check_parameters(): - return { - "check_interval": config.inventory_check_interval, - "severity_unmonitored": config.inventory_check_severity, - "severity_vanished": 0, - "inventory_check_do_scan": config.inventory_check_do_scan, - } - - def _set_rediscovery_flag(hostname): def touch(filename): if not os.path.exists(filename): @@ -582,7 +557,7 @@ def _discover_marked_host(config_cache, host_config, now_ts, oldest_queued): console.verbose("%s%s%s:\n" % (tty.bold, hostname, tty.normal)) host_flag_path = os.path.join(_get_autodiscovery_dir(), hostname) - params = discovery_check_parameters(hostname) or default_discovery_check_parameters() + params = host_config.discovery_check_parameters params_rediscovery = params.get("inventory_rediscovery", {}) if "service_blacklist" in params_rediscovery or "service_whitelist" in params_rediscovery: # whitelist. if none is specified, this matches everything diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 210087a..8044206 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -518,6 +518,34 @@ def test_host_config_inventory_parameters(monkeypatch, hostname, result): @pytest.mark.parametrize("hostname,result", [ + ("testhost1", { + 'check_interval': None, + 'inventory_check_do_scan': True, + 'severity_unmonitored': 1, + 'severity_vanished': 0, + }), + ("testhost2", { + "check_interval": 1, + }), +]) +def test_host_config_discovery_check_parameters(monkeypatch, hostname, result): + ts = Scenario().add_host(hostname) + ts.set_option( + "periodic_discovery", + [ + ({ + "check_interval": 1, + }, [], ["testhost2"], {}), + ({ + "check_interval": 2, + }, [], ["testhost2"], {}), + ], + ) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).discovery_check_parameters == result + + +(a)pytest.mark.parametrize("hostname,result", [ ("testhost1", []), ("testhost2", [ ("abc", {

5 years, 1 month

Minor refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 676b4dfff9de3eecb2665ced099dee7de7336624 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=676b4dfff9de3e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 25 08:56:10 2019 +0200 Minor refactoring Change-Id: I1a8186e751692e24a49a6b94d6cf0649f5bb1ce8 --- cmk_base/core_config.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 9c11136..88e3458 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -114,7 +114,7 @@ def host_check_command(config_cache, if value == "smart" and not is_clust: return "check-mk-host-smart" - elif value in ["ping", "smart"]: # Cluster host + if value in ["ping", "smart"]: # Cluster host ping_args = check_icmp_arguments_of(config_cache, host_config.hostname) if is_clust and ip: # Do check cluster IP address if one is there @@ -126,10 +126,10 @@ def host_check_command(config_cache, return None - elif value == "ok": + if value == "ok": return "check-mk-host-ok" - elif value == "agent" or value[0] == "service": + if value == "agent" or value[0] == "service": service = "Check_MK" if value == "agent" else value[1] if config.monitoring_core == "cmc": @@ -142,10 +142,10 @@ def host_check_command(config_cache, host_config.hostname, service.replace('$HOSTNAME$', host_config.hostname)))) return command - elif value[0] == "tcp": + if value[0] == "tcp": return "check-mk-host-tcp!" + str(value[1]) - elif value[0] == "custom": + if value[0] == "custom": try: custom_commands_to_define.add("check-mk-custom") except:

5 years, 1 month

Move version specific snmp credentials processing to HostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a053fc1eb831589a0752ac401be200de5d18872 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a053fc1eb8315… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 25 10:37:09 2019 +0200 Move version specific snmp credentials processing to HostConfig CMK-2030 Change-Id: Ie20fbbc25046a81fb2e20819d034aaa5e20e7ee5 --- cmk_base/automations/check_mk.py | 14 ++++---------- cmk_base/config.py | 16 +++++++++++++++- tests/unit/cmk_base/test_config.py | 19 +++++++++++++++++++ 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index ea24628..aa0cb2c 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -1217,16 +1217,10 @@ class AutomationDiagHost(Automation): # Determine SNMPv2/v3 community if hostname not in config.explicit_snmp_communities: - communities = config_cache.host_extra_conf(hostname, config.snmp_communities) - for entry in communities: - if (test == "snmpv3") and not isinstance(entry, tuple): - continue - - if (test != "snmpv3") and isinstance(entry, tuple): - continue - - credentials = entry - break + cred = host_config.snmp_credentials_of_version( + snmp_version=3 if test == "snmpv3" else 2) + if cred is not None: + credentials = cred # SNMP versions if test in ['snmpv2', 'snmpv3']: diff --git a/cmk_base/config.py b/cmk_base/config.py index 177701a..845c0d8 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2397,11 +2397,12 @@ class HostConfig(object): ) def _snmp_credentials(self): + # type: () -> cmk_base.snmp_utils.SNMPCredentials """Determine SNMP credentials for a specific host It the host is found int the map snmp_communities, that community is returned. Otherwise the snmp_default_community is returned (wich is - preset with "public", but can be overridden in main.mk + preset with "public", but can be overridden in main.mk. """ try: return explicit_snmp_communities[self.hostname] @@ -2415,6 +2416,19 @@ class HostConfig(object): # nothing configured for this host -> use default return snmp_default_community + def snmp_credentials_of_version(self, snmp_version): + # type: (int) -> Optional[cmk_base.snmp_utils.SNMPCredentials] + for entry in self._config_cache.host_extra_conf(self.hostname, snmp_communities): + if snmp_version == 3 and not isinstance(entry, tuple): + continue + + if snmp_version != 3 and isinstance(entry, tuple): + continue + + return entry + + return None + def _snmp_port(self): # type: () -> int ports = self._config_cache.host_extra_conf(self.hostname, snmp_ports) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index d8df3f2..b2d0105 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -778,6 +778,25 @@ def test_host_config_exit_code_spec_individual(monkeypatch, hostname, result): assert config_cache.get_host_config(hostname).exit_code_spec(data_source_id="snmp") == result +(a)pytest.mark.parametrize("hostname,version,result", [ + ("testhost1", 2, None), + ("testhost2", 2, "bla"), + ("testhost2", 3, ('noAuthNoPriv', 'v3')), + ("testhost3", 2, "bla"), + ("testhost3", 3, None), + ("testhost4", 2, None), + ("testhost4", 3, ('noAuthNoPriv', 'v3')), +]) +def test_host_config_snmp_credentials_of_version(monkeypatch, hostname, version, result): + ts = Scenario().add_host(hostname) + ts.set_ruleset("snmp_communities", [ + ("bla", [], ["testhost2", "testhost3"], {}), + (('noAuthNoPriv', 'v3'), [], ["testhost2", "testhost4"], {}), + ]) + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config(hostname).snmp_credentials_of_version(version) == result + + @pytest.mark.parametrize("hostname,section_name,result", [ ("testhost1", "uptime", None), ("testhost2", "uptime", None),

5 years, 1 month

Make cluster config test use at more realistic config

by Lars Michelsen

Module: check_mk Branch: master Commit: 592dea3412faf3229b9ca7474408eddfbc84538f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=592dea3412faf3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 25 09:35:11 2019 +0200 Make cluster config test use at more realistic config Change-Id: Ie087882aac23891effe3a8a2a05a5915d6b9fa58 --- tests/unit/cmk_base/test_core_nagios.py | 37 +++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/tests/unit/cmk_base/test_core_nagios.py b/tests/unit/cmk_base/test_core_nagios.py index 60f863b..d60cb9b 100644 --- a/tests/unit/cmk_base/test_core_nagios.py +++ b/tests/unit/cmk_base/test_core_nagios.py @@ -89,26 +89,34 @@ def ts(): yield ts3, result3 - ts4 = Scenario().add_cluster("localhost") + ts4 = Scenario().add_cluster("localhost", nodes=["node1", "node2"]) + ts4.add_host("node1") + ts4.add_host("node2") + ts4.add_host("switch") + ts4.set_option("ipaddresses", { + "node1": "127.0.0.1", + "node2": "127.0.0.2", + }) ts4.set_option("extra_host_conf", { "alias": [(u'lOCALhost', ['localhost']),], + "parents": [('switch', ['node1', 'node2']),], }) result4 = { '_ADDRESS_4': '127.0.0.1', '_ADDRESS_6': '', '_ADDRESS_FAMILY': '4', '_FILENAME': '/', - '_NODEIPS': '', - '_NODEIPS_4': '', + '_NODEIPS': '127.0.0.1 127.0.0.2', + '_NODEIPS_4': '127.0.0.1 127.0.0.2', '_NODEIPS_6': '', - '_NODENAMES': '', + '_NODENAMES': 'node1 node2', '_TAGS': '', 'address': '127.0.0.1', 'alias': u'lOCALhost', 'check_command': 'check-mk-host-ping!-w 200.00,80.00% -c 500.00,100.00%', 'host_name': 'localhost', 'hostgroups': 'check_mk', - 'parents': '', + 'parents': 'node1,node2', 'use': 'check_mk_cluster', } @@ -124,5 +132,22 @@ def test_create_nagios_host_spec(ts, result, monkeypatch): host_attrs = core_config.get_host_attributes("localhost", config_cache) host_spec = core_nagios._create_nagios_host_spec(cfg, config_cache, "localhost", host_attrs) - assert host_spec == result + + if "node1" in config_cache.all_configured_hosts(): + host_attrs = core_config.get_host_attributes("node1", config_cache) + host_spec = core_nagios._create_nagios_host_spec(cfg, config_cache, "node1", host_attrs) + assert host_spec == { + '_ADDRESS_4': '127.0.0.1', + '_ADDRESS_6': '', + '_ADDRESS_FAMILY': '4', + '_FILENAME': '/', + '_TAGS': '', + 'address': '127.0.0.1', + 'alias': 'node1', + 'check_command': 'check-mk-host-ping!-w 200.00,80.00% -c 500.00,100.00%', + 'host_name': 'node1', + 'hostgroups': 'check_mk', + 'parents': 'switch', + 'use': 'check_mk_host', + }

5 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019