Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

by Andreas Umbreit

Module: check_mk Branch: master Commit: 3f18764d94a5f196b802a602c4f15051ccd9131e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f18764d94a5f1… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Dec 12 08:06:04 2017 +0100 Add werk 5265 Change-Id: I42aa846042ba3fb4e63be243302eef2244c46e33 --- .werks/5265 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.werks/5265 b/.werks/5265 new file mode 100644 index 0000000..d4370e1 --- /dev/null +++ b/.werks/5265 @@ -0,0 +1,15 @@ +Title: cmk-update-agent: Enable Agent Updater to update itself on Windows +Level: 2 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1512997920 +Class: fix + +When triggering an update under Windows, the agent updater could not be replaced by its new downloaded version because it was still running from the corresponding file. + +This situation is now mitigated by restarting the agent updater from within ../temp when running from plugins-dir. + +This is relevant only for a manual execution of cmk-update-agent.exe +

6 years, 6 months

5473 FIX Add correct host-related acknowledgement info to notifications.

by Sven Panne

Module: check_mk Branch: master Commit: b1845408530d2f55ef230661b3d7832a7608ac67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1845408530d2f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 14 13:59:44 2017 +0100 5473 FIX Add correct host-related acknowledgement info to notifications. When a notification for a service was constructed, the HOSTACKAUTHOR and HOSTACKCOMMENT variables were incorrectly filled with service-related information. This has been fixed. Change-Id: Ic52bd237897a0ee517b631a25b59d86980794ea9 --- .werks/5473 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5473 b/.werks/5473 new file mode 100644 index 0000000..6c1b581 --- /dev/null +++ b/.werks/5473 @@ -0,0 +1,12 @@ +Title: Add correct host-related acknowledgement info to notifications. +Level: 1 +Component: cmc +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1513256289 +Class: fix + +When a notification for a service was constructed, the HOSTACKAUTHOR and +HOSTACKCOMMENT variables were incorrectly filled with service-related +information. This has been fixed.

6 years, 6 months

5472 FIX Ensure correct quoting of values in event contexts.

by Sven Panne

Module: check_mk Branch: master Commit: fe6fe17789cc6937989bf0cfb55c4b523eea7990 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe6fe17789cc69… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 14 13:42:35 2017 +0100 5472 FIX Ensure correct quoting of values in event contexts. The values of custom host/service variables and acknowledgement comments were not correctly quoted when being passed to the alert/notification helpers. Therefore, some special characters could have been mishandled, this has been fixed. Change-Id: I48799e953fca738bbc81957821ba03af7134dea5 --- .werks/5472 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/5472 b/.werks/5472 new file mode 100644 index 0000000..58ec040 --- /dev/null +++ b/.werks/5472 @@ -0,0 +1,13 @@ +Title: Ensure correct quoting of values in event contexts. +Level: 1 +Component: cmc +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1513255154 +Class: fix + +The values of custom host/service variables and acknowledgement comments +were not correctly quoted when being passed to the alert/notification +helpers. Therefore, some special characters could have been mishandled, +this has been fixed.

6 years, 6 months

Added decorator to cmk.profile

by Simon Betz

Module: check_mk Branch: master Commit: c3f45875d283485d3c8a768765a90ec8ff086182 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3f45875d28348… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 12 16:30:04 2017 +0100 Added decorator to cmk.profile Change-Id: Ia81323e0c212baf2052df7729ad38cab6ad1733d --- lib/profile.py | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/profile.py b/lib/profile.py index f01b479..2ed4173 100644 --- a/lib/profile.py +++ b/lib/profile.py @@ -31,7 +31,7 @@ minimal changes.""" import cProfile import contextlib import os - +import time import cmk.log @@ -71,3 +71,26 @@ class Profile(object): "stats.sort_stats('time').print_stats()\n" % self._profile_file) os.chmod(self._profile_file + ".py", 0o755) cmk.log.logger.info("Created profile dump script: %s.py" % self._profile_file) + + +def profile_call(base_dir, enabled=True): + """ +This decorator can be used to profile single functions as a starting point. +A directory where the file will be saved has to be stated as first argument. +Enabling/disabling as second argument is optional. By default it's enabled. +The name of the output file is composed of the function name itself, +the timestamp when the function was called and the suffix '.profile'. +Examples: + @cmk.profile.profile_call(base_dir="/PATH/TO/DIR") + @cmk.profile.profile_call(base_dir="/PATH/TO/DIR", enabled=True) + @cmk.profile.profile_call(base_dir="/PATH/TO/DIR", enabled=False) +""" + def decorate(f): + def wrapper(*args, **kwargs): + filepath = "%s/%s_%s.profile" % \ + (base_dir.rstip("/"), f.__name__, time.time()) + with Profile(enabled=enabled, + profile_file=filepath): + return f(*args, **kwargs) + return wrapper + return decorate

