update project

agent_based/checkpoint_fw_ls.py

@@ -117,31 +117,33 @@ _fwLocalLoggingStat = {
 }
 
 
-def parse_checkpoint_fw_ls(string_table: List[StringTable]) -> Dict:
-    if string_table != [[], []]:
-        over_all, log_servers = string_table
-
+def parse_checkpoint_fw_ls(string_table: List[StringTable]) -> Optional[Dict]:
+    over_all, log_servers = string_table
+    try:
         fwlsconnoverall, fwlsconnoveralldesc, fwlocalloggingdesc, fwlocalloggingstat, fwlocalloggingwriterate, \
         fwlogginghandlingrate = over_all[0]
-        parsed = {}
-        parsed.update({'over all': CheckPointFwLsOverAll(
-            fwlsconnoverall=int(fwlsconnoverall),
-            fwlsconnoveralldesc=fwlsconnoveralldesc,
-            fwlocalloggingdesc=fwlocalloggingdesc,
-            fwlocalloggingstat=int(fwlocalloggingstat),
-            fwLocalLoggingWriteRate=int(fwlocalloggingwriterate) if fwlocalloggingwriterate.isdigit() else None,
-            fwLoggingHandlingRate=int(fwlogginghandlingrate) if fwlogginghandlingrate.isdigit() else None,
+    except (IndexError, ValueError):
+        return
+
+    parsed = {}
+    parsed.update({'over all': CheckPointFwLsOverAll(
+        fwlsconnoverall=int(fwlsconnoverall),
+        fwlsconnoveralldesc=fwlsconnoveralldesc,
+        fwlocalloggingdesc=fwlocalloggingdesc,
+        fwlocalloggingstat=int(fwlocalloggingstat),
+        fwLocalLoggingWriteRate=int(fwlocalloggingwriterate) if fwlocalloggingwriterate.isdigit() else None,
+        fwLoggingHandlingRate=int(fwlogginghandlingrate) if fwlogginghandlingrate.isdigit() else None,
+    )})
+
+    for fwLSConnIndex, fwLSConnName, fwLSConnState, fwLSConnStateDesc, fwLSConnSendRate in log_servers:
+        parsed.update({fwLSConnName: CheckPointFwLs(
+            fwLSConnIndex=int(fwLSConnIndex),
+            fwLSConnName=fwLSConnName,
+            fwLSConnState=int(fwLSConnState),
+            fwLSConnStateDesc=fwLSConnStateDesc,
+            fwLSConnSendRate=int(fwLSConnSendRate) if fwLSConnSendRate.isdigit() else None,
         )})
 
-        for fwLSConnIndex, fwLSConnName, fwLSConnState, fwLSConnStateDesc, fwLSConnSendRate in log_servers:
-            parsed.update({fwLSConnName: CheckPointFwLs(
-                fwLSConnIndex=int(fwLSConnIndex),
-                fwLSConnName=fwLSConnName,
-                fwLSConnState=int(fwLSConnState),
-                fwLSConnStateDesc=fwLSConnStateDesc,
-                fwLSConnSendRate=int(fwLSConnSendRate) if fwLSConnSendRate.isdigit() else None,
-            )})
-
         return parsed
 
 

agent_based/checkpoint_fwm_ls.py

@@ -191,9 +191,7 @@ def parse_checkpoint_fwm_ls(string_table: List[StringTable]) -> Optional[CheckPo
     try:
         lsvermajor, lsverminor, lsbuildnumber, lsfwmisalive, lsstatcode, lsstatshortdescr, \
         lsstatlongdescr = string_table[0][0]
-    except IndexError:
-        return
-    except ValueError:
+    except (IndexError, ValueError):
         return
 
     checkpointfwmr77 = CheckPointFwmR77(

packages/checkpoint_log_server

@@ -13,5 +13,5 @@
  'title': 'Check Point Log service status',
  'version': '20210816.v0.2b',
  'version.min_required': '2.0.0',
- 'version.packaged': '2021.07.14',
+ 'version.packaged': '2021.09.20',
  'version.usable_until': None}
\ No newline at end of file

web/plugins/wato/checkpoint_fw_ls.py

@@ -10,7 +10,6 @@ from cmk.gui.i18n import _
 from cmk.gui.valuespec import (
     Dictionary,
     TextAscii,
-    FixedValue,
     MonitoringState,
     DropdownChoice,
 )