Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

Cleaned up more arguments of ViewRenderer.render()

by Lars Michelsen

Module: check_mk Branch: master Commit: ebd02786071a8dfb5c06e1c669294e8ff57033a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebd02786071a8d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 3 20:01:20 2019 +0100 Cleaned up more arguments of ViewRenderer.render() Removed mostly unused show_heading, show_buttons, show_footer args of ViewRenderer.render(). The GUIViewRenderer() only needs a flag for show_buttons to handle single view and the dashlet view cases correctly. Change-Id: If93342dc435dcd0c3bb16893f5af0a707e94cb65 --- cmk/gui/mobile.py | 7 ++--- cmk/gui/plugins/dashboard/view.py | 5 ++- cmk/gui/views.py | 66 ++++++++++++++++++--------------------- 3 files changed, 35 insertions(+), 43 deletions(-) diff --git a/cmk/gui/mobile.py b/cmk/gui/mobile.py index 6ee9323..0a637ff 100644 --- a/cmk/gui/mobile.py +++ b/cmk/gui/mobile.py @@ -290,8 +290,7 @@ def page_view(): try: view_renderer = MobileViewRenderer(view) - views.show_view( - view, view_renderer, show_heading=False, show_buttons=False, show_footer=False) + views.show_view(view, view_renderer) except Exception as e: if config.debug: raise @@ -301,8 +300,8 @@ def page_view(): class MobileViewRenderer(views.ViewRenderer): - def render(self, rows, group_cells, cells, show_heading, show_buttons, show_checkboxes, layout, - num_columns, show_filters, show_footer, browser_reload): + def render(self, rows, group_cells, cells, show_checkboxes, layout, num_columns, show_filters, + browser_reload): view_spec = self.view.spec home = ("mobile.py", "Home", "home") diff --git a/cmk/gui/plugins/dashboard/view.py b/cmk/gui/plugins/dashboard/view.py index 3652fd9..1533902 100644 --- a/cmk/gui/plugins/dashboard/view.py +++ b/cmk/gui/plugins/dashboard/view.py @@ -92,6 +92,5 @@ class ViewDashlet(IFrameDashlet): painter_options = PainterOptions.get_instance() painter_options.load(self._dashlet_spec["name"]) view = views.View(self._dashlet_spec["name"], self._dashlet_spec) - view_renderer = views.GUIViewRenderer(view) - views.show_view( - view, view_renderer, show_heading=True, show_buttons=False, show_footer=True) + 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 d66274f..71b9cfe 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -235,27 +235,29 @@ class ViewRenderer(object): self.view = view @abc.abstractmethod - def render(self, rows, group_cells, cells, show_heading, show_buttons, show_checkboxes, layout, - num_columns, show_filters, show_footer, browser_reload): + def render(self, rows, group_cells, cells, show_checkboxes, layout, num_columns, show_filters, + browser_reload): raise NotImplementedError() class GUIViewRenderer(ViewRenderer): - def render(self, rows, group_cells, cells, show_heading, show_buttons, show_checkboxes, layout, - num_columns, show_filters, show_footer, browser_reload): + def __init__(self, view, show_buttons): + super(GUIViewRenderer, self).__init__(view) + self._show_buttons = show_buttons + + def render(self, rows, group_cells, cells, show_checkboxes, layout, num_columns, show_filters, + browser_reload): view_spec = self.view.spec if html.transaction_valid() and html.do_actions(): html.set_browser_reload(0) - # Show heading (change between "preview" mode and full page mode) - if show_heading: - # Show/Hide the header with page title, MK logo, etc. - if display_options.enabled(display_options.H): - html.body_start(view_title(view_spec)) + # Show/Hide the header with page title, MK logo, etc. + if display_options.enabled(display_options.H): + html.body_start(view_title(view_spec)) - if display_options.enabled(display_options.T): - html.top_heading(view_title(view_spec)) + if display_options.enabled(display_options.T): + html.top_heading(view_title(view_spec)) has_done_actions = False row_count = len(rows) @@ -268,7 +270,7 @@ class GUIViewRenderer(ViewRenderer): if command_form: weblib.init_selection() - if show_buttons: + if self._show_buttons: show_combined_graphs_button = \ ("host" in self.view.datasource.infos or "service" in self.view.datasource.infos) and \ (isinstance(self.view.datasource.table, str)) and \ @@ -362,7 +364,7 @@ class GUIViewRenderer(ViewRenderer): html.javascript("cmk.utils.update_header_info(%s);" % json.dumps(headinfo)) # The number of rows might have changed to enable/disable actions and checkboxes - if show_buttons: + if self._show_buttons: update_context_links( # don't take display_options into account here ('c' is set during reload) row_count > 0 and @@ -391,20 +393,18 @@ class GUIViewRenderer(ViewRenderer): if display_options.enabled(display_options.R): html.close_div() - if show_footer: - pid = os.getpid() - if sites.live().successfully_persisted(): - html.add_status_icon( - "persist", - _("Reused persistent livestatus connection from earlier request (PID %d)") % - pid) + pid = os.getpid() + if sites.live().successfully_persisted(): + html.add_status_icon( + "persist", + _("Reused persistent livestatus connection from earlier request (PID %d)") % pid) - html.bottom_focuscode() - if display_options.enabled(display_options.Z): - html.bottom_footer() + html.bottom_focuscode() + if display_options.enabled(display_options.Z): + html.bottom_footer() - if display_options.enabled(display_options.H): - html.body_end() + if display_options.enabled(display_options.H): + html.body_end() # Load all view plugins @@ -1128,19 +1128,13 @@ def page_view(): painter_options.load(view.name) painter_options.update_from_url(view.name, view.spec) - view_renderer = GUIViewRenderer(view) - show_view(view, view_renderer, show_heading=True, show_buttons=True, show_footer=True) + view_renderer = GUIViewRenderer(view, show_buttons=True) + show_view(view, view_renderer) # Display view with real data. This is *the* function everying # is about. -def show_view(view, - view_renderer, - show_heading=False, - show_buttons=True, - show_footer=True, - only_count=False, - limit=None): +def show_view(view, view_renderer, only_count=False, limit=None): display_options.load_from_html() @@ -1357,8 +1351,8 @@ def show_view(view, # Until now no single byte of HTML code has been output. # Now let's render the view - view_renderer.render(rows, group_cells, cells, show_heading, show_buttons, show_checkboxes, - layout, num_columns, show_filters, show_footer, browser_reload) + view_renderer.render(rows, group_cells, cells, show_checkboxes, layout, num_columns, + show_filters, browser_reload) SorterEntry = namedtuple("SorterEntry", ["sorter", "negate", "join_key"])

