Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

by Marcel Arentz

Module: check_mk Branch: master Commit: 14403d4a172d64e5c86410ec2cc40089eb960158 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14403d4a172d64… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Oct 12 09:50:43 2018 +0200 updated Docker README Change-Id: I8c6b00243f4b7824939383faedff0881baa58e09 --- docker/README.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/README.asciidoc b/docker/README.asciidoc index 1950f83..7de0f8c 100644 --- a/docker/README.asciidoc +++ b/docker/README.asciidoc @@ -21,7 +21,7 @@ Quick start You can start a Check_MK container like this: .... -docker container run -dit -p 8080:5000 --tmpfs /omd/sites/cmk/tmp -v /omd/sites --name monitoring -v /etc/localtime:/etc/localtime --restart always checkmk/check-mk-enterprise:1.5.0p2 +docker container run -dit -p 8080:5000 --tmpfs /omd/sites/cmk/tmp -v /omd/sites --name monitoring -v /etc/localtime:/etc/localtime --restart always checkmk/check-mk-enterprise:1.5.0p5 .... The Check_MK GUI should now be reachable via

5 years, 8 months

docker: add parse functions and tests

by Moritz Kiemer

Module: check_mk Branch: master Commit: 198066e9f9990ebc3db7e64456e55f760f19fe68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=198066e9f9990e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Oct 10 14:48:57 2018 +0200 docker: add parse functions and tests CMK-1031 Change-Id: I490476a9735ec565f6f80d1e72fdbcfd9c97670e --- checks/docker.include | 234 +++++--- checks/docker_node_disk_usage | 2 +- tests/unit/checks/test_docker_parse_helpers.py | 27 + .../unit/checks/test_docker_parse_image_inspect.py | 589 +++++++++++++++++++++ tests/unit/checks/test_docker_parse_images.py | 57 ++ .../checks/test_docker_parse_network_inspect.py | 166 ++++++ tests/unit/checks/test_docker_parse_node_images.py | 417 +++++++++++++++ tests/unit/checks/test_docker_parse_node_info.py | 241 +++++++++ tests/unit/checks/test_docker_parse_ps_all.py | 80 +++ tests/unit/checks/test_docker_parse_system_df.py | 71 +++ 10 files changed, 1814 insertions(+), 70 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=198066e9f9…

5 years, 8 months

6779 FIX Fixed displaying unrelated livestatus data to users randomly

by Lars Michelsen

Module: check_mk Branch: master Commit: ed908c0b47cfcff7cdadcbf902176f92435e6d23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed908c0b47cfcf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 12 09:05:27 2018 +0200 6779 FIX Fixed displaying unrelated livestatus data to users randomly Because subsequent requests to the GUI could use left over livestatus connections of other users it could randomly happen that one user used the livestatus connection of another user which could then result in wrong data shown to the user in the GUI. Change-Id: I53cd562798870a6cac40ef05a2c87f0fb2e8d1f7 --- .werks/6779 | 14 ++++++++++++++ web/app/index.wsgi | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/.werks/6779 b/.werks/6779 new file mode 100644 index 0000000..d4b6243 --- /dev/null +++ b/.werks/6779 @@ -0,0 +1,14 @@ +Title: Fixed displaying unrelated livestatus data to users randomly +Level: 2 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539264368 + +Because subsequent requests to the GUI could use left over livestatus connections +of other users it could randomly happen that one user used the livestatus connection +of another user which could then result in wrong data shown to the user in the +GUI. diff --git a/web/app/index.wsgi b/web/app/index.wsgi index dcce0ea..563b236 100644 --- a/web/app/index.wsgi +++ b/web/app/index.wsgi @@ -168,6 +168,12 @@ class Application(object): # time before the first login for generating auth.php. modules.load_all_plugins() + # Clean up left over livestatus + connection objects (which are + # globally stored in sites module). This is a quick fix for the 1.5 + # and will be cleaned up in 1.6 by storing these objects in the user + # request context instead of a global context. + sites.disconnect() + handler = pages.get_page_handler(html.myfile, self._page_not_found) # Some pages do skip authentication. This is done by adding

5 years, 8 months

6782 FIX Fixed automatic refresh of "Custom graph" pages

by Lars Michelsen

Module: check_mk Branch: master Commit: 29d1a5a5ef2447501bcbc8118c79bb13073444df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29d1a5a5ef2447… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 12 07:48:57 2018 +0200 6782 FIX Fixed automatic refresh of "Custom graph" pages The graphs on the dedicated custom graph pages that are linked from the sidebar were not refreshed at all. Now they are refreshed regularly, just like the other views. Change-Id: I7ddc51aa0d0594417032fa662c32beaebcaf6f6f --- .werks/6782 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/6782 b/.werks/6782 new file mode 100644 index 0000000..14010f4 --- /dev/null +++ b/.werks/6782 @@ -0,0 +1,13 @@ +Title: Fixed automatic refresh of "Custom graph" pages +Level: 1 +Component: metrics +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1539323264 + +The graphs on the dedicated custom graph pages that are linked +from the sidebar were not refreshed at all. Now they are refreshed +regularly, just like the other views.

