Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

by Konstantin Büttner

Module: check_mk Branch: master Commit: 19c6b0dc6f11c2dc65491701888086bd4f4a7b2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19c6b0dc6f11c2… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jul 12 09:27:50 2017 +0200 Added todo Change-Id: Ibc435af55247ec456201ca43fe7a77b814a325b6 --- checks/akcp_sensor.include | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include index 3be3cc1..d97a65b 100644 --- a/checks/akcp_sensor.include +++ b/checks/akcp_sensor.include @@ -102,6 +102,7 @@ def check_akcp_humidity(item, params, info): belowtext = " (warn/crit at %.1f/%.1f%%)" % (warn_lower, crit_lower) abovetext = " (warn/crit at %.1f/%.1f%%)" % (warn, crit) + # TODO: This is not how the API works! perfdata = [ ( "humidity", humidity, crit_lower, warn_lower, warn, crit ) ] if humidity <= crit_lower:

6 years, 11 months

packaging tests: increased max package size

by Lars Michelsen

Module: check_mk Branch: master Commit: 91723489f21fcc60374faa900bac7e016b1cd13e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91723489f21fcc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 12 08:42:08 2017 +0200 packaging tests: increased max package size Change-Id: Icd46cd8156e02a5bf038dbefd66151c5b3ea0ba8 --- tests/packaging/test_files.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 6e82a10..fa7cc17 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -25,9 +25,9 @@ def _get_package_paths(version_path, what): # In case packages grow/shrink this check has to be changed. @pytest.mark.parametrize("what,min_size,max_size", [ - ("rpm", 119*1024*1024, 190*1024*1024), - ("deb", 94*1024*1024, 165*1024*1024), - ("cma", 169*1024*1024, 195*1024*1024), + ("rpm", 119*1024*1024, 210*1024*1024), + ("deb", 94*1024*1024, 195*1024*1024), + ("cma", 169*1024*1024, 215*1024*1024), ]) def test_package_sizes(version_path, what, min_size, max_size): for pkg in _get_package_paths(version_path, what):

6 years, 11 months

Updated bug entries #2927

by Lars Michelsen

Module: check_mk Branch: master Commit: 1a2edebb34d110b795e3019c6f819dfe348506f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a2edebb34d110… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 16:59:36 2017 +0200 Updated bug entries #2927 Change-Id: Id802dd54639f6b2bf657e6cc3fca0e82fff0172f --- .bugs/2927 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.bugs/2927 b/.bugs/2927 index b4c6228..32e15be 100644 --- a/.bugs/2927 +++ b/.bugs/2927 @@ -1,12 +1,20 @@ Title: mknotify with distributed monitoring Component: wato -State: open +Class: bug +State: wontfix Date: 2017-07-05 14:08:01 Targetversion: 1.4.0 -Class: bug If you set up a distributed monitoring environment with a central notification instance on master site. After activating mknotifyd and activate the listener port on the master, this setting will automatically synchronized to all slave sites. A user have to modify each sitespecific global settings to deactivate the listener and add the connection to the master. This global setting should not be synchronized to all slaves. + +2017-07-11 16:58:04: changed state open -> wontfix +We have introduced the site specific globals for the local site. With this change it is now possible +to configure individual settings for the central site. The "global settings" now act as what they +are named: global defaults. + +The central site specific option to enable the port listener should be set in the central site +specific global settings.

6 years, 11 months

4847 FIX Windows Agent / fileinfo: fixed another issue, where meta information (size, age) was not accessible

by Andreas Boesl

