Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

mk_msoffice: New plugin which monitors licenses and service plans of MS Office

by Simon Betz

Module: check_mk Branch: master Commit: 94d37ef64672d19bff89c6cf12fe1d2a83efc9ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94d37ef64672d1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 7 11:32:44 2019 +0100 mk_msoffice: New plugin which monitors licenses and service plans of MS Office Change-Id: I9881b8280ce1f887cc5ca5db4d35d3d646ae536a --- .werks/7118 | 10 ++ agents/windows/plugins/mk_msoffice.ps1 | 35 +++++++ checkman/msoffice_licenses | 13 +++ checkman/msoffice_serviceplans | 15 +++ checks/msoffice_licenses | 80 ++++++++++++++++ checks/msoffice_serviceplans | 74 +++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 40 ++++++++ cmk/gui/plugins/wato/check_parameters/msoffice.py | 109 ++++++++++++++++++++++ cmk/utils/man_pages.py | 1 + 9 files changed, 377 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=94d37ef646…

5 years, 4 months

Revert "mk_msonline: New plugin which monitors licenses and service plans of MS Office"

by Simon Betz

Module: check_mk Branch: master Commit: 85c91c5e4222459568061954d6532e81e877d48e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85c91c5e422245… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 7 11:20:43 2019 +0100 Revert "mk_msonline: New plugin which monitors licenses and service plans of MS Office" This reverts commit d85b6838fc0bbf93d3d4b6b73385afe8fcf620a2. --- .werks/7118 | 10 -- agents/windows/plugins/mk_msonline.ps1 | 35 ------- checkman/msonline_licenses | 13 --- checkman/msonline_serviceplans | 15 --- checks/msonline_licenses | 80 ---------------- checks/msonline_serviceplans | 74 --------------- cmk/gui/plugins/metrics/check_mk.py | 40 -------- cmk/gui/plugins/wato/check_parameters/msonline.py | 109 ---------------------- cmk/utils/man_pages.py | 1 - 9 files changed, 377 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=85c91c5e42…

5 years, 4 months

7230 FIX Fixed selection of checks in "Check intervals for SNMP checks" ruleset

by Lars Michelsen

Module: check_mk Branch: master Commit: 6dccda7c7d17b5ce9e3c2c5efc4a28e77cfb8386 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dccda7c7d17b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 11:14:55 2019 +0100 7230 FIX Fixed selection of checks in "Check intervals for SNMP checks" ruleset Instead of selecting individual check types as it was possible before, the section names are now selectable as it was intended. As described in help text of this option it is not possible to configured this setting for individual sub checks, but only for a family of SNMP checks that share a single SNMP section. FEED-3402 Change-Id: Ie1948a4478451a9961a06fb0503a7d4e229db73a --- .werks/7230 | 14 ++++++++++++++ cmk/gui/plugins/wato/check_mk_configuration.py | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/7230 b/.werks/7230 new file mode 100644 index 0000000..85be0d1 --- /dev/null +++ b/.werks/7230 @@ -0,0 +1,14 @@ +Title: Fixed selection of checks in "Check intervals for SNMP checks" ruleset +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1551884231 + +Instead of selecting individual check types as it was possible before, the section names +are now selectable as it was intended. As described in help text of this option it is +not possible to configured this setting for individual sub checks, but only for a family +of SNMP checks that share a single SNMP section. diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 68c3ef2..58dc6c9 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -4956,8 +4956,9 @@ def get_snmp_checktypes(): def get_snmp_section_names(): checks = watolib.check_mk_local_automation("get-check-information") - return [(None, _('All SNMP Checks'))] + sorted( - [(cn, cn) for (cn, c) in checks.items() if c['snmp']]) + snmp_section_names = set(cn.split(".", 1)[0] for (cn, c) in checks.items() if c['snmp']) + section_choices = [ (sn, sn) for sn in snmp_section_names ] + return [ (None, _('All SNMP Checks')) ] + sorted(section_choices) @rulespec_registry.register

5 years, 4 months

mk_oracle_crs: Fixed folding

by Simon Betz

Module: check_mk Branch: master Commit: 6b895bf6631836082b6a5267198405377db7195c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b895bf6631836… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 7 11:05:29 2019 +0100 mk_oracle_crs: Fixed folding Change-Id: I82794deff62c139048abbc4a337d2e2b2df39951 --- agents/plugins/mk_oracle_crs | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/plugins/mk_oracle_crs b/agents/plugins/mk_oracle_crs index 15efd85..cbf7587 100755 --- a/agents/plugins/mk_oracle_crs +++ b/agents/plugins/mk_oracle_crs @@ -104,6 +104,7 @@ function printcrsdata() { fi } +#. # .--Main----------------------------------------------------------------. # | __ __ _ | # | | \/ | __ _(_)_ __ |

