Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Florian Kromer

Module: check_mk Branch: master Commit: 23d9df62f5c4f807045562259c6dca49da37a9e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23d9df62f5c4f8… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Nov 7 15:28:31 2018 +0100 Reserved 10 Werk IDS Change-Id: I3f8acf735042c9c8d04f1f023ea8b7b28d8b44bc --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 525fac8..5c6e481 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6891 +6901

5 years, 7 months

Semi-automatic Fix of unidiomatic-typecheck in cmk_base

by Óscar Nájera

Module: check_mk Branch: master Commit: 6dfe5d29688d93053fcf2d62130ef106cf58a95f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dfe5d29688d93… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Nov 6 16:39:47 2018 +0100 Semi-automatic Fix of unidiomatic-typecheck in cmk_base CMK-837 Change-Id: Ib87256d0ed11fc3238e32c6dbf6d24bc3d29e6dd --- cmk_base/autochecks.py | 2 +- cmk_base/automations/check_mk.py | 11 +++++-- cmk_base/check_api.py | 4 +-- cmk_base/check_table.py | 6 ++-- cmk_base/checking.py | 6 ++-- cmk_base/config.py | 38 +++++++++++----------- cmk_base/core_config.py | 2 +- cmk_base/core_nagios.py | 2 +- cmk_base/data_sources/host_sections.py | 4 +-- cmk_base/data_sources/ipmi.py | 2 +- cmk_base/data_sources/snmp.py | 2 +- cmk_base/data_sources/tcp.py | 6 ++-- cmk_base/discovery.py | 8 ++--- cmk_base/events.py | 2 +- cmk_base/ip_lookup.py | 2 +- cmk_base/notify.py | 10 +++--- cmk_base/snmp.py | 4 +-- tests/integration/cmk_base/test_automations.py | 44 +++++++++++++------------- 18 files changed, 80 insertions(+), 75 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6dfe5d2968…

5 years, 7 months

Manual unidiomatic-typecheck fix for cmk_base

by Óscar Nájera

Module: check_mk Branch: master Commit: 90715bebd9acef80632a7ead785176d936d876fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90715bebd9acef… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Nov 6 16:09:21 2018 +0100 Manual unidiomatic-typecheck fix for cmk_base CMK-837 Change-Id: I5a07084df58af2797a0f14d7bcad740b0d1bed2f --- cmk_base/autochecks.py | 9 ++++++++- cmk_base/checking.py | 13 ++++++++++--- cmk_base/classic_snmp.py | 9 ++++++++- cmk_base/config.py | 40 +++++++++++++++++++++++++++------------- cmk_base/core_config.py | 3 ++- cmk_base/data_sources/snmp.py | 9 ++++++++- cmk_base/events.py | 19 +++++++++++++------ cmk_base/parent_scan.py | 9 ++++++++- cmk_base/snmp_scan.py | 2 +- 9 files changed, 85 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=90715bebd9…

5 years, 7 months

added incompatibility hint to werk 6871

by Marcel Schulte

Module: check_mk Branch: master Commit: 2dab21d1e6b00b57c6fc3fbccdf46607331e7bad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dab21d1e6b00b… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Nov 7 12:59:38 2018 +0100 added incompatibility hint to werk 6871 Change-Id: Ia8808230c1826d7c38648d145b05ecdd2dcd5d74 --- .werks/6871 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.werks/6871 b/.werks/6871 index 12c1037..09efad5 100644 --- a/.werks/6871 +++ b/.werks/6871 @@ -8,3 +8,6 @@ Date: 1541591281 Class: fix Bakery rule wrote multiple perfcounters to the same INI line, missing CR character has been fixed now. + +This is an incompatible change, because affected agents must get baked newly after applying this change. +You usually must already do this after an update of your site so this should only apply to those users applying the werk manually.

5 years, 7 months

6871 FIX multiple perfcounters were written to same INI line

by Marcel Schulte

