Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

Moved join_columns to join implementation

by Lars Michelsen

Module: check_mk Branch: master Commit: 802aa0a1936274630d2b40531e327787be9b709d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=802aa0a1936274… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 19:54:04 2019 +0100 Moved join_columns to join implementation Change-Id: I3ed2b1a62dde6ed2a9dd3e8b5969a08da736ea5d --- cmk/gui/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index f3d9b17..033e7ee 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1317,7 +1317,6 @@ def show_view(view, view_renderer, only_count=False): # Prepare cells of the view group_cells = view.group_cells cells = view.row_cells - join_cells = view.join_cells # Now compute the list of all columns we need to query via Livestatus. # Those are: (1) columns used by the sorters in use, (2) columns use by @@ -1326,7 +1325,6 @@ def show_view(view, view_renderer, only_count=False): # is the trickiest. Also compute this list of view options use by the # painters columns = _get_needed_regular_columns(group_cells + cells, sorters, view.datasource) - join_columns = _get_needed_join_columns(join_cells, sorters) # Fetch data. Some views show data only after pressing [Search] if (only_count or (not view.spec.get("mustsearch")) or @@ -1335,8 +1333,8 @@ def show_view(view, view_renderer, only_count=False): all_active_filters) # Now add join information, if there are join columns - if join_cells: - _do_table_join(view, rows, filterheaders, join_cells, join_columns) + if view.join_cells: + _do_table_join(view, rows, filterheaders, sorters) # If any painter, sorter or filter needs the information about the host's # inventory, then we load it and attach it as column "host_inventory" @@ -1494,10 +1492,12 @@ def columns_of_cells(cells): return columns -def _do_table_join(view, master_rows, master_filters, join_cells, join_columns): +def _do_table_join(view, master_rows, master_filters, sorters): join_table, join_master_column = view.datasource.join slave_ds = data_source_registry[join_table]() join_slave_column = slave_ds.join_key + join_cells = view.join_cells + join_columns = _get_needed_join_columns(join_cells, sorters) # Create additional filters join_filters = []

5 years, 3 months

Simplified view tests

by Lars Michelsen