5 years, 4 months

Abstraction of row gathering for views

by Lars Michelsen

Module: check_mk Branch: master Commit: f0d930b0c378eee1fe7b2ce3a99e12fa6d48a723 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0d930b0c378ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 08:38:14 2019 +0100 Abstraction of row gathering for views * Cleans up another aspect of views.show_view(): Simplified the DataSources.table property to always provide an instance of a RowTable object. * The query method is used to get all rows needed for the view. * The API of the query method will be simplified step by step with the next commits. Change-Id: Ib509b7bc5c44ab773648b5ddc82111702d4e9540 --- cmk/gui/bi.py | 36 ++++++--- cmk/gui/plugins/views/__init__.py | 3 + cmk/gui/plugins/views/bi.py | 32 +++++++- cmk/gui/plugins/views/datasources.py | 150 +++++++++++++---------------------- cmk/gui/plugins/views/inventory.py | 27 ++++--- cmk/gui/plugins/views/mkeventd.py | 46 +++++------ cmk/gui/plugins/views/utils.py | 39 ++++++++- cmk/gui/views.py | 17 +--- 8 files changed, 189 insertions(+), 161 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f0d930b0c3…

5 years, 4 months

Move sorter selection logic to View()

by Lars Michelsen

Module: check_mk Branch: master Commit: f2abfba0436db71714336a277fb75a1a4287c50a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2abfba0436db7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 18:06:34 2019 +0100 Move sorter selection logic to View() Change-Id: I132bbc875c2f6eadf61fa2f1b75d696f8a7c4182 --- cmk/gui/views.py | 52 ++++++++++++++++++++-------------------- tests/unit/cmk/gui/test_views.py | 6 ++--- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 44fade4..fb7efa4 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -228,6 +228,25 @@ class View(object): "because the datasource does not exist.") % (self.name, self.datasource)) @property + def sorters(self): + """Returns the list of effective sorters to be used to sort the rows of this view""" + return self._get_sorter_entries( + self.user_sorters if self.user_sorters else self.spec["sorters"]) + + def _get_sorter_entries(self, sorter_list): + sorters = [] + for entry in sorter_list: + if entry[0] not in sorter_registry: + continue # Skip removed sorters + + # e.g. service description + join_key = entry[2] if len(entry) > 2 else None + + sorters.append( + SorterEntry(sorter=sorter_registry[entry[0]](), negate=entry[1], join_key=join_key)) + return sorters + + @property def row_limit(self): if self.datasource.ignore_limit: return None @@ -257,6 +276,7 @@ class View(object): The user may click on the headers of tables to change the default view sorting. In the moment the user overrides the sorting configured for the view in self.spec""" + # TODO: Only process in case the view is user sortable return self._user_sorters @user_sorters.setter @@ -1170,8 +1190,11 @@ def page_view(): show_view(view, view_renderer) -# Display view with real data. This is *the* function everying -# is about. +# Display view with real data +# TODO: Disentangle logic and presentation like this: +# - Move logic stuff to View class +# - Move rendering specific stuff to the fitting ViewRenderer +# - Find the right place for the availability / SLA hacks here def show_view(view, view_renderer, only_count=False): display_options.load_from_html() @@ -1261,7 +1284,7 @@ def show_view(view, view_renderer, only_count=False): if only_count: sorters = [] else: - sorters = _get_sorters(view) + sorters = view.sorters # Prepare cells of the view # Group cells: Are displayed as titles of grouped rows @@ -1369,29 +1392,6 @@ def show_view(view, view_renderer, only_count=False): SorterEntry = namedtuple("SorterEntry", ["sorter", "negate", "join_key"]) -def _get_sorters(view): - if view.user_sorters: - sorter_list = view.user_sorters - else: - sorter_list = view.spec["sorters"] - - return _get_sorter_entries(sorter_list) - - -def _get_sorter_entries(sorter_list): - sorters = [] - for entry in sorter_list: - if entry[0] not in sorter_registry: - continue # Skip removed sorters - - # e.g. service description - join_key = entry[2] if len(entry) > 2 else None - - sorters.append( - SorterEntry(sorter=sorter_registry[entry[0]](), negate=entry[1], join_key=join_key)) - return sorters - - def get_join_cells(cell_list): return [x for x in cell_list if isinstance(x, JoinCell)] diff --git a/tests/unit/cmk/gui/test_views.py b/tests/unit/cmk/gui/test_views.py index 6c3f5ef..e5d6885 100644 --- a/tests/unit/cmk/gui/test_views.py +++ b/tests/unit/cmk/gui/test_views.py @@ -5726,11 +5726,10 @@ def test_get_needed_regular_columns(register_builtin_html, load_view_plugins): view = cmk.gui.views.View(view_name, view_spec) - sorters = cmk.gui.views._get_sorters(view) group_cells = cmk.gui.views.get_group_cells(view) cells = cmk.gui.views.get_cells(view) - columns = cmk.gui.views._get_needed_regular_columns(group_cells + cells, sorters, view.datasource) + columns = cmk.gui.views._get_needed_regular_columns(group_cells + cells, view.sorters, view.datasource) assert sorted(columns) == sorted([ 'host_scheduled_downtime_depth', 'host_in_check_period', @@ -5777,11 +5776,10 @@ def test_get_needed_join_columns(register_builtin_html, load_view_plugins): view = cmk.gui.views.View(view_name, view_spec) - sorters = cmk.gui.views._get_sorters(view) cells = cmk.gui.views.get_cells(view) join_cells = cmk.gui.views.get_join_cells(cells) - columns = cmk.gui.views._get_needed_join_columns(join_cells, sorters) + columns = cmk.gui.views._get_needed_join_columns(join_cells, view.sorters) assert sorted(columns) == sorted([ 'host_name', 'service_description',

