Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

5971 FIX docker_node_disk_usage: Fix "No JSON object could be decoded" exception with older docker versions

by Lars Michelsen

Module: check_mk Branch: master Commit: d67255af1c25249a77b098f9f043fc39195ff7c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d67255af1c2524… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 11 13:37:45 2018 +0200 5971 FIX docker_node_disk_usage: Fix "No JSON object could be decoded" exception with older docker versions When the new agent is executed on a docker nodes that does not yet support the "docker system df" command with the "--format" parameter, then the check crashed. The agent has now been fixed to not transport the error message to the Check_MK server. Change-Id: Iea883794b090191f3a273647c6dae40996475cb7 --- .werks/5971 | 13 +++++++++++++ agents/check_mk_agent.linux | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5971 b/.werks/5971 new file mode 100644 index 0000000..68cbde1 --- /dev/null +++ b/.werks/5971 @@ -0,0 +1,13 @@ +Title: docker_node_disk_usage: Fix "No JSON object could be decoded" exception with older docker versions +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523446569 + +When the new agent is executed on a docker nodes that does not yet support the "docker system df" command +with the "--format" parameter, then the check crashed. The agent has now been fixed to not transport the +error message to the Check_MK server. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 94e974d..5011234 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -968,7 +968,7 @@ if type docker > /dev/null 2>&1 ; then docker info --format "{{json .}}" 2>&1 echo "<<<docker_node_disk_usage:sep(44)>>>" - docker system df --format "{{json .}}" 2>&1 + docker system df --format "{{json .}}" echo "<<<docker_node_images>>>" echo "[[[images]]]"

6 years, 5 months

5935 logwatch: "Activate modern eventlog API introduced in vista" is now configurable via agent bakery

by Simon Betz

Module: check_mk Branch: master Commit: 4c6b62b887ccf5ada469f847558bff0eeb02f615 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c6b62b887ccf5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 3 11:23:48 2018 +0200 5935 logwatch: "Activate modern eventlog API introduced in vista" is now configurable via agent bakery Change-Id: I382b3188e9997a7390059561e0a5d1ebfdda98b7 --- .werks/5935 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/5935 b/.werks/5935 new file mode 100644 index 0000000..8f22bd3 --- /dev/null +++ b/.werks/5935 @@ -0,0 +1,10 @@ +Title: logwatch: "Activate modern eventlog API introduced in vista" is now configurable via agent bakery +Level: 1 +Component: checks +Compatible: compat +Edition: cee +Version: 1.5.0i4 +Date: 1522747385 +Class: feature + +

6 years, 5 months

5972 FIX docker_node_info: Fixed crash when a node with older version reports null labels

by Lars Michelsen

