Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

7223 FIX db2_tablespaces: Occasionally wrong CRIT state

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5b49273efc1968aca5afe3f6f85faac15b6fd337 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b49273efc1968… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Sat Mar 23 13:41:57 2019 +0100 7223 FIX db2_tablespaces: Occasionally wrong CRIT state In some cases the state of the check went to CRIT, although the reported values where fine. Avoid using the reported 'free' variable to guarante consistency between info text and state. Change-Id: If5d54019118dad4a5903e1dfc6865f21547b2c48 --- .werks/7223 | 12 ++++++++++++ checks/db2_tablespaces | 18 ++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.werks/7223 b/.werks/7223 new file mode 100644 index 0000000..027dca8 --- /dev/null +++ b/.werks/7223 @@ -0,0 +1,12 @@ +Title: db2_tablespaces: Occasionally wrong CRIT state +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1553344784 +Class: fix + +In some cases the state of the check went to CRIT, although the +reported values where fine. + diff --git a/checks/db2_tablespaces b/checks/db2_tablespaces index a21f51a..3ef95e5 100644 --- a/checks/db2_tablespaces +++ b/checks/db2_tablespaces @@ -84,27 +84,29 @@ def check_db2_tablespaces(item, params, parsed): if tbsp_type == "SMS": usable = free # for SMS free size is the amount of disk space available to the db file - perc_free = 100.0 - used / usable * 100.0 warn, crit, levels_text, as_perc = db_get_tablespace_levels_in_bytes(usable, params) + infotext = "%s of %s used" % (get_bytes_human_readable(used), get_bytes_human_readable(usable)) perfdata = [("tablespace_size", usable, max(0, total - (warn or 0)), max( 0, total - (crit or 0))), ("tablespace_used", used), ("tablespace_max_size", total)] + yield 0, infotext, perfdata - yield 0, "%s of %s used" % (get_bytes_human_readable(used), get_bytes_human_readable(usable)) - yield 0, "s% free" % get_percent_human_readable(perc_free), perfdata + perc_free = 100.0 - used / usable * 100.0 + abs_free = usable - used state = 0 - if crit and free <= crit: + infotext = "%s free" % get_percent_human_readable(perc_free) + if crit is not None and abs_free <= crit: state = 2 - elif warn and free <= warn: + elif warn is not None and abs_free <= warn: state = 1 if state: if as_perc: value_str = get_percent_human_readable(perc_free) else: - # TODO: check if "used" is correct (should't it be "free"?) - value_str = get_bytes_human_readable(used) - yield state, "only %s left %s" % (value_str, levels_text) + value_str = get_bytes_human_readable(abs_free) + infotext = "only %s left %s" % (value_str, levels_text) + yield state, infotext yield tbsp_state.lower() != "normal" and 1 or 0, "State: %s" % tbsp_state yield 0, "Type: %s" % tbsp_type

5 years, 3 months

db2_tablespaces: re-arrange yields and refactor

by Moritz Kiemer

Module: check_mk Branch: master Commit: cee58e34da855a34165d9fe5352979fe57ed6143 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cee58e34da855a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Sat Mar 23 13:04:55 2019 +0100 db2_tablespaces: re-arrange yields and refactor Change-Id: Id4d1f8bc4dde5f6218ad7d7f62da7f69a8206b93 --- checks/db2_tablespaces | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/checks/db2_tablespaces b/checks/db2_tablespaces index 8e111f7..a21f51a 100644 --- a/checks/db2_tablespaces +++ b/checks/db2_tablespaces @@ -89,15 +89,22 @@ def check_db2_tablespaces(item, params, parsed): perfdata = [("tablespace_size", usable, max(0, total - (warn or 0)), max( 0, total - (crit or 0))), ("tablespace_used", used), ("tablespace_max_size", total)] - yield 0, "%.1f%% free" % perc_free, perfdata + yield 0, "%s of %s used" % (get_bytes_human_readable(used), get_bytes_human_readable(usable)) + yield 0, "s% free" % get_percent_human_readable(perc_free), perfdata + + state = 0 if crit and free <= crit: - yield 2, "only %s left %s" % (as_perc and ("%.1f%%" % perc_free) or \ - get_bytes_human_readable(used), levels_text) + state = 2 elif warn and free <= warn: - yield 1, "only %s left %s" % (as_perc and ("%.1f%%" % perc_free) or \ - get_bytes_human_readable(used), levels_text) - yield 0, "%s of %s used" % (get_bytes_human_readable(used), get_bytes_human_readable(usable)) + state = 1 + if state: + if as_perc: + value_str = get_percent_human_readable(perc_free) + else: + # TODO: check if "used" is correct (should't it be "free"?) + value_str = get_bytes_human_readable(used) + yield state, "only %s left %s" % (value_str, levels_text) yield tbsp_state.lower() != "normal" and 1 or 0, "State: %s" % tbsp_state yield 0, "Type: %s" % tbsp_type