5 years, 3 months

alcatel_power: Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 6146d25464f2eed8e8849ed71efccd7544f30add URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6146d25464f2ee… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 4 10:46:11 2019 +0100 alcatel_power: Minor cleanup Change-Id: I4e3559ec24acd850b8d2438fb7e9cda23109cd4c --- checks/alcatel_power | 61 ++++++++++++++++------ .../datasets/alcatel_power_regression.py | 44 ++++++++-------- 2 files changed, 65 insertions(+), 40 deletions(-) diff --git a/checks/alcatel_power b/checks/alcatel_power index 1563cfa..036ec3f 100644 --- a/checks/alcatel_power +++ b/checks/alcatel_power @@ -24,33 +24,62 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +alcatel_power_operstate_map = { + "1": "up", + "2": "down", + "3": "testing", + "4": "unknown", + "5": "secondary", + "6": "not present", + "7": "unpowered", + "9": "master", +} + +alcatel_power_no_power_supply_info = "no power supply" + +alcatel_power_type_map = { + "0": alcatel_power_no_power_supply_info, + "1": "AC", + "2": "DC", +} + +AlcatelPowerEntry = collections.namedtuple("AlcatelPowerEntry", [ + "oper_state_readable", + "power_type", +]) + def parse_alcatel_power(info): - known_types = ['0x35000001', '0x45000002', '0x45000004', '0x45000008', '0x45000009'] + parsed = {} + for oidend, status, power_type in info: + parsed.setdefault( + oidend, + AlcatelPowerEntry( + alcatel_power_operstate_map.get(status, 'unknown[%s]' % status), + alcatel_power_type_map.get(power_type, alcatel_power_no_power_supply_info), + )) + return parsed - def is_power_device(device_type, power_type): - return (power_type in ('1', '2') or - # for old devices not providing power_type - power_type == '' and device_type in known_types) - return { - item: status - for (item, status, device_type, power_type) in info - if is_power_device(device_type, power_type) - } +@discover +def inventory_alcatel_power(_oidend, device): + return (device.power_type != alcatel_power_no_power_supply_info and + device.oper_state_readable != 'not present') @get_parsed_item_data -def check_alcatel_power(_no_item, _no_params, status): - if status == '1': - return 0, "Supply status OK" - return 2, "Supply in error condition (%s)" % status +def check_alcatel_power(item, _no_params, device): + if device.oper_state_readable == 'up': + state = 0 + else: + state = 2 + yield state, "[%s] Operational status: %s" % (device.power_type, device.oper_state_readable) check_info["alcatel_power"] = { "parse_function": parse_alcatel_power, "check_function": check_alcatel_power, - "inventory_function": discover(), + "inventory_function": inventory_alcatel_power, "service_description": "Power Supply %s", "snmp_scan_function": alcatel_networking_products_scan_function, "snmp_info": ( @@ -60,8 +89,6 @@ check_info["alcatel_power"] = { 2, # MIB object "chasEntPhysOperStatus": # up(1), down(2), testing(3), unknown(4), # secondary(5), notPresent(6), unpowered(7), master(9) - 5, # MIB object "chasEntPhysModuleType": - # Device Type (0x35000001 == Power Supply) 36, # MIB object "chasEntPhysPowerType": # 0 no power supply, 1 ac, 2 dc (not available on old devices) ]), diff --git a/tests/unit/checks/generictests/datasets/alcatel_power_regression.py b/tests/unit/checks/generictests/datasets/alcatel_power_regression.py index 5edf4f9..360b219 100644 --- a/tests/unit/checks/generictests/datasets/alcatel_power_regression.py +++ b/tests/unit/checks/generictests/datasets/alcatel_power_regression.py @@ -1,28 +1,26 @@ # yapf: disable + checkname = 'alcatel_power' -info = [[u'1', u'1', u'0x35000001', u'0'], [u'2', u'1', u'0x35000001', u'1'], - [u'3', u'1', u'0x35000001', u''], [u'4', u'1', u'0x35000002', u'0'], - [u'5', u'1', u'0x35000002', u'1'], [u'6', u'1', u'0x35000002', u''], - [u'7', u'2', u'0x35000001', u'0'], [u'8', u'2', u'0x35000001', u'1'], - [u'9', u'2', u'0x35000001', u''], [u'10', u'2', u'0x35000002', u'0'], - [u'11', u'2', u'0x35000002', u'1'], [u'12', u'2', u'0x35000002', u'']] -discovery = { - '': [ - (u'2', {}), - (u'3', {}), - (u'5', {}), - (u'8', {}), - (u'9', {}), - (u'11', {}), - ], -} +info = [[u'1', u'1', u'0'], + [u'2', u'1', u'1'], + [u'3', u'1', u''], + [u'4', u'1', u'0'], + [u'5', u'1', u'1'], + [u'6', u'1', u''], + [u'7', u'2', u'0'], + [u'8', u'2', u'1'], + [u'9', u'2', u''], + [u'10', u'2', u'0'], + [u'11', u'2', u'1'], + [u'12', u'2', u'']] + + +discovery = {'': [(u'11', {}), (u'2', {}), (u'5', {}), (u'8', {})]} + -checks = { - '': [(u'1', {}, []), (u'2', {}, [(0, 'Supply status OK', [])]), - (u'3', {}, [(0, 'Supply status OK', [])]), (u'5', {}, [(0, 'Supply status OK', [])]), - (u'8', {}, [(2, 'Supply in error condition (2)', [])]), - (u'11', {}, [(2, 'Supply in error condition (2)', [])]), - (u'9', {}, [(2, 'Supply in error condition (2)', [])])] -} +checks = {'': [(u'11', {}, [(2, '[AC] Operational status: down', [])]), + (u'2', {}, [(0, '[AC] Operational status: up', [])]), + (u'5', {}, [(0, '[AC] Operational status: up', [])]), + (u'8', {}, [(2, '[AC] Operational status: down', [])])]}

5 years, 3 months

Moved row limit handling out of views.show_view()

by Lars Michelsen

Module: check_mk Branch: master Commit: f7bce57e9c02863007e7e3841067a706b148712e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7bce57e9c0286… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 3 21:19:40 2019 +0100 Moved row limit handling out of views.show_view() Change-Id: I2822e00b0a6eeaf93194a6ecb20efa5a3dd2eceb --- cmk/gui/mobile.py | 5 ++++- cmk/gui/plugins/dashboard/view.py | 3 +++ cmk/gui/views.py | 40 ++++++++++++++++++++++----------------- tests/unit/cmk/gui/test_views.py | 32 +++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 18 deletions(-) diff --git a/cmk/gui/mobile.py b/cmk/gui/mobile.py index ad2774c..e872aa8 100644 --- a/cmk/gui/mobile.py +++ b/cmk/gui/mobile.py @@ -236,6 +236,8 @@ def page_index(): for view_name, view_spec in views.get_permitted_views().items(): if view_spec.get("mobile") and not view_spec.get("hidden"): view = views.View(view_name, view_spec) + view.row_limit = views.get_limit() + url = "mobile_view.py?view_name=%s" % view_name count = "" if not view_spec.get("mustsearch"): @@ -281,6 +283,7 @@ def page_view(): raise MKUserError("view_name", "No view defined with the name '%s'." % view_name) view = views.View(view_name, view_spec) + view.row_limit = views.get_limit() title = views.view_title(view_spec) mobile_html_head(title) @@ -357,7 +360,7 @@ class MobileViewRenderer(views.ViewRenderer): html.write(_("No hosts/services found.")) else: try: - cmk.gui.view_utils.check_limit(rows, views.get_limit(), config.user) + cmk.gui.view_utils.check_limit(rows, self.view.row_limit, config.user) layout.render(rows, view_spec, group_cells, cells, num_columns, show_checkboxes and not html.do_actions()) except Exception as e: diff --git a/cmk/gui/plugins/dashboard/view.py b/cmk/gui/plugins/dashboard/view.py index 1533902..e6c0e93 100644 --- a/cmk/gui/plugins/dashboard/view.py +++ b/cmk/gui/plugins/dashboard/view.py @@ -91,6 +91,9 @@ class ViewDashlet(IFrameDashlet): painter_options = PainterOptions.get_instance() painter_options.load(self._dashlet_spec["name"]) + view = views.View(self._dashlet_spec["name"], self._dashlet_spec) + view.row_limit = views.get_limit() + 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 82b3840..63948f0 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -209,6 +209,7 @@ class View(object): super(View, self).__init__() self.name = view_name self.spec = view_spec + self._row_limit = None # type: Optional[int] @property def datasource(self): @@ -226,6 +227,17 @@ class View(object): _("The view '%s' using the datasource '%s' can not be rendered " "because the datasource does not exist.") % (self.name, self.datasource)) + @property + def row_limit(self): + if self.datasource.ignore_limit: + return None + + return self._row_limit + + @row_limit.setter + def row_limit(self, row_limit): + self._row_limit = row_limit + class ViewRenderer(object): __metaclass__ = abc.ABCMeta @@ -349,7 +361,7 @@ class GUIViewRenderer(ViewRenderer): if not has_done_actions: # Limit exceeded? Show warning if display_options.enabled(display_options.W): - cmk.gui.view_utils.check_limit(rows, get_limit(), config.user) + cmk.gui.view_utils.check_limit(rows, self.view.row_limit, config.user) layout.render(rows, view_spec, group_cells, cells, num_columns, show_checkboxes and not html.do_actions()) headinfo = "%d %s" % (row_count, _("row") if row_count == 1 else _("rows")) @@ -1115,6 +1127,7 @@ def page_view(): view_spec, view_name = html.get_item_input("view_name", get_permitted_views()) view = View(view_name, view_spec) + view.row_limit = get_limit() # Gather the page context which is needed for the "add to visual" popup menu # to add e.g. views to dashboards or reports @@ -1132,8 +1145,7 @@ def page_view(): # Display view with real data. This is *the* function everying # is about. -def show_view(view, view_renderer, only_count=False, limit=None): - +def show_view(view, view_renderer, only_count=False): display_options.load_from_html() # Load from hard painter options > view > hard coded default @@ -1211,15 +1223,6 @@ def show_view(view, view_renderer, only_count=False, limit=None): else: only_sites = None - # Prepare limit: - # We had a problem with stats queries on the logtable where - # the limit was not applied on the resulting rows but on the - # lines of the log processed. This resulted in wrong stats. - # For these datasources we ignore the query limits. - if limit is None: # Otherwise: specified as argument - if not view.datasource.ignore_limit: - limit = get_limit() - # 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 @@ -1229,7 +1232,7 @@ def show_view(view, view_renderer, only_count=False, limit=None): 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, limit) + view.spec, view.datasource, context, filterheaders, only_sites, view.row_limit) query = filterheaders + view.spec.get("add_headers", "") @@ -1265,12 +1268,15 @@ def show_view(view, view_renderer, only_count=False, limit=None): # is a list of argument to hand over to the function together with all other arguments that # are passed to query_data(). if callable(view.datasource.table): - rows = view.datasource.table(columns, query, only_sites, limit, all_active_filters) + rows = view.datasource.table(columns, query, only_sites, view.row_limit, + all_active_filters) elif isinstance(view.datasource.table, tuple): func, args = view.datasource.table - rows = func(view.datasource, columns, add_columns, query, only_sites, limit, *args) + rows = func(view.datasource, columns, add_columns, query, only_sites, view.row_limit, + *args) else: - rows = query_data(view.datasource, columns, add_columns, query, only_sites, limit) + rows = query_data(view.datasource, columns, add_columns, query, only_sites, + view.row_limit) # Now add join information, if there are join columns if join_cells: @@ -1548,8 +1554,8 @@ def play_alarm_sounds(): break # only one sound at one time -# How many data rows may the user query? def get_limit(): + """How many data rows may the user query?""" limitvar = html.request.var("limit", "soft") if limitvar == "hard" and config.user.may("general.ignore_soft_limit"): return config.hard_query_limit diff --git a/tests/unit/cmk/gui/test_views.py b/tests/unit/cmk/gui/test_views.py index 3438d61..a1f84e0 100644 --- a/tests/unit/cmk/gui/test_views.py +++ b/tests/unit/cmk/gui/test_views.py @@ -9,6 +9,7 @@ import cmk.gui.config as config import cmk.gui.views # pylint: disable=unused-import import cmk.gui.default_permissions +from cmk.gui.globals import html from cmk.gui.valuespec import ValueSpec import cmk.gui.plugins.views import cmk.gui.modules as modules @@ -5794,3 +5795,34 @@ def test_create_view_basics(register_builtin_html, load_view_plugins): assert view.name == view_name assert view.spec == view_spec assert isinstance(view.datasource, cmk.gui.plugins.views.utils.DataSource) + assert view.row_limit 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) + assert view.row_limit is None + view.row_limit = 101 + assert view.row_limit == 101 + assert cmk.gui.views.get_limit() == 1000 + +(a)pytest.mark.parametrize("limit,permissions,result", [ + ("soft", [], 1000), + ("hard", [], 1000), + ("none", [], 1000), + + ("soft", ["general.ignore_soft_limit"], 1000), + ("hard", ["general.ignore_soft_limit"], 5000), + # Strange. Shouldn't this stick to the hard limit? + ("none", ["general.ignore_soft_limit"], 1000), + + ("soft", ["general.ignore_soft_limit", "general.ignore_hard_limit"], 1000), + ("hard", ["general.ignore_soft_limit", "general.ignore_hard_limit"], 5000), + ("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) + for perm in permissions: + monkeypatch.setitem(config.user.permissions, perm, True) + assert cmk.gui.views.get_limit() == result

5 years, 3 months

aix_hacmp_{services, resources}: Do not discovery if there' s no cluster definition and fixed parsing unexpected lines

by Simon Betz

Module: check_mk Branch: master Commit: 5f429a090a9cdbee3eaa98e057b0cdd1c4a0a9c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f429a090a9cdb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 4 15:26:36 2019 +0100 aix_hacmp_{services,resources}: Do not discovery if there's no cluster definition and fixed parsing unexpected lines Change-Id: I3cdf6bf76caaaae05475419db39855df8ce2e315 --- .werks/7110 | 10 ++++++++++ .werks/7111 | 10 ++++++++++ checks/aix_hacmp_resources | 2 ++ checks/aix_hacmp_services | 21 ++++++++++++--------- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/.werks/7110 b/.werks/7110 new file mode 100644 index 0000000..f1f09ad --- /dev/null +++ b/.werks/7110 @@ -0,0 +1,10 @@ +Title: aix_hacmp_resources: If there's no cluster definition we do not discover services +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551709507 +Class: fix + + diff --git a/.werks/7111 b/.werks/7111 new file mode 100644 index 0000000..c40b5e8 --- /dev/null +++ b/.werks/7111 @@ -0,0 +1,10 @@ +Title: aix_hacmp_services: Fixed parsing of unexpected line 'The cthags Subsystem is not on file' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551709598 +Class: fix + + diff --git a/checks/aix_hacmp_resources b/checks/aix_hacmp_resources index 61aa38b..cfdd38d 100644 --- a/checks/aix_hacmp_resources +++ b/checks/aix_hacmp_resources @@ -42,6 +42,8 @@ factory_settings["aix_hacmp_resources"] = { def parse_aix_hacmp_resources(info): parsed = {} for line in info: + if 'There is no cluster definition.' in " ".join(line): + continue if line[0] not in parsed: parsed[line[0]] = [(line[2], line[1].lower())] else: diff --git a/checks/aix_hacmp_services b/checks/aix_hacmp_services index b8b9348..cce977a 100644 --- a/checks/aix_hacmp_services +++ b/checks/aix_hacmp_services @@ -88,23 +88,26 @@ def parse_aix_hacmp_services(info): parsed = {} - check_block = False # are we in the check relevant info block? + inst = None for line in info: - if line[0] == 'Details': - check_block = False + inst = None elif line[0] == 'Status': - check_block = True subsystem_ty_name = line[3] if subsystem_ty_name == 'PowerHA': subsystem_ty_name += " %s" % line[4] + inst = parsed.setdefault(subsystem_ty_name, []) - elif check_block: - if line[0] == 'Subsystem': - parsed.setdefault(subsystem_ty_name, []) - else: - parsed[subsystem_ty_name].append((line[0], line[-1])) + elif line[0] == 'Subsystem': + # header line + continue + + elif inst is not None and len(line) in [3, 4]: + # Not all lines contain PID: + # clcomd caa 7537142 active + # clconfd caa inoperative + inst.append((line[0], line[-1])) return parsed

5 years, 3 months

Renamed test file to fix issues in pytest

by Lars Michelsen

Module: check_mk Branch: master Commit: cd646d513b82938f1cefef3b12a70b419c1f8837 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd646d513b8293… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 08:02:55 2019 +0100 Renamed test file to fix issues in pytest Change-Id: I541af3fcec795f7a6e2b517c321f56e90d0ab999 --- tests/unit/omdlib/{test_backup.py => test_omdlib_backup.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/unit/omdlib/test_backup.py b/tests/unit/omdlib/test_omdlib_backup.py similarity index 100% rename from tests/unit/omdlib/test_backup.py rename to tests/unit/omdlib/test_omdlib_backup.py

5 years, 3 months

Change MK_IN_CONTAINER to more specific name: It only applies to docker containers

by Lars Michelsen

Module: check_mk Branch: master Commit: ebd176a2851555418e5e954d03058e5bdcdaeeeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebd176a2851555… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 3 15:18:40 2019 +0100 Change MK_IN_CONTAINER to more specific name: It only applies to docker containers Change-Id: I69c64731c3bf5b3da1cbb075dec4ff9056ec9eaf --- agents/check_mk_agent.linux | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index adc18e5..e8b3565 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -79,9 +79,9 @@ fi # Detect whether or not the agent is being executed in a container # environment. if [ -f /.dockerenv ]; then - MK_IN_CONTAINER=1 + IS_DOCKERIZED=1 else - unset MK_IN_CONTAINER + unset IS_DOCKERIZED fi # Prefer (relatively) new /usr/bin/timeout from coreutils against @@ -116,7 +116,7 @@ fi function section_mem() { - if [ -z "$MK_IN_CONTAINER" ]; then + if [ -z "$IS_DOCKERIZED" ]; then echo '<<<mem>>>' grep -E -v '^Swap:|^Mem:|total:' < /proc/meminfo else @@ -139,7 +139,7 @@ function section_cpu() fi NUM_CPUS=$(grep -c -E $CPU_REGEX < /proc/cpuinfo) - if [ -z "$MK_IN_CONTAINER" ]; then + if [ -z "$IS_DOCKERIZED" ]; then echo '<<<cpu>>>' echo "$(cat /proc/loadavg) $NUM_CPUS" else @@ -153,7 +153,7 @@ function section_cpu() function section_uptime() { echo '<<<uptime>>>' - if [ -z "$MK_IN_CONTAINER" ]; then + if [ -z "$IS_DOCKERIZED" ]; then cat /proc/uptime else echo "$(($(date +%s) - $(stat -c %Z /dev/pts)))" @@ -168,7 +168,7 @@ function section_uptime() # These should generally be monitored on the NFS server, not on the clients. function section_df() { - if [ -n "$MK_IN_CONTAINER" ]; then + if [ -n "$IS_DOCKERIZED" ]; then return fi @@ -507,7 +507,7 @@ if type multipath >/dev/null ; then fi # Performancecounter Platten -if [ -z "$MK_IN_CONTAINER" ]; then +if [ -z "$IS_DOCKERIZED" ]; then echo '<<<diskstat>>>' date +%s grep -E ' (x?[shv]d[a-z]*[0-9]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*|dasd[a-z]*|bcache[0-9]+|nvme[0-9]+n[0-9]+) ' < /proc/diskstats @@ -536,7 +536,7 @@ fi # Performancecounter Kernel -if [ -z "$MK_IN_CONTAINER" ]; then +if [ -z "$IS_DOCKERIZED" ]; then echo '<<<kernel>>>' date +%s cat /proc/vmstat /proc/stat @@ -696,7 +696,7 @@ then done fi -if [ -z "$MK_IN_CONTAINER" ] && [ -e /proc/drbd ]; then +if [ -z "$IS_DOCKERIZED" ] && [ -e /proc/drbd ]; then echo '<<<drbd>>>' cat /proc/drbd fi @@ -1017,7 +1017,7 @@ fi # Gather thermal information provided e.g. by acpi # At the moment only supporting thermal sensors -if [ -z "$MK_IN_CONTAINER" ] && ls /sys/class/thermal/thermal_zone* >/dev/null 2>&1; then +if [ -z "$IS_DOCKERIZED" ] && ls /sys/class/thermal/thermal_zone* >/dev/null 2>&1; then echo '<<<lnx_thermal:sep(124)>>>' for F in /sys/class/thermal/thermal_zone*; do line="${F##*/}"

5 years, 3 months

Improve custom host attribute texts

by Lars Michelsen

Module: check_mk Branch: master Commit: 1df8068f9a6c93c6af207f1b39e998db933a53ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1df8068f9a6c93… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 09:58:18 2019 +0100 Improve custom host attribute texts Change-Id: I373179f41887badc18f47a6a2301c8f2c400bb14 --- cmk/gui/wato/pages/custom_attributes.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/cmk/gui/wato/pages/custom_attributes.py b/cmk/gui/wato/pages/custom_attributes.py index dbe0598..e29d3a4 100644 --- a/cmk/gui/wato/pages/custom_attributes.py +++ b/cmk/gui/wato/pages/custom_attributes.py @@ -251,16 +251,16 @@ class ModeEditCustomAttr(WatoMode): self._add_extra_form_sections() - forms.section(_('Show in Table')) + forms.section(_('Show in WATO host table')) html.help( - _('This attribute is only visibile on the detail pages by default, but ' - 'you can also make it visible in the overview tables.')) + _('This attribute is only visibile on the edit host and folder pages by default, but ' + 'you can also make it visible in the host overview tables of WATO.')) html.checkbox( 'show_in_table', self._attr.get('show_in_table', False), - label=_("Show the setting of the attribute in the list table")) + label=_("Show the setting of the attribute in the WATO host list table")) - forms.section(_('Add as custom macro')) + forms.section(_('Add to monitoring configuration')) html.help(self._macro_help) html.checkbox( 'add_custom_macro', self._attr.get('add_custom_macro', False), label=self._macro_label) @@ -357,14 +357,17 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): @property def _macro_help(self): - return _("The attribute can be added to the host definition in order to " - "use it as monitoring macro in different places, for example " - "as macro in check commands or notifications.") + return _( + "The attribute can be added to the host definition in order to use it as custom host attribute " + "(sometimes called monitoring macro) in different places, for example as in check commands or " + "notifications. You can also only display this attribute in the status GUI when enabling this " + "option.") @property def _macro_label(self): - return _("Make this variable available as monitoring macro, " - "e.g. in check commands or in notifications.") + return _( + "Make this custom attribute available to check commands, notifications and the status GUI" + ) def _update_config(self): _update_host_custom_attrs()

