Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

Check tests: Introduce class for handling compound check results as returned by the yield API

by Konstantin Büttner

Module: check_mk Branch: master Commit: 15db0491bd2cf714ee6128c02bbb7194f2e94d3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15db0491bd2cf7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 18 09:51:15 2017 +0100 Check tests: Introduce class for handling compound check results as returned by the yield API Change-Id: Iaa4c451851ea1c5100c096005ae6f955d5a063d0 --- tests/checks/checktestlib.py | 9 +++++++++ tests/checks/test_statgrab_cpu_check.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index ad32453..39a0b98 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -37,3 +37,12 @@ class BasicCheckResult(object): assert result.infotext == expected_result["infotext"] if "perfdata" in expected_result: assert result.perfdata == expected_result["perfdata"] + + +class CompoundCheckResult(object): + """A check result consisting of multiple subresults, as returned by yield-style checks""" + + def __init__(self, result): + self.subresults = [] + for subresult in result: + self.subresults.append(BasicCheckResult(*subresult)) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index e9e6942..446aa27 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -31,4 +31,4 @@ def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, ex except MKCounterWrapped: pass monkeypatch.setattr("time.time", lambda: 60) - subresults = [ checktestlib.BasicCheckResult(*subresult) for subresult in check.run_check(None, params, time_to_info(60)) ] + result = checktestlib.CompoundCheckResult(check.run_check(None, params, time_to_info(60)))

6 years, 6 months

Updated werk text

by Lars Michelsen

Module: check_mk Branch: master Commit: 826242b1bee74134667d0889024681bcfac18ec8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=826242b1bee741… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 18 09:26:06 2017 +0100 Updated werk text Change-Id: Id51687755c234ba83fe2c865f4dfd8f8e726d12f --- .werks/5267 | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/.werks/5267 b/.werks/5267 index 0c1a092..d3f0112 100644 --- a/.werks/5267 +++ b/.werks/5267 @@ -10,13 +10,28 @@ Class: feature The cmk-update-agent executable is now implemented as a packaged binary executable. This werk consists of many changes that have partly already been applied to Check_MK 1.5.0i1. -The new format addresses several problems and yields some improvements: +The new agent updater addresses several problems and yields some improvements: -* Better compatibility: All requirements regarding the installed Python Interpreter or other packages/programs were eliminated; the only requirements left are a x86_64 processor architecture and a glibc 2.5 or above. +* Better compatibility: All requirements regarding the installed Python + Interpreter or other packages/programs were eliminated; the only requirements + left are a x86_64 processor architecture and a glibc 2.5 or above. -* More convenient communication to Check_MK Server: All GET-Requests have been replaced with according POST-Requests. This improves security as sensitive data is no longer sent within the URL of the HTTP(S) request. +* Notably, there will be no more problems with curl and because all + communication is now done via python-requests, which is included within the + cmk-update-agent executable as mentioned above. -* Only one copy of cmk-update-agent: The copy of cmk-update-agent previously placed under /usr/bin/cmk-update-agent has been replaced by a shell script that executes the actual cmk-update-agent executable situated at the Check_MK Agent plugin directory. This eliminates the need to maintain two places when manually replacing cmk-update-agent for debugging reasons. -However, it is still possible to execute a copy of the cmk-update-agent executable directly. +* The reduction of the requirements will also reduce compatibility problems on some systems + related to the encrypted SSL communication with the Check_MK server. -* Notably, there will be no more problems with curl and because all communication is now done via python-requests, which is included within the cmk-update-agent executable as mentioned above. +* More convenient communication with Check_MK Server: All HTTP-Requests have been + changed to POST-Requests. This improves confidentiality of the information transfered + to the Check_MK server. The data is no longer written to the apache log of + the Check_MK servers apache (system and site apache). + +* cmk-update-agent installed only once: The copy of cmk-update-agent previously + placed under <tt>/usr/bin/cmk-update-agent</tt> has been replaced by a shell script + that executes the actual cmk-update-agent executable situated at the Check_MK + Agent plugin directory. This eliminates the need to maintain two places when + manually replacing cmk-update-agent for debugging reasons. + However, it is still possible to execute a copy of the cmk-update-agent + executable directly.