5 years, 3 months

Improved diagnostic and removed bad message

by Sergey Kipnis

Module: check_mk Branch: master Commit: 22dcd6f8ff2e94c8fb538ffd1f76300799e3b503 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22dcd6f8ff2e94… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Mon Mar 25 12:08:09 2019 +0100 Improved diagnostic and removed bad message Change-Id: Ifca6f63eedb2585e6c557e093b0270a39e3b47b6 --- agents/wnx/prepare_to_tests.cmd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/agents/wnx/prepare_to_tests.cmd b/agents/wnx/prepare_to_tests.cmd index 93fecfd..4fd54ff 100644 --- a/agents/wnx/prepare_to_tests.cmd +++ b/agents/wnx/prepare_to_tests.cmd @@ -7,7 +7,7 @@ powershell Write-Host Setting root to %root% -Foreground Green :exec_me set user_dir=%root%\%prdata%\CheckMk\Agent if not exist "%root%" powershell Write-Host Making folder %root% -Foreground Yellow && mkdir %root% 2> nul -mkdir %root%\plugins +mkdir %root%\plugins 2> nul if not exist "%user_dir%" powershell Write-Host Making folder %user_dir% -Foreground Yellow && mkdir %user_dir% 2> nul mkdir %root%\bin 2> nul mkdir %root%\utils 2> nul @@ -15,6 +15,8 @@ mkdir %root%\providers 2> nul mkdir %root%\exe 2> nul mkdir %root%\pdb 2> nul +if not exist "..\windows\plugins" powershell Write-Host "Folder agents\windows\plugins doesnt exist. Check prep\checkout routine" -Foreground Red && exit 33 + powershell Write-Host "Installation simulation Root Folder: plugins, ohm, yml" -Foreground Green copy ..\windows\plugins\*.* %root%\plugins\ > nul || powershell Write-Host "Failed plugins copy" -Foreground Red && exit 3 copy .\test_files\ohm\cli\*.* %root%\bin\ > nul || powershell Write-Host "Failed ohm copy. Try to kill Open Hardware Monitor: taskkill /F /IM OpenhardwareMonitorCLI.exe" -Foreground Red && exit 4

5 years, 3 months

[CMK-1791] - light weight fixes

by Sergey Kipnis

Module: check_mk Branch: master Commit: e33e3750bb08299fa62322ffe71361c78824c3c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e33e3750bb0829… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri Mar 22 15:52:04 2019 +0100 [CMK-1791] - light weight fixes - tests improved and extended - section df test added - usage notification is more clear, color and valid - df shows mounting points (forgotten one line of code) - almost all "binary" files in UTF-16 in git replaced with text files in ANSI - all UTF-xxx strings located have been moved in separate file in UTF-8 format - corrected file headers Change-Id: Ie6cb08770dd4fea9796aef6e45d611dd8c0f376a --- agents/wnx/microservice/microservice.cpp | Bin 19010 -> 9186 bytes agents/wnx/microservice/pch.cpp | Bin 430 -> 212 bytes agents/wnx/microservice/pch.h | Bin 1262 -> 620 bytes agents/wnx/src/common/wtools.h | 10 +-- agents/wnx/src/engine/asio.h | Bin 1546 -> 749 bytes agents/wnx/src/engine/providers/df.cpp | 1 + agents/wnx/src/engine/stdafx.cpp | Bin 442 -> 218 bytes agents/wnx/src/engine/stdafx.h | Bin 1148 -> 552 bytes agents/wnx/src/engine/stdafx_defines.h | Bin 1624 -> 794 bytes agents/wnx/src/engine/windows_service_api.cpp | 43 +++++++-- agents/wnx/src/engine/windows_service_api.h | 19 ++-- agents/wnx/src/main/check_mk_service.cpp | 120 +++++++++++++++++++------- agents/wnx/src/main/check_mk_service.h | 5 +- agents/wnx/src/main/pch.cpp | Bin 430 -> 212 bytes agents/wnx/src/main/pch.h | Bin 730 -> 348 bytes agents/wnx/src/tests/pch.cpp | Bin 430 -> 212 bytes agents/wnx/src/tests/pch.h | Bin 1262 -> 619 bytes agents/wnx/watest/pch.cpp | Bin 430 -> 212 bytes agents/wnx/watest/pch.h | Bin 1754 -> 854 bytes agents/wnx/watest/test-carrier.cpp | Bin 11862 -> 5747 bytes agents/wnx/watest/test-mrpe.cpp | 8 +- agents/wnx/watest/test-section_fileinfo.cpp | 6 +- agents/wnx/watest/test-section_ps.cpp | Bin 12692 -> 6183 bytes agents/wnx/watest/test-spool.cpp | 4 +- agents/wnx/watest/test-tools.cpp | 13 +-- agents/wnx/watest/test-utf-names.h | 13 +++ agents/wnx/watest/test-yaml.cpp | 14 +++ 27 files changed, 191 insertions(+), 65 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e33e3750bb…