5 years, 3 months

LXC: Add basic support for Linux containers

by Lars Michelsen

Module: check_mk Branch: master Commit: 5297a36d112cd5684c2e62dc83f247ff5dcf4567 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5297a36d112cd5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 3 18:02:51 2019 +0100 LXC: Add basic support for Linux containers The agent is now detecting when it is executed in a Linux container context and changes it's behaviour depending the environment. In containers the agent currently does the following: <ul> <li>lxc_container_cpu: This check is used instead of the normal CPU utilization check</li> <li>zfs filesystems are not excluded for the df section anymore</li> <li>kernel section is not processed, because it's the host systems kernel the agent reports information for</li> <li>drbd section is not processed for the same reason</li> <li>lnx_thermal section is not processed for the same reason</li> </ul> CMK-1561 Change-Id: I94a515be6f7c0fbaf8831d1c62c9563ee0aec759 --- .werks/7226 | 23 +++++++++++++++++++++++ agents/check_mk_agent.linux | 30 +++++++++++++++++++++++------- checkman/lxc_container_cpu | 14 ++++++++++++++ checks/cpu_util.include | 23 +++++++++++++++++++++++ checks/docker_container_cpu | 26 +------------------------- checks/lxc_container_cpu | 34 ++++++++++++++++++++++++++++++++++ cmk/utils/man_pages.py | 1 + 7 files changed, 119 insertions(+), 32 deletions(-) diff --git a/.werks/7226 b/.werks/7226 new file mode 100644 index 0000000..e079c94 --- /dev/null +++ b/.werks/7226 @@ -0,0 +1,23 @@ +Title: LXC: Add basic support for Linux containers +Level: 2 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551686646 +Class: feature + +The agent is now detecting when it is executed in a Linux container +context and changes it's behaviour depending the environment. + +In containers the agent currently does the following: + +<ul> +<li>lxc_container_cpu: This check is used instead of the normal CPU +utilization check</li> +<li>zfs filesystems are not excluded for the df section anymore</li> +<li>kernel section is not processed, because it's the host systems +kernel the agent reports information for</li> +<li>drbd section is not processed for the same reason</li> +<li>lnx_thermal section is not processed for the same reason</li> +</ul> diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index e8b3565..8f1c447 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -80,8 +80,16 @@ fi # environment. if [ -f /.dockerenv ]; then IS_DOCKERIZED=1 +elif grep container=lxc /proc/1/environ >/dev/null 2>&1; then + # Works in lxc environment e.g. on Ubuntu bionic, but does not + # seem to work in proxmox (see CMK-1561) + IS_LXC_CONTAINER=1 +elif grep 'lxcfs /proc/cpuinfo fuse.lxcfs' /proc/mounts >/dev/null 2>&1; then + # Seems to work in proxmox + IS_LXC_CONTAINER=1 else unset IS_DOCKERIZED + unset IS_LXC_CONTAINER fi # Prefer (relatively) new /usr/bin/timeout from coreutils against @@ -139,11 +147,15 @@ function section_cpu() fi NUM_CPUS=$(grep -c -E $CPU_REGEX < /proc/cpuinfo) - if [ -z "$IS_DOCKERIZED" ]; then + if [ -z "$IS_DOCKERIZED" ] && [ -z "$IS_LXC_CONTAINER" ]; then echo '<<<cpu>>>' echo "$(cat /proc/loadavg) $NUM_CPUS" else - echo '<<<docker_container_cpu>>>' + if [ -n "$IS_DOCKERIZED" ]; then + echo '<<<docker_container_cpu>>>' + else + echo '<<<lxc_container_cpu>>>' + fi grep "^cpu " /proc/stat echo "num_cpus $NUM_CPUS" cat /sys/fs/cgroup/cpuacct/cpuacct.stat @@ -172,10 +184,14 @@ function section_df() return fi - echo '<<<df>>>' # The exclusion list is getting a bit of a problem. -l should hide any remote FS but seems # to be all but working. - local excludefs="-x smbfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs -x zfs -x prl_fs -x squashfs" + local excludefs="-x smbfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs -x prl_fs -x squashfs" + if [ -n "$IS_LXC_CONTAINER" ]; then + excludefs+=" -x zfs" + fi + + echo '<<<df>>>' df -PTlk $excludefs | sed 1d # df inodes information @@ -536,7 +552,7 @@ fi # Performancecounter Kernel -if [ -z "$IS_DOCKERIZED" ]; then +if [ -z "$IS_DOCKERIZED" ] && [ -z "$IS_LXC_CONTAINER" ]; then echo '<<<kernel>>>' date +%s cat /proc/vmstat /proc/stat @@ -696,7 +712,7 @@ then done fi -if [ -z "$IS_DOCKERIZED" ] && [ -e /proc/drbd ]; then +if [ -z "$IS_DOCKERIZED" ] && [ -z "$IS_LXC_CONTAINER" ] && [ -e /proc/drbd ]; then echo '<<<drbd>>>' cat /proc/drbd fi @@ -1017,7 +1033,7 @@ fi # Gather thermal information provided e.g. by acpi # At the moment only supporting thermal sensors -if [ -z "$IS_DOCKERIZED" ] && ls /sys/class/thermal/thermal_zone* >/dev/null 2>&1; then +if [ -z "$IS_DOCKERIZED" ] && [ -z "$IS_LXC_CONTAINER" ] && ls /sys/class/thermal/thermal_zone* >/dev/null 2>&1; then echo '<<<lnx_thermal:sep(124)>>>' for F in /sys/class/thermal/thermal_zone*; do line="${F##*/}" diff --git a/checkman/lxc_container_cpu b/checkman/lxc_container_cpu new file mode 100644 index 0000000..7711a5f --- /dev/null +++ b/checkman/lxc_container_cpu @@ -0,0 +1,14 @@ +title: Linux container CPU utilization +agents: linux +catalog: containerization/lxc +license: GPL +distribution: check_mk +description: + This check measures the CPU utilization of a linux container (LXC) during + the last check cycle. Levels can be set on the total utilization. + + This check can currently report user and system time. + +inventory: + One check per container is created if the Check_MK agent is executed + in the context of a linux container. diff --git a/checks/cpu_util.include b/checks/cpu_util.include index cf862b4..a7a6621 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -248,6 +248,29 @@ def util_perfdata(core, total_perc, core_index, this_time, params): yield state, infotext, [] +def check_cpu_util_linux_container(_no_item, params, info): + if not params: + params = {} + + ticks = {} + for line in info: + if line[0] == "cpu": + ticks["total"] = sum(map(int, line[1:])) + else: + ticks[line[0]] = int(line[1]) + + this_time = time.time() + node_delta = get_rate("node_total", this_time, ticks["total"]) + container_delta = get_rate("container", this_time, ticks["user"] + ticks["system"]) + + if not node_delta or not container_delta: + raise MKCounterWrapped("Too short time difference since last check") + + cpu_usage = (container_delta / node_delta) * ticks["num_cpus"] * 100.0 + + return check_cpu_util(cpu_usage, params) + + # .--helper--------------------------------------------------------------. # | _ _ | # | | |__ ___| |_ __ ___ _ __ | diff --git a/checks/docker_container_cpu b/checks/docker_container_cpu index 41eb43b..64fd386 100644 --- a/checks/docker_container_cpu +++ b/checks/docker_container_cpu @@ -24,32 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - -def check_docker_container_cpu(_no_item, params, info): - if not params: - params = {} - - ticks = {} - for line in info: - if line[0] == "cpu": - ticks["total"] = sum(map(int, line[1:])) - else: - ticks[line[0]] = int(line[1]) - - this_time = time.time() - node_delta = get_rate("node_total", this_time, ticks["total"]) - container_delta = get_rate("container", this_time, ticks["user"] + ticks["system"]) - - if not node_delta or not container_delta: - raise MKCounterWrapped("Too short time difference since last check") - - cpu_usage = (container_delta / node_delta) * ticks["num_cpus"] * 100.0 - - return check_cpu_util(cpu_usage, params) - - check_info["docker_container_cpu"] = { - "check_function": check_docker_container_cpu, + "check_function": check_cpu_util_linux_container, "inventory_function": discover_single, "service_description": "CPU utilization", "has_perfdata": True, diff --git a/checks/lxc_container_cpu b/checks/lxc_container_cpu new file mode 100644 index 0000000..6b04de1 --- /dev/null +++ b/checks/lxc_container_cpu @@ -0,0 +1,34 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +check_info["lxc_container_cpu"] = { + "check_function": check_cpu_util_linux_container, + "inventory_function": discover_single, + "service_description": "CPU utilization", + "has_perfdata": True, + "includes": ["cpu_util.include"], + "group": "cpu_utilization_os", +} diff --git a/cmk/utils/man_pages.py b/cmk/utils/man_pages.py index 0f9e90b..3f6c9f1 100644 --- a/cmk/utils/man_pages.py +++ b/cmk/utils/man_pages.py @@ -233,6 +233,7 @@ catalog_titles = { "containerization" : "Containerization", "docker" : "Docker", "kubernetes" : "Kubernetes", + "lxc" : "Linux Container", "agentless": "Networking checks without agent", "generic" : "Generic check plugins", "unsorted" : "Uncategorized",

