Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Use user specific CMK download credentials

by Lars Michelsen

Module: check_mk Branch: master Commit: 2e3658e76b8bad453b9ed20cc0a14352f47535f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e3658e76b8bad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 10:44:10 2018 +0100 Use user specific CMK download credentials Change-Id: I5b69b25ed50f636ffdea955076b095b80b01ff34 --- tests/testlib/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 013fd52..ec8b382 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -78,11 +78,17 @@ class CMKVersion(object): raise Exception("Invalid edition: %s. Must be short notation (cee, cre, ...)") self.edition_short = edition - self._credentials = ("d-vonheute", "lOBFsgAH") + self._credentials = self._get_cmk_download_credentials() self.set_version(version, branch) + def _get_cmk_download_credentials(self): + try: + return tuple(file("%s/.cmk-credentials" % os.environ["HOME"]).read().strip().split(":")) + except IOError: + raise Exception("Missing ~/.cmk-credentials file (Create with content: USER:PASSWORD)") + def get_default_version(self): if os.path.exists("/etc/alternatives/omd"):

6 years, 4 months

5736 FIX Show even empty custom graphs in sidebar view snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: ac36912b6bb18ae75c8837f532104ed93a5cd06e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac36912b6bb18a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 07:58:26 2018 +0100 5736 FIX Show even empty custom graphs in sidebar view snapin Change-Id: Ia3b140fbadf80ad0cfca4aa130f1ffcfef30b1a7 --- .bugs/2845 | 6 ++++-- .werks/5736 | 10 ++++++++++ web/htdocs/pagetypes.py | 7 ++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.bugs/2845 b/.bugs/2845 index f91ab28..81da7e1 100644 --- a/.bugs/2845 +++ b/.bugs/2845 @@ -1,10 +1,12 @@ Title: Empty custom graphs should be shown in sidebar nevertheless Component: metrics -State: open +Class: nastiness +State: done Date: 2017-02-21 10:46:23 Targetversion: 1.2.8 -Class: nastiness It seems to be a "feature" that empty custom graphs are never shown in the sidebar - regardless of the checkbox "do not show in sidebar". This is confusing to users. Better treat empty graphs like nonempty-graphs. + +2018-02-19 07:57:29: changed state open -> done diff --git a/.werks/5736 b/.werks/5736 new file mode 100644 index 0000000..8fe151f --- /dev/null +++ b/.werks/5736 @@ -0,0 +1,10 @@ +Title: Show even empty custom graphs in sidebar view snapin +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1519023460 +Class: fix + + diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index fd0b7a0..de0bc4f 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -189,6 +189,11 @@ class Base(object): def is_empty(self): return False + + def _show_in_sidebar(self): + return not self.is_empty() and not self.is_hidden() + + # Default values for the creation dialog can be overridden by the # sub class. @classmethod @@ -375,7 +380,7 @@ class PageRenderer(Base): @classmethod def sidebar_links(cls): for page in cls.pages(): - if not page.is_empty() and not page.is_hidden(): + if page._show_in_sidebar(): yield page.topic(), page.title(), page.page_url()

6 years, 4 months

Add werk 5781

by Andreas Umbreit

Module: check_mk Branch: master Commit: f2b015c9bbc922678d347b11049649efdd42366e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2b015c9bbc922… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Feb 16 11:38:12 2018 +0100 Add werk 5781 Change-Id: Icec30a45e74fb483a898b0f776156e981019f689 --- .werks/5781 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/5781 b/.werks/5781 new file mode 100644 index 0000000..eb50b78 --- /dev/null +++ b/.werks/5781 @@ -0,0 +1,16 @@ +Title: Check_MK Update Agent: Now automatically repairs missing agent plugins after a failed windows agent update +Level: 2 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1518711069 +Class: fix + +On some occassions, the windows agent may loose its agent plugins during an msi update. +This issue is still being investigated. In the meantime, the cmk-update-agent.exe is now able to detect +a failed installation and tries to repair the missing plugin files. + +Keep in mind that this workaround is only available -after- the next agent update, so the initial rollout +of this update may still fail, since it is done by an earlier version of the agent updater. +

6 years, 4 months

Use traditional command substitution syntax, fixing a syntax error on the way.

by Sven Panne

