Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: bc3444655506c390af7762fe3baab995febed6ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc3444655506c3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 24 14:17:01 2018 +0200 fixed import error Change-Id: I85cc57532b53ee216c5e2acc786de7612d7f74aa --- cmk/gui/wato/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 12b1a16..a61fe6f 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -13386,8 +13386,8 @@ def create_sample_config(): # Initial baking of agents (when bakery is available) if watolib.has_agent_bakery(): - bake_job = BakeAgentsBackgroundJob() import cmk.gui.cee.plugins.wato.agent_bakery + bake_job = cmk.gui.cee.plugins.wato.agent_bakery.BakeAgentsBackgroundJob() bake_job.set_function(cmk.gui.cee.plugins.wato.agent_bakery.bake_agents_background_job) try: bake_job.start()

6 years, 1 month

migrated WK6660

by Andreas Boesl

Module: check_mk Branch: master Commit: 35dcbf4019d3a381fdab0f0fc4c46fec5c0153c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35dcbf4019d3a3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 24 14:03:50 2018 +0200 migrated WK6660 Change-Id: Iee25727c3a847caa3429e77fccfa2b32768ef5fc --- .werks/6660 | 13 ++++++++++ cmk/gui/background_job.py | 61 ++++++++++++++++++++++++++++------------------- cmk/gui/userdb.py | 8 ++++--- cmk/gui/wato/__init__.py | 41 +++++++++++++++++++++---------- 4 files changed, 82 insertions(+), 41 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=35dcbf4019…

6 years, 1 month

fixed incorrect import

by Andreas Boesl

Module: check_mk Branch: master Commit: 78ec0a9ee19ffc1d159ede305c99b0388da5e3a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78ec0a9ee19ffc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 24 14:09:12 2018 +0200 fixed incorrect import Change-Id: Ib745e36d2cb958068893eebc14914b41133be58d --- cmk_base/checking.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index c630362..3daccdb 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -47,7 +47,6 @@ import cmk_base.snmp as snmp import cmk_base.ip_lookup as ip_lookup import cmk_base.data_sources as data_sources import cmk_base.item_state as item_state -import cmk_base.core import cmk_base.check_table as check_table from cmk_base.exceptions import MKTimeout, MKParseFunctionError import cmk_base.check_utils

6 years, 1 month

6714 FIX docker_container_status: Fixed possible "ValueError" exception

by Lars Michelsen

Module: check_mk Branch: master Commit: 26e2bb51e03cd092156c21f11f72e9ca2e84a6c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26e2bb51e03cd0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 11:48:42 2018 +0200 6714 FIX docker_container_status: Fixed possible "ValueError" exception Change-Id: Ic993ad9862b958d942aa597053f157219050ca14 --- .werks/6714 | 11 +++++++++++ checks/docker_container_status | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6714 b/.werks/6714 new file mode 100644 index 0000000..e163c68 --- /dev/null +++ b/.werks/6714 @@ -0,0 +1,11 @@ +Title: docker_container_status: Fixed possible "ValueError" exception +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537782461 + + diff --git a/checks/docker_container_status b/checks/docker_container_status index 68604bb..fd9c8ce 100644 --- a/checks/docker_container_status +++ b/checks/docker_container_status @@ -35,7 +35,7 @@ def parse_docker_container_status(info): # line. We assume that this a full JSON object. The rest of the section is skipped. # When a container got piggyback data from multiple hosts (e.g. a cluster) this results # in multiple JSON objects handed over to this check. - json_raw_data = info[0][0] + json_raw_data = " ".join(info[0]) import json return json.loads(json_raw_data)

6 years, 1 month

Test get_bulk_notification_subject

by Óscar Nájera

Module: check_mk Branch: master Commit: 2e101bb7810eba6483de82fea08234114191a0ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e101bb7810eba… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Sep 24 10:49:19 2018 +0200 Test get_bulk_notification_subject Change-Id: Iad543ccb3a027b1561bf9c22cc142db80ca6a91a --- tests/unit/cmk/notifications/test_utils.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/unit/cmk/notifications/test_utils.py b/tests/unit/cmk/notifications/test_utils.py index cbc54e2..1c7074d 100644 --- a/tests/unit/cmk/notifications/test_utils.py +++ b/tests/unit/cmk/notifications/test_utils.py @@ -60,3 +60,21 @@ def test_read_bulk_contents(monkeypatch, capsys): monkeypatch.setattr('sys.stdin', ('key=val', '\n', 'key2=val2', 'a comment')) assert utils.read_bulk_contexts() == ({'key': 'val'}, [{'key2': 'val2'}]) assert capsys.readouterr().err == "Invalid line 'a comment' in bulked notification context\n" + + +(a)pytest.mark.parametrize("context, hosts, result", [ + ([{ + "k": "y" + }], ["local", "host"], "Check_MK: 1 notifications for 2 hosts"), + ([{ + "k": "y" + }, { + "l": "p" + }], ["first"], "Check_MK: 2 notifications for first"), + ([{ + "PARAMETER_BULK_SUBJECT": "Check_MK: $FOLDER$ gone $COUNT_HOSTS$ host", + "HOSTTAGS": "/wato/lan cmk-agent ip-v4 prod site:heute tcp wato" + }], ["first"], "Check_MK: lan gone 1 host"), +]) +def test_get_bulk_notification_subject(context, hosts, result): + assert utils.get_bulk_notification_subject(context, hosts) == result

6 years, 1 month

