Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

5555 mk_inventory: Added Bakery configuration for AIX inventory plugin

by Marcel Arentz

Module: check_mk Branch: master Commit: fb33266c89607ff1b240d5cb6063ebe14b5756b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb33266c89607f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jan 22 19:04:40 2018 +0100 5555 mk_inventory: Added Bakery configuration for AIX inventory plugin Change-Id: I18d332f9c7b41bf4dd1ed22a1a40cf58237b8587 --- .werks/5555 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/5555 b/.werks/5555 new file mode 100644 index 0000000..a29c33f --- /dev/null +++ b/.werks/5555 @@ -0,0 +1,10 @@ +Title: mk_inventory: Added Bakery configuration for AIX inventory plugin +Level: 1 +Component: checks +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1516644221 +Class: feature + +

6 years, 7 months

Fixed setup target.

by Sven Panne

Module: check_mk Branch: master Commit: 0049b9e9c6af61aa2e506d990584704a7afb4f43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0049b9e9c6af61… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 23 13:16:36 2018 +0100 Fixed setup target. Change-Id: I9b773f73d83cdce91585697fe7858a98b3431aef --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 367c345..f0acfe8 100644 --- a/Makefile +++ b/Makefile @@ -411,6 +411,9 @@ setup: valgrind $(MAKE) -C tests setup $(MAKE) -C omd setup +ifeq ($(ENTERPRISE),yes) + $(MAKE) -C enterprise/locale setup +endif linesofcode: @wc -l $$(find -type f -name "*.py" -o -name "*.js" -o -name "*.cc" -o -name "*.h" -o -name "*.css" | grep -v openhardwaremonitor | grep -v jquery | grep -v livestatus/src ) | sort -n

6 years, 7 months

5653: New report element: Add host report for multiple hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: b03e488c6ede5564b04ce5a8b0df88b9fbfe420f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b03e488c6ede55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 23 10:56:56 2018 +0100 5653: New report element: Add host report for multiple hosts Change-Id: I17e58a1d5a0e3bf25b5b8823e97adfb9da43fd26 --- .werks/5653 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.werks/5653 b/.werks/5653 new file mode 100644 index 0000000..f87f8da --- /dev/null +++ b/.werks/5653 @@ -0,0 +1,25 @@ +Title: New report element: Add host report for multiple hosts +Level: 2 +Component: reporting +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1516700903 +Class: feature + +Using the new report element "Host report for multiple hosts" it is now +possible to include reports in other reports to instanciate it multiple +times. + +For example you can now create a top-level "ESX host" report that +contains sub reports for each of your ESX servers. + +All you need to do is to create a report that contains all the report elements +you want to see for a single ESX server. Either the whole report or at least +the single elements in that report need to have the "single host context" +configured. Then you need to create a top level report, add the element +"Host report for multiple hosts" to this report and select the previously +configured host specific report as child report. In that element you also +need to configure the "Search filters" to match the hosts you want to create +the child elements for. In the example above you need to configure e.g. the +host tag filter to select the ESX hosts.

6 years, 7 months

Use artful for windows agent builds - zesty is EOL

by Lars Michelsen

Module: check_mk Branch: master Commit: dd562a095120eac80b3147bc3e3b20b32c620e5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd562a095120ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 19 14:34:52 2018 +0100 Use artful for windows agent builds - zesty is EOL Change-Id: I22933521bba3b26c3a3a822e4660c1c032c84e43 --- agents/windows/make-chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index d586ec1..9b6824b 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -4,7 +4,7 @@ set -e -DISTRO=zesty +DISTRO=artful MIRROR=http://de.archive.ubuntu.com/ubuntu export HOSTNAME=cmk-windows-agent-chroot

6 years, 7 months

test_statgrab_cpu_check: Remove monkeypatching of time module, as it doesn 't work this way and is unnecessary

by Konstantin Büttner

Module: check_mk Branch: master Commit: 69357eb52eb6ec4e7ee49325ea9406566bf4e0d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69357eb52eb6ec… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 14:02:16 2018 +0100 test_statgrab_cpu_check: Remove monkeypatching of time module, as it doesn't work this way and is unnecessary Change-Id: Ic86f0871393cc57d199699855b33209ed9466b54 --- 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 e43b017..e001129 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -22,12 +22,13 @@ info_statgrab_cpu_hpux = lambda t: [[u'idle', u'%d' % int(t*5)], ), ]) def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, predicate): - import time check = check_manager.get_check("statgrab_cpu") + # NOTE: We do not mock the time module here, because the check does not depend on any + # absolute rates. The mocking that was included in this test previously had no + # effect, which went unnoticed because it doesn't matter in this case. try: list(check.run_check(None, params, time_to_info(0))) except MKCounterWrapped: pass - monkeypatch.setattr("time.time", lambda: 60) result = checktestlib.CheckResult(check.run_check(None, params, time_to_info(60))) assert predicate(result)

6 years, 7 months

Tests: Not try to clean up versions when no version is installed

by Lars Michelsen

Module: check_mk Branch: master Commit: aac0e510bda6288bca53cc4b66327fa88fa16008 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aac0e510bda628… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 19 19:17:55 2018 +0100 Tests: Not try to clean up versions when no version is installed Change-Id: I5f8dfdfc378af8f3fc216bdfb1160c07423f76b0 --- tests/testlib/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d5b3570..19612fa 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -585,6 +585,9 @@ class Site(object): def cleanup_old_sites(self, cleanup_pattern): + if not os.path.exists("/omd/sites"): + return + for site_id in os.listdir("/omd/sites"): if site_id != self.id and site_id.startswith(cleanup_pattern): print "Cleaning up old site: %s" % site_id

