From 1d5b54ec663b94650164f429b3ce10d83e8eea54 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Fri, 16 Jun 2023 13:26:31 +0200
Subject: [PATCH] update project

---
 agent_based/inv_opengear_serial_lines.py |  12 +++++-------
 gui/views/inv_opengear_serial_lines.py   |  11 ++++-------
 inv_opengear_serial_line.mkp             | Bin 2272 -> 2324 bytes
 packages/inv_opengear_serial_line        |   6 +++---
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/agent_based/inv_opengear_serial_lines.py b/agent_based/inv_opengear_serial_lines.py
index f88df5f..dcd581a 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 c96c001..3187360 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
GIT binary patch
delta 2299
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
VV>y$d2s8^!_&0!ozoY<o008+KnRx&J

delta 2256
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

diff --git a/packages/inv_opengear_serial_line b/packages/inv_opengear_serial_line
index 01646c8..7926a6f 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}
-- 
GitLab