6 years, 6 months

5267 cmk-update-agent: New binary format of Agent Updater executable on Linux

by Andreas Umbreit

Module: check_mk Branch: master Commit: 72b76053bedac8e2dc0fc0859bf3393edd7991c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72b76053bedac8… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Dec 15 14:55:44 2017 +0100 5267 cmk-update-agent: New binary format of Agent Updater executable on Linux The cmk-update-agent executable is now implemented as a packaged binary executable. This werk consists of many changes that have partly already been applied to Check_MK 1.5.0i1. The new format addresses several problems and yields some improvements: * Better compatibility: All requirements regarding the installed Python Interpreter or other packages/programs were eliminated; the only requirements left are a x86_64 processor architecture and a glibc 2.5 or above. * More convenient communication to Check_MK Server: All GET-Requests have been replaced with according POST-Requests. This improves security as sensitive data is no longer sent within the URL of the HTTP(S) request. * Only one copy of cmk-update-agent: The copy of cmk-update-agent previously placed under /usr/bin/cmk-update-agent has been replaced by a shell script that executes the actual cmk-update-agent executable situated at the Check_MK Agent plugin directory. This eliminates the need to maintain two places when manually replacing cmk-update-agent for debugging reasons. However, it is still possible to execute a copy of the cmk-update-agent executable directly. * Notably, there will be no more problems with curl and because all communication is now done via python-requests, which is included within the cmk-update-agent executable as mentioned above. Change-Id: Ibd2d5e833c75bc51ea9b23098ee3a5edc253dbe6 --- .werks/5267 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.werks/5267 b/.werks/5267 new file mode 100644 index 0000000..0c1a092 --- /dev/null +++ b/.werks/5267 @@ -0,0 +1,22 @@ +Title: cmk-update-agent: New binary format of Agent Updater executable on Linux +Level: 2 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1513344138 +Class: feature + +The cmk-update-agent executable is now implemented as a packaged binary executable. +This werk consists of many changes that have partly already been applied to Check_MK 1.5.0i1. + +The new format addresses several problems and yields some improvements: + +* Better compatibility: All requirements regarding the installed Python Interpreter or other packages/programs were eliminated; the only requirements left are a x86_64 processor architecture and a glibc 2.5 or above. + +* More convenient communication to Check_MK Server: All GET-Requests have been replaced with according POST-Requests. This improves security as sensitive data is no longer sent within the URL of the HTTP(S) request. + +* Only one copy of cmk-update-agent: The copy of cmk-update-agent previously placed under /usr/bin/cmk-update-agent has been replaced by a shell script that executes the actual cmk-update-agent executable situated at the Check_MK Agent plugin directory. This eliminates the need to maintain two places when manually replacing cmk-update-agent for debugging reasons. +However, it is still possible to execute a copy of the cmk-update-agent executable directly. + +* Notably, there will be no more problems with curl and because all communication is now done via python-requests, which is included within the cmk-update-agent executable as mentioned above.

6 years, 6 months

Refactor the ValueSpec TimeperiodSelection

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 3a9b50fe6d426e8066db5f44ce7f76c48424f6a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a9b50fe6d426e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Dec 15 10:15:53 2017 +0100 Refactor the ValueSpec TimeperiodSelection Refactor the Valuespec TimeperiodSelection to use DropdownChoice instead of ElementSelection. Change-Id: I18daf9015f7c237ca8b5dd8439c9db7abd49076a --- web/htdocs/valuespec.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a163967..d2c6090 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4621,22 +4621,23 @@ class SiteChoice(DropdownChoice): return config.site_choices(filter_func=lambda site_id, site: site_id in authorized_site_ids) - - -class TimeperiodSelection(ElementSelection): +class TimeperiodSelection(DropdownChoice): def __init__(self, **kwargs): - ElementSelection.__init__(self, **kwargs) + kwargs.setdefault("default_value", "24X7") + DropdownChoice.__init__(self, choices=self._get_choices, **kwargs) - def get_elements(self): + def _get_choices(self): import watolib timeperiods = watolib.load_timeperiods() - elements = dict([ ("24X7", _("Always")) ] + \ - [ (name, "%s - %s" % (name, tp["alias"])) for (name, tp) in timeperiods.items() ]) - return elements + elements = [ + (name, "%s - %s" % (name, tp["alias"])) for (name, tp) in timeperiods.items() + ] - def default_value(self): - return "24x7" + always = ("24X7", _("Always")) + if always not in elements: + elements.insert(0, always) + return elements class TimeperiodValuespec(ValueSpec):

