Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Windows: add test for unpacking binary plugins

by Jukka Aro

Module: check_mk Branch: master Commit: beaa13c7209cdc8bc1e7ef1e5c32223b65ad9a81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=beaa13c7209cdc… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 6 09:33:31 2018 +0100 Windows: add test for unpacking binary plugins --- agents/windows/Makefile.am | 3 + agents/windows/it/DummyPlugin.cc | 7 + agents/windows/it/test_agent_start_parameters.py | 187 +++++++++++++++-------- 3 files changed, 133 insertions(+), 64 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=beaa13c720…

6 years, 4 months

Windows: update CLEANFILES

by Jukka Aro

Module: check_mk Branch: master Commit: 65d64726b1030f43ec29309ca087400503a3e391 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65d64726b1030f… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 6 10:03:24 2018 +0100 Windows: update CLEANFILES --- agents/windows/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 81961c6..1b2a4b9 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -119,8 +119,8 @@ wmitest_SOURCES = Logger.cc WinApi.cc stringutil.cc wmiHelper.cc wmitest.cc CLEANFILES = \ *.ico *.res *.rc config.* stamp-* Makefile \ - sections/.dirstamp test/.dirstamp \ - $$(find .deps/ sections/.deps test/.deps -type f) \ + $$(find . -name .dirstamp) \ + $$(find .deps/ sections/.deps test/.deps test/sections/.deps it/.deps -type f) \ $(addprefix $(bindir)/,$(bin_PROGRAMS)) \ $(patsubst %$(EXEEXT),%-64$(EXEEXT),$(addprefix $(bindir)/,$(bin_PROGRAMS))) \ $(patsubst %$(EXEEXT),%.msi,$(addprefix $(bindir)/,$(bin_PROGRAMS)))

6 years, 4 months

Windows: fix make target 'check' and wmitest build

by Jukka Aro

Module: check_mk Branch: master Commit: 83fc13c9c3edd2fb02afc90d7418cd46da5a6ed1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83fc13c9c3edd2… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Feb 5 11:53:06 2018 +0100 Windows: fix make target 'check' and wmitest build --- agents/windows/Makefile.am | 2 +- agents/windows/build-agent | 7 +++++++ agents/windows/wmitest.cc | 6 ++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 4446ef2..47e1584 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -112,7 +112,7 @@ WindowsAgentTest_SOURCES = \ test/sections/SectionLogwatchTest.cc \ test/sections/SectionMRPETest.cc -wmitest_SOURCES = wmitest.cc stringutil.cc WinApi.cc wmiHelper.cc +wmitest_SOURCES = Logger.cc WinApi.cc stringutil.cc wmiHelper.cc wmitest.cc CLEANFILES = \ *.ico *.res *.rc config.* stamp-* Makefile \ diff --git a/agents/windows/build-agent b/agents/windows/build-agent index b64c4d9..0a04c7c 100755 --- a/agents/windows/build-agent +++ b/agents/windows/build-agent @@ -30,9 +30,16 @@ if [[ " $targets " =~ " integrationtest " && "$targets" != integrationtest ]] ; exit 1 fi +if [[ " $targets " =~ " check " && "$targets" != check ]] ; then + echo "check cannot be combined with other targets" + exit 1 +fi + if [[ "$targets" == unittest || "$targets" == integrationtest ]] ; then # Only unittest or integrationtest build_archs=() +elif [[ "$targets" == check ]] ; then + build_archs=(64) elif [[ " $targets " =~ " unittest " ]] ; then # unittest together with other target(s) targets=${targets/unittest/} diff --git a/agents/windows/wmitest.cc b/agents/windows/wmitest.cc index 7e1c84e..be81b68 100644 --- a/agents/windows/wmitest.cc +++ b/agents/windows/wmitest.cc @@ -1,5 +1,6 @@ #include <algorithm> #include <string> +#include "Logger.h" #include "WinApi.h" #include "stringutil.h" #include "wmiHelper.h" @@ -18,7 +19,7 @@ void print_usage(const char *exe_name) { } void print_namespace(const std::wstring &path, int depth = 0) { - wmi::Helper helper(winapi, path.c_str()); + wmi::Helper helper(Logger::getLogger("wmitest"), winapi, path.c_str()); std::string offset = std::string(depth * 2, ' '); { @@ -48,7 +49,8 @@ void print_namespace(const std::wstring &path, int depth = 0) { } void print_table(const std::string &ns, const std::string &pattern) { - wmi::Helper helper(winapi, to_utf16(ns.c_str(), winapi).c_str()); + wmi::Helper helper(Logger::getLogger("wmitest"), winapi, + to_utf16(ns.c_str(), winapi).c_str()); wmi::Result result = helper.query(L"SELECT * FROM meta_class"); bool more = result.valid();

6 years, 4 months

checktestlib.py: Add docstrings and a TODO

by Konstantin Büttner

