From e18882fec64cb728dda929aa7b395be445be8b25 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Tue, 8 Nov 2022 15:57:15 +0100
Subject: [PATCH] update project

---
 agent_based/inv_opengear_base.py |  44 ++++++++++++++++++++++++++++---
 inv_opengear_base.mkp            | Bin 1717 -> 2074 bytes
 packages/inv_opengear_base       |   2 +-
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/agent_based/inv_opengear_base.py b/agent_based/inv_opengear_base.py
index ade8a82..f160ccc 100644
--- a/agent_based/inv_opengear_base.py
+++ b/agent_based/inv_opengear_base.py
@@ -5,10 +5,14 @@
 #
 # Author: thl-cmk[at]outlook[dot]com
 # URL   : https://thl-cmk.hopto.org
-# Date  : 2021-12-25
+# Date  : 2022-06-28
+# file  : inv_opengear_base
 #
 # opengear base inventory
 #
+# 2022-11-08: fixed crash in parse function empty inv_data
+#
+#
 # sample string_table
 # [
 #  [
@@ -36,10 +40,39 @@ from cmk.base.plugins.agent_based.agent_based_api.v1 import (
     startswith,
 )
 
+# from the OG-PRODUCTS-MIB, LAST-UPDATED "202005200000Z"
+#
+# ogCM4001 OBJECT IDENTIFIER ::= { ogProducts 1 }
+# ogCM4002 OBJECT IDENTIFIER ::= { ogProducts 2 }
+# ogCM4008 OBJECT IDENTIFIER ::= { ogProducts 3 }
+# ogCM41xx OBJECT IDENTIFIER ::= { ogProducts 10 }
+# ogCM71xx OBJECT IDENTIFIER ::= { ogProducts 11 }
+# ogCM7196 OBJECT IDENTIFIER ::= { ogProducts 12 }
+# ogSD4001 OBJECT IDENTIFIER ::= { ogProducts 20 }
+# ogSD4002 OBJECT IDENTIFIER ::= { ogProducts 21 }
+# ogSD4008 OBJECT IDENTIFIER ::= { ogProducts 22 }
+# ogSD4001DW OBJECT IDENTIFIER ::= { ogProducts 23 }
+# ogSD4002DX OBJECT IDENTIFIER ::= { ogProducts 24 }
+# ogCD OBJECT IDENTIFIER ::= { ogProducts 30 }
+# ogCMx86 OBJECT IDENTIFIER ::= { ogProducts 31 }
+# ogCMS61xx OBJECT IDENTIFIER ::= { ogProducts 40 }
+# ogLighthouse OBJECT IDENTIFIER ::= { ogProducts 41 }
+# ogLighthouse5 OBJECT IDENTIFIER ::= { ogProducts 42 }
+# ogIM4004 OBJECT IDENTIFIER ::= { ogProducts 50 }
+# ogIM42xx OBJECT IDENTIFIER ::= { ogProducts 60 }
+# ogIM72xx OBJECT IDENTIFIER ::= { ogProducts 61 }
+# ogKCS61xx OBJECT IDENTIFIER ::= { ogProducts 70 }
+# ogACM500x OBJECT IDENTIFIER ::= { ogProducts 80 }
+# ogACM550x OBJECT IDENTIFIER ::= { ogProducts 81 }
+# ogACM700x OBJECT IDENTIFIER ::= { ogProducts 90 }
+# ogACM70045 OBJECT IDENTIFIER ::= { ogProducts 91 }
+# ogOperationsManager OBJECT IDENTIFIER ::= { ogProducts 101 }
+#
+
 _opengear_models = {
     ('.1.3.6.1.4.1.25049.1.11', 18): 'CM7116',  # 16 serial + 2 usb lines
     ('.1.3.6.1.4.1.25049.1.11', 34): 'CM7132',  # 32 serial + 2 usb lines
-    ('.1.3.6.1.4.1.25049.1.11', 48): 'CM7148',  # 48 serial + 2 usb lines
+    ('.1.3.6.1.4.1.25049.1.11', 50): 'CM7148',  # 48 serial + 2 usb lines
     ('.1.3.6.1.4.1.25049.1.60', 16): 'IM4216',  # 16 serial lines
 }
 
@@ -47,7 +80,10 @@ _opengear_models = {
 def parse_inv_opengear_base(string_table: List[StringTable]) -> Optional[List]:
     inv_data, ogSerialPortCTS, sysObjectID = string_table
 
-    firmware_version, serial_number = inv_data[0]
+    try:
+        firmware_version, serial_number = inv_data[0]
+    except IndexError:
+        return
 
     if serial_number == 'N/A':
         serial_number = ''
@@ -98,7 +134,7 @@ register.snmp_section(
             ]
         ),
         SNMPTree(
-            base='.1.3.6.1.4.1.25049.17.2.1',  # OG-STATUSv2-MIB
+            base='.1.3.6.1.4.1.25049.17.2.1',  # OG-STATUSv2-MIB:orgSerialÃœprtEntry
             oids=[
                 '19',  # ogSerialPortCTS. ogSerialPortIndex don't exist so we use CTS to get the number of lines
             ]
diff --git a/inv_opengear_base.mkp b/inv_opengear_base.mkp
index d33e312e6215a71f8be0b8e6fdb285a4c589e40c..8ca96d87869fcd9fcfbff50fccf5e90e8d1a5d26 100644
GIT binary patch
literal 2074
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
E05Gxv*#H0l

literal 1717
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
L`@29y08jt`PEJKf

diff --git a/packages/inv_opengear_base b/packages/inv_opengear_base
index ea3488e..c52f130 100644
--- a/packages/inv_opengear_base
+++ b/packages/inv_opengear_base
@@ -14,7 +14,7 @@
  'name': 'inv_opengear_base',
  'num_files': 1,
  'title': 'opengear base inventory',
- 'version': '20220628.v.0.01',
+ 'version': '20221108.v.0.01a',
  'version.min_required': '2.0.0',
  'version.packaged': '2021.09.20',
  'version.usable_until': None}
\ No newline at end of file
-- 
GitLab