5 years, 3 months

ucs_c_rack_server_psu: Make check reliable against namespace conflict

by Florian Kromer

Module: check_mk Branch: master Commit: 54780710f21ea8ba79cd85b7e1e60464d11266dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54780710f21ea8… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Mar 4 12:10:24 2019 +0100 ucs_c_rack_server_psu: Make check reliable against namespace conflict Previously the check specific dicts potentially conflicted with other checks. This change prevents from possible namespace conflicts with other checks. Change-Id: Id3a37713f7bd1cbde80002331c31d9bc4dba0055 --- checks/ucs_c_rack_server_psu | 92 ++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 47 deletions(-) diff --git a/checks/ucs_c_rack_server_psu b/checks/ucs_c_rack_server_psu index 6f233e0..d1dbd2c 100644 --- a/checks/ucs_c_rack_server_psu +++ b/checks/ucs_c_rack_server_psu @@ -26,7 +26,7 @@ # exemplary output of special agent agent_ucs_bladecenter (<TAB> is tabulator): # -# <<<ucsc_psu:sep(9)>>> +# <<<ucs_c_rack_server_psu:sep(9)>>> # equipmentPsu<TAB>dn sys/rack-unit-1/psu-1<TAB>id 1<TAB>model blabla<TAB>operability operable<TAB>voltage upper-critical # equipmentPsu<TAB>dn sys/rack-unit-1/psu-2 <TAB>id 2<TAB>model blabla<TAB>operability inoperable<TAB>voltage ok @@ -63,42 +63,41 @@ def inventory_ucs_c_rack_server_psu(parsed): # ucs_c_rack_server_psu # ######################### -# maps XML API v2.0 XML entity values to check function status values -operability_to_status_mapping = { - "unknown": 3, - "operable": 0, - "inoperable": 2, - "degraded": 2, - "powered-off": 1, - "power-problem": 2, - "removed": 1, - "voltage-problem": 2, - "thermal-problem": 2, - "performance-problem": 2, - "accessibility-problem": 2, - "identity-unestablishable": 1, - "bios-post-timeout": 1, - "disabled": 1, - "malformed-fru": 1, - "fabric-conn-problem": 2, - "fabric-unsupported-conn": 1, - "config": 1, - "equipment-problem": 2, - "decomissioning": 1, - "chassis-limit-exceeded": 1, - "not-supported": 1, - "discovery": 1, - "discovery-failed": 1, - "identify": 1, - "post-failure": 1, - "upgrade-problem": 1, - "peer-comm-problem": 2, - "auto-upgrade": 1, -} - @get_parsed_item_data def check_ucs_c_rack_server_psu(item, _no_params, data): + # maps XML API v2.0 XML entity values to check function status values + operability_to_status_mapping = { + "unknown": 3, + "operable": 0, + "inoperable": 2, + "degraded": 2, + "powered-off": 1, + "power-problem": 2, + "removed": 1, + "voltage-problem": 2, + "thermal-problem": 2, + "performance-problem": 2, + "accessibility-problem": 2, + "identity-unestablishable": 1, + "bios-post-timeout": 1, + "disabled": 1, + "malformed-fru": 1, + "fabric-conn-problem": 2, + "fabric-unsupported-conn": 1, + "config": 1, + "equipment-problem": 2, + "decomissioning": 1, + "chassis-limit-exceeded": 1, + "not-supported": 1, + "discovery": 1, + "discovery-failed": 1, + "identify": 1, + "post-failure": 1, + "upgrade-problem": 1, + "peer-comm-problem": 2, + "auto-upgrade": 1, + } operability = data["operability"] try: status = operability_to_status_mapping[operability] @@ -120,22 +119,21 @@ check_info["ucs_c_rack_server_psu"] = { # ucs_c_rack_server_psu.voltage # ################################# -# maps XML API v2.0 XML entity values to check function status values -voltage_to_status_mapping = { - "unknown": 3, - "ok": 0, - "upper-non-recoverable": 2, - "upper-critical": 2, - "upper-non-critical": 1, - "lower-non-critical": 1, - "lower-critical": 2, - "lower-non-recoverable": 2, - "not-supported": 1, -} - @get_parsed_item_data def check_ucs_c_rack_server_psu_voltage(item, _no_params, data): + # maps XML API v2.0 XML entity values to check function status values + voltage_to_status_mapping = { + "unknown": 3, + "ok": 0, + "upper-non-recoverable": 2, + "upper-critical": 2, + "upper-non-critical": 1, + "lower-non-critical": 1, + "lower-critical": 2, + "lower-non-recoverable": 2, + "not-supported": 1, + } voltage_status = data["voltage"] try: status = voltage_to_status_mapping[voltage_status]