5 years, 8 months

added #WK6556

by Andreas Boesl

Module: check_mk Branch: master Commit: 12b7213f68752408111b8181be95a824e09252bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12b7213f687524… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 11 16:45:14 2018 +0200 added #WK6556 Change-Id: I9a9972dc1e86cb92526b04bcec8c3fed036f2fb1 --- .werks/6665 | 14 ++++++++++++++ cmk_base/checking.py | 28 ++++++++++------------------ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/.werks/6665 b/.werks/6665 new file mode 100644 index 0000000..b522304 --- /dev/null +++ b/.werks/6665 @@ -0,0 +1,14 @@ +Title: Checks may now yield the value None as plugin output +Level: 1 +Component: checks +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539174883 + +A check usually returns a state, followed by text and optional perfdata. +The plugin output was not well formatted, in case yield returned an empty string. +It is now possible to yield None as plugin output, which instructs the Check API +to ignore this value. diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 6dfdf1c..bb7c81e 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -421,33 +421,25 @@ def _sanitize_yield_check_result(result, is_snmp): if not subresults: return _item_not_found(is_snmp) - # Simple check with no separate subchecks (yield wouldn't have been neccessary here!) - if len(subresults) == 1: - state, infotext, perfdata = _sanitize_tuple_check_result(subresults[0], allow_missing_infotext=True) - # just to be safe - infotext should allways be a string - if infotext == None: - return state, u"", perfdata - - return state, infotext, perfdata # Several sub results issued with multiple yields. Make that worst sub check # decide the total state, join the texts and performance data. Subresults with # an infotext of None are used for adding performance data. - else: - perfdata = [] - infotexts = [] - status = 0 + perfdata = [] + infotexts = [] + status = 0 - for subresult in subresults: - st, text, perf = _sanitize_tuple_check_result(subresult, allow_missing_infotext=True) + for subresult in subresults: + st, text, perf = _sanitize_tuple_check_result(subresult, allow_missing_infotext=True) + status = cmk_base.utils.worst_service_state(st, status) + if text != None: infotexts.append(text + ["", "(!)", "(!!)", "(?)"][st]) - status = cmk_base.utils.worst_service_state(st, status) - if perf != None: - perfdata += subresult[2] + if perf != None: + perfdata += perf - return status, ", ".join(i for i in infotexts if i), perfdata + return status, ", ".join(infotexts), perfdata def _item_not_found(is_snmp):

5 years, 8 months

added #WK6667

by Andreas Boesl

Module: check_mk Branch: master Commit: 9d67ad72049b7539da46b9c49478ae308af74406 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d67ad72049b75… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 11 16:24:00 2018 +0200 added #WK6667 Change-Id: I780c958a02a4eafbd71609faefdd7f14e2db821f --- .werks/6667 | 14 ++++++++++++++ agents/windows/build_version | 2 +- agents/windows/sections/SectionPluginGroup.cc | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/6667 b/.werks/6667 new file mode 100644 index 0000000..7fdf946 --- /dev/null +++ b/.werks/6667 @@ -0,0 +1,14 @@ +Title: Windows agent: Increased maximum allowed plugin output from 2MB to 16MB +Level: 1 +Component: checks +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539244926 + +If the combined output of all plugins exceeded 2MB, subsequent plugin data got discarded. + + + diff --git a/agents/windows/build_version b/agents/windows/build_version index 496b659..74de7d2 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3262 +3264 diff --git a/agents/windows/sections/SectionPluginGroup.cc b/agents/windows/sections/SectionPluginGroup.cc index 95c73c5..9f088d4 100644 --- a/agents/windows/sections/SectionPluginGroup.cc +++ b/agents/windows/sections/SectionPluginGroup.cc @@ -32,7 +32,7 @@ namespace { -const size_t HEAP_BUFFER_MAX = 2097152L; +const size_t HEAP_BUFFER_MAX = 16777216L; const size_t HEAP_BUFFER_DEFAULT = 16384L; const char *typeToSection(script_type type) {

5 years, 8 months

added WK6666

by Andreas Boesl

