From 5149f37927e234759deb26ad9996ee0bd8d0fc59 Mon Sep 17 00:00:00 2001
From: Thl CMK <thl-cmk@outlook.com>
Date: Sun, 7 Jun 2020 22:25:47 +0200
Subject: [PATCH] update project

---
 checkpoint_fw_connections.mkp                 | Bin 3019 -> 3013 bytes
 checks/checkpoint_fw_connections              |   4 ++--
 .../metrics/checkpoint_fw_connections.py      |  12 ++++++------
 web/plugins/wato/checkpoint_fw_connections.py |   4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/checkpoint_fw_connections.mkp b/checkpoint_fw_connections.mkp
index afc083ea8e955bebb15236d37f1a9582715a6426..55f0fb181169aecd8bc35109f729c00c7e1e24fc 100644
GIT binary patch
delta 2993
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

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

diff --git a/checks/checkpoint_fw_connections b/checks/checkpoint_fw_connections
index da95794..459d333 100644
--- a/checks/checkpoint_fw_connections
+++ b/checks/checkpoint_fw_connections
@@ -21,7 +21,7 @@
 #
 
 factory_settings['checkpoint_fw_connections_defaults'] = {
-    # 'warncritconcurrent': (1000, 2000),
+    # 'warncritcurrent': (1000, 2000),
     # 'warncritnew': (100, 200)
 }
 
@@ -61,7 +61,7 @@ def check_checkpoint_fw_connections(item, params, info):
                 ]
 
     for info, unit, counter, value, warncrit in [
-        ('current: ', '', 'fwcurrnetnumconn', fwCurrnetNumConn, 'warncritconcurrent'),
+        ('current: ', '', 'fwcurrentnumconn', fwCurrnetNumConn, 'warncritcurrent'),
         ('rate: ', '/s', 'fwconnectionrate', fwConnectionRate, 'warncritrate')
     ]:
         if params.get(warncrit):
diff --git a/web/plugins/metrics/checkpoint_fw_connections.py b/web/plugins/metrics/checkpoint_fw_connections.py
index 9df7757..d14cfb0 100644
--- a/web/plugins/metrics/checkpoint_fw_connections.py
+++ b/web/plugins/metrics/checkpoint_fw_connections.py
@@ -31,7 +31,7 @@ metric_info['checkpoint_fw_connections_fwconnectionstcp'] = {
 metric_info['checkpoint_fw_connections_fwconnectionsudp'] = {
     'title': _('UDP connections'),
     'unit': '1/s',
-    'color': '21/a',
+    'color': '14/a',
 }
 metric_info['checkpoint_fw_connections_fwconnectionsicmp'] = {
     'title': _('ICMP connections'),
@@ -41,7 +41,7 @@ metric_info['checkpoint_fw_connections_fwconnectionsicmp'] = {
 metric_info['checkpoint_fw_connections_fwconnectionsother'] = {
     'title': _('Other connections'),
     'unit': '1/s',
-    'color': '41/a',
+    'color': '34/a',
 }
 metric_info['checkpoint_fw_connections_fwconnectionssum'] = {
     'title': _('Total connections'),
@@ -51,7 +51,7 @@ metric_info['checkpoint_fw_connections_fwconnectionssum'] = {
 metric_info['checkpoint_fw_connections_fwconnectionrate'] = {
     'title': _('Connections rate'),
     'unit': '1/s',
-    'color': '42/a',
+    'color': '22/a',
 }
 
 metric_info['checkpoint_fw_connections_fwcurrentnumconn'] = {
@@ -62,7 +62,7 @@ metric_info['checkpoint_fw_connections_fwcurrentnumconn'] = {
 metric_info['checkpoint_fw_connections_fwpeaknumconn'] = {
     'title': _('Peak Connections'),
     'unit': 'count',
-    'color': '23/a',
+    'color': '13/a',
 }
 
 
@@ -131,8 +131,8 @@ perfometer_info.append(('stacked', [
     },
     {
         'type': 'logarithmic',
-        'metric': 'checkpoint_fw_connections_fwconnectionssum',
+        'metric': 'checkpoint_fw_connections_fwconnectionrate',
         'half_value': 1000.0,
         'exponent': 2,
     },
-]))
+]))
\ No newline at end of file
diff --git a/web/plugins/wato/checkpoint_fw_connections.py b/web/plugins/wato/checkpoint_fw_connections.py
index bc646da..5fd7be0 100644
--- a/web/plugins/wato/checkpoint_fw_connections.py
+++ b/web/plugins/wato/checkpoint_fw_connections.py
@@ -13,9 +13,9 @@ register_check_parameters(
     _('Check Point Firewall Connections'),
     Dictionary(
         elements=[
-            ('warncritconcurrent',
+            ('warncritcurrent',
              Tuple(
-                 title=_('Levels for number of concurrent active connections'),
+                 title=_('Levels for number of current active connections'),
                  elements=[
                      Integer(title=_('Warning at'), default_value=1000, unit=_('Count'), allow_empty=False),
                      Integer(title=_('Critical at'), default_value=2000, unit=_('Count'), allow_empty=False),
-- 
GitLab