Module: check_mk Branch: master Commit: 1754113080910217fc247b7a71eb76b128cbe530 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17541130809102… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 11 13:42:49 2018 +0200 5972 FIX docker_node_info: Fixed crash when a node with older version reports null labels The inventory plugin made the Check_MK and Check_MK Inventory services crash when working with an older docker version. Change-Id: I4d3c0ba50522e3a5ec4f8597c69008192d63c37d --- .werks/5972 | 12 ++++++++++++ inventory/docker_node_info | 6 ++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/5972 b/.werks/5972 new file mode 100644 index 0000000..115ac52 --- /dev/null +++ b/.werks/5972 @@ -0,0 +1,12 @@ +Title: docker_node_info: Fixed crash when a node with older version reports null labels +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523446916 + +The inventory plugin made the Check_MK and Check_MK Inventory services crash when working +with an older docker version. diff --git a/inventory/docker_node_info b/inventory/docker_node_info index 2d8914e..67c6cf5 100644 --- a/inventory/docker_node_info +++ b/inventory/docker_node_info @@ -30,8 +30,10 @@ def inv_docker_node_info(parsed, inventory_tree): node = inventory_tree.get_dict("software.applications.docker.") node["version"] = parsed[u"ServerVersion"] - node_labels = inventory_tree.get_list("software.applications.docker.node_labels:") - node_labels += [ {"label": label} for label in parsed[u"Labels"] ] + labels = parsed[u"Labels"] + if labels: + node_labels = inventory_tree.get_list("software.applications.docker.node_labels:") + node_labels += [ {"label": label} for label in labels ] inv_info['docker_node_info'] = {

6 years, 5 months

5969 FIX Fixed possible "params" exception when editing sites after update

by Lars Michelsen

Module: check_mk Branch: master Commit: 6614fe83353660e70d3a8eaa2d4c4a91b6c63e44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6614fe83353660… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 11 10:14:26 2018 +0200 5969 FIX Fixed possible "params" exception when editing sites after update When trying to edit an existing site configuration a "params" exception could occur. This happened when at least one configured site is configured to use the livestatus proxy. Change-Id: I9369527f905e238c6a422f1667f2825eb7693f28 --- .werks/5969 | 13 ++++++++++++ web/htdocs/watolib.py | 58 ++++++++++++++++++++++++++------------------------- 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/.werks/5969 b/.werks/5969 new file mode 100644 index 0000000..c769922 --- /dev/null +++ b/.werks/5969 @@ -0,0 +1,13 @@ +Title: Fixed possible "params" exception when editing sites after update +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0b2 +Date: 1523434352 + +When trying to edit an existing site configuration a "params" exception +could occur. This happened when at least one configured site is configured +to use the livestatus proxy. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 6c895f9..aef3b35 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3964,34 +3964,30 @@ class CRESiteManagement(object): @classmethod def load_sites(cls): - try: - if not os.path.exists(sites_mk): - return config.default_single_site_configuration() - - vars = { "sites" : {} } - execfile(sites_mk, vars, vars) - - # Be compatible to old "disabled" value in socket attribute. - # Can be removed one day. - for site in vars['sites'].values(): - if site.get('socket') == 'disabled': - site['disabled'] = True - del site['socket'] - - if not vars["sites"]: - # There seem to be installations out there which have a sites.mk - # which has an empty sites dictionary. Apply the default configuration - # for these sites too. - return config.default_single_site_configuration() - else: - return vars["sites"] - - - except Exception, e: - if config.debug: - raise MKGeneralException(_("Cannot read configuration file %s: %s") % - (sites_mk, e)) - return {} + if not os.path.exists(sites_mk): + return config.default_single_site_configuration() + + vars = { "sites" : {} } + execfile(sites_mk, vars, vars) + + # Be compatible to old "disabled" value in socket attribute. + # Can be removed one day. + for site_id, site in vars['sites'].items(): + socket = site.get("socket") + if socket == 'disabled': + site['disabled'] = True + del site['socket'] + + elif type(socket) == tuple and socket[0] == "proxy": + site["socket"] = ("proxy", cls.transform_old_connection_params(socket[1])) + + if not vars["sites"]: + # There seem to be installations out there which have a sites.mk + # which has an empty sites dictionary. Apply the default configuration + # for these sites too. + return config.default_single_site_configuration() + else: + return vars["sites"] @classmethod @@ -4051,6 +4047,12 @@ class CRESiteManagement(object): return [ConfigDomainGUI] + @classmethod + def transform_old_connection_params(cls, value): + return value + + + SiteManagement = CRESiteManagement

6 years, 5 months

Fixed pylint not scanning cmk module oO

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d7478874c0236a6f62a34f8526da2bc819ae101 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d7478874c0236… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 7 15:26:00 2018 +0200 Fixed pylint not scanning cmk module oO Change-Id: Ia812e783ab8df23f5db5c07f994810b8fee8edb7 --- tests/pylint/conftest.py | 6 ++++++ tests/pylint/test_pylint_misc.py | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/pylint/conftest.py b/tests/pylint/conftest.py index dd3fcc0..970f8e2 100644 --- a/tests/pylint/conftest.py +++ b/tests/pylint/conftest.py @@ -6,6 +6,12 @@ import tempfile import shutil import pytest +# pylint tests should not be executed in site. +# -> Disabled site fixture for them +(a)pytest.fixture(scope="session") +def site(request): + pass + @pytest.fixture(scope="session") def pylint_test_dir(): base_path = os.environ.get("WORKDIR") diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py index b72fdb1..62cc32c 100755 --- a/tests/pylint/test_pylint_misc.py +++ b/tests/pylint/test_pylint_misc.py @@ -15,6 +15,8 @@ def test_pylint_misc(): cmk_path() + "/cmk_base/default_config", cmk_path() + "/cmk_base/data_sources", + cmc_path() + "/cmk", + cmc_path() + "/cmk/cee/liveproxy", cmc_path() + "/cmk_base", cmc_path() + "/cmk_base/cee", cmc_path() + "/cmk_base/modes", @@ -23,7 +25,8 @@ def test_pylint_misc(): cme_path() + "/cmk_base/default_config", - cmk_path() + "/lib", + cmk_path() + "/cmk", + cmk_path() + "/cmk/ec", cmk_path() + "/bin", cmk_path() + "/notifications", cmk_path() + "/agents/plugins",

6 years, 5 months

Fix loading and saving of custom host and user attributes

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1fd285dfdc39533faa63f58c01f7e0f8d5122ca4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fd285dfdc3953… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Apr 11 13:13:03 2018 +0200 Fix loading and saving of custom host and user attributes Change-Id: I0e4f96fa215b4c28b78fb9739095fbfaf202a39e --- web/htdocs/wato.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fcb6f01..d6adb02 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15542,8 +15542,8 @@ class CustomAttrMode(WatoMode): }, lock=lock) attrs = {} - for self._what in [ "user", "host" ]: - attrs[self._what] = vars.get("wato_%s_attrs" % self._what, []) + for what in [ "user", "host" ]: + attrs[what] = vars.get("wato_%s_attrs" % what, []) return attrs @@ -15560,10 +15560,10 @@ class CustomAttrMode(WatoMode): def _save(self, attrs): output = watolib.wato_fileheader() - for self._what in [ "user", "host" ]: - if self._what in attrs and len(attrs[self._what]) > 0: - output += "if type(wato_%s_attrs) != list:\n wato_%s_attrs = []\n" % (self._what, self._what) - output += "wato_%s_attrs += %s\n\n" % (self._what, pprint.pformat(attrs[self._what])) + for what in [ "user", "host" ]: + if what in attrs and len(attrs[what]) > 0: + output += "if type(wato_%s_attrs) != list:\n wato_%s_attrs = []\n" % (what, what) + output += "wato_%s_attrs += %s\n\n" % (what, pprint.pformat(attrs[what])) make_nagios_directory(multisite_dir) store.save_file(multisite_dir + "custom_attrs.mk", output)