Module: check_mk Branch: master Commit: cbf99c0369f1ed2745d7a6eb85de072b852fa289 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbf99c0369f1ed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 09:40:48 2019 +0100 Simplified view tests Change-Id: Ibbb0b9847c3c4eac76493ddce7885ce42c8aa65f --- tests/unit/cmk/gui/test_views.py | 51 ++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/tests/unit/cmk/gui/test_views.py b/tests/unit/cmk/gui/test_views.py index 81460aa..51a0290 100644 --- a/tests/unit/cmk/gui/test_views.py +++ b/tests/unit/cmk/gui/test_views.py @@ -22,6 +22,12 @@ def load_view_plugins(register_builtin_html, monkeypatch, tmpdir): monkeypatch.setattr(config, "config_dir", "%s" % config_dir) modules.load_all_plugins() +(a)pytest.fixture() +def view(register_builtin_html, load_view_plugins): + view_name = "allhosts" + view_spec = cmk.gui.views.multisite_builtin_views[view_name] + return cmk.gui.views.View(view_name, view_spec) + def test_registered_painter_options(): expected = [ @@ -5720,7 +5726,7 @@ def test_register_sorter(monkeypatch): assert sorter.cmp.__name__ == cmpfunc.__name__ -def test_get_needed_regular_columns(register_builtin_html, load_view_plugins): +def test_get_needed_regular_columns(view): view_name = "allhosts" view_spec = cmk.gui.views.multisite_builtin_views[view_name] @@ -5764,14 +5770,10 @@ def test_get_needed_regular_columns(register_builtin_html, load_view_plugins): ]) -def test_get_needed_join_columns(register_builtin_html, load_view_plugins): - view_name = "allhosts" - builtin_view_spec = cmk.gui.views.multisite_builtin_views[view_name] - - view_spec = copy.deepcopy(builtin_view_spec) +def test_get_needed_join_columns(view): + view_spec = copy.deepcopy(view.spec) view_spec["painters"].append(('service_description', None, None, u'CPU load')) - - view = cmk.gui.views.View(view_name, view_spec) + view = cmk.gui.views.View(view.name, view_spec) columns = cmk.gui.views._get_needed_join_columns(view.join_cells, view.sorters) assert sorted(columns) == sorted([ @@ -5779,27 +5781,27 @@ def test_get_needed_join_columns(register_builtin_html, load_view_plugins): 'service_description', ]) -def test_create_view_basics(register_builtin_html, load_view_plugins): +def test_create_view_basics(load_view_plugins): view_name = "allhosts" view_spec = cmk.gui.views.multisite_builtin_views[view_name] - view = cmk.gui.views.View(view_name, view_spec) + assert view.name == view_name assert view.spec == view_spec assert isinstance(view.datasource, cmk.gui.plugins.views.utils.DataSource) + assert isinstance(view.datasource.table, cmk.gui.plugins.views.utils.RowTable) assert view.row_limit is None + assert view.user_sorters is None + assert view.only_sites is None -def test_view_row_limit(register_builtin_html, load_view_plugins): - view_name = "allhosts" - view_spec = cmk.gui.views.multisite_builtin_views[view_name] - - view = cmk.gui.views.View(view_name, view_spec) +def test_view_row_limit(view): assert view.row_limit is None view.row_limit = 101 assert view.row_limit == 101 - assert cmk.gui.views.get_limit() == 1000 @pytest.mark.parametrize("limit,permissions,result", [ + (None, [], 1000), + ("soft", [], 1000), ("hard", [], 1000), ("none", [], 1000), @@ -5814,26 +5816,19 @@ def test_view_row_limit(register_builtin_html, load_view_plugins): ("none", ["general.ignore_soft_limit", "general.ignore_hard_limit"], None), ]) def test_gui_view_row_limit(register_builtin_html, monkeypatch, limit, permissions, result): - monkeypatch.setitem(html.request._vars, "limit", limit) + if limit is not None: + monkeypatch.setitem(html.request._vars, "limit", limit) + for perm in permissions: monkeypatch.setitem(config.user.permissions, perm, True) assert cmk.gui.views.get_limit() == result -def test_view_only_sites(register_builtin_html, load_view_plugins): - view_name = "allhosts" - view_spec = cmk.gui.views.multisite_builtin_views[view_name] - - view = cmk.gui.views.View(view_name, view_spec) +def test_view_only_sites(view): assert view.only_sites is None view.only_sites = ["unit"] assert view.only_sites == ["unit"] -def test_view_user_sorters(register_builtin_html, load_view_plugins): - view_name = "allhosts" - view_spec = cmk.gui.views.multisite_builtin_views[view_name] - - view = cmk.gui.views.View(view_name, view_spec) - +def test_view_user_sorters(view): assert view.user_sorters is None view.user_sorters = [("abc", True)] assert view.user_sorters == [("abc", True)]

5 years, 3 months

Move cell collection computation to View class

by Lars Michelsen