5 years, 3 months

Fix artefact copy error

by Alex Zurhake

Module: check_mk Branch: master Commit: 2a251eb1a0b30cdb5c9473fca419a10f84e0a0e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a251eb1a0b30c… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Mar 25 11:29:37 2019 +0100 Fix artefact copy error Change-Id: Ib28f7efc522ea7c635518a775e903fd7de43702b --- buildscripts/scripts/nightly-build.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index d5c4b5c..23ff51f 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -123,7 +123,7 @@ AGENT_LIST.each { AGENT -> make """ sh """ - mkdir -p ${DAILY_DATA}/agent${AGENT} + mkdir -p ${DAILY_DATA}/agents cp agent${AGENT}-dest/enterprise/agents/plugins/cmk-update-agent${AGENT} ${DAILY_DATA}/agents """ }

5 years, 3 months

Stash former missing build dependencies for new Windows agent

by Alex Zurhake

Module: check_mk Branch: master Commit: 34f87548691c679747ad4cd35e991d62e04d163f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34f87548691c67… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Mar 25 09:45:07 2019 +0100 Stash former missing build dependencies for new Windows agent Change-Id: I25f47db0dbc1e146d20b932273cd2427ce3b7735 --- buildscripts/scripts/nightly-build.jenkins | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 50dfb35..d5c4b5c 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -48,6 +48,12 @@ node { dir('agents/wnx') { stash name: 'WinSRC', include: '**/*' } + dir('agents/windows/dependencies/') { + stash name: 'WinDep', include: '**/*' + } + dir('omd/packages/') { + stash name: 'WinDepOMD', include: 'googletest/*, simpleini/*' + } } } } @@ -62,6 +68,12 @@ AGENT_LIST.each { AGENT -> dir('agents/wnx') { unstash name: 'WinSRC' } + dir('agents/windows/dependencies/') { + unstash name: 'WinDep' + } + dir('omd/packages/') { + unstash name: 'WinDepOMD' + } bat 'cd agents\\wnx && call build_release.cmd' dir('artefacts') { stash name: 'WinMSI', includes: 'check_mk_agent*'

5 years, 3 months

[CMK-1791] - crash on init globals fixed

by Sergey Kipnis

Module: check_mk Branch: master Commit: c7da38c4188418c6dc53703d03d8e09c88b3ec3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7da38c4188418… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri Mar 22 13:49:18 2019 +0100 [CMK-1791] - crash on init globals fixed - order of init is a problem when you have constructors which requires config data - this is serious design flaw and to be fixed in the future Change-Id: Ibbfcbc466c3acb58b07d56bf1c32ae5c4d888289 --- agents/wnx/src/engine/cfg.cpp | 9 +++++++++ agents/wnx/src/engine/groups.cpp | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/agents/wnx/src/engine/cfg.cpp b/agents/wnx/src/engine/cfg.cpp index 2aedb0d..ed3415b 100644 --- a/agents/wnx/src/engine/cfg.cpp +++ b/agents/wnx/src/engine/cfg.cpp @@ -56,12 +56,21 @@ std::wstring WinPerf::buildCmdLine() const { return cmd_line; } +// we have chaos with globals namespace details { ConfigInfo G_ConfigInfo; // store boot fixed data uint64_t RegisteredPerformanceFreq = wtools::QueryPerformanceFreq(); } // namespace details +// stores EVERYTHING which can be configured +namespace groups { +Global global; +WinPerf winperf; +Plugins plugins; +Plugins localGroup; +}; // namespace groups + // API uint64_t GetPerformanceFrequency() noexcept { diff --git a/agents/wnx/src/engine/groups.cpp b/agents/wnx/src/engine/groups.cpp index 9835a7e..fcd6026 100644 --- a/agents/wnx/src/engine/groups.cpp +++ b/agents/wnx/src/engine/groups.cpp @@ -22,14 +22,6 @@ namespace cma::cfg { -// stores EVERYTHING which can be configured -namespace groups { -Global global; -WinPerf winperf; -Plugins plugins; -Plugins localGroup; -}; // namespace groups - Global::Global() { setDefaults(); calcDerivatives();

5 years, 3 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: c84dc8f33bcca7257b21233e612fa67d72b5cec7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c84dc8f33bcca7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 25 09:20:16 2019 +0100 Testcommit Change-Id: Ief349c70e35be619dd8387bea8972046c549fd84 --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index fcd7e67..8605ab4 100644 --- a/README +++ b/README @@ -55,3 +55,4 @@ Don't forget to insert your name and mail address. As a result your should find packages named like this: check-mk-[edition]-[version].[deb|rpm] in your current directory. +

5 years, 3 months

added WK7249: Check_Discovery: Automatic discovery of hosts now correctly ignores unreachable hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: 127e09fe5c411a87e25c972bd9c0a992b68bea27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=127e09fe5c411a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 25 09:24:30 2019 +0100 added WK7249: Check_Discovery: Automatic discovery of hosts now correctly ignores unreachable hosts Change-Id: Ibe9aea5d1399e09a6d2c9d7e441d86cb163c8379 --- .werks/7249 | 12 ++++++++++++ cmk_base/discovery.py | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/.werks/7249 b/.werks/7249 new file mode 100644 index 0000000..5afe2ab --- /dev/null +++ b/.werks/7249 @@ -0,0 +1,12 @@ +Title: Check_Discovery: Automatic discovery of hosts now correctly ignores unreachable hosts +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1553184609 + +Hosts with a state differing from <tt>UP</tt> will no longer be considered in the +automatic check discovery routine. diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index a4729c5..687d0ea 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -495,10 +495,21 @@ def discover_marked_hosts(core): if not hosts: console.verbose(" Nothing to do. No hosts marked by discovery check.\n") + + # Fetch host state information from livestatus + host_states = _fetch_host_states() activation_required = False + try: _set_discovery_timeout() for hostname in hosts: + if not _discover_marked_host_exists(hostname, all_hosts): + continue + + # Only try to discover hosts with UP state + if host_states and host_states.get(hostname) != 0: + continue + if _discover_marked_host(hostname, all_hosts, now_ts, oldest_queued): activation_required = True @@ -520,6 +531,30 @@ def discover_marked_hosts(core): cmk_base.core.do_restart(core) +def _fetch_host_states(): + host_states = {} + try: + import livestatus + query = "GET hosts\nColumns: name state" + host_states = dict(livestatus.LocalConnection().query(query)) + except (livestatus.MKLivestatusNotFoundError, livestatus.MKLivestatusSocketError): + pass + return host_states + + +def _discover_marked_host_exists(hostname, all_hosts): + if hostname in all_hosts: + return True + + host_flag_path = os.path.join(_get_autodiscovery_dir(), hostname) + try: + os.remove(host_flag_path) + except OSError: + pass + console.verbose(" Skipped. Host %s does not exist in configuration. Removing mark.\n" % hostname) + return False + + def _discover_marked_host(hostname, all_hosts, now_ts, oldest_queued): services_changed = False @@ -527,13 +562,6 @@ def _discover_marked_host(hostname, all_hosts, 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) - if hostname not in all_hosts: - try: - os.remove(host_flag_path) - except OSError: - pass - console.verbose(" Skipped. Host does not exist in configuration. Removing mark.\n") - return params = discovery_check_parameters(hostname) or default_discovery_check_parameters() params_rediscovery = params.get("inventory_rediscovery", {})

5 years, 3 months

check_http: tests + minor refactor

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5ad191209f8d47510c0d13ed6c1560e293e344fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ad191209f8d47… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Mar 22 11:41:13 2019 +0100 check_http: tests + minor refactor * make tests consider order, as it might become relevant * add some test cases * simplify "-I" logic in check Change-Id: I894d6633a9775dedcd870c2041772020330c54bf --- checks/check_http | 6 +-- tests/unit/checks/test_check_http.py | 80 ++++++++++++++++++++++++------------ 2 files changed, 56 insertions(+), 30 deletions(-) diff --git a/checks/check_http b/checks/check_http index b493b0d..e1c265d 100644 --- a/checks/check_http +++ b/checks/check_http @@ -90,10 +90,10 @@ def _url_args(address_family, address, settings): args = [] - if (not omit_ip) and ("proxy" not in settings): - args += ["-I", address] - elif "proxy" in settings: + if "proxy" in settings: args += ["-I", settings["proxy"]] + elif not omit_ip: + args += ["-I", address] if vhost: args += ["-H", vhost] diff --git a/tests/unit/checks/test_check_http.py b/tests/unit/checks/test_check_http.py index f4c638d..eae8884 100644 --- a/tests/unit/checks/test_check_http.py +++ b/tests/unit/checks/test_check_http.py @@ -3,9 +3,8 @@ import pytest pytestmark = pytest.mark.checks -(a)pytest.mark.parametrize( - 'params,expected_args', - [( +(a)pytest.mark.parametrize('params,expected_args', [ + ( (None, { 'onredirect': 'follow', 'port': 80, @@ -15,32 +14,59 @@ pytestmark = pytest.mark.checks }), ['-H', 'www.test123.de', '-p', 80, '-u', '/images', '--onredirect=follow', '-L'], ), - ( - (None, { - 'extended_perfdata': True, - 'method': 'CONNECT', - 'port': 3128, - 'proxy': '163.172.86.64', - 'ssl': 'auto', - 'uri': '/images', - 'virthost': ('www.test123.de', True) - }), - [ - '-I', '163.172.86.64', '-H', 'www.test123.de', '-p', 3128, '-u', '/images', '--ssl', - '--extended-perfdata', '-j', 'CONNECT' - ], - ), - ( - (None, { - 'cert_days': (10, 20), - 'cert_host': 'www.test123.com' - }), - ['-I', 'www.test123.com', '-C', '10,20'], - )]) + ( + (None, { + 'extended_perfdata': True, + 'method': 'CONNECT', + 'port': 3128, + 'proxy': '163.172.86.64', + 'ssl': 'auto', + 'uri': '/images', + 'virthost': ('www.test123.de', True) + }), + [ + '-I', '163.172.86.64', '-H', 'www.test123.de', '-p', 3128, '-u', '/images', '--ssl', + '--extended-perfdata', '-j', 'CONNECT' + ], + ), + ( + (None, { + 'cert_days': (10, 20), + 'cert_host': 'www.test123.com' + }), + ['-I', 'www.test123.com', '-C', '10,20'], + ), + ( + (None, { + 'virthost': (None, True), + 'proxy': "foo.bar", + }), + ['-I', 'foo.bar'], + ), + ( + (None, { + 'virthost': (None, False), + 'proxy': "foo.bar", + }), + ['-I', 'foo.bar'], + ), + ( + (None, { + 'virthost': (None, True), + }), + [], + ), + ( + (None, { + 'virthost': (None, False), + }), + ['-I', '$_HOSTADDRESS_4$'], + ), +]) def test_check_http_argument_parsing(check_manager, params, expected_args): - """Tests if all required arguments are present. The tests do not check the order of arguments.""" + """Tests if all required arguments are present.""" active_check = check_manager.get_active_check('check_http') - assert sorted(active_check.run_argument_function(params)) == sorted(expected_args) + assert active_check.run_argument_function(params) == expected_args @pytest.mark.parametrize('params,expected_description', [

5 years, 3 months

← Newer
1
...
11
12
13
14
15
16
17
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019