Module: check_mk Branch: master Commit: 53e3337ab066e3aa7e5436baea6ec5c62281a853 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53e3337ab066e3… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Nov 7 12:50:38 2018 +0100 6871 FIX multiple perfcounters were written to same INI line Bakery rule wrote multiple perfcounters to the same INI line, missing CR character has been fixed now. Change-Id: I421b8d8bd7aa025cd8e2e6fc386e96852778561a --- .werks/6871 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/6871 b/.werks/6871 new file mode 100644 index 0000000..12c1037 --- /dev/null +++ b/.werks/6871 @@ -0,0 +1,10 @@ +Title: multiple perfcounters were written to same INI line +Level: 1 +Component: agents +Compatible: incomp +Edition: cee +Version: 1.6.0i1 +Date: 1541591281 +Class: fix + +Bakery rule wrote multiple perfcounters to the same INI line, missing CR character has been fixed now.

5 years, 7 months

Reserved 20 Werk IDS

by Marcel Schulte

Module: check_mk Branch: master Commit: 44b9029733ca7d863fb46ab0e4e1277d8f851f38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44b9029733ca7d… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Nov 7 12:44:39 2018 +0100 Reserved 20 Werk IDS Change-Id: I27dac865d13473f53239f97097440ee466edd4d7 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 54b9c3c..525fac8 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6871 +6891

5 years, 7 months

Fixed yapf formatting of function calls with _() function calls as arguments

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a7b78e472d1d2e3ee79254c2c7df179d0da1118 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a7b78e472d1d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 7 12:18:47 2018 +0100 Fixed yapf formatting of function calls with _() function calls as arguments Change-Id: I700d90865f695a771446eb638ac32725635030cd --- .style.yapf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.style.yapf b/.style.yapf index 1584e60..2bde9f5 100644 --- a/.style.yapf +++ b/.style.yapf @@ -3,3 +3,9 @@ based_on_style=google blank_line_before_nested_class_or_def=False column_limit=100 indent_dictionary_value=True + +# We do not use i18n comments. Therefore we allow yapf to also format these things. +# Most declarations e.g. in cmk/gui/plugins/wato/active_checks.py are only reformatted +# with this change. +i18n_comment= +i18n_function_call=

5 years, 7 months

Removed dependency to "patch" package

by Lars Michelsen

Module: check_mk Branch: master Commit: aa3adc40dd15dc8edf9bff023cd5234f9be95791 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa3adc40dd15dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 7 10:02:38 2018 +0100 Removed dependency to "patch" package We ship our own patch binary since a long, long time. Sites are always using this patch command. There is no need to have a system wide patch command for OMD to work. Change-Id: Id891cc939a57c404324a5a3848790daefb281b86 --- omd/distros/CENTOS_5.mk | 1 - omd/distros/CENTOS_6.mk | 1 - omd/distros/CENTOS_7.mk | 1 - omd/distros/DEBIAN_5.mk | 1 - omd/distros/DEBIAN_6.mk | 1 - omd/distros/DEBIAN_7.mk | 1 - omd/distros/DEBIAN_8.mk | 1 - omd/distros/DEBIAN_9.mk | 1 - omd/distros/SLES_11SP1.mk | 1 - omd/distros/SLES_11SP2.mk | 1 - omd/distros/SLES_11SP3.mk | 1 - omd/distros/SLES_11SP4.mk | 1 - omd/distros/SLES_12.mk | 1 - omd/distros/SLES_12SP1.mk | 1 - omd/distros/SLES_12SP2.mk | 1 - omd/distros/SLES_12SP3.mk | 1 - omd/distros/SLES_15.mk | 1 - omd/distros/UBUNTU_12.04.mk | 1 - omd/distros/UBUNTU_13.04.mk | 1 - omd/distros/UBUNTU_14.04.mk | 1 - omd/distros/UBUNTU_15.04.mk | 1 - omd/distros/UBUNTU_16.04.mk | 1 - omd/distros/UBUNTU_16.10.mk | 1 - omd/distros/UBUNTU_17.04.mk | 1 - omd/distros/UBUNTU_17.10.mk | 1 - omd/distros/UBUNTU_18.04.mk | 1 - omd/distros/UBUNTU_18.10.mk | 1 - 27 files changed, 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=aa3adc40dd…

5 years, 7 months

Shipping own libgsf to fix dependency issues with SLES 15

by Lars Michelsen

