update project

agent_based/checkpoint_vsx_system.py

@@ -137,6 +137,7 @@ def parse_checkpoint_vsx_system(string_table: StringTable) -> Optional[Dict[str,
             vsxCountersBytesDroppedTotal, vsxCountersBytesRejectedTotal, vsxCountersLoggedTotal = entry
         except ValueError:
             return
+
         vsx_systems[vsxStatusVsName] = CheckpointVsx(
             vsxStatusVSId=vsxStatusVSId,
             vsxStatusVsType=vsxStatusVsType,
@@ -185,7 +186,8 @@ def check_checkpoint_vsx_system(item, params, section: Dict[str, CheckpointVsx])
     if vsx.vsxStatusVsType.lower() in ['virtual system', 'vsx gateway']:
         yield Result(state=State.OK, notice=f'System name: {item}')
         yield Result(state=State.OK, summary=f'Main IP: {vsx.vsxStatusMainIP}')
-        yield Result(state=State.OK, summary=f'VS ID: {vsx.vsxStatusVSId}', details='Virtual system ID:')
+        yield Result(state=State.OK, summary=f'VS ID: {vsx.vsxStatusVSId}',
+                     details=f'Virtual system ID: {vsx.vsxStatusVSId}')
         yield Result(state=State.OK, notice=f'System type: {vsx.vsxStatusVsType}')
 
         if not vsx.vsxStatusHAState.lower() in ['active', 'standby']:
@@ -294,7 +296,7 @@ register.check_plugin(
     service_name='VSX System %s',
     discovery_function=discovery_checkpoint_vsx_system,
     discovery_default_parameters={
-        'vs_type': ['virtual system', 'vsx gateway']
+        'vs_type': ['virtual system']
     },
     discovery_ruleset_name='discovery_checkpoint_vsx_system',
     check_function=check_checkpoint_vsx_system,

packages/checkpoint_vsx_system

@@ -15,7 +15,7 @@
  'name': 'checkpoint_vsx_system',
  'num_files': 3,
  'title': 'Check Point VSX system status and counter',
- 'version': '20210907.v.0.3a',
+ 'version': '20210921.v.0.3a',
  '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/metrics/checkpoint_vsx_system.py

@@ -96,9 +96,9 @@ graph_info['checkpoint_vsx_connections'] = {
 graph_info['checkpoint_vsx_packets'] = {
     'title': _('Check Point VSX: Packets'),
     'metrics': [
-        ('checkpoint_vsx_packets_rejected', 'line'),
-        ('checkpoint_vsx_packets_dropped', 'line'),
-        ('checkpoint_vsx_packets_accepted', 'line'),
+        ('checkpoint_vsx_packets_rejected', 'stack'),
+        ('checkpoint_vsx_packets_dropped', 'stack'),
+        ('checkpoint_vsx_packets_accepted', 'stack'),
         ('checkpoint_vsx_packets_processed', 'line'),
     ]
 }
@@ -112,10 +112,10 @@ graph_info['checkpoint_vsx_bytes'] = {
     ]
 }
 
-graph_info['checkpoint_vsx_logges_send'] = {
+graph_info['checkpoint_vsx_loggs_send'] = {
     'title': _('Check Point VSX: Logs'),
     'metrics': [
-        ('checkpoint_vsx_loggs_send', 'line'),
+        ('checkpoint_vsx_loggs_send', 'area'),
     ]
 }
 

web/plugins/wato/checkpoint_vsx_system.py

@@ -96,10 +96,10 @@ rulespec_registry.register(
 
 def _valuespec_discovery_checkpoint_vsx_system():
     _vs_types = [
-        ('virtual system', 'Virtual system'),
-        ('vsx gateway', 'VSX gateway'),
-        ('virtual switch', 'Virtual switch'),
-        ('virtual router', 'Virtual router'),
+        ('virtual system', 'Virtual System'),
+        ('vsx gateway', 'VSX Gateway'),
+        ('virtual switch', 'Virtual Switch'),
+        ('virtual router', 'Virtual Router'),
     ]
     return Transform(
         Dictionary(
@@ -108,11 +108,11 @@ def _valuespec_discovery_checkpoint_vsx_system():
                 ('vs_type',
                  ListChoice(
                      title=_('VS types to discover'),
-                     help=_('Virtual system types to discover'),
+                     help=_('Virtual system types to discover. Note: if you select "VSX Gateway", '
+                            'this will also discover ClusterXL systems.'),
                      choices=_vs_types,
                      default_value=[
                          'virtual system',
-                         'vsx gateway',
                      ],
                  )),
             ],