6 years, 6 months

Make check tests happy again by removing superfluous string formatting from perfdata

by Konstantin Büttner

Module: check_mk Branch: master Commit: e52e39c1d6d424bff49592744ee79837d1c2de71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e52e39c1d6d424… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 13 18:57:00 2017 +0100 Make check tests happy again by removing superfluous string formatting from perfdata Change-Id: I6847b0cf3d4cef0d04a14419646c221c23ce2a2e --- checks/cpu_util.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 25e53ce..20d608a 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -157,9 +157,9 @@ def check_cpu_util_unix(values, params, cores = None): system_perc = 100.0 * float(system) / float(sum_jiffies) wait_perc = 100.0 * float(wait) / float(sum_jiffies) perfdata = [ - ( "user", "%.3f" % user_perc ), - ( "system", "%.3f" % system_perc ), - ( "wait", "%.3f" % wait_perc ) ] + ( "user", user_perc ), + ( "system", system_perc ), + ( "wait", wait_perc ) ] yield 0, "user: %.1f%%, system: %.1f%%" % (user_perc, system_perc), perfdata

6 years, 6 months

test_statgrab_cpu_check: Use BasicCheckResult for subresults

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0a51ee03391151cd997048ce5e43effb98fb5d60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a51ee03391151… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 13 18:41:05 2017 +0100 test_statgrab_cpu_check: Use BasicCheckResult for subresults Change-Id: I85df38eb178e444db7ef686218da5b257da0c653 --- tests/checks/test_statgrab_cpu_check.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index 9f4cc21..e9e6942 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -1,6 +1,7 @@ import pytest import pprint from cmk_base.check_api import MKCounterWrapped +import checktestlib pytestmark = pytest.mark.checks @@ -26,8 +27,8 @@ def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, ex import time check = check_manager.get_check("statgrab_cpu") try: - result = list(check.run_check(None, params, time_to_info(0))) + list(check.run_check(None, params, time_to_info(0))) except MKCounterWrapped: pass monkeypatch.setattr("time.time", lambda: 60) - result = list(check.run_check(None, params, time_to_info(60))) + subresults = [ checktestlib.BasicCheckResult(*subresult) for subresult in check.run_check(None, params, time_to_info(60)) ]

6 years, 6 months

test_statgrab_cpu_check: Remove unnecessary argument timepoints

by Konstantin Büttner