Module: check_mk Branch: master Commit: 3cf3454f938fee25d824ebe6f5fb2f4631cf0ac1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cf3454f938fee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 18:24:40 2019 +0100 Move cell collection computation to View class Change-Id: Ie3ab93296f92f5e439a0bf8b24c103c4b27e9f68 --- cmk/gui/plugins/views/utils.py | 21 +----------------- cmk/gui/views.py | 47 +++++++++++++++++++++++++++------------- tests/unit/cmk/gui/test_views.py | 10 ++------- 3 files changed, 35 insertions(+), 43 deletions(-) diff --git a/cmk/gui/plugins/views/utils.py b/cmk/gui/plugins/views/utils.py index 2c998cf..dde56d4 100644 --- a/cmk/gui/plugins/views/utils.py +++ b/cmk/gui/plugins/views/utils.py @@ -89,7 +89,7 @@ class PainterOptions(object): def _load_used_options(self, view): options = set([]) - for cell in get_group_cells(view) + get_cells(view): + for cell in view.group_cells + view.row_cells: options.update(cell.painter_options()) # Also layouts can register painter options @@ -1966,25 +1966,6 @@ class EmptyCell(Cell): return False -def get_cells(view): - cells = [] - for e in view.spec["painters"]: - if not painter_exists(e): - continue - - if Cell.is_join_cell(e): - cells.append(JoinCell(view, e)) - - else: - cells.append(Cell(view, e)) - - return cells - - -def get_group_cells(view): - return [Cell(view, e) for e in view.spec["group_painters"] if painter_exists(e)] - - def output_csv_headers(view): filename = '%s-%s.csv' % (view['name'], time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index fb7efa4..f3d9b17 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -92,6 +92,7 @@ from cmk.gui.plugins.views.utils import ( sorter_registry, get_permitted_views, get_all_views, + painter_exists, PainterOptions, ) @@ -105,7 +106,7 @@ from cmk.gui.plugins.views.utils import ( # pylint: disable=unused-import cmp_insensitive_string, cmp_num_split, cmp_custom_variable, cmp_service_name_equiv, cmp_string_list, cmp_ip_address, get_custom_var, get_perfdata_nth_value, get_tag_group, query_data, do_query_data, join_row, get_view_infos, replace_action_url_macros, Cell, JoinCell, - get_cells, get_group_cells, register_legacy_command, register_painter, register_sorter, + register_legacy_command, register_painter, register_sorter, ) # Needed for legacy (pre 1.6) plugins @@ -228,6 +229,33 @@ class View(object): "because the datasource does not exist.") % (self.name, self.datasource)) @property + def row_cells(self): + # type: () -> List[Cell] + """Regular cells are displaying information about the rows of the type the view is about""" + cells = [] + for e in self.spec["painters"]: + if not painter_exists(e): + continue + + if Cell.is_join_cell(e): + cells.append(JoinCell(self, e)) + else: + cells.append(Cell(self, e)) + + return cells + + @property + def group_cells(self): + # type: () -> List[Cell] + """Group cells are displayed as titles of grouped rows""" + return [Cell(self, e) for e in self.spec["group_painters"] if painter_exists(e)] + + @property + def join_cells(self): + """Join cells are displaying information of a joined source (e.g.service data on host views)""" + return [x for x in self.row_cells if isinstance(x, JoinCell)] + + @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( @@ -1287,12 +1315,9 @@ def show_view(view, view_renderer, only_count=False): sorters = view.sorters # Prepare cells of the view - # 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) - cells = get_cells(view) - join_cells = get_join_cells(cells) + group_cells = view.group_cells + cells = view.row_cells + join_cells = view.join_cells # Now compute the list of all columns we need to query via Livestatus. # Those are: (1) columns used by the sorters in use, (2) columns use by @@ -1392,14 +1417,6 @@ def show_view(view, view_renderer, only_count=False): SorterEntry = namedtuple("SorterEntry", ["sorter", "negate", "join_key"]) -def get_join_cells(cell_list): - return [x for x in cell_list if isinstance(x, JoinCell)] - - -def get_regular_cells(cell_list): - return [x for x in cell_list if isinstance(x, Cell)] - - def _get_needed_regular_columns(cells, sorters, datasource): # BI availability needs aggr_tree # TODO: wtf? a full reset of the list? Move this far away to a special place! diff --git a/tests/unit/cmk/gui/test_views.py b/tests/unit/cmk/gui/test_views.py index e5d6885..81460aa 100644 --- a/tests/unit/cmk/gui/test_views.py +++ b/tests/unit/cmk/gui/test_views.py @@ -5726,10 +5726,7 @@ def test_get_needed_regular_columns(register_builtin_html, load_view_plugins): view = cmk.gui.views.View(view_name, 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, view.sorters, view.datasource) + columns = cmk.gui.views._get_needed_regular_columns(view.group_cells + view.row_cells, view.sorters, view.datasource) assert sorted(columns) == sorted([ 'host_scheduled_downtime_depth', 'host_in_check_period', @@ -5776,10 +5773,7 @@ def test_get_needed_join_columns(register_builtin_html, load_view_plugins): view = cmk.gui.views.View(view_name, 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, view.sorters) + columns = cmk.gui.views._get_needed_join_columns(view.join_cells, view.sorters) assert sorted(columns) == sorted([ 'host_name', 'service_description',

5 years, 3 months

Move user sorter handling to View

by Lars Michelsen

Module: check_mk Branch: master Commit: 03c3c9bbea1f24de857fc13a9db17d0e21c62303 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03c3c9bbea1f24… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 15:18:49 2019 +0100 Move user sorter handling to View * The configured sorting of the rows may be modified by the user by clicking on the column header * The user sets the HTTP variable "sort" in this moment * Moved processing of this HTTP variable out of show_view() and _get_separated_sorters(). * The HTTP variable is now processed equal to other user modifyable variables (row_limit and only_sites at the moment) and set on the View() instances to make it avaiable to other code parts. Change-Id: Ibf79c222878067d3c61d5a1cdd5300af1e12bd7b --- cmk/gui/mobile.py | 2 ++ cmk/gui/plugins/dashboard/view.py | 1 + cmk/gui/plugins/views/utils.py | 51 +++++++++++++-------------------------- cmk/gui/views.py | 47 +++++++++++++++++++++++++++++------- tests/unit/cmk/gui/test_views.py | 14 +++++++++-- 5 files changed, 70 insertions(+), 45 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=03c3c9bbea…