6715 FIX Editing BI Rules: Increased size of the rule ID input field

by Lars Michelsen

Module: check_mk Branch: master Commit: 7aecbb70ccb66d261dc84cf9333cb3fe103977c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aecbb70ccb66d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 13:24:19 2018 +0200 6715 FIX Editing BI Rules: Increased size of the rule ID input field Change-Id: I5b6392e7807bd11acacf655c263374edc5d404d8 --- .werks/6715 | 11 +++++++++++ cmk/gui/plugins/wato/bi.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6715 b/.werks/6715 new file mode 100644 index 0000000..e1a8a77 --- /dev/null +++ b/.werks/6715 @@ -0,0 +1,11 @@ +Title: Editing BI Rules: Increased size of the rule ID input field +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537788247 + + diff --git a/cmk/gui/plugins/wato/bi.py b/cmk/gui/plugins/wato/bi.py index 536cce4..f5007fb 100644 --- a/cmk/gui/plugins/wato/bi.py +++ b/cmk/gui/plugins/wato/bi.py @@ -1972,7 +1972,7 @@ class ModeBIEditRule(ModeBI): "when rules refer to each other. The rule IDs will not be visible in the status " "GUI. They are just used within the configuration."), allow_empty = False, - size = 24, + size = 80, ), ), ( "title",

6 years, 1 month

Fixed pylint issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 8711e6f3a38ad6c914021ad83e47a971be48c83c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8711e6f3a38ad6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 13:59:40 2018 +0200 Fixed pylint issues Change-Id: I0dafef37ec79497be1be37d26df82ae61bbe9e21 --- cmk_base/checking.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index e0925ff..c630362 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -39,7 +39,6 @@ import cmk.cpu_tracking as cpu_tracking from cmk.exceptions import MKGeneralException from cmk.regex import regex -import cmk_base.core as core import cmk_base.utils import cmk_base.crash_reporting import cmk_base.console as console @@ -299,7 +298,7 @@ def execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, i item_state.reset_wrapped_counters() raw_result = check_function(item, determine_check_params(params), section_content) - result = sanitize_check_result(raw_result, checks.is_snmp_check(check_plugin_name)) + result = sanitize_check_result(raw_result, cmk_base.check_utils.is_snmp_check(check_plugin_name)) item_state.raise_counter_wrap() except item_state.MKCounterWrapped, e: @@ -378,7 +377,7 @@ def _evaluate_timespecific_entry(entry): combined_entry = copy.copy(entry["tp_default_value"]) for timeperiod_name, tp_entry in entry["tp_values"][::-1]: try: - tp_active = core.timeperiod_active(timeperiod_name) + tp_active = cmk_base.core.timeperiod_active(timeperiod_name) except: # Connection error if cmk.debug.enabled():

6 years, 1 month

migrated WK6662 into master

by Andreas Boesl

Module: check_mk Branch: master Commit: 95e20f9bd8725267224c140cd61b675dbf9ef485 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95e20f9bd87252… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 24 13:41:20 2018 +0200 migrated WK6662 into master Change-Id: Ib403985e2bbf3e2a9d54d374839223b4ba1d7a9d --- .werks/6662 | 63 +++++++++++++++++++++++++++++ cmk/gui/wato/__init__.py | 4 ++ cmk_base/automations/check_mk.py | 18 +++++++++ cmk_base/checking.py | 78 +++++++++++++++++++++++++----------- cmk_base/config.py | 17 ++++++++ cmk_base/discovery.py | 5 ++- cmk_base/dump_host.py | 13 +++++- tests/unit/cmk_base/test_checking.py | 37 +++++++++++++++++ 8 files changed, 209 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=95e20f9bd8…

6 years, 1 month

Move into modules asciimail, pushover & spectrum

by Óscar Nájera

Module: check_mk Branch: master Commit: 6f8286ecbc7895f89c2bca13fdf4cfc5b241f9ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f8286ecbc7895… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Sep 21 15:57:00 2018 +0200 Move into modules asciimail, pushover & spectrum Change-Id: I45e63095e70947e84b6cf197c1441f40c268d880 --- cmk/notification_plugins/asciimail.py | 300 +++++++++++++++++++++++++++++++++ cmk/notification_plugins/pushover.py | 160 ++++++++++++++++++ cmk/notification_plugins/spectrum.py | 101 ++++++++++++ notifications/asciimail | 302 +--------------------------------- notifications/pushover | 164 +----------------- notifications/spectrum | 89 +--------- 6 files changed, 570 insertions(+), 546 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6f8286ecbc…

6 years, 1 month

Make slack notification plugin a python module of Check_MK

by Óscar Nájera

Module: check_mk Branch: master Commit: 4b858f056e90108153722bc03a87937471ae97c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b858f056e9010… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 20 14:58:09 2018 +0200 Make slack notification plugin a python module of Check_MK - This change allows to import the pluging and test it. - A utils module is created to collect commonly used functions for notification plugins - Wrapper script to call module Change-Id: I637a47ffd73711359d6608dce040db7b080471b3 --- cmk/notification_plugins/__init__.py | 0 cmk/notification_plugins/slack.py | 106 ++++++++++++++++++++++ cmk/notification_plugins/utils.py | 55 ++++++++++++ notifications/slack | 139 +---------------------------- tests/unit/cmk/notifications/test_slack.py | 42 +++++++++ tests/unit/cmk/notifications/test_utils.py | 31 +++++++ 6 files changed, 237 insertions(+), 136 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4b858f056e…

6 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018