update project

agent_based/checkpoint_fw_connections.py

@@ -31,7 +31,7 @@
 
 import time
 from dataclasses import dataclass
-from typing import List, Dict, Any, Optional
+from typing import List, Optional
 
 from cmk.base.plugins.agent_based.agent_based_api.v1 import (
     register,
@@ -48,7 +48,6 @@ from cmk.base.plugins.agent_based.agent_based_api.v1 import (
     get_rate,
     GetRateError,
     get_value_store,
-    IgnoreResultsError,
     render,
 )
 from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
@@ -172,6 +171,7 @@ def check_checkpoint_fw_connections(params, section: CheckpointFwConnections) ->
 register.snmp_section(
     name='checkpoint_fw_connections',
     parse_function=parse_checkpoint_fw_connections,
+    supersedes=['checkpoint_connections'],
     fetch=[
         SNMPTree(
             base='.1.3.6.1.4.1.2620.1.1.26.11',  # CHECKPOINT-MIB::fwConnectionsStat
@@ -193,12 +193,15 @@ register.snmp_section(
             ]
         ),
     ],
-    detect=any_of(
-        startswith('.1.3.6.1.2.1.1.2.0', '.1.3.6.1.4.1.2620'),
-        all_of(
-            equals('.1.3.6.1.2.1.1.2.0', '.1.3.6.1.4.1.8072.3.2.10'),
-            equals('.1.3.6.1.4.1.2620.1.6.1.0', 'SVN Foundation'),
-        )
+    detect=all_of(
+        any_of(
+            startswith('.1.3.6.1.2.1.1.2.0', '.1.3.6.1.4.1.2620'),
+            all_of(
+                equals('.1.3.6.1.2.1.1.2.0', '.1.3.6.1.4.1.8072.3.2.10'),
+                equals('.1.3.6.1.4.1.2620.1.6.1.0', 'SVN Foundation'),
+            )
+        ),
+        equals('.1.3.6.1.4.1.2620.1.1.21.0', 'Firewall'),
     )
 )
 

packages/checkpoint_fw_connections

 {'author': 'Th.L. (thl-cmk[at]outlook[dot]com)',
  'description': 'Monitor Check Point Firewall connection statistics.\n'
                 '\n'
-                'Rewrite of the original check.\n'
-                'Added perfdata for peak connections and TCP, UDP, ICMP, other '
-                'and total connection rate\n',
+                'This plugin supersedes the "checkpoint_connections" plugin.\n'
+                '\n'
+                'Service\n'
+                ' - Firewall connections\n'
+                '\n'
+                'Metrics \n'
+                ' - TCP connections/s\n'
+                ' - UDP connections/s\n'
+                ' - ICMP connections/s\n'
+                ' - Other connections/s\n'
+                ' - Total connections/s\n'
+                ' - Connections rate/s\n'
+                ' - Current connections\n'
+                ' - Peak Connections\n'
+                ' - Current connections relative to table limit (if '
+                'available)\n'
+                '\n'
+                'WATO\n'
+                ' - Upper/Lower levels for current connections (absolute)\n'
+                ' - Upper/Lower levels for current connections (relative to '
+                'connection table limit)\n'
+                ' - Admin connection table limit\n',
  'download_url': 'https://thl-cmk.hopto.org',
  'files': {'agent_based': ['checkpoint_fw_connections.py'],
            'web': ['plugins/metrics/checkpoint_fw_connections.py',
@@ -11,7 +30,7 @@
  'name': 'checkpoint_fw_connections',
  'num_files': 3,
  'title': 'Check Point Connections',
- 'version': '20210824.v.0.0.3',
+ 'version': '20210825.v.0.0.3a',
  'version.min_required': '2.0.0',
  'version.packaged': '2021.07.14',
  'version.usable_until': None}
\ No newline at end of file