Module: check_mk Branch: master Commit: a9bdc947692e5bad162fe92b2e129c693925a490 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9bdc947692e5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 7 11:09:19 2018 +0100 Shipping own libgsf to fix dependency issues with SLES 15 In previous versions we relied on the libgsf of the Operating systems. This library is not available in the SLES 15 package sources. Instead of just compiling it for SLES 15 we ship it now for all distros to have a consistent environment. Change-Id: If61813dc210076819b96bfd2548e92f102fea3f3 --- omd/Makefile | 1 + omd/distros/CENTOS_5.mk | 3 +-- omd/distros/CENTOS_6.mk | 3 +-- omd/distros/CENTOS_7.mk | 3 +-- omd/distros/DEBIAN_5.mk | 3 +-- omd/distros/DEBIAN_6.mk | 3 +-- omd/distros/DEBIAN_7.mk | 3 +-- omd/distros/DEBIAN_8.mk | 3 +-- omd/distros/DEBIAN_9.mk | 3 +-- omd/distros/SLES_11SP1.mk | 3 +-- omd/distros/SLES_11SP2.mk | 3 +-- omd/distros/SLES_11SP3.mk | 3 +-- omd/distros/SLES_11SP4.mk | 3 +-- omd/distros/SLES_12.mk | 3 +-- omd/distros/SLES_12SP1.mk | 3 +-- omd/distros/SLES_12SP2.mk | 3 +-- omd/distros/SLES_12SP3.mk | 3 +-- omd/distros/SLES_15.mk | 3 +-- omd/distros/UBUNTU_12.04.mk | 3 +-- omd/distros/UBUNTU_13.04.mk | 3 +-- omd/distros/UBUNTU_14.04.mk | 3 +-- omd/distros/UBUNTU_15.04.mk | 3 +-- omd/distros/UBUNTU_16.04.mk | 3 +-- omd/distros/UBUNTU_16.10.mk | 3 +-- omd/distros/UBUNTU_17.04.mk | 3 +-- omd/distros/UBUNTU_17.10.mk | 3 +-- omd/distros/UBUNTU_18.04.mk | 3 +-- omd/distros/UBUNTU_18.10.mk | 3 +-- omd/packages/libgsf/.gitignore | 1 + omd/packages/libgsf/Makefile | 20 ++++++++++++++++++++ omd/packages/libgsf/libgsf-1.14.44.tar.xz | Bin 0 -> 619008 bytes 31 files changed, 49 insertions(+), 54 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a9bdc94769…

5 years, 7 months

Improved view filtering flexibility

by Lars Michelsen

