diff --git a/agent_based/inv_opengear_serial_lines.py b/agent_based/inv_opengear_serial_lines.py index f88df5f6b06889692940c80870e23fb84e00dfe3..dcd581afe14371487fd0b83a9aca06175384b081 100644 --- a/agent_based/inv_opengear_serial_lines.py +++ b/agent_based/inv_opengear_serial_lines.py @@ -11,7 +11,7 @@ # inventory of opengear console servers serial lines # # 2023-02-20: moved gui files from ~/local/share/check_mk/... to ~/local/lib/check_mk... -# +# 2023-06-16: removed unused inventory_ruleset_name and params from cmk.base.plugins.agent_based.agent_based_api.v1 import ( register, @@ -70,10 +70,11 @@ _opengear_parity = { def parse_inv_opengear_serial_lines(string_table: StringTable): section = [] - for index, label, speed, databits, parity, stopbits, flowcontrol, mode, loglevel, dcd, dtr, dsr, cts, rts in string_table: + for index, label, speed, databits, parity, stopbits, flowcontrol, mode, loglevel, \ + dcd, dtr, dsr, cts, rts in string_table: entry = { 'key_columns': { - 'index': index + 'index': f'{int(index):02}' }, 'inventory_columns': { 'label': label, @@ -100,7 +101,7 @@ def parse_inv_opengear_serial_lines(string_table: StringTable): return section -def inventory_bgp_peers(params, section) -> InventoryResult: +def inventory_bgp_peers(section) -> InventoryResult: path = ['hardware', 'serial_lines'] for entry in section: @@ -146,7 +147,4 @@ register.snmp_section( register.inventory_plugin( name='inv_opengear_serial_lines', inventory_function=inventory_bgp_peers, - inventory_default_parameters={ - }, - inventory_ruleset_name='inv_opengear_serial_lines', ) diff --git a/gui/views/inv_opengear_serial_lines.py b/gui/views/inv_opengear_serial_lines.py index c96c001e2e1e9df7f650d2eda71325f31afabe53..3187360920e3f2eacecdb3329bbcbf308c8d8881 100644 --- a/gui/views/inv_opengear_serial_lines.py +++ b/gui/views/inv_opengear_serial_lines.py @@ -9,14 +9,13 @@ # File : view/inv_opengear_serial_lines # # 2023-02-20: moved from ~/local/share/check_mk/... to ~/local/lib/check_mk... -# +# 2023-06-14: removed declare_invtable_view from view definition on cmk 2.2 (see werk 15493) +# changed inventory_displayhints import (see werk 15493) + from cmk.gui.i18n import _ -from cmk.gui.plugins.views.utils import ( - inventory_displayhints, -) +from cmk.gui.views.inventory.registry import inventory_displayhints -from cmk.gui.plugins.views.inventory import declare_invtable_view inventory_displayhints.update({ '.hardware.serial_lines:': { @@ -40,5 +39,3 @@ inventory_displayhints.update({ '.hardware.serial_lines:*.dtr': {'title': _('DTR'), }, '.hardware.serial_lines:*.rts': {'title': _('RTS'), }, }) - -declare_invtable_view('invseriallines', '.hardware.serial_lines:', _('Serial lines'), _('Serial lines')) diff --git a/inv_opengear_serial_line.mkp b/inv_opengear_serial_line.mkp index de83dd1006e349de49583a4f57f029d44fc848dc..649054826aca7e12dbc7a1d67442a29494fa4ce3 100644 Binary files a/inv_opengear_serial_line.mkp and b/inv_opengear_serial_line.mkp differ diff --git a/packages/inv_opengear_serial_line b/packages/inv_opengear_serial_line index 01646c8ec27bd988adf099f6064401fdc6a83d06..7926a6f2c6154ddcb08873733a28402a8c1031e6 100644 --- a/packages/inv_opengear_serial_line +++ b/packages/inv_opengear_serial_line @@ -5,7 +5,7 @@ 'gui': ['views/inv_opengear_serial_lines.py']}, 'name': 'inv_opengear_serial_line', 'title': 'opengear serial line inventory', - 'version': '0.0.2-20230614', - 'version.min_required': '2.1.0b1', + 'version': '0.1.1-20230614', + 'version.min_required': '2.2.0b1', 'version.packaged': '2.2.0p2', - 'version.usable_until': '2.2.0b1'} + 'version.usable_until': None}