5 years, 4 months

Cleanup add_columns special case from RowTable.query API

by Lars Michelsen

Module: check_mk Branch: master Commit: e0db32d88b4b27f5c51fb88970d7342da8c0017f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0db32d88b4b27… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 13:52:10 2019 +0100 Cleanup add_columns special case from RowTable.query API Change-Id: I4e6bf4d9d3caef1b36cf54f683490f1c5311bd98 --- cmk/gui/bi.py | 15 +++++++-------- cmk/gui/plugins/views/bi.py | 18 ++++++++---------- cmk/gui/plugins/views/datasources.py | 2 +- cmk/gui/plugins/views/inventory.py | 4 ++-- cmk/gui/plugins/views/mkeventd.py | 4 ++-- cmk/gui/plugins/views/utils.py | 28 +++++++--------------------- cmk/gui/views.py | 8 ++------ 7 files changed, 29 insertions(+), 50 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e0db32d88b…

5 years, 4 months

Simplify render_availability_page() arguments

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e7217c99cfc95f326777f9868f60ce6a824dafe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e7217c99cfc95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 14:09:30 2019 +0100 Simplify render_availability_page() arguments Change-Id: Ic0e5be8cf9ebb63c3cf1ff461710698aaa158ae8 --- cmk/gui/plugins/views/availability.py | 10 +++++----- cmk/gui/views.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmk/gui/plugins/views/availability.py b/cmk/gui/plugins/views/availability.py index a057f5f..6a91620 100644 --- a/cmk/gui/plugins/views/availability.py +++ b/cmk/gui/plugins/views/availability.py @@ -165,16 +165,16 @@ def render_availability_options(what): # Render the page showing availability table or timelines. It # is (currently) called by views.py, when showing a view but # availability mode is activated. -def render_availability_page(view, datasource, context, filterheaders, only_sites, limit): +def render_availability_page(view, context, filterheaders): config.user.need_permission("general.see_availability") if handle_edit_annotations(): return # We make reports about hosts, services or BI aggregates - if "service" in datasource.infos: + if "service" in view.datasource.infos: what = "service" - elif "aggr_name" in datasource.infos: + elif "aggr_name" in view.datasource.infos: what = "bi" else: what = "host" @@ -210,7 +210,7 @@ def render_availability_page(view, datasource, context, filterheaders, only_site title += av_object[2] else: av_object = None - title += view_title(view) + title += view_title(view.spec) # Deletion must take place before computation, since it affects the outcome with html.plugged(): @@ -220,7 +220,7 @@ def render_availability_page(view, datasource, context, filterheaders, only_site # Now compute all data, we need this also for CSV export if not html.has_user_errors(): av_rawdata, has_reached_logrow_limit = \ - availability.get_availability_rawdata(what, context, filterheaders, only_sites, + availability.get_availability_rawdata(what, context, filterheaders, view.only_sites, av_object, av_mode == "timeline", avoptions) av_data = availability.compute_availability(what, av_rawdata, avoptions) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index d5b68b3..dc8158a 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1241,7 +1241,7 @@ def show_view(view, view_renderer, only_count=False): context.update(visuals.get_singlecontext_html_vars(view.spec)) return cmk.gui.plugins.views.availability.render_availability_page( - view.spec, view.datasource, context, filterheaders, view.only_sites, view.row_limit) + view, context, filterheaders) query = filterheaders + view.spec.get("add_headers", "")