5 years, 3 months

Moved only_sites handling to View()

by Lars Michelsen

Module: check_mk Branch: master Commit: 46fa60bdb147906f6cb31eeff789afe2e1787ec3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46fa60bdb14790… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 14:05:59 2019 +0100 Moved only_sites handling to View() Change-Id: I036c3964293c277bfb65884fb8db9eba7cfc242a --- cmk/gui/mobile.py | 2 ++ cmk/gui/plugins/dashboard/view.py | 1 + cmk/gui/views.py | 44 ++++++++++++++++++++++++++------------- tests/unit/cmk/gui/test_views.py | 9 ++++++++ 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/cmk/gui/mobile.py b/cmk/gui/mobile.py index e872aa8..3a06fcc 100644 --- a/cmk/gui/mobile.py +++ b/cmk/gui/mobile.py @@ -237,6 +237,7 @@ def page_index(): if view_spec.get("mobile") and not view_spec.get("hidden"): view = views.View(view_name, view_spec) view.row_limit = views.get_limit() + view.only_sites = views.get_only_sites() url = "mobile_view.py?view_name=%s" % view_name count = "" @@ -284,6 +285,7 @@ def page_view(): view = views.View(view_name, view_spec) view.row_limit = views.get_limit() + view.only_sites = views.get_only_sites() title = views.view_title(view_spec) mobile_html_head(title) diff --git a/cmk/gui/plugins/dashboard/view.py b/cmk/gui/plugins/dashboard/view.py index e6c0e93..f80f1f7 100644 --- a/cmk/gui/plugins/dashboard/view.py +++ b/cmk/gui/plugins/dashboard/view.py @@ -94,6 +94,7 @@ class ViewDashlet(IFrameDashlet): view = views.View(self._dashlet_spec["name"], self._dashlet_spec) view.row_limit = views.get_limit() + view.only_sites = views.get_only_sites() view_renderer = views.GUIViewRenderer(view, show_buttons=False) views.show_view(view, view_renderer) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 2185956..d5b68b3 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -31,7 +31,7 @@ import pprint import traceback import json from collections import namedtuple -from typing import Dict # pylint: disable=unused-import +from typing import Dict, Optional, List # pylint: disable=unused-import import livestatus @@ -210,6 +210,7 @@ class View(object): self.name = view_name self.spec = view_spec self._row_limit = None # type: Optional[int] + self._only_sites = None # type: Optional[List[str]] @property def datasource(self): @@ -238,6 +239,19 @@ class View(object): def row_limit(self, row_limit): self._row_limit = row_limit + @property + def only_sites(self): + """Optional list of sites to query instead of all sites + + This is a performance feature. It is highly recommended to set the only_sites attribute + whenever it is possible. In the moment it is set a livestatus query is not sent to all + sites anymore but only to the given list of sites.""" + return self._only_sites + + @only_sites.setter + def only_sites(self, only_sites): + self._only_sites = only_sites + class ViewRenderer(object): __metaclass__ = abc.ABCMeta @@ -1128,6 +1142,7 @@ def page_view(): view = View(view_name, view_spec) view.row_limit = get_limit() + view.only_sites = get_only_sites() # Gather the page context which is needed for the "add to visual" popup menu # to add e.g. views to dashboards or reports @@ -1217,12 +1232,6 @@ def show_view(view, view_renderer, only_count=False): continue filterheaders += header - # Apply the site hint / filter - if html.request.var("site"): - only_sites = [html.request.var("site")] - else: - only_sites = None - # Fork to availability view. We just need the filter headers, since we do not query the normal # hosts and service table, but "statehist". This is *not* true for BI availability, though (see later) if html.request.var("mode") == "availability" and ("aggr" not in view.datasource.infos or @@ -1232,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, only_sites, view.row_limit) + view.spec, view.datasource, context, filterheaders, view.only_sites, view.row_limit) query = filterheaders + view.spec.get("add_headers", "") @@ -1259,13 +1268,12 @@ def show_view(view, view_renderer, only_count=False): # Fetch data. Some views show data only after pressing [Search] if (only_count or (not view.spec.get("mustsearch")) or html.request.var("filled_in") in ["filter", 'actions', 'confirm', 'painteroptions']): - rows = view.datasource.table.query(view, columns, query, only_sites, view.row_limit, + rows = view.datasource.table.query(view, columns, query, view.only_sites, view.row_limit, all_active_filters) # Now add join information, if there are join columns if join_cells: - _do_table_join(view.datasource, rows, filterheaders, join_cells, join_columns, - only_sites) + _do_table_join(view, rows, filterheaders, join_cells, join_columns) # If any painter, sorter or filter needs the information about the host's # inventory, then we load it and attach it as column "host_inventory" @@ -1458,8 +1466,8 @@ def columns_of_cells(cells): return columns -def _do_table_join(master_ds, master_rows, master_filters, join_cells, join_columns, only_sites): - join_table, join_master_column = master_ds.join +def _do_table_join(view, master_rows, master_filters, join_cells, join_columns): + join_table, join_master_column = view.datasource.join slave_ds = data_source_registry[join_table]() join_slave_column = slave_ds.join_key @@ -1474,7 +1482,7 @@ def _do_table_join(master_ds, master_rows, master_filters, join_cells, join_colu datasource=slave_ds, columns=[join_master_column, join_slave_column] + join_columns, add_headers=query, - only_sites=only_sites, + only_sites=view.only_sites, limit=None) per_master_entry = {} current_key = None @@ -1537,6 +1545,14 @@ def play_alarm_sounds(): break # only one sound at one time +def get_only_sites(): + # type: () -> Optional[List[str]] + """Is the view limited to specific sites by request?""" + if html.request.var("site"): + return [html.request.var("site")] + return None + + def get_limit(): """How many data rows may the user query?""" limitvar = html.request.var("limit", "soft") diff --git a/tests/unit/cmk/gui/test_views.py b/tests/unit/cmk/gui/test_views.py index a1f84e0..23c9f94 100644 --- a/tests/unit/cmk/gui/test_views.py +++ b/tests/unit/cmk/gui/test_views.py @@ -5826,3 +5826,12 @@ def test_gui_view_row_limit(register_builtin_html, monkeypatch, limit, permissio for perm in permissions: monkeypatch.setitem(config.user.permissions, perm, True) assert cmk.gui.views.get_limit() == result + +def test_view_only_sites(register_builtin_html, load_view_plugins): + view_name = "allhosts" + view_spec = cmk.gui.views.multisite_builtin_views[view_name] + + view = cmk.gui.views.View(view_name, view_spec) + assert view.only_sites is None + view.only_sites = ["unit"] + assert view.only_sites == ["unit"]

