From 478699aa726e043eb78d18f7e8da95e9012b2182 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Tue, 21 Sep 2021 19:32:41 +0200
Subject: [PATCH] update project

---
 agent_based/checkpoint_vsx_system.py         |   6 ++++--
 checkpoint_vsx_system.mkp                    | Bin 5296 -> 5340 bytes
 packages/checkpoint_vsx_system               |   4 ++--
 web/plugins/metrics/checkpoint_vsx_system.py |  10 +++++-----
 web/plugins/wato/checkpoint_vsx_system.py    |  12 ++++++------
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/agent_based/checkpoint_vsx_system.py b/agent_based/checkpoint_vsx_system.py
index e60509b..171320a 100644
--- a/agent_based/checkpoint_vsx_system.py
+++ b/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,
diff --git a/checkpoint_vsx_system.mkp b/checkpoint_vsx_system.mkp
index 7ba13e66108c46971d51de73b77d46b78da104dc..e60d912aa55f449c14a436a7318aae75142ed593 100644
GIT binary patch
delta 5297
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
D5d~v!

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

diff --git a/packages/checkpoint_vsx_system b/packages/checkpoint_vsx_system
index 3558a34..ebf407f 100644
--- a/packages/checkpoint_vsx_system
+++ b/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
diff --git a/web/plugins/metrics/checkpoint_vsx_system.py b/web/plugins/metrics/checkpoint_vsx_system.py
index 1cc2923..3756058 100644
--- a/web/plugins/metrics/checkpoint_vsx_system.py
+++ b/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'),
     ]
 }
 
diff --git a/web/plugins/wato/checkpoint_vsx_system.py b/web/plugins/wato/checkpoint_vsx_system.py
index b3625b8..aabe424 100644
--- a/web/plugins/wato/checkpoint_vsx_system.py
+++ b/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',
                      ],
                  )),
             ],
-- 
GitLab