6 years, 6 months

Cleaned up warning messages about invalid format when doing localizations

by Lars Michelsen

Module: check_mk Branch: master Commit: 73f3eec55ff679ac562b1ee83947445475d9ebec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73f3eec55ff679… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 15 10:29:32 2017 +0100 Cleaned up warning messages about invalid format when doing localizations Change-Id: I97817bee48ac2c0c7004482dd22fb95514ff8752 --- web/plugins/sidebar/search.py | 4 ++-- web/plugins/wato/active_checks.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 86e9af0..2bd7e5b 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -35,8 +35,8 @@ def render_searchform(): sidebar_snapins["search"] = { "title": _("Quicksearch"), "description": _("Interactive search field for direct access to hosts, services, host- and "\ - "servicegroups. You can use the following filters: h: {host}, s: {service} "\ - "hg: {hostgroup}, sg: {servicegroup} ad: {address}, al: {alias}, tg: {hosttag}"), + "servicegroups. You can use the following filters: h: Host, s: Service "\ + "hg: Hostgroup, sg: Servicegroup ad: Address, al: Alias, tg: Hosttag"), "render": render_searchform, "restart": False, "allowed": [ "user", "admin", "guest" ], diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 1e23127..7a6d2e8 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -666,7 +666,7 @@ register_rule(group, title = _("Service description"), allow_empty = False, help = _("Here you can specify a service description. " - "If this parameter is not set, the service is named <tt>TCP Port {Portnumber}</tt>"))), + "If this parameter is not set, the service is named <tt>TCP Port [PORT NUMBER]</tt>"))), ( "hostname", TextAscii( title = _("DNS Hostname"),

6 years, 6 months

Fixed typo in profile_call

by Simon Betz

Module: check_mk Branch: master Commit: fb2becd05a78a65aed03add8667b85667c7f9770 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb2becd05a78a6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 15 10:37:13 2017 +0100 Fixed typo in profile_call Change-Id: I268b8158c47ad15042c320ee831503242dfade05 --- lib/profile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/profile.py b/lib/profile.py index 2ed4173..39e9918 100644 --- a/lib/profile.py +++ b/lib/profile.py @@ -88,7 +88,7 @@ Examples: def decorate(f): def wrapper(*args, **kwargs): filepath = "%s/%s_%s.profile" % \ - (base_dir.rstip("/"), f.__name__, time.time()) + (base_dir.rstrip("/"), f.__name__, time.time()) with Profile(enabled=enabled, profile_file=filepath): return f(*args, **kwargs)

6 years, 6 months

Updated bug entries #2308, #0391, #0524, #1053, #2206, #2208, #2980, #2213 , #0678, #2094, #2099, #2229, #0437, #2369, #2123, #2381, #0595, #2781, #2526, #0486, #0488, #0489, #0491, #0748, #0880, #2291, #0635, #2557

by Lars Michelsen

6 years, 6 months

5415 FIX Make Windows section openhardwaremonitor backwards compatible

by Jukka Aro

Module: check_mk Branch: master Commit: 08b0130b2c1da5573ece2cbd74663f6107ac8171 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08b0130b2c1da5… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Dec 14 16:04:55 2017 +0100 5415 FIX Make Windows section openhardwaremonitor backwards compatible Version 1.4.0 'corrected' the naming of section openhardwaremonitor. Unfortunately, this broke the backwards compatibility of old ini files that still call this 'ohm'. The fix maps the old name to the new one so that both old and new ini files work. Moreover, the agent bakery was still writing ini files with the old name. Now the agent bakery is also fixed. Change-Id: I5adf3680c46c39c5833b5e39073064b1e2c74f5d --- .werks/5415 | 17 +++++++++++++++++ agents/windows/SectionManager.cc | 2 +- agents/windows/build_version | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/5415 b/.werks/5415 new file mode 100644 index 0000000..dbaab02 --- /dev/null +++ b/.werks/5415 @@ -0,0 +1,17 @@ +Title: Make Windows section openhardwaremonitor backwards compatible +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1513263715 +Class: fix + +Version 1.4.0 'corrected' the naming of section openhardwaremonitor. +Unfortunately, this broke the backwards compatibility of old ini files +that still call this 'ohm'. The fix maps the old name to the new one +so that both old and new ini files work. Moreover, the agent bakery +was still writing ini files with the old name. Now the agent bakery +is also fixed. + + diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc index e0aa5e2..a548665 100644 --- a/agents/windows/SectionManager.cc +++ b/agents/windows/SectionManager.cc @@ -26,7 +26,7 @@ namespace { // 'old' names to 'new' ones. std::string mapSectionName(const std::string &sectionName) { const std::unordered_map<std::string, std::string> mappedSectionNames = { - {"webservices", "wmi_webservices"}}; + {"webservices", "wmi_webservices"}, {"ohm", "openhardwaremonitor"}}; const auto it = mappedSectionNames.find(sectionName); return it == mappedSectionNames.end() ? sectionName : it->second; } diff --git a/agents/windows/build_version b/agents/windows/build_version index 71bfd5b..95a3b3e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3024 +3026

6 years, 6 months

Add werk 5264

by Andreas Umbreit

Module: check_mk Branch: master Commit: 2954b368d42f6c26e68586ceff642f7d4a86f58a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2954b368d42f6c… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Dec 12 08:03:35 2017 +0100 Add werk 5264 Change-Id: I27565f621e4e7f1d7b28b1c2682b6e89b20ca369 --- .werks/5264 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5264 b/.werks/5264 new file mode 100644 index 0000000..a30d1d0 --- /dev/null +++ b/.werks/5264 @@ -0,0 +1,12 @@ +Title: cmk-update-agent: Improve logging under windows +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1512997046 +Class: fix + +With this werk, the Agent Updater ensures that there is a logging infrastructure (i.e. log-dir within agent-installation-dir) is available when running as plugin. + +Additionally, an MSI-Installation log will be written on update if there is a log-dir available.

6 years, 6 months

5255 FIX Autodiscovery with Automatic Activate changes: fixed race condition when trying to delete state file

by Andreas Boesl

Module: check_mk Branch: master Commit: c74df2583367dd4fd9dcb271c1459a701f9b03df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c74df2583367dd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 14 14:23:19 2017 +0100 5255 FIX Autodiscovery with Automatic Activate changes: fixed race condition when trying to delete state file Change-Id: I644c630b8f30489cab242d9628583c6accfa106c --- .werks/5255 | 10 ++++++++++ cmk_base/discovery.py | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.werks/5255 b/.werks/5255 new file mode 100644 index 0000000..613de91 --- /dev/null +++ b/.werks/5255 @@ -0,0 +1,10 @@ +Title: Autodiscovery with Automatic Activate changes: fixed race condition when trying to delete state file +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1513257721 +Class: fix + + diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 85c04b3..239a2f2 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -476,7 +476,10 @@ def _set_rediscovery_flag(hostname, need_rediscovery): touch(discovery_filename) else: if os.path.exists(discovery_filename): - os.remove(discovery_filename) + try: + os.remove(discovery_filename) + except OSError: + pass def discover_marked_hosts(): @@ -540,7 +543,10 @@ def discover_marked_hosts(): host_flag_path = autodiscovery_dir + "/" + hostname if hostname not in config.all_configured_hosts(): - os.remove(host_flag_path) + try: + os.remove(host_flag_path) + except OSError: + pass console.verbose(" Skipped. Host does not exist in configuration. Removing mark.\n") continue @@ -590,7 +596,10 @@ def discover_marked_hosts(): # delete the file even in error case, otherwise we might be causing the same error # every time the cron job runs - os.remove(host_flag_path) + try: + os.remove(host_flag_path) + except OSError: + pass else: console.verbose(" skipped: %s\n" % why_not)

6 years, 6 months

← Newer
1
...
5
6
7
8
9
10
11
...
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