6 years, 7 months

Basic test for kernel.util

by Konstantin Büttner

Module: check_mk Branch: master Commit: f8b5d21912f9792150dba53d3aef05a9c0168b87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8b5d21912f979… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 14:50:24 2018 +0100 Basic test for kernel.util Change-Id: I3e4118dd892cb20bd3c6f89ecea8c2b53b0d6ddf --- tests/checks/test_kernel_check.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/checks/test_kernel_check.py b/tests/checks/test_kernel_check.py new file mode 100644 index 0000000..f8c495b --- /dev/null +++ b/tests/checks/test_kernel_check.py @@ -0,0 +1,19 @@ +import pytest +import pprint +from cmk_base.check_api import MKCounterWrapped +import checktestlib + +pytestmark = pytest.mark.checks + + +(a)pytest.mark.parametrize("time_to_info,params,predicate", [ +(lambda t: [["cpu", 15*t, 10*t, 5*t, 5*t, 5*t, 5*t, 5*t]], {}, lambda cr: True), +]) +def test_kernel_util_check(check_manager, monkeypatch, time_to_info, params, predicate): + check = check_manager.get_check("kernel.util") + try: + list(check.run_check(None, params, time_to_info(0))) + except MKCounterWrapped: + pass + result = checktestlib.CheckResult(check.run_check(None, params, time_to_info(60))) + assert predicate(result)

6 years, 7 months

kernel.util: Remove dysfunctional default levels variable

by Konstantin Büttner

Module: check_mk Branch: master Commit: 848c87b65da0dca21e8511f4281724a789a72c47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=848c87b65da0dc… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 15:33:49 2018 +0100 kernel.util: Remove dysfunctional default levels variable This particular combination of passing an empty dict at discovery, declaring a default_levels_variable in check_info but not using factory_settings does not work. Any value this variable might be set to would simply be ignored. Change-Id: Iee7748ace8480e64a7482e99bc10622465c7da91 --- checks/kernel | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/kernel b/checks/kernel index 6a9e2f8..f4f5e9c 100644 --- a/checks/kernel +++ b/checks/kernel @@ -106,7 +106,6 @@ check_info["kernel"] = { # | Check system/user/io-wait | # '----------------------------------------------------------------------' -kernel_util_default_levels = None def inventory_cpu_utilization(info): for x in info: @@ -160,7 +159,6 @@ check_info["kernel.util"] = { 'inventory_function': inventory_cpu_utilization, 'service_description': 'CPU utilization', 'has_perfdata': True, - 'default_levels_variable': 'kernel_util_default_levels', 'group': 'cpu_iowait', 'includes': ['cpu_util.include'], }

6 years, 7 months

Windows agent: build check_mk_agent.a library

by Jukka Aro

Module: check_mk Branch: master Commit: 355e515d63f67199b5ac2c0041df6dd33d687ce1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=355e515d63f671… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jan 19 14:35:56 2018 +0100 Windows agent: build check_mk_agent.a library Link this lib to both check_mk_agent.exe and WindowsAgentTest.exe. The target was to allow different compile options (include path) for test sources than for the rest of the sources but reuse same object files / libraries for both the exe and tests without the need to compile them twice. Fix linkage by replacing global extern variables with_stderr and g_workers_job_object with member variables in Environment. Change-Id: Ic77e14c1d252adae674de37009b53d7f8d1500b3 --- agents/windows/Environment.cc | 7 ++++-- agents/windows/Environment.h | 13 ++++++++++- agents/windows/ExternalCmd.cc | 13 +++++------ agents/windows/ExternalCmd.h | 9 +++++--- agents/windows/Makefile.am | 27 ++++++---------------- agents/windows/check_mk_agent.cc | 23 ++++-------------- agents/windows/configure.ac | 1 + agents/windows/test/EnvironmentTest.cc | 20 ++++++++++------ .../windows/test/sections/SectionEventlogTest.cc | 20 ++++++++-------- .../windows/test/sections/SectionLogwatchTest.cc | 24 +++++++++---------- 10 files changed, 75 insertions(+), 82 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=355e515d63…

6 years, 7 months

5698 FIX Windows agent: space in MRPE plugin path resulted in wrong plugin name

by Jukka Aro

Module: check_mk Branch: master Commit: 50841c33a841cfe2937b7a9e881e8c9ee1d25701 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50841c33a841cf… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Jan 22 14:00:55 2018 +0100 5698 FIX Windows agent: space in MRPE plugin path resulted in wrong plugin name If the path of a(n included) MRPE plugin contained one or more spaces, the plugin name was parsed incorrectly. Quotes were incorrectly required for the whole command line including parameters within quotes, making it impossible to distinguish between a script path containing space(s) and space-separated script parameters. Now the MRPE plugin path must be enclosed in double quotes (") in order to be processed correctly. The same applies for script parameters with whitespace: also they must be separately enclosed in quotes. Example: check_mk.ini: [mrpe] include = C:\Temp\my.cfg C:\Temp\my.cfg: check = Dummy "C:\Program Files (x86)\check_mk\mrpe\check_crit.bat" some parameter "with space" --- .werks/5698 | 30 ++++++++ agents/windows/Makefile.am | 3 +- agents/windows/build_version | 2 +- agents/windows/check_mk.example.ini | 27 ++++++++ agents/windows/sections/SectionMRPE.cc | 91 +++++++++++++++++-------- agents/windows/stringutil.h | 4 +- agents/windows/test/sections/SectionMRPETest.cc | 71 +++++++++++++++++++ agents/windows/test/stringutilTest.cc | 39 ++++++++++- 8 files changed, 233 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=50841c33a8…

6 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018