5 years, 4 months

ucs_c_rack_server_health: consider id in agent output

by Florian Kromer

Module: check_mk Branch: master Commit: 510fc34d41cf373edb1599113f60c517326227fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=510fc34d41cf37… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Fri Mar 1 11:52:05 2019 +0100 ucs_c_rack_server_health: consider id in agent output Change-Id: Ie57300e1e9ac11a87875a8e7096b01752df4c58c --- checks/ucs_c_rack_server_health | 8 +++++--- .../unit/checks/generictests/datasets/ucs_c_rack_server_health.py | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/checks/ucs_c_rack_server_health b/checks/ucs_c_rack_server_health index 8ff34da..f3ff547 100644 --- a/checks/ucs_c_rack_server_health +++ b/checks/ucs_c_rack_server_health @@ -25,8 +25,10 @@ # Boston, MA 02110-1301 USA. # exemplary output of special agent agent_ucs_bladecenter (<TAB> is tabulator): -# storageControllerHealth<TAB>dn sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0<TAB>health Good -# storageControllerHealth<TAB>dn sys/rack-unit-2/board/storage-SAS-SLOT-HBA/vd-0<TAB>health Good +# storageControllerHealth<TAB>dn +# sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0 <TAB>id SLOT-HBA<TAB>health Good +# storageControllerHealth<TAB>dn +# sys/rack-unit-2/board/storage-SAS-SLOT-HBA/vd-0 <TAB>id SLOT-HBA<TAB>health Good # Dict keys are storage controller health strings provided via special agent -> XML # API of servers. Dict values are corresponding check status. @@ -48,7 +50,7 @@ def parse_ucs_c_rack_server_health(info): 'health' if rack server has racks attached or empty dict if not. """ parsed = {} - for _, dn, health in info: + for _, dn, _id, health in info: rack_storage_board = dn.replace("dn sys/", "").replace("rack-unit-", "Rack unit ").replace( "/board/storage-", " Storage ").replace("-", " ").replace("/", " ") parsed[rack_storage_board] = health.replace("health ", "").lower() diff --git a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py index b5ebb9e..52cf0de 100644 --- a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py +++ b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py @@ -1,11 +1,12 @@ checkname = 'ucs_c_rack_server_health' info = [[ - 'storageControllerHealth', 'dn sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0', 'health Good' + 'storageControllerHealth', 'dn sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0', 'id SLOT-HBA', + 'health Good' ], [ 'storageControllerHealth', 'dn sys/rack-unit-2/board/storage-SAS-SLOT-HBA/vd-0', - 'health AnythingElse' + 'id SLOT-HBA', 'health AnythingElse' ]] discovery = {

5 years, 4 months

← Newer
1
...
38
39
40
41
42
43
44
45
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