Module: check_mk Branch: master Commit: d88b5ead0f2e2d48256f2cf9ec47a04c4d7f6025 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d88b5ead0f2e2d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 11 16:26:19 2018 +0200 added WK6666 Change-Id: I08154d56b35a8e92a8a29d04e561d980776a6d06 --- .werks/6666 | 12 ++++++++++++ agents/windows/sections/SectionPluginGroup.cc | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/6666 b/.werks/6666 new file mode 100644 index 0000000..4dd8c8a --- /dev/null +++ b/.werks/6666 @@ -0,0 +1,12 @@ +Title: Windows agent: Fixed race condition leading to missing plugin output +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539242160 + +Due to an memory management error, the plugin data sometimes could get +discarded when plugins produced more than 16KB plugin output. diff --git a/agents/windows/sections/SectionPluginGroup.cc b/agents/windows/sections/SectionPluginGroup.cc index 086956e..95c73c5 100644 --- a/agents/windows/sections/SectionPluginGroup.cc +++ b/agents/windows/sections/SectionPluginGroup.cc @@ -98,7 +98,7 @@ int launch_program(script_container *cont) { break; } - while (out_offset + available > current_heap_size) { + while (out_offset + available >= current_heap_size) { // Increase heap buffer if (current_heap_size * 2 <= HEAP_BUFFER_MAX) { cont->buffer_work.reset(

5 years, 8 months

6498 fileinfo.groups: Conjunctions of different levels are configurable

by Simon Betz

Module: check_mk Branch: master Commit: 8ccaa7c9f5b43e43538b9c00e6ac67729be66ea9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ccaa7c9f5b43e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 13 08:58:34 2018 +0200 6498 fileinfo.groups: Conjunctions of different levels are configurable Change-Id: I1f46fb14daabeb18b44769447d1fc7d3d77067ae --- .werks/6498 | 25 +++++++++++++++++++++++++ checks/fileinfo | 32 ++++++++++++++++++++++++++++---- cmk/gui/plugins/wato/check_parameters.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 4 deletions(-) diff --git a/.werks/6498 b/.werks/6498 new file mode 100644 index 0000000..d40b26e --- /dev/null +++ b/.werks/6498 @@ -0,0 +1,25 @@ +Title: fileinfo.groups: Conjunctions of different levels are configurable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536821894 +Class: feature + +File group statistics such as +<ul> +<li>count</li> +<li>size</li> +<li>largest size</li> +<li>smallest size</li> +<li>oldest age</li> +<li>newest age</li> +</ul> +can be checked by upper and lower thresholds which consists of two values: warn +and crit. These levels are independent of each other. + +In order to check dependent file group statistics you can configure +conjunctions of single levels now. A conjunction consists of a monitoring state +and any number of upper or lower levels. If all of the configured levels within +a conjunction are reached then the related state is reported. diff --git a/checks/fileinfo b/checks/fileinfo index c5bec7e..091d5ec 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -251,9 +251,9 @@ def check_fileinfo(item, params, parsed): age = reftime - file_stat.time check_definition = [ ("Size", "size", file_stat.size, get_filesize_human_readable), - ("Age", "age", age, get_age_human_readable) + ("Age", "age", age, get_age_human_readable), ] - return fileinfo_check_function(check_definition, params, outof_range_txt) + return _fileinfo_check_function(check_definition, params, outof_range_txt) else: if outof_range_txt: return 0, "File not found - %s" % outof_range_txt @@ -398,7 +398,10 @@ def check_fileinfo_groups(_item, params, parsed): if files_stat_failed: yield 1, "Files with unknown stat: %s" % ", ".join(files_stat_failed) - yield fileinfo_check_function(check_definition, params, outof_range_txt) + yield _fileinfo_check_function(check_definition, params, outof_range_txt) + + for res in _fileinfo_check_conjunctions(check_definition, params): + yield res long_output = [] if any(include_patterns): @@ -417,7 +420,7 @@ def check_fileinfo_groups(_item, params, parsed): yield 0, "\n%s" % "\n".join(long_output) -def fileinfo_check_function(check_definition, params, outof_range_txt): +def _fileinfo_check_function(check_definition, params, outof_range_txt): infotexts = [] states = [0] perfdata = [] @@ -464,6 +467,27 @@ def inventory_fileinfo(parsed): return inventory_fileinfo_common(parsed, "single") +def _fileinfo_check_conjunctions(check_definition, params): + conjunctions = params.get("conjunctions", []) + for conjunction_state, levels in conjunctions: + levels = dict(levels) + match_texts = [] + matches = 0 + for title, key, value, readable_f in check_definition: + level = levels.get(key) + if level is not None and value >= level: + match_texts.append("%s at %s" % (title.lower(), readable_f(level))) + matches += 1 + + level_lower = levels.get("%s_lower" % key) + if level_lower is not None and value < level_lower: + match_texts.append("%s below %s" % (title.lower(), readable_f(level_lower))) + matches += 1 + + if matches == len(levels): + yield conjunction_state, "Conjunction: %s" % " AND ".join(match_texts) + + check_info["fileinfo"] = { "parse_function" : parse_fileinfo, "check_function" : check_fileinfo, diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 9f94be3..5b63ea8 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -7293,6 +7293,36 @@ register_check_parameters( title = _("Only check during the following times of the day"), help = _("Outside these ranges the check will always be OK"), )), + ("conjunctions", ListOf(Tuple( + elements=[ + MonitoringState(title=_("Monitoring state"), default_value=2), + ListOf( + CascadingDropdown( + orientation="hroizontal", + choices=[ + ("count", _("File count at"), Integer()), + ("count_lower", _("File count below"), Integer()), + ("size", _("File size at"), Filesize()), + ("size_lower", _("File size below"), Filesize()), + ("largest_size", _("Largest file size at"), Filesize()), + ("largest_size_lower", _("Largest file size below"), Filesize()), + ("smallest_size", _("Smallest file size at"), Filesize()), + ("smallest_size_lower", _("Smallest file size below"), Filesize()), + ("oldest_age", _("Oldest file age at"), Age()), + ("oldest_age_lower", _("Oldest file age below"), Age()), + ("newest_age", _("Newest file age at"), Age()), + ("newest_age_lower", _("Newest file age below"), Age()), + ] + ), + magic="@#@#", + ) + ]), + title=_("Level conjunctions"), + help=_("In order to check dependent file group statistics you can configure " + "conjunctions of single levels now. A conjunction consists of a monitoring state " + "and any number of upper or lower levels. If all of the configured levels within " + "a conjunction are reached then the related state is reported."), + )), ], ignored_keys = ["precompiled_patterns"] ),