Module: check_mk Branch: master Commit: 1cbc6cde9c5ef92e35590519ff5c4b0fcda26a9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cbc6cde9c5ef9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Feb 5 17:36:38 2018 +0100 checktestlib.py: Add docstrings and a TODO Change-Id: Ifc207fac229fada4055445b42809320262469c6e --- tests/checks/checktestlib.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 8092a91..86691f0 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -133,6 +133,7 @@ class CheckResult(object): class DiscoveryEntry(Tuploid): + """A single entry as returned by the discovery (or in oldspeak: inventory) function.""" def __init__(self, entry): item, default_params = entry @@ -146,7 +147,15 @@ class DiscoveryEntry(Tuploid): class DiscoveryResult(object): + """ + The result of the discovery as a whole. + + Much like in the case of the check result, this also makes sure + that yield-based discovery functions run, and that no exceptions + get lost in the laziness. + """ + # TODO: Add some more consistency checks here. def __init__(self, result): self.entries = [] for entry in result:

6 years, 4 months

Temporarily disable "omd rm" exit code test

by Lars Michelsen

Module: check_mk Branch: master Commit: fa1642f69244f358d3fb64d6d5d67ffd21a46cb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa1642f69244f3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 5 17:07:10 2018 +0100 Temporarily disable "omd rm" exit code test Change-Id: Ibb461a8e3bf0983df55022ead38721f33f25ff30 --- tests/testlib/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index c641ee8..013fd52 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -594,9 +594,11 @@ class Site(object): def rm(self, site_id=None): if site_id == None: site_id = self.id - assert subprocess.Popen(["/usr/bin/sudo", "/usr/bin/omd", + # TODO: LM: Temporarily disabled until "omd rm" issue is fixed. + #assert subprocess.Popen(["/usr/bin/sudo", "/usr/bin/omd", + subprocess.Popen(["/usr/bin/sudo", "/usr/bin/omd", "-f", "rm", "--apache-reload", - "--kill", site_id]).wait() == 0 + "--kill", site_id]).wait() def cleanup_old_sites(self, cleanup_pattern):

6 years, 4 months

Reflect recent table changes in tests

by Lars Michelsen

Module: check_mk Branch: master Commit: f66dac410b454211d80445fa6dcf243c5b4dca04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f66dac410b4542… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 5 16:50:44 2018 +0100 Reflect recent table changes in tests Change-Id: I9e1bf44cf58cbb7f6cedd3825f36a969aaba4489 --- tests/web/test_table.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/web/test_table.py b/tests/web/test_table.py index 9af7ada..6bba8dc 100644 --- a/tests/web/test_table.py +++ b/tests/web/test_table.py @@ -140,10 +140,12 @@ def test_nesting(): table.end() text = html.written_text assert compare_html(text, '''<h3> TEST </h3> + <script type="text/javascript">\nupdate_headinfo(\'1 row\');\n</script> <table class="data oddeven"> <tr> <th> A </th> <th> B </th> </tr> <tr class="data odd0"> <td> 1 </td> <td> <h3> TEST 2</h3> + <script type="text/javascript">\nupdate_headinfo(\'1 row\');\n</script> <table class="data oddeven"> <tr><th>_</th><th>|</th></tr> <tr class="data odd0"><td>+</td><td>-</td></tr> @@ -173,10 +175,12 @@ def test_nesting_context(): text = html.written_text assert compare_html(text, '''<h3> TEST </h3> + <script type="text/javascript">\nupdate_headinfo(\'1 row\');\n</script> <table class="data oddeven"> <tr> <th> A </th> <th> B </th> </tr> <tr class="data odd0"> <td> 1 </td> <td> <h3> TEST 2</h3> + <script type="text/javascript">\nupdate_headinfo(\'1 row\');\n</script> <table class="data oddeven"> <tr><th>_</th><th>|</th></tr> <tr class="data odd0"><td>+</td><td>-</td></tr>

6 years, 4 months

Fix classes for discovery results in checktestlib, make tests for df discovery use them

by Konstantin Büttner

Module: check_mk Branch: master Commit: 03928aa0254185e7474a403364fc2c355129eeb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03928aa0254185… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Feb 5 16:29:20 2018 +0100 Fix classes for discovery results in checktestlib, make tests for df discovery use them Change-Id: I3d308f36d15d1edbdc96c9202d28270f2f3d9551 --- tests/checks/checktestlib.py | 13 +++++++++++-- tests/checks/test_df_check.py | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 109d9f7..8092a91 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -16,6 +16,10 @@ class Tuploid(object): def tuple(self): raise NotImplementedError() + def __iter__(self): + for x in self.tuple: + yield x + class PerfValue(Tuploid): """Represents a single perf value""" @@ -132,12 +136,13 @@ class DiscoveryEntry(Tuploid): def __init__(self, entry): item, default_params = entry - assert type(item) in [ str. types.NoneType ] + assert type(item) in [ str, unicode, types.NoneType ] self.item = item self.default_params = default_params + @property def tuple(self): - return (item, default_params) + return (self.item, self.default_params) class DiscoveryResult(object): @@ -146,3 +151,7 @@ class DiscoveryResult(object): self.entries = [] for entry in result: self.entries.append(DiscoveryEntry(entry)) + + def __eq__(self, other_value): + return all(entry in other_value for entry in self.entries) and \ + all(other_entry in self.entries for other_entry in other_value) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index bd0b8ff..1681b5c 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -250,7 +250,7 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_resu check = check_manager.get_check("df") monkeypatch.setitem(check.context, "host_extra_conf_merged", lambda _, __: inventory_df_rules) - assert check.run_discovery(check.run_parse(info)) == expected_result + assert checktestlib.DiscoveryResult(check.run_discovery(check.run_parse(info))) == expected_result @pytest.mark.parametrize("item,params,info,expected_result", [

6 years, 4 months

5720 Standard tables now tell their number of rows in page title area

by Lars Michelsen

Module: check_mk Branch: master Commit: 83b14e0f8d095958b300caf5c32e36b06e469193 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83b14e0f8d0959… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 5 09:33:18 2018 +0100 5720 Standard tables now tell their number of rows in page title area When a data table is rendered, e.g. like it is done in the configuration GUI on a lot of pages, the tables write the number of shown rows to detail text of the header area of the page. Change-Id: I2cce0be4096c66b6bd1b07c44f07b3f20327a7c9 --- .werks/5720 | 12 ++++++++++++ web/htdocs/table.py | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/.werks/5720 b/.werks/5720 new file mode 100644 index 0000000..a75811b --- /dev/null +++ b/.werks/5720 @@ -0,0 +1,12 @@ +Title: Standard tables now tell their number of rows in page title area +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1517609742 +Class: feature + +When a data table is rendered, e.g. like it is done in the configuration GUI on +a lot of pages, the tables write the number of shown rows to detail text of the +header area of the page. diff --git a/web/htdocs/table.py b/web/htdocs/table.py index d687d61..0d9e75a 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -324,6 +324,7 @@ class Table(object): def _write_table(self, rows, actions_enabled, actions_visible, search_term): + self._update_headinfo(len(rows)) table_id = self.id num_cols = len(self.headers) @@ -399,6 +400,11 @@ class Table(object): html.close_table() + def _update_headinfo(self, num_rows): + headinfo = _("1 row") if num_rows == 1 else _("%d rows") % num_rows + html.javascript("update_headinfo('%s');" % headinfo) + + def _write_csv(self, csv_separator): rows = self.rows

6 years, 4 months

Added bug/nastiness regarding disabled services

by Marcel Arentz

Module: check_mk Branch: master Commit: 1e45026257167159bbbd60a0a442d10d342e4a78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e450262571671… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Feb 5 15:15:38 2018 +0100 Added bug/nastiness regarding disabled services Change-Id: I617bb6f3c1379bbcc874de531e2ad93e7f282dc1 --- .bugs/2974 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2974 b/.bugs/2974 new file mode 100644 index 0000000..cf0b3ce --- /dev/null +++ b/.bugs/2974 @@ -0,0 +1,8 @@ +Title: Services marked as vanished even if they have been disabled previously +Component: checks +State: open +Date: 2018-02-05 15:12:29 +Targetversion: 1.4.0 +Class: nastiness + +Even if a service has been disabled previously it will be marked as vanished and the service "Check_MK Discovery" will change to WARN. The expected behaviour would be to silently dissappear these disabled services.

6 years, 4 months

jolokia_generic: Give a better error message in case of missing data instead of crashing

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2086a3b8fa9bfe304e4c1d96a3cbcd4e96ff8e88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2086a3b8fa9bfe… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Feb 5 14:06:16 2018 +0100 jolokia_generic: Give a better error message in case of missing data instead of crashing Change-Id: I3a4e1eb6edc8b7fb53338f56ee75544bdbb23ac7 --- checks/jolokia_generic | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/checks/jolokia_generic b/checks/jolokia_generic index 81e0abf..bf39f21 100644 --- a/checks/jolokia_generic +++ b/checks/jolokia_generic @@ -59,6 +59,8 @@ def inventory_jolokia_generic_string(parsed): def check_jolokia_generic_string(item, params, parsed): + if item not in parsed: + return 3, "Item not found in agent output" value = parsed[item]["value"] default_status = params.get("default_status", 0) @@ -95,6 +97,9 @@ def inventory_jolokia_generic_rate(parsed): def check_jolokia_generic_rate(item, params, parsed): + if item not in parsed: + yield 3, "Item not found in agent output" + return now = time.time() rate = get_rate(item, now, parsed[item]["value"]) infotext = "%.1f" % rate @@ -160,6 +165,9 @@ def inventory_jolokia_generic(parsed): def check_jolokia_generic(item, params, parsed): + if item not in parsed: + yield 3, "Item not found in agent output" + return value = parsed[item]["value"] infotext = "%.1f" % value perfdata = None

6 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018