Module: check_mk Branch: master Commit: f7eb9805b86b77cb9c1d03fc9cf2c7ffbd0cdf5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7eb9805b86b77… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 13 18:34:55 2017 +0100 test_statgrab_cpu_check: Remove unnecessary argument timepoints This level of generality is excessive at this point. We really only need to initialize all counters and get one 'real' result. Change-Id: Ica69b993552490a0e57e10bdf0b22637db091030 --- tests/checks/test_statgrab_cpu_check.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index 71a7460..9f4cc21 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -5,8 +5,8 @@ from cmk_base.check_api import MKCounterWrapped pytestmark = pytest.mark.checks -(a)pytest.mark.parametrize("timepoints,time_to_info,params,expected_results", [ -([60],lambda t: [[u'ctxsw', u'%d' % int(t*50)], +(a)pytest.mark.parametrize("time_to_info,params,expected_result", [ +(lambda t: [[u'ctxsw', u'%d' % int(t*50)], [u'idle', u'%d' % int(t*50)], [u'intrs', u'%d' % int(t*50)], [u'iowait', u'%d' % int(t*50)], @@ -22,13 +22,12 @@ pytestmark = pytest.mark.checks [u'vctxsw', u'%d' % int(t*50)]], {}, None), ]) -def test_statgrab_cpu_check(check_manager, monkeypatch, timepoints, time_to_info, params, expected_results): +def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, expected_result): import time check = check_manager.get_check("statgrab_cpu") try: result = list(check.run_check(None, params, time_to_info(0))) except MKCounterWrapped: pass - for t in timepoints: - monkeypatch.setattr("time.time", lambda: t) - result = list(check.run_check(None, params, time_to_info(t))) + monkeypatch.setattr("time.time", lambda: 60) + result = list(check.run_check(None, params, time_to_info(60)))

6 years, 6 months

Check tests: Move logic for result assertion to BasicCheckResult class

by Konstantin Büttner

Module: check_mk Branch: master Commit: 226ad44b9097d13c7a7ce6fd929baae48bae7e24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=226ad44b9097d1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 13 18:23:00 2017 +0100 Check tests: Move logic for result assertion to BasicCheckResult class Change-Id: I8adc2132aa070ac04d17e01eafd9734ed089f145 --- tests/checks/checktestlib.py | 7 +++++++ tests/checks/test_df_check.py | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index ee82e1d..ad32453 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -30,3 +30,10 @@ class BasicCheckResult(object): assert all(type(value) in [int, float, type(None)] for value in entry[2:]) self.perfdata = perfdata + def assert_result(self, expected_result): + if "status" in expected_result: + assert result.status == expected_result["status"] + if "infotext" in expected_result: + assert result.infotext == expected_result["infotext"] + if "perfdata" in expected_result: + assert result.perfdata == expected_result["perfdata"] diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index 6331e43..57f5abd 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -267,9 +267,4 @@ def test_df_check_with_parse(check_manager, monkeypatch, item, params, info, exp params = check.default_parameters() result = checktestlib.BasicCheckResult(*check.run_check(item, params, check.run_parse(info))) - if "status" in expected_result: - assert result.status == expected_result["status"] - if "infotext" in expected_result: - assert result.infotext == expected_result["infotext"] - if "perfdata" in expected_result: - assert result.perfdata == expected_result["perfdata"] + result.assert_result(expected_result)

6 years, 6 months

test_statgrab_cpu_check: Fix test data

by Konstantin Büttner

Module: check_mk Branch: master Commit: 32616506f0f6b3eb553d8744b1996d2cd90cb4c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32616506f0f6b3… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 13 16:39:57 2017 +0100 test_statgrab_cpu_check: Fix test data Change-Id: Ieb5b4b46e4dc5168fedb79e208049ca2c9008764 --- tests/checks/test_statgrab_cpu_check.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index fe3ea1a..71a7460 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -7,19 +7,19 @@ pytestmark = pytest.mark.checks @pytest.mark.parametrize("timepoints,time_to_info,params,expected_results", [ ([60],lambda t: [[u'ctxsw', u'%d' % int(t*50)], - [u'idle', int(t*50)], - [u'intrs',int(t*50)], - [u'iowait',int(t*50)], - [u'kernel',int(t*50)], - [u'nice',int(t*50)], - [u'nvctxsw',int(t*50)], - [u'softintrs',int(t*50)], - [u'swap',int(t*50)], - [u'syscalls',int(t*50)], - [u'systime',int(t*50)], - [u'total',int(t*50)], - [u'user',int(t*50)], - [u'vctxsw',int(t*50)]], + [u'idle', u'%d' % int(t*50)], + [u'intrs', u'%d' % int(t*50)], + [u'iowait', u'%d' % int(t*50)], + [u'kernel', u'%d' % int(t*50)], + [u'nice', u'%d' % int(t*50)], + [u'nvctxsw', u'%d' % int(t*50)], + [u'softintrs', u'%d' % int(t*50)], + [u'swap', u'%d' % int(t*50)], + [u'syscalls', u'%d' % int(t*50)], + [u'systime', u'%d' % int(t*50)], + [u'total', u'%d' % int(t*50)], + [u'user', u'%d' % int(t*50)], + [u'vctxsw', u'%d' % int(t*50)]], {}, None), ]) def test_statgrab_cpu_check(check_manager, monkeypatch, timepoints, time_to_info, params, expected_results):

6 years, 6 months

5254 Event console: Introduced syslog application placeholder which can be used in rewriting events

by Andreas Boesl

Module: check_mk Branch: master Commit: d6c497c6697d4c3d8e362a8ef9a39104655ed571 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6c497c6697d4c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 16 11:25:13 2017 +0100 5254 Event console: Introduced syslog application placeholder which can be used in rewriting events When rewriting text, hostname or application for an event you can now use the new placeholders Message text regex match groups <ul> <li>MATCH_GROUPS_MESSAGE_1</li> <li>MATCH_GROUPS_MESSAGE_2</li> <li>MATCH_GROUPS_MESSAGE_n</li> </ul> Syslog application regex match groups <ul> <li>MATCH_GROUPS_SYSLOG_APPLICATION_1</li> <li>MATCH_GROUPS_SYSLOG_APPLICATION_2</li> <li>MATCH_GROUPS_SYSLOG_APPLICATION_n</li> </ul> Note: The syslog application match groups are now also considered when canceling events. The previous version did only check for identical create/canceling match groups in the event message text. Change-Id: Iad038310001363f7dff0e88fa46c5db559da1340 --- .werks/5254 | 32 +++++ bin/mkeventd | 332 ++++++++++++++++++++++++++++++++----------- web/plugins/wato/mkeventd.py | 12 +- 3 files changed, 291 insertions(+), 85 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d6c497c669…

6 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017