6 years, 5 months

5934 Service Discovery: Permissions for moving services can be assigned to user role

by Simon Betz

Module: check_mk Branch: master Commit: ec3196817b283b9dc814796005278d873dafb9b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec3196817b283b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 3 09:48:27 2018 +0200 5934 Service Discovery: Permissions for moving services can be assigned to user role The service discovery dialog shows different action buttons of the single service tables. For each action button permissions can be assigned to user role. These actions are - Move to undecided services - Move to monitored services - Move to ignored services - Move to removed services Change-Id: I819ef935e8b65b7afaa4e73f210356a87543dd56 --- .werks/5934 | 29 +++++++++++++++ web/htdocs/wato.py | 106 ++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 106 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ec3196817b…

6 years, 5 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: e0edb52d5ccbec22a6681ded2e62778fbfdad106 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0edb52d5ccbec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 11 10:12:05 2018 +0200 Reserved 20 Werk IDS Change-Id: I21be4a41c0d7d8b899a8990f30ba681c7fb02839 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index a87ce13..86278f6 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5969 +5989

6 years, 5 months

5754 FIX netapp_api_vf_stats: now uses the correct number of CPUs

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1d30cee2e3f124efd69b7a3f5fe33ef45fca4afe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d30cee2e3f124… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Apr 5 12:35:25 2018 +0200 5754 FIX netapp_api_vf_stats: now uses the correct number of CPUs Change-Id: I832d4824593044c02545927957f760a300e8aef3 --- .werks/5754 | 10 ++++++++++ checks/netapp_api_vf_stats | 20 ++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.werks/5754 b/.werks/5754 new file mode 100644 index 0000000..71cb49e --- /dev/null +++ b/.werks/5754 @@ -0,0 +1,10 @@ +Title: netapp_api_vf_stats: now uses the correct number of CPUs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1522924468 +Class: fix + + diff --git a/checks/netapp_api_vf_stats b/checks/netapp_api_vf_stats index cab4717..724bab6 100644 --- a/checks/netapp_api_vf_stats +++ b/checks/netapp_api_vf_stats @@ -31,12 +31,15 @@ netapp_api_vf_stats_cpu_util_default_levels = (90.0, 95.0) def inventory_netapp_api_vf_stats(parsed): - for key in parsed.keys(): + stats, cpu = parsed + for key in stats.keys(): yield key, 'netapp_api_vf_stats_cpu_util_default_levels' def check_netapp_api_vf_stats(item, params, parsed): - vf = parsed.get(item) + stats, cpu = parsed + + vf = stats.get(item) if not vf: return @@ -51,7 +54,8 @@ def check_netapp_api_vf_stats(item, params, parsed): if ticks_per_sec == 0: raise MKCounterWrapped("Counter wrapped") - num_processors = float(vf.get("num_processors", 1)) + # vFilers are 7mode only and cannot appear in clustermoder + num_processors = float(cpu.get('7mode', {}).get("num_processors", 1)) used_perc = ticks_per_sec / num_processors / ticks_per_sec_base * 100 @@ -75,17 +79,21 @@ check_info["netapp_api_vf_stats"] = { 'has_perfdata' : True, 'group' : 'cpu_utilization_multiitem', 'service_description' : 'CPU utilization %s', - 'includes' : [ "cpu_util.include", "netapp_api.include" ] + 'includes' : [ "cpu_util.include", "netapp_api.include" ], + 'extra_sections' : ['netapp_api_cpu'], } def inventory_netapp_api_vf_stats_traffic(parsed): - for key in parsed.keys(): + stats, _ = parsed + for key in stats.keys(): yield key, None def check_netapp_api_vf_stats_traffic(item, params, parsed): - vf = parsed.get(item) + stats, _ = parsed + + vf = stats.get(item) if not vf: return else:

6 years, 5 months

5834 FIX Fixed SNMPv3 credential handling in the event console.

by Sven Panne

Module: check_mk Branch: master Commit: 195b809bbcbcf8467310e1cbb967f0b5bd179358 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=195b809bbcbcf8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 11 08:32:49 2018 +0200 5834 FIX Fixed SNMPv3 credential handling in the event console. Although it is not really useful, the list of engine IDs, for which a given set of credential parameters should be used, can be empty. Previously this lead to a traceback in the EC log and missing credentials for SNMP traps. This has been fixed. Another bug was in the handling of the noAuthNoPriv security level, where the wrong user name was used. This, too, has been fixed. Change-Id: If3a83a2b34e1cb8f22d95de92618bb826809745f --- .werks/5834 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/5834 b/.werks/5834 new file mode 100644 index 0000000..bfb47aa --- /dev/null +++ b/.werks/5834 @@ -0,0 +1,16 @@ +Title: Fixed SNMPv3 credential handling in the event console. +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1523427930 +Class: fix + +Although it is not really useful, the list of engine IDs, for which a given +set of credential parameters should be used, can be empty. Previously this +lead to a traceback in the EC log and missing credentials for SNMP traps. +This has been fixed. + +Another bug was in the handling of the noAuthNoPriv security level, where +the wrong user name was used. This, too, has been fixed.

6 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018