5 years, 4 months

Propagate View objects to Cell instances instead of the view spec

by Lars Michelsen

Module: check_mk Branch: master Commit: e98e41b853bb128b41a8c5fe49cf293d56d0cf4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e98e41b853bb12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 14:38:37 2019 +0100 Propagate View objects to Cell instances instead of the view spec Change-Id: I7dc67c27220386af928b193d12a98ed030497461 --- cmk/gui/plugins/views/utils.py | 20 ++++++++++---------- cmk/gui/views.py | 8 ++++---- tests/unit/cmk/gui/test_views.py | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cmk/gui/plugins/views/utils.py b/cmk/gui/plugins/views/utils.py index 82285a6..6a006b1 100644 --- a/cmk/gui/plugins/views/utils.py +++ b/cmk/gui/plugins/views/utils.py @@ -93,7 +93,7 @@ class PainterOptions(object): options.update(cell.painter_options()) # Also layouts can register painter options - layout_class = layout_registry.get(view.get("layout")) + layout_class = layout_registry.get(view.spec.get("layout")) if layout_class: options.update(layout_class().painter_options) @@ -119,18 +119,18 @@ class PainterOptions(object): vo[view_name] = self._options config.user.save_file("viewoptions", vo) - def update_from_url(self, view_name, view): + def update_from_url(self, view): self._load_used_options(view) if not self.painter_option_form_enabled(): return if html.request.has_var("_reset_painter_options"): - self._clear_painter_options(view_name) + self._clear_painter_options(view.name) return elif html.request.has_var("_update_painter_options"): - self._set_from_submitted_form(view_name) + self._set_from_submitted_form(view.name) def _set_from_submitted_form(self, view_name): # TODO: Remove all keys that are in painter_option_registry @@ -1596,8 +1596,8 @@ def painter_exists(painter_spec): return painter_name in painter_registry -# A cell is an instance of a painter in a view (-> a cell or a grouping cell) class Cell(object): + """A cell is an instance of a painter in a view (-> a cell or a grouping cell)""" # Wanted to have the "parse painter spec logic" in one place (The Cell() class) # but this should be cleaned up more. TODO: Move this to another place @@ -1746,7 +1746,7 @@ class Cell(object): onclick = '' title = '' if display_options.enabled(display_options.L) \ - and self._view.get('user_sortable', False) \ + and self._view.spec.get('user_sortable', False) \ and get_sorter_name_of_painter(self.painter_name()) is not None: params = [ ('sort', self._sort_url()), @@ -1754,7 +1754,7 @@ class Cell(object): if display_options.title_options: params.append(('display_options', display_options.title_options)) - classes += ["sort", get_primary_sorter_order(self._view, self.painter_name())] + classes += ["sort", get_primary_sorter_order(self._view.spec, self.painter_name())] onclick = "location.href=\'%s\'" % html.makeuri(params, 'sort') title = _('Sort by %s') % self.title() @@ -1776,7 +1776,7 @@ class Cell(object): """ sorter = [] - group_sort, user_sort, view_sort = get_separated_sorters(self._view) + group_sort, user_sort, view_sort = get_separated_sorters(self._view.spec) sorter = group_sort + user_sort + view_sort @@ -1968,7 +1968,7 @@ class EmptyCell(Cell): def get_cells(view): cells = [] - for e in view["painters"]: + for e in view.spec["painters"]: if not painter_exists(e): continue @@ -1982,7 +1982,7 @@ def get_cells(view): def get_group_cells(view): - return [Cell(view, e) for e in view["group_painters"] if painter_exists(e)] + return [Cell(view, e) for e in view.spec["group_painters"] if painter_exists(e)] def output_csv_headers(view): diff --git a/cmk/gui/views.py b/cmk/gui/views.py index d1f0087..815e9a8 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -366,7 +366,7 @@ class GUIViewRenderer(ViewRenderer): pass # currently no feed back on webservice painter_options = PainterOptions.get_instance() - painter_options.show_form(view_spec) + painter_options.show_form(self.view) # The refreshing content container if display_options.enabled(display_options.R): @@ -1152,7 +1152,7 @@ def page_view(): painter_options = PainterOptions.get_instance() painter_options.load(view.name) - painter_options.update_from_url(view.name, view.spec) + painter_options.update_from_url(view) view_renderer = GUIViewRenderer(view, show_buttons=True) show_view(view, view_renderer) @@ -1255,8 +1255,8 @@ def show_view(view, view_renderer, only_count=False): # Group cells: Are displayed as titles of grouped rows # Regular cells: Are displaying information about the rows of the type the view is about # Join cells: Are displaying information of a joined source (e.g.service data on host views) - group_cells = get_group_cells(view.spec) - cells = get_cells(view.spec) + group_cells = get_group_cells(view) + cells = get_cells(view) join_cells = get_join_cells(cells) # Now compute the list of all columns we need to query via Livestatus. diff --git a/tests/unit/cmk/gui/test_views.py b/tests/unit/cmk/gui/test_views.py index 731cfed..c55a1f6 100644 --- a/tests/unit/cmk/gui/test_views.py +++ b/tests/unit/cmk/gui/test_views.py @@ -5727,8 +5727,8 @@ def test_get_needed_regular_columns(register_builtin_html, load_view_plugins): view = cmk.gui.views.View(view_name, view_spec) sorters = cmk.gui.views._get_sorters(view.spec, user_sort_parameter=None) - group_cells = cmk.gui.views.get_group_cells(view.spec) - cells = cmk.gui.views.get_cells(view.spec) + group_cells = cmk.gui.views.get_group_cells(view) + cells = cmk.gui.views.get_cells(view) columns = cmk.gui.views._get_needed_regular_columns(group_cells + cells, sorters, view.datasource) assert sorted(columns) == sorted([ @@ -5778,7 +5778,7 @@ def test_get_needed_join_columns(register_builtin_html, load_view_plugins): view = cmk.gui.views.View(view_name, view_spec) sorters = cmk.gui.views._get_sorters(view.spec, user_sort_parameter=None) - cells = cmk.gui.views.get_cells(view.spec) + cells = cmk.gui.views.get_cells(view) join_cells = cmk.gui.views.get_join_cells(cells) columns = cmk.gui.views._get_needed_join_columns(join_cells, sorters)

