Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

Move agent-plugin UTs to tests/unit/agents/plugins

by Andreas Umbreit

Module: check_mk Branch: master Commit: dc6fa9f184328dfe2874f5ade6a942e1bd756ae8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc6fa9f184328d… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Jan 21 15:35:06 2019 +0100 Move agent-plugin UTs to tests/unit/agents/plugins Change-Id: Ie96c09ea614a7d989ef6761c94118a92d01831f6 --- tests/unit/{ => agents}/plugins/test_mk_filestats.py | 0 tests/unit/{ => agents}/plugins/test_mk_logwatch_aix.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/unit/plugins/test_mk_filestats.py b/tests/unit/agents/plugins/test_mk_filestats.py similarity index 100% rename from tests/unit/plugins/test_mk_filestats.py rename to tests/unit/agents/plugins/test_mk_filestats.py diff --git a/tests/unit/plugins/test_mk_logwatch_aix.py b/tests/unit/agents/plugins/test_mk_logwatch_aix.py similarity index 100% rename from tests/unit/plugins/test_mk_logwatch_aix.py rename to tests/unit/agents/plugins/test_mk_logwatch_aix.py

5 years, 8 months

6938 FIX cmk-update-agent: Handle failing package manager

by Andreas Umbreit

Module: check_mk Branch: master Commit: 0ed40af72dc95d6fd3dbf1f2e2f5eaa321ac49c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ed40af72dc95d… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Jan 18 16:57:50 2019 +0100 6938 FIX cmk-update-agent: Handle failing package manager This werk fixes two bugs that occur on Unix and Linux when the invoked package manager fails to install an agent package: The agent updater saved the agent hash to its state file immediately before the update takes place. As a result, an agent package got recognized as installed even if its installation failed. (Regression since Check_MK 1.5) Due to inproper handling of the stderr and stdout streams coming from the invoked package manager, the agent updater crashed on a package manager failure instead of forwarding the error messages to the user or log. (Jira: CMK-1552) Change-Id: I47668286c465145cbe43d00469e030201cdbfe7e --- .werks/6938 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.werks/6938 b/.werks/6938 new file mode 100644 index 0000000..fef6715 --- /dev/null +++ b/.werks/6938 @@ -0,0 +1,25 @@ +Title: cmk-update-agent: Handle failing package manager +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1547826201 + +This werk fixes two bugs that occur on Unix and Linux +when the invoked package manager fails to install an +agent package: + +The agent updater saved the agent hash to its state file +immediately before the update takes place. As a result, an +agent package got recognized as installed even if +its installation failed. + +(Regression since Check_MK 1.5) Due to inproper handling +of the stderr and stdout streams coming from the invoked +package manager, the agent updater crashed on a package +manager failure instead of forwarding the error messages +to the user or log. +

5 years, 8 months

Removed ancient azure related stuff

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a168568da015154a65835fde4a86f1f73c9b0d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a168568da0151… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 21 13:24:11 2019 +0100 Removed ancient azure related stuff Change-Id: I97721e36273f2460084fa1e8877e200c728a4a08 --- doc/treasures/azure/README | 11 --- doc/treasures/azure/agent_azure | 101 --------------------- doc/treasures/azure/azuremonitor/__init__.py | 15 --- .../azure/azuremonitor/publishsettings.py | 66 -------------- doc/treasures/azure/checks/azure_deployments | 53 ----------- doc/treasures/azure/checks/azure_servicecount | 44 --------- 6 files changed, 290 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8a168568da…

5 years, 8 months