Module: check_mk Branch: master Commit: f1af2a49a319c68873c5acbc42d3515b25e1ea62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1af2a49a319c6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 19 08:24:29 2018 +0100 Use traditional command substitution syntax, fixing a syntax error on the way. Change-Id: I8f5c7a77fbb15d4fe7208df1a4b2d3a2d09696d3 --- agents/mk-job.solaris | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/mk-job.solaris b/agents/mk-job.solaris index e887253..b389477 100755 --- a/agents/mk-job.solaris +++ b/agents/mk-job.solaris @@ -42,7 +42,7 @@ if [ $# -lt 2 ]; then exit 1 fi -MYSELF=$(id | awk -F')' '{print $1}' | awk -F'(' '{print $2}') +MYSELF=`id | awk -F')' '{print $1}' | awk -F'(' '{print $2}'` OUTPUT_PATH=$MK_VARDIR/job/$MYSELF IDENT=$1 shift @@ -63,10 +63,10 @@ if ! type $1 >/dev/null 2>&1; then fi -echo "start_time $(perl -e 'print time')" > "$OUTPUT_PATH/$IDENT.running" +echo "start_time `perl -e 'print time'`" > "$OUTPUT_PATH/$IDENT.running" -info=$((/usr/bin/time -p sh -c "$@ 2>/dev/null 1>&2" 2>&1; echo $?) | sed -e 's/,/\./g'); -RC=$(echo $info | awk '{print $7}') +info=`(/usr/bin/time -p sh -c "$@ 2>/dev/null 1>&2" 2>&1; echo $?) | sed -e 's/,/\./g'` +RC=`echo $info | awk '{print $7}'` (echo $info | awk '{print "exit_code "$7"\nreal_time "$2"\nuser_time "$4"\nsystem_time "$6""}') >> "$OUTPUT_PATH/$IDENT.running" (echo -e "reads 0\nwrites 0\nmax_res_kbytes 0\navg_mem_kbytes 0\ninvol_context_switches 0\nvol_context_switches 0";) >> "$OUTPUT_PATH/$IDENT.running"

6 years, 4 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: d5a1a079423f4ff088476d0d385c123349fb825d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5a1a079423f4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 13:57:23 2018 +0100 Reserved 20 Werk IDS Change-Id: I38d9eaced25b257f0e10bb73afdd022068e3f4d0 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 58f5100..8029a14 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5848 +5868

6 years, 4 months

Reserved 10 Werk IDS

by Marcel Schulte

Module: check_mk Branch: master Commit: 704208d7bdf971349753cdd73ae0ae591401a89d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=704208d7bdf971… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Fri Feb 16 15:19:29 2018 +0100 Reserved 10 Werk IDS Change-Id: I0ca74ea7c3a02bdd2f902aa87f8fbf2693d43c63 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 46829db..58f5100 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5838 +5848

6 years, 4 months

Do not start sites on CMA restore

by Lars Michelsen

Module: check_mk Branch: master Commit: 937ed216a38c6cdcb59b3b9947cf47b811147a12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=937ed216a38c6c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 07:33:58 2018 +0100 Do not start sites on CMA restore Change-Id: I388e1f22aa10fcf70b15b9dd641d0ce7d422b13d --- bin/mkbackup | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/mkbackup b/bin/mkbackup index 1b5960d..e04658b 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -1561,9 +1561,10 @@ def do_site_restore(opts, info, site=None): log(p.stderr.read()) raise MKGeneralException("Site restore failed") - site_arg = [ site ] if is_root() else [] - if subprocess.call(["omd", "start" ] + site_arg) != 0: - raise MKGeneralException("Failed to start the site after restore") + if not is_root(): + site_arg = [ site ] if is_root() else [] + if subprocess.call(["omd", "start" ] + site_arg) != 0: + raise MKGeneralException("Failed to start the site after restore") def do_system_restore(opts, info):

6 years, 4 months

Resetting check config variable structure before loading the checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 42f4813a30fcf3f17897d601cf335d4cc094d3c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42f4813a30fcf3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 15:22:18 2018 +0100 Resetting check config variable structure before loading the checks Change-Id: I1a47cd0f8cee18598f503539c8fd3ced82cec9e0 --- cmk_base/checks.py | 3 +++ tests/cmk_base/test_checks.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 12668b6..dcdda9e 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -103,6 +103,9 @@ def get_plugin_paths(*dirs): # If a check or check.include is both found in local/ and in the # normal structure, then only the file in local/ must be read! def load_checks(filelist): + # Initialize some data structures which are populated while loading the checks + _check_variables.clear() + loaded_files = set() check_variable_defaults = {} ignored_variable_types = [ type(lambda: None), type(os) ] diff --git a/tests/cmk_base/test_checks.py b/tests/cmk_base/test_checks.py index fca7e8d..731befa 100644 --- a/tests/cmk_base/test_checks.py +++ b/tests/cmk_base/test_checks.py @@ -206,7 +206,7 @@ check_info["test_check_2"] = { # Test whether or not factory settings and checkgroup parameters work -def test_test_check_factory_settings(request, test_cfg, site, web): +def test_check_factory_settings(request, test_cfg, site, web): test_check_path = "local/share/check_mk/checks/test_check_3" def cleanup():

6 years, 4 months

Added pathlib2 and scandir packages.

by Sven Panne

Module: check_mk Branch: master Commit: 19a007bc6575c2846298735803d53e48cff06942 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19a007bc6575c2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 20 15:17:38 2018 +0100 Added pathlib2 and scandir packages. Change-Id: I85c5c2070c4a99b19439592eb7a0b64f63a2b038 --- omd/packages/python-modules/Makefile | 2 ++ omd/packages/python-modules/src/pathlib2-2.3.0.tar.gz | Bin 0 -> 34291 bytes omd/packages/python-modules/src/scandir-1.7.tar.gz | Bin 0 -> 32812 bytes 3 files changed, 2 insertions(+) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 618a45f..67e3f94 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -112,6 +112,8 @@ MODULES += tinkerforge-2.1.15.tar.gz MODULES += paramiko-2.1.2.tar.gz MODULES += typing-3.6.4.tar.gz +MODULES += scandir-1.7.tar.gz +MODULES += pathlib2-2.3.0.tar.gz .PHONY: build check-freetds install skel clean diff --git a/omd/packages/python-modules/src/pathlib2-2.3.0.tar.gz b/omd/packages/python-modules/src/pathlib2-2.3.0.tar.gz new file mode 100644 index 0000000..06366cd Binary files /dev/null and b/omd/packages/python-modules/src/pathlib2-2.3.0.tar.gz differ diff --git a/omd/packages/python-modules/src/scandir-1.7.tar.gz b/omd/packages/python-modules/src/scandir-1.7.tar.gz new file mode 100644 index 0000000..e068774 Binary files /dev/null and b/omd/packages/python-modules/src/scandir-1.7.tar.gz differ

6 years, 4 months

Cleaned up side effects of other cmk_base tests with the new management board tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 2feb89a0dfcf6f77f5a179657ec8198ed99ba24c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2feb89a0dfcf6f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 14:04:11 2018 +0100 Cleaned up side effects of other cmk_base tests with the new management board tests Change-Id: I5957b5a934a42266816bc4e1e170dc3e16d73e0a --- tests/cmk_base/test_data_sources.py | 2 +- tests/cmk_base/test_mgmt_board.py | 56 ++++++++++++++++++++++++++----------- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/tests/cmk_base/test_data_sources.py b/tests/cmk_base/test_data_sources.py index cba1986..ea9afb7 100644 --- a/tests/cmk_base/test_data_sources.py +++ b/tests/cmk_base/test_data_sources.py @@ -52,9 +52,9 @@ def test_cfg(web, site): import cmk.debug cmk.debug.enable() + # Needs to be done together, even when the checks are not directly needed import cmk_base.checks as checks checks.load() - config.load() yield None diff --git a/tests/cmk_base/test_mgmt_board.py b/tests/cmk_base/test_mgmt_board.py index 3d55a1d..3718839 100644 --- a/tests/cmk_base/test_mgmt_board.py +++ b/tests/cmk_base/test_mgmt_board.py @@ -5,11 +5,33 @@ from testlib import web import cmk_base.config as config -(a)pytest.fixture(autouse=True) -def test_cfg(web): + +(a)pytest.fixture(scope="function") +def clear_config_caches(monkeypatch): + import cmk_base + import cmk_base.caching + monkeypatch.setattr(cmk_base, "config_cache", cmk_base.caching.CacheManager()) + monkeypatch.setattr(cmk_base, "runtime_cache", cmk_base.caching.CacheManager()) + + +(a)pytest.fixture(scope="function") +def reload_config(): + # Needs to be done together, even when the checks are not directly needed + import cmk_base.checks as checks + checks.load() + config.load() + + +(a)pytest.fixture(scope="function") +def enable_debug(): import cmk.debug cmk.debug.enable() + yield + cmk.debug.disable() + +(a)pytest.fixture(autouse=True) +def test_cfg(web, clear_config_caches, reload_config, enable_debug): yield # @@ -17,17 +39,19 @@ def test_cfg(web): # print "Cleaning up test config" - cmk.debug.disable() - if web.host_exists("mgmt-host"): web.delete_host("mgmt-host") if web.folder_exists("folder1"): web.delete_folder("folder1") - web.activate_changes() + web.set_ruleset("management_board_config", { + "ruleset": { + "": [], # -> folder + } + }) - config.load() + web.activate_changes() def test_mgmt_explicit_settings(web): @@ -37,7 +61,7 @@ def test_mgmt_explicit_settings(web): "management_snmp_community": "HOST", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -51,7 +75,7 @@ def test_mgmt_explicit_address(web): "management_address": "127.0.0.2", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.2" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -66,7 +90,7 @@ def test_mgmt_disabled(web): "management_snmp_community": "HOST", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") == False assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == None @@ -84,7 +108,7 @@ def test_mgmt_inherit_credentials_explicit_host(web): "management_snmp_community": "HOST", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -102,7 +126,7 @@ def test_mgmt_inherit_credentials(web): "management_protocol": "snmp", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -121,7 +145,7 @@ def test_mgmt_inherit_protocol_explicit_host(web): "management_snmp_community": "HOST", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -139,7 +163,7 @@ def test_mgmt_inherit_protocol(web): "ipaddress": "127.0.0.1", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -169,7 +193,7 @@ def test_mgmt_config_ruleset(web): "management_protocol": "snmp", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -201,7 +225,7 @@ def test_mgmt_config_ruleset_overidden_by_explicit_setting(web): "management_protocol": "snmp", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" @@ -239,7 +263,7 @@ def test_mgmt_config_ruleset_order(web): "management_protocol": "snmp", }) - config.load() + reload_config() assert config.has_management_board("mgmt-host") assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp"

6 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018