5 years, 8 months

Fixed rendering of filters in custom dashlet edit dialog ( css files were missing)

by Lars Michelsen

Module: check_mk Branch: master Commit: 68e956305d2cf7d05c9f1c106a8bff09292e3a6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68e956305d2cf7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 20:31:45 2018 +0200 Fixed rendering of filters in custom dashlet edit dialog (css files were missing) Change-Id: I1179ef9d1184e5e7877cf3e7be0d1d53d4f6479d --- cmk/gui/pagetypes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/pagetypes.py b/cmk/gui/pagetypes.py index 2c6d75d..8ee575b9 100644 --- a/cmk/gui/pagetypes.py +++ b/cmk/gui/pagetypes.py @@ -1082,8 +1082,8 @@ class Overridable(Base): page = cls.instance((load_user, page_name)) page_dict = page.internal_representation() - - html.header(title) ### TODO: extra stylesheets for BI. Move bi.css into views.css , stylesheets=["pages", "views", "status", "bi"]) + ### TODO: extra stylesheets for BI. Move bi.css into views.css , stylesheets=["pages", "views", "status", "bi"]) + html.header(title, stylesheets=["pages", "views", "status"]) html.begin_context_buttons() html.context_button(_("Back"), back_url, "back") html.end_context_buttons()

5 years, 8 months

Fix filter rendering in dashboard properties and report scheduler properties

by Lars Michelsen

Module: check_mk Branch: master Commit: 3f7bfeb9a23c34126b49ef9228c51ae0cf12a90a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f7bfeb9a23c34… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 20:19:27 2018 +0200 Fix filter rendering in dashboard properties and report scheduler properties Commit 913ad42c810763a0cc9268da8d0420a62714ad07 modified too many css selectors Change-Id: I7f73a41e12e35dc1080afee4889924e0a940180c --- web/htdocs/themes/facelift/theme.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index fdb3b91..fa3d339 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -578,24 +578,24 @@ table { border-bottom: 1px solid #cccfdb; padding-bottom: 32px; padding-top: 8px; } - table.nform table.valuespec_listof.regular.filter .vlof_content.filter .floatfilter { + table.nform table.valuespec_listof.filter .vlof_content.filter .floatfilter { height: auto; box-shadow: none; border: 1px solid #cccfdb; background-color: #FFFFFF; width: 400px; } - table.nform table.valuespec_listof.regular.filter .vlof_content.filter .floatfilter .legend { + table.nform table.valuespec_listof.filter .vlof_content.filter .floatfilter .legend { font-size: 12px; text-transform: uppercase; letter-spacing: 1px; color: #2a2a2a; padding: 16px 0px 0px 16px; } - table.nform table.valuespec_listof.regular.filter .vlof_content.filter .floatfilter .content { + table.nform table.valuespec_listof.filter .vlof_content.filter .floatfilter .content { padding: 16px; width: 100%; } - table.nform table.valuespec_listof.regular.filter .vlof_content.filter .floatfilter .content table { + table.nform table.valuespec_listof.filter .vlof_content.filter .floatfilter .content table { border-spacing: 8px 4px; } - table.nform table.valuespec_listof.regular.filter .vlof_buttons.filter img { + table.nform table.valuespec_listof.filter .vlof_buttons.filter img { top: 8px; left: -40px; } table.report_contents td.preview img {

5 years, 8 months

← Newer
1
...
18
19
20
21
22
23
24
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018