5 years, 3 months

fixed oracle db connect

by Marcel Arentz

Module: check_mk Branch: master Commit: e13219a4c60ed15740602a9101b6e82ab195ed3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e13219a4c60ed1… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Mar 7 09:43:34 2019 +0100 fixed oracle db connect Change-Id: Iff426bf246cab53bb2bb353cfd64beed800e4176 --- agents/plugins/mk_oracle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 1a27915..1a2b672 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -2126,10 +2126,7 @@ mk_ora_db_connect () { # => use the wallet with tnsnames.ora or EZCONNECT TNSALIAS=${TNSALIAS:-"localhost:1521/${ORACLE_SID}"} else - if [ ! "${DBSYSCONNECT:-'None'}" = "None" ]; then - assysdbaconnect=" as "${DBSYSCONNECT} - fi - + assysdbaconnect=${DBSYSCONNECT:-} TNSALIAS=${TNSALIAS:-"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=${DBHOST:-"localhost"})(PORT=${DBPORT:-1521}))(CONNECT_DATA=(SID=${ORACLE_SID})(SERVER=DEDICATED)(UR=A)))"} # ORADBUSER = '/'? => ignore DBPASSWORD and use the wallet

5 years, 3 months

ibm_svc_*: Added regressions tests

by Simon Betz

Module: check_mk Branch: master Commit: 61b1087c6e0b88f6722f74337880a4dae241b3de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61b1087c6e0b88… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 7 09:41:58 2019 +0100 ibm_svc_*: Added regressions tests Change-Id: Ie8bab790f3834305406f35883da9375b13032029 --- .../datasets/ibm_svc_array_regression.py | 67 +++ .../datasets/ibm_svc_disks_regression.py | 317 +++++++++++ .../datasets/ibm_svc_enclosure_regression.py | 148 +++++ .../datasets/ibm_svc_enclosurestats_regression.py | 56 ++ .../datasets/ibm_svc_host_regression.py | 22 + .../datasets/ibm_svc_mdisk_regression.py | 230 ++++++++ .../datasets/ibm_svc_mdiskgrp_regression.py | 617 +++++++++++++++++++++ .../datasets/ibm_svc_node_regression.py | 93 ++++ .../datasets/ibm_svc_nodestats_regression.py | 131 +++++ .../datasets/ibm_svc_portfc_regression.py | 117 ++++ .../datasets/ibm_svc_portsas_regression.py | 234 ++++++++ 11 files changed, 2032 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=61b1087c6e…

5 years, 3 months

ibm_svc_enclosure: Fixed file formatting

by Simon Betz

Module: check_mk Branch: master Commit: baab8b4eedbef3c8f3119e9491795ae911453e40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baab8b4eedbef3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 7 09:44:15 2019 +0100 ibm_svc_enclosure: Fixed file formatting Change-Id: Iebd0f1419d0ddde7eb8b74974662ec76b92ec119 --- checks/ibm_svc_enclosure | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/checks/ibm_svc_enclosure b/checks/ibm_svc_enclosure index 9d6aeee..af0a92c 100644 --- a/checks/ibm_svc_enclosure +++ b/checks/ibm_svc_enclosure @@ -64,9 +64,8 @@ def check_ibm_svc_enclosure(item, _no_params, info): for line in info: if line[0] == item: if len(line) == 9: - line = line[:3] + [None, None, None] + line[3:7] + [ - None - ] + line[7:] + [None, None, None, None] + line = line[:3] + [None, None, None + ] + line[3:7] + [None] + line[7:] + [None, None, None, None] elif len(line) == 13: line = line + [None, None, None, None] elif len(line) == 15: @@ -93,8 +92,7 @@ def check_ibm_svc_enclosure(item, _no_params, info): (online_canisters, total_canisters, 'canisters'), (online_PSUs, total_PSUs, "PSUs"), (online_fan_modules, total_fan_modules, 'fan modules'), - (online_secondary_expander_modules, - total_secondary_expander_modules, + (online_secondary_expander_modules, total_secondary_expander_modules, 'secondary expander modules'), ]: if online is None:

5 years, 3 months

ibm_svc_enclosurestats: Removed unit from perf value

by Simon Betz

Module: check_mk Branch: master Commit: 44700a549be6aabf1d426bd6c7604b56d7dbd3e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44700a549be6aa… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 7 09:39:24 2019 +0100 ibm_svc_enclosurestats: Removed unit from perf value Change-Id: Ie81727154b2dc5a75c02f7cc6f17ac69f091d2a7 --- checks/ibm_svc_enclosurestats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ibm_svc_enclosurestats b/checks/ibm_svc_enclosurestats index 4de4812..4b1ccd8 100644 --- a/checks/ibm_svc_enclosurestats +++ b/checks/ibm_svc_enclosurestats @@ -98,7 +98,7 @@ def check_ibm_svc_enclosurestats_power(item, _no_params, info): for enclosure_id, stat_name, stat_current, _stat_peak, _stat_peak_time in info: if enclosure_id == item and stat_name == "power_w": stat_current = int(stat_current) - perfdata = [('power', str(stat_current) + "Watt")] + perfdata = [('power', stat_current)] return 0, "Enclosure %s Power Consumption is %s Watt" % (enclosure_id, stat_current), perfdata

5 years, 3 months

ibm_svc_enclosure: Fixed unused variable

by Simon Betz

Module: check_mk Branch: master Commit: 27e0b6c80aa6c16a1a1a27549deece1338fa7985 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27e0b6c80aa6c1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 7 09:29:07 2019 +0100 ibm_svc_enclosure: Fixed unused variable Change-Id: Ie01742db80c9b36365617539360ed93bb32787d7 --- checks/ibm_svc_enclosure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ibm_svc_enclosure b/checks/ibm_svc_enclosure index 9383cca..9d6aeee 100644 --- a/checks/ibm_svc_enclosure +++ b/checks/ibm_svc_enclosure @@ -77,7 +77,7 @@ def check_ibm_svc_enclosure(item, _no_params, info): yield 3, "Unknown format" return - enclosure_id, enclosure_status, _enclosure_type, _managed, _IO_group_id, \ + _enclosure_id, enclosure_status, _enclosure_type, _managed, _IO_group_id, \ _IO_group_name, _product_MTM, _serial_number, total_canisters, online_canisters, \ total_PSUs, online_PSUs, _drive_slots, total_fan_modules, online_fan_modules, \ total_secondary_expander_modules, online_secondary_expander_modules = line

5 years, 3 months

← Newer
1
...
34
35
36
37
38
39
40
...
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