Module: check_mk Branch: master Commit: d13e92c992481a2e3870af3b189dd715ef208649 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d13e92c992481a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 25 09:14:51 2018 +0200 Improved view filtering flexibility Previously we had two different concepts for applying filters to views and reports. Views could only be filtered by the filters that have previously been configured by the view owner. In reports all available filters for a data type could be used. The view logic has now been changed to fit the report logic. It is now equal to the report processing logic. Filters now have this logic: <ul> <li>When you create a view without adding a filter the view will not be filtered when accessing the view. There will be no filter dialog offered via the GUI. New: The user may now provide a filter related HTTP variable via URL to filter the view data.</li> <li>To make a filter available to the user, you need to add this filter to the view using the view editor.</li> <li>To pre-filter a view you may add initial values to the filters that are selected using the view editor.</li> </ul> This change was needed to support the configurable sidebar snapin feature. It needs to be able to use arbitrary filters the user has configured using the snapin. Added some tests for the filter selection logic and cleaned up the related functions a bit to reduce duplicated logic. CMK-437 Change-Id: I68240571d1e2bb14859481b738fd67f58d8a4577 --- cmk/gui/views.py | 14 ++++++------- cmk/gui/visuals.py | 41 ++++++++++++++++++++++---------------- tests/unit/cmk/gui/test_visuals.py | 26 ++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 25 deletions(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index b92cc54..c937c7b 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -811,14 +811,14 @@ def page_view(): painter_options.load(view_name) painter_options.update_from_url(view_name, view) - show_view(view, True, True, True) + show_view(view, show_heading=True, show_buttons=True, show_footer=True) # Display view with real data. This is *the* function everying # is about. def show_view(view, show_heading = False, show_buttons = True, show_footer = True, render_function = None, only_count=False, - all_filters_active=False, limit=None): + limit=None): display_options.load_from_html() @@ -844,15 +844,13 @@ def show_view(view, show_heading = False, show_buttons = True, tablename = datasource["table"] - # Filters to use in the view - # In case of single object views, the needed filters are fixed, but not always present - # in context. In this case, take them from the context type definition. - use_filters = visuals.filters_of_visual(view, datasource['infos'], - all_filters_active, datasource.get('link_filters', {})) + # Always allow the users to specify all allowed filters using the URL + use_filters = visuals.filters_allowed_for_infos(datasource['infos']).values() # Not all filters are really shown later in show_filter_form(), because filters which # have a hardcoded value are not changeable by the user - show_filters = visuals.visible_filters_of_visual(view, use_filters) + show_filters = visuals.filters_of_visual(view, datasource['infos'], link_filters=datasource.get('link_filters', {})) + show_filters = visuals.visible_filters_of_visual(view, show_filters) # FIXME TODO HACK to make grouping single contextes possible on host/service infos # Is hopefully cleaned up soon. diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index 0cbc55c..86c4db0 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -975,15 +975,31 @@ def show_filter(f): def get_filter(name): + # type: (str) -> Type[Filter] + """Returns the filter object identified by the given name + Raises a KeyError in case a not existing filter is requested.""" return multisite_filters[name] + def filters_allowed_for_info(info): + # type (str) -> Dict[str, Type[Filter]] + """Returns a map of filter names and filter objects that are registered for the given info""" allowed = {} for fname, filt in multisite_filters.items(): if filt.info == None or info == filt.info: allowed[fname] = filt return allowed + +def filters_allowed_for_infos(infos): + # type (List[str]) -> Dict[str, Type[Filter]] + """Same as filters_allowed_for_info() but for multiple infos""" + filters = {} + for info in infos: + filters.update(filters_allowed_for_info(info)) + return filters + + # For all single_infos which are configured for a view which datasource # does not provide these infos, try to match the keys of the single_info # attributes to a filter which can then be used to filter the data of @@ -1002,38 +1018,29 @@ def get_link_filter_names(visual, info_keys, link_filters): return names # Collects all filters to be used for the given visual -def filters_of_visual(visual, info_keys, show_all=False, link_filters=None): +def filters_of_visual(visual, info_keys, link_filters=None): if link_filters is None: link_filters = [] filters = [] - # Collect all available filters for these infos - all_possible_filters = [] - for _filter_name, filter_ in multisite_filters.items(): - if filter_.info in info_keys: - all_possible_filters.append(filter_) - for info_key in info_keys: if info_key in visual['single_infos']: for key in info_params(info_key): filters.append(get_filter(key)) + continue - elif not show_all: - for key, val in visual['context'].items(): - if type(val) == dict: # this is a real filter - try: - filters.append(get_filter(key)) - except KeyError: - pass # Silently ignore not existing filters + for key, val in visual['context'].items(): + if type(val) == dict: # this is a real filter + try: + filters.append(get_filter(key)) + except KeyError: + pass # Silently ignore not existing filters # See get_link_filter_names() comment for details for key, dst_key in get_link_filter_names(visual, info_keys, link_filters): filters.append(get_filter(dst_key)) - if show_all: # add *all* available filters of these infos - filters += all_possible_filters - # add ubiquitary_filters that are possible for these infos for fn in get_ubiquitary_filters(): # Disable 'wato_folder' filter, if WATO is disabled or there is a single host view diff --git a/tests/unit/cmk/gui/test_visuals.py b/tests/unit/cmk/gui/test_visuals.py new file mode 100644 index 0000000..fbb2331 --- /dev/null +++ b/tests/unit/cmk/gui/test_visuals.py @@ -0,0 +1,26 @@ +import pytest + +import cmk.gui.plugins.visuals +import cmk.gui.visuals as visuals + + +def test_get_filter(): + f = visuals.get_filter("hostregex") + assert isinstance(f, cmk.gui.plugins.visuals.Filter) + + +def test_get_not_existing_filter(): + with pytest.raises(KeyError): + visuals.get_filter("dingelig") + + +def test_filters_allowed_for_info(): + allowed = visuals.filters_allowed_for_info("host") + assert isinstance(allowed["host"], cmk.gui.plugins.visuals.filters.FilterText) + assert "service" not in allowed + + +def test_filters_allowed_for_infos(): + allowed = visuals.filters_allowed_for_infos(["host", "service"]) + assert isinstance(allowed["host"], cmk.gui.plugins.visuals.filters.FilterText) + assert isinstance(allowed["service"], cmk.gui.plugins.visuals.filters.FilterText)

5 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018