5 years, 4 months

Move show_view() specific only_count handling out of get_sorters()

by Lars Michelsen

Module: check_mk Branch: master Commit: 1f3d316256f01d1105ec1fa2a524ed5360c29da2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f3d316256f01d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 14:27:08 2019 +0100 Move show_view() specific only_count handling out of get_sorters() Change-Id: Ia3d49312a7875052983132da1be9ef455d6ec40c --- cmk/gui/views.py | 10 +++++----- tests/unit/cmk/gui/test_views.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index dc8158a..d1f0087 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1246,7 +1246,10 @@ def show_view(view, view_renderer, only_count=False): query = filterheaders + view.spec.get("add_headers", "") # Sorting - use view sorters and URL supplied sorters - sorters = get_sorters(view.spec, only_count, html.request.var("sort")) + if only_count: + sorters = [] + else: + sorters = _get_sorters(view.spec, html.request.var("sort")) # Prepare cells of the view # Group cells: Are displayed as titles of grouped rows @@ -1354,10 +1357,7 @@ def show_view(view, view_renderer, only_count=False): SorterEntry = namedtuple("SorterEntry", ["sorter", "negate", "join_key"]) -def get_sorters(view, only_count, user_sort_parameter): - if only_count: - return [] - +def _get_sorters(view, user_sort_parameter): user_sorters = parse_url_sorters(user_sort_parameter) if user_sorters: sorter_list = user_sorters diff --git a/tests/unit/cmk/gui/test_views.py b/tests/unit/cmk/gui/test_views.py index 23c9f94..731cfed 100644 --- a/tests/unit/cmk/gui/test_views.py +++ b/tests/unit/cmk/gui/test_views.py @@ -5726,7 +5726,7 @@ def test_get_needed_regular_columns(register_builtin_html, load_view_plugins): view = cmk.gui.views.View(view_name, view_spec) - sorters = cmk.gui.views.get_sorters(view.spec, only_count=False, user_sort_parameter=None) + sorters = cmk.gui.views._get_sorters(view.spec, user_sort_parameter=None) group_cells = cmk.gui.views.get_group_cells(view.spec) cells = cmk.gui.views.get_cells(view.spec) @@ -5777,7 +5777,7 @@ def test_get_needed_join_columns(register_builtin_html, load_view_plugins): view = cmk.gui.views.View(view_name, view_spec) - sorters = cmk.gui.views.get_sorters(view.spec, only_count=False, user_sort_parameter=None) + sorters = cmk.gui.views._get_sorters(view.spec, user_sort_parameter=None) cells = cmk.gui.views.get_cells(view.spec) join_cells = cmk.gui.views.get_join_cells(cells)

5 years, 4 months

← Newer
1
...
33
34
35
36
37
38
39
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019