lnx_thermal: use get_parsed_item_data decorator

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 57b82eb1e03fb3d464575d29a680cac42e4f5022 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57b82eb1e03fb3… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jan 21 12:55:40 2019 +0100 lnx_thermal: use get_parsed_item_data decorator Add a regression test and reformat the existing regression tests, as well. Change-Id: I4e889660bfb3ce13e832716731de5ce45fb72994 --- checks/lnx_thermal | 11 +-- .../checks/generictests/datasets/lnx_thermal.py | 83 +++++++++++++++------- 2 files changed, 65 insertions(+), 29 deletions(-) diff --git a/checks/lnx_thermal b/checks/lnx_thermal index 8386532..f01808d 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -86,7 +86,8 @@ def inventory_lnx_thermal(parsed): yield item, {} -def check_lnx_thermal(item, params, parsed): +@get_parsed_item_data +def check_lnx_thermal(item, params, data): """ - Trip points hot and critical are considered for the device crit level. In case both trip points are given the lower value is considered for the device crit level. @@ -95,10 +96,10 @@ def check_lnx_thermal(item, params, parsed): is considered for the device crit level. - Trip point temperatures are provided via performance data. """ - temperature = parsed.get(item).get('temperature') - warn_level = parsed.get(item).get('passive') - hot_value = parsed.get(item).get('hot') - critical_value = parsed.get(item).get('critical') + temperature = data.get('temperature') + warn_level = data.get('passive') + hot_value = data.get('hot') + critical_value = data.get('critical') if temperature is None: return diff --git a/tests/unit/checks/generictests/datasets/lnx_thermal.py b/tests/unit/checks/generictests/datasets/lnx_thermal.py index 3def5af..fbb2173 100644 --- a/tests/unit/checks/generictests/datasets/lnx_thermal.py +++ b/tests/unit/checks/generictests/datasets/lnx_thermal.py @@ -19,28 +19,63 @@ discovery = { } checks = { - '': [('Zone 0', { - 'device_levels_handling': 'devdefault', - 'levels': (70.0, 80.0) - }, [(0, u'57.0 \xb0C', [('temp', 57.0, 127.0, 127.0, None, None)])]), - ('Zone 1', { - 'device_levels_handling': 'devdefault', - 'levels': (70.0, 80.0) - }, [(0, u'65.0 \xb0C', [('temp', 65.0, 95.5, 100.0, None, None)])]), - ('Zone 2', { - 'device_levels_handling': 'devdefault', - 'levels': (70.0, 80.0) - }, [(0, u'44.0 \xb0C', [('temp', 44.0, 70.0, 80.0, None, None)])]), - ('Zone 3', { - 'device_levels_handling': 'devdefault', - 'levels': (70.0, 80.0) - }, [(0, u'48.0 \xb0C', [('temp', 48.0, 77.0, 87.0, None, None)])]), - ('Zone 4', { - 'device_levels_handling': 'devdefault', - 'levels': (70.0, 80.0) - }, [(0, u'20.0 \xb0C', [('temp', 20.0, 70.0, 80.0, None, None)])]), - ('Zone 5', { - 'device_levels_handling': 'devdefault', - 'levels': (70.0, 80.0) - }, [(0, u'27.0 \xb0C', [('temp', 27.0, 70.0, 80.0, None, None)])])] + '': [ + ( + 'Zone 0', + { + 'device_levels_handling': 'devdefault', + 'levels': (70.0, 80.0) + }, + [(0, u'57.0 \xb0C', [('temp', 57.0, 127.0, 127.0, None, None)])], + ), + ( + 'Zone 1', + { + 'device_levels_handling': 'devdefault', + 'levels': (70.0, 80.0) + }, + [(0, u'65.0 \xb0C', [('temp', 65.0, 95.5, 100.0, None, None)])], + ), + ( + 'Zone 2', + { + 'device_levels_handling': 'devdefault', + 'levels': (70.0, 80.0) + }, + [(0, u'44.0 \xb0C', [('temp', 44.0, 70.0, 80.0, None, None)])], + ), + ( + 'Zone 3', + { + 'device_levels_handling': 'devdefault', + 'levels': (70.0, 80.0) + }, + [(0, u'48.0 \xb0C', [('temp', 48.0, 77.0, 87.0, None, None)])], + ), + ( + 'Zone 4', + { + 'device_levels_handling': 'devdefault', + 'levels': (70.0, 80.0) + }, + [(0, u'20.0 \xb0C', [('temp', 20.0, 70.0, 80.0, None, None)])], + ), + ( + 'Zone 5', + { + 'device_levels_handling': 'devdefault', + 'levels': (70.0, 80.0) + }, + [(0, u'27.0 \xb0C', [('temp', 27.0, 70.0, 80.0, None, None)])], + ), + # test for an unknown item + ( + 'Zone 6', + { + 'device_levels_handling': 'devdefault', + 'levels': (70.0, 80.0) + }, + None + ), + ] }

5 years, 8 months

Fix WATO rules for process discovery & state and count of processes

by Óscar Nájera

Module: check_mk Branch: master Commit: b51c1abccb59b32bd016dfb4ae205551dd877e0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b51c1abccb59b3… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Wed Jan 9 15:41:42 2019 +0100 Fix WATO rules for process discovery & state and count of processes - Move all rules to check_parameters/ps.py - Unify option parameters for all 3 rulesets - Move icon value spec into the common default_params group - Dealing with transforms more appropriately - Fix WATO transform for PS rules - WATO alternative defaults match function: Make it explicit and easier to understand - Ignore match_groups key from discovered processes - Only show CPU utilization when there is at least one process Change-Id: Idadb023164bf2e280a6305776e94748cc2246693 --- checks/ps.include | 24 +- cmk/gui/plugins/wato/check_parameters/ps.py | 366 +++++++++++++++------ cmk/gui/plugins/wato/check_parameters/unsorted.py | 192 ----------- tests/unit/checks/test_ps.py | 41 ++- .../cmk/gui/plugins/wato/test_check_parameters.py | 49 ++- 5 files changed, 353 insertions(+), 319 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b51c1abccb…

5 years, 8 months

Fixed broken view editor after htmllib refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fd45b835248c8de4614363898def900c7549adb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fd45b835248c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 21 11:03:01 2019 +0100 Fixed broken view editor after htmllib refactoring Change-Id: I4cfa6193e992ff1931c3b6cd07f617b936a5e859 --- cmk/gui/plugins/visuals/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmk/gui/plugins/visuals/utils.py b/cmk/gui/plugins/visuals/utils.py index dbea96a..de8b192 100644 --- a/cmk/gui/plugins/visuals/utils.py +++ b/cmk/gui/plugins/visuals/utils.py @@ -137,7 +137,9 @@ class Filter(object): # the HTML context where it can be used by e.g. the display() method. def set_value(self, value): for varname in self.htmlvars: - html.request.set_var(varname, value.get(varname)) + var_value = value.get(varname) + if var_value is not None: + html.request.set_var(varname, var_value) # TODO: We should merge this with Filter() and make all vars unicode ...

5 years, 8 months

Fix hiding host attributes when depending on locked attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: dc940d51791ea7cf9daf11a93bfdab640086ba10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc940d51791ea7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 21 12:36:02 2019 +0100 Fix hiding host attributes when depending on locked attributes Change-Id: Icec41589574b94d650610af86561887f168162ea --- web/htdocs/js/modules/wato.js | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/web/htdocs/js/modules/wato.js b/web/htdocs/js/modules/wato.js index 36fab56..829717d 100644 --- a/web/htdocs/js/modules/wato.js +++ b/web/htdocs/js/modules/wato.js @@ -191,12 +191,27 @@ function get_effective_tags() continue; } var oTdContent = oTr.childNodes[1]; - /* If the Checkbox is unchecked try to get a value from the inherited_tags */ - var oCheckbox = oTdLegend.getElementsByTagName("input")[0]; - if (oCheckbox.checked == false ){ - var attrname = "attr_" + oCheckbox.name.replace(/.*_change_/, ""); - if (attrname in dialog_properties.inherited_tags && dialog_properties.inherited_tags[attrname] !== null){ - add_tag_id = dialog_properties.inherited_tags[attrname]; + + /* + * If the Checkbox is unchecked try to get a value from the inherited_tags + * + * The checkbox may be disabled. In this case there is a hidden field with the original + * name of the checkbox. Get that value instead of the checkbox checked state. + */ + var input_fields = oTdLegend.getElementsByTagName("input"); + var checkbox = input_fields[0]; + var attr_enabled = false; + if (checkbox.name.indexOf("ignored_") === 0) { + var hidden_field = input_fields[input_fields.length - 1]; + attr_enabled = hidden_field.value == "on"; + } else { + attr_enabled = checkbox.checked; + } + + if (attr_enabled == false ){ + var attr_ident = "attr_" + checkbox.name.replace(/.*_change_/, ""); + if (attr_ident in dialog_properties.inherited_tags && dialog_properties.inherited_tags[attr_ident] !== null){ + add_tag_id = dialog_properties.inherited_tags[attr_ident]; } } else { /* Find the <select>/<checkbox> object in this tr */

5 years, 8 months

lnx_thermal: Use standard text if item not found

by Simon Betz

Module: check_mk Branch: master Commit: 2bc84b39c2c7d0b7872a1053af9749e9c61494fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bc84b39c2c7d0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 21 10:00:28 2019 +0100 lnx_thermal: Use standard text if item not found Change-Id: Iafe6ec568c02944a6d0a3d6196a6f8e65820b5eb --- checks/lnx_thermal | 4 ++-- tests/unit/checks/generictests/datasets/lnx_thermal.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/lnx_thermal b/checks/lnx_thermal index f165b68..8386532 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -100,8 +100,8 @@ def check_lnx_thermal(item, params, parsed): hot_value = parsed.get(item).get('hot') critical_value = parsed.get(item).get('critical') - if not temperature: - return 3, "Item not found or invalid agent data." + if temperature is None: + return if hot_value and critical_value: crit_level = min(hot_value, critical_value) diff --git a/tests/unit/checks/generictests/datasets/lnx_thermal.py b/tests/unit/checks/generictests/datasets/lnx_thermal.py index cc54922..3def5af 100644 --- a/tests/unit/checks/generictests/datasets/lnx_thermal.py +++ b/tests/unit/checks/generictests/datasets/lnx_thermal.py @@ -20,9 +20,9 @@ discovery = { checks = { '': [('Zone 0', { - 'device_levels_handling': 'devdefault', - 'levels': (70.0, 80.0) - }, [(0, u'57.0 \xb0C', [('temp', 57.0, 127.0, 127.0, None, None)])]), + 'device_levels_handling': 'devdefault', + 'levels': (70.0, 80.0) + }, [(0, u'57.0 \xb0C', [('temp', 57.0, 127.0, 127.0, None, None)])]), ('Zone 1', { 'device_levels_handling': 'devdefault', 'levels': (70.0, 80.0)

5 years, 8 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: fa58282a86a50498adce65c18f96bb86a602c561 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa58282a86a504… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 21 09:59:33 2019 +0100 Reserved 20 Werk IDS Change-Id: I4441627ad29747467ec7618220d818a0b3de5c72 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 64aee72..5997a44 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7111 +7131

5 years, 8 months

k8s_roles: replace check for individual roles by a summary check

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 8eb535e553bcbb528ed4633527b560deb11f5d56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eb535e553bcbb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Jan 18 11:55:45 2019 +0100 k8s_roles: replace check for individual roles by a summary check The checks for the individual roles are replaced by a summary check that return the number of cluster roles, roles and total roles defined in the Kubernetes cluster. The information for the individual roles are moved to the HW/SW Inventory. Change-Id: I6d39d7e4070c561c319fecde63da4b3d5c73a0ad --- checkman/k8s_roles | 10 ++- checks/k8s_roles | 44 +++++++++---- cmk/gui/plugins/metrics/check_mk.py | 18 ++++++ cmk/gui/plugins/views/inventory.py | 7 +++ cmk/gui/plugins/wato/check_parameters/k8s_roles.py | 73 ++++++++++++++++++++++ cmk/special_agents/agent_kubernetes.py | 15 +++-- inventory/k8s_roles | 47 ++++++++++++++ .../generictests/datasets/k8s_roles_regression.py | 33 ++++++++++ tests/unit/cmk/gui/test_watolib.py | 2 + 9 files changed, 224 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8eb535e553…

5 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019