Module: check_mk Branch: master Commit: 549b3364d62f27967c5f555463dd50cf9e12b7c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=549b3364d62f27… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 11 15:29:04 2017 +0200 4847 FIX Windows Agent / fileinfo: fixed another issue, where meta information (size,age) was not accessible Change-Id: I45b16de4fbd0821ab639058ce420689e3e5e5fd0 --- .werks/4847 | 10 ++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1340416 -> 1340416 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15823789 -> 15809577 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1340416 -> 1340416 bytes agents/windows/check_mk_agent.exe | Bin 1318400 -> 1318400 bytes agents/windows/check_mk_agent.msi | Bin 2928640 -> 2928640 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13682205 -> 13668491 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1318400 -> 1318400 bytes agents/windows/install_agent-64.exe | Bin 591914 -> 591916 bytes agents/windows/install_agent.exe | Bin 589544 -> 589458 bytes agents/windows/plugins/mk_jolokia.exe | Bin 10106761 -> 10106761 bytes agents/windows/sections/SectionFileinfo.cc | 31 ++++++++++------------- 13 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.werks/4847 b/.werks/4847 new file mode 100644 index 0000000..f9fec0d --- /dev/null +++ b/.werks/4847 @@ -0,0 +1,10 @@ +Title: Windows Agent / fileinfo: fixed another issue, where meta information (size,age) was not accessible +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499779700 +Class: fix + + diff --git a/agents/windows/build_version b/agents/windows/build_version index 70142a5..88ebae5 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2838 +2846 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 056374b..17522d1 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 3b9865f..fc6580e 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 25ebfa6..b572492 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index d32b0b2..7592877 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index b65283f..b1709a3 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 55f6945..ff3b25a 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 4dfd3b0..97d96ac 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index cb37a54..8c62ddb 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index dca8f40..d7aea94 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index fde7dc3..2f88ebb 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ diff --git a/agents/windows/sections/SectionFileinfo.cc b/agents/windows/sections/SectionFileinfo.cc index 13db252..b08cc6d 100644 --- a/agents/windows/sections/SectionFileinfo.cc +++ b/agents/windows/sections/SectionFileinfo.cc @@ -94,7 +94,7 @@ void SectionFileinfo::determine_filepaths_simple_search(std::string base_path, s std::stringstream ss; if (findHandle != INVALID_HANDLE_VALUE) { do { - if (true || (0 == (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))) { + if (0 == (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { ss.str(""); ss.clear(); ss << base_path << "\\" << data.cFileName; @@ -141,21 +141,18 @@ void SectionFileinfo::outputFileinfos(std::ostream &out, const char *path) { } bool SectionFileinfo::outputFileinfo(std::ostream &out, const std::string filename) { - auto hFile = std::make_unique<ManagedHandle>(CreateFile(filename.c_str(), 0, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, NULL)); - - FILETIME ftCreate, ftAccess, ftWrite; - if (!GetFileTime(hFile->get_handle(), &ftCreate, &ftAccess, &ftWrite)) - return false; - - LARGE_INTEGER size; - if(!GetFileSizeEx(hFile->get_handle(), &size)) - return false; - - out << filename.c_str() << "|" << size.QuadPart << "|" - << std::fixed << std::setprecision(0) - << file_time(&ftWrite) << "\n"; - - return true; + WIN32_FIND_DATA findData; + HANDLE findHandle; + if ( (findHandle=FindFirstFile(filename.c_str(), &findData)) != INVALID_HANDLE_VALUE ) + { + unsigned long long size = (unsigned long long)findData.nFileSizeLow + + (((unsigned long long)findData.nFileSizeHigh) << 32); + out << filename.c_str() << "|" << size << "|" + << std::fixed << std::setprecision(0) + << file_time(&findData.ftLastWriteTime) << "\n"; + FindClose(findHandle); + return true; + } + return false; }

6 years, 11 months

test with git version: Only deploy CEE files to CEE editions and CME files to CME edition

by Lars Michelsen

Module: check_mk Branch: master Commit: edc67bf777a54421e04d02ead36202b31fbe487f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edc67bf777a544… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 15:36:46 2017 +0200 test with git version: Only deploy CEE files to CEE editions and CME files to CME edition Change-Id: I8b9403ec89b0f431b2c7d6abc9902be7b46ae31a --- tests/conftest.py | 3 ++- tests/testlib/__init__.py | 24 +++++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 748d2ef..d719250 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -60,6 +60,7 @@ def setup_site_and_switch_user(): sys.stdout.write("===============================================\n") sys.stdout.write("Switching to site context\n") sys.stdout.write("===============================================\n") + sys.stdout.flush() exit_code = site.switch_to_site_user() @@ -79,7 +80,7 @@ def _get_site_object(): return os.environ.get("EDITION", testlib.CMKVersion.CEE) def site_branch(): - return os.environ.get("BRANCH", "master") + return os.environ.get("BRANCH", "1.4.0") def reuse_site(): return os.environ.get("REUSE", "1") == "1" diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index bad0811..d32fd7b 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -65,6 +65,7 @@ class CMKVersion(object): CEE = "cee" CME = "cme" CRE = "cre" + CME = "cme" def __init__(self, version, edition, branch): self._version = version @@ -111,7 +112,24 @@ class CMKVersion(object): def edition(self): - return self.edition_short == CMKVersion.CRE and "raw" or "enterprise" + if self.edition_short == CMKVersion.CRE: + return "raw" + elif self.edition_short == CMKVersion.CEE: + return "enterprise" + elif self.edition_short == CMKVersion.CME: + return "managed" + + + def is_managed_edition(self): + return self.edition_short == CMKVersion.CME + + + def is_enterprise_edition(self): + return self.edition_short == CMKVersion.CEE + + + def is_raw_edition(self): + return self.edition_short == CMKVersion.CRE def _needed_distro(self): @@ -407,7 +425,7 @@ class Site(object): cmk_path() + "/.werks", ] - if os.path.exists(cmc_path()): + if os.path.exists(cmc_path()) and not self.version.is_raw_edition(): paths += [ cmc_path() + "/bin", cmc_path() + "/modules", @@ -422,7 +440,7 @@ class Site(object): cmc_path() + "/agents", ] - if os.path.exists(cme_path()): + if os.path.exists(cme_path()) and self.version.is_managed_edition(): paths += [ cme_path(), cme_path() + "/cmk_base",

6 years, 11 months

4846 FIX ESX monitoring: fixed incomplete data, when the xml response from the esx server includes newlines

by Andreas Boesl

Module: check_mk Branch: master Commit: b7b415e2ee2d57f0b590605b5fdff67913b934dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7b415e2ee2d57… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 11 15:00:29 2017 +0200 4846 FIX ESX monitoring: fixed incomplete data, when the xml response from the esx server includes newlines In most scenarios, the xml response never has a newline. There was an instance, where a newline was entered into a comment field. This newline broke the xml parser... Change-Id: Ia7ffa9d5d7fef40fcefd02b3bfa7a1c6677dd8a0 --- .werks/4846 | 13 +++++++++++++ agents/special/agent_vsphere | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4846 b/.werks/4846 new file mode 100644 index 0000000..e4e736d --- /dev/null +++ b/.werks/4846 @@ -0,0 +1,13 @@ +Title: ESX monitoring: fixed incomplete data, when the xml response from the esx server includes newlines +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499777566 +Class: fix + +In most scenarios, the xml response never has a newline. +There was an instance, where a newline was entered into a comment field. +This newline broke the xml parser... + diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 9424d01..2916b4a 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1016,7 +1016,7 @@ if opt_tracefile: def get_pattern(pattern, line): if not line: return [] - p = re.compile(pattern) + p = re.compile(pattern, re.MULTILINE) return p.findall(line) if tracefile:

6 years, 11 months

Fixed editing virtual host trees

by Lars Michelsen

Module: check_mk Branch: master Commit: d06bc3396baf90f1a8e5bff05cff7903ae01a569 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d06bc3396baf90… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 13:15:58 2017 +0200 Fixed editing virtual host trees Change-Id: I5d132816cea99682efe17588f2fb5b84fed1510a --- web/plugins/wato/check_mk_configuration.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 9827f69..0a2c80f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -439,6 +439,7 @@ register_configvar(group, ), title = _("Tree levels"), allow_empty = False, + magic = "#!#", )), ], optional_keys = [],

6 years, 11 months

add group test: Only try to delete it after the test when it was created

by Lars Michelsen

Module: check_mk Branch: master Commit: e3aa76ec9f433e4a1cf7a33f3fd5ff0c0c077943 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3aa76ec9f433e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 13:17:50 2017 +0200 add group test: Only try to delete it after the test when it was created Change-Id: I330926f3ffd9994c7d0e1da34e36fa22e3ebf3b5 --- tests/web/test_webapi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/web/test_webapi.py b/tests/web/test_webapi.py index ee78e66..9b5540d 100644 --- a/tests/web/test_webapi.py +++ b/tests/web/test_webapi.py @@ -178,7 +178,9 @@ def test_add_group(web, group_type): if cmk.is_managed_edition(): assert provider == all_groups[group_id]["provider"] finally: - web.delete_group(group_type, group_id) + all_groups = web.get_all_groups(group_type) + if group_id in all_groups: + web.delete_group(group_type, group_id) # TODO: Parameterize test for cme / non cme

6 years, 11 months

Update example jolokia.cfg

by Konstantin Büttner

Module: check_mk Branch: master Commit: badbb6b6e80cd00f640c18cb7d3b15afb704a5f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=badbb6b6e80cd0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jul 11 13:08:53 2017 +0200 Update example jolokia.cfg Change-Id: I85d0d978741e26ecee4a803e9732baa174528df8 --- agents/cfg_examples/jolokia.cfg | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/agents/cfg_examples/jolokia.cfg b/agents/cfg_examples/jolokia.cfg index 41c354a..9372b98 100644 --- a/agents/cfg_examples/jolokia.cfg +++ b/agents/cfg_examples/jolokia.cfg @@ -53,3 +53,10 @@ instance = None # "password" : "hirsch", # } # ] + +# Custom MBeans can be defined like this: +# (MBean, path/within/mbean, title, [], False, value_type) +#custom_vars = [ +#('foo.bar:type=baz', 'FooBar/baz', 'Foo', [], False, 'string'), +#] +# Supported Value types: 'string', 'number' and 'rate'

6 years, 11 months

Fixed WATO ruleset page for some categories (e.g. access to agents)

by Lars Michelsen

Module: check_mk Branch: master Commit: 84b03dde9f444c7cf1a2fd806fb77bbcb57f990f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84b03dde9f444c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 13:00:22 2017 +0200 Fixed WATO ruleset page for some categories (e.g. access to agents) Change-Id: Idb873099204cfc7c23581ccb2df81b2e29f6d046 --- web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 77d6490..f81de23 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12357,7 +12357,7 @@ class ModeRulesets(WatoMode): # Keeping this for compatibility reasons for the moment if self._group_name: html.set_var("search_p_ruleset_group", - DropdownChoice.option_id(html.var("group"))) + DropdownChoice.option_id(self._group_name)) html.set_var("search_p_ruleset_group_USE", "on") html.del_var("group") diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index eab4cbc..ea9116a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -7029,7 +7029,7 @@ class Rulespecs(object): if group_name.startswith(main_group_name + "/"): # TODO: Move this subgroup title calculation to some generic place sub_group_title = group_name.split("/", 1)[1] - choices.append((group_name, u"  ⌙ %s" % sub_group_title)) + choices.append((make_utf8(group_name), u"  ⌙ %s" % sub_group_title)) return choices @@ -7049,7 +7049,7 @@ class Rulespecs(object): group_names = [] for group_name in self._sorted_groups: - main_group = group_name.split('/')[0] + main_group = make_utf8(group_name.split('/')[0]) if main_group not in seen: group_names.append(main_group) seen.add(main_group)

6 years, 11 months

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017