From 43773916f6cd788451dc12f2b4119bac40483864 Mon Sep 17 00:00:00 2001
From: Thl CMK <thl-cmk@outlook.com>
Date: Sun, 7 Jun 2020 23:01:23 +0200
Subject: [PATCH] update project

---
 checkpoint_fw_connections.mkp                 | Bin 3013 -> 3023 bytes
 checks/checkpoint_fw_connections              |  26 ++++++++++--------
 .../metrics/checkpoint_fw_connections.py      |   8 +++---
 3 files changed, 18 insertions(+), 16 deletions(-)

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

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

diff --git a/checks/checkpoint_fw_connections b/checks/checkpoint_fw_connections
index 459d333..a37baca 100644
--- a/checks/checkpoint_fw_connections
+++ b/checks/checkpoint_fw_connections
@@ -52,14 +52,6 @@ def check_checkpoint_fw_connections(item, params, info):
     if fwConnTableLimit == 0:
         fwConnTableLimit = 'automatically adjusted'
 
-    perfdata = [('fwconnectionstcp', fwConnectionsTcp),
-                ('fwconnectionsudp', fwConnectionsUdp),
-                ('fwconnectionsicmp', fwConnectionsIcmp),
-                ('fwconnectionsother', fwConnectionsOther),
-                ('fwconnectionssum', fwConnectionsSum),
-                ('fwpeaknumconn', fwPeakNumConn)
-                ]
-
     for info, unit, counter, value, warncrit in [
         ('current: ', '', 'fwcurrentnumconn', fwCurrnetNumConn, 'warncritcurrent'),
         ('rate: ', '/s', 'fwconnectionrate', fwConnectionRate, 'warncritrate')
@@ -69,15 +61,25 @@ def check_checkpoint_fw_connections(item, params, info):
         else:
             warn = None
             crit = None
-        perfdata.append((counter, value, warn, crit))
+        infotext = info + '%d' % value + unit
+        perfdata = [(counter, value, warn, crit)]
         if crit != None and value >= crit:
-            yield 2, info + '%d' % value + unit + ' (>=%d)' % crit
+            yield 2, infotext + ' (>=%d)' % crit, perfdata
         elif warn != None  and value >= warn:
-            yield 1, info + '%d' % value + unit + ' (>=%d)' % warn
+            yield 1, infotext + ' (>=%d)' % warn, perfdata
         else:
-            yield 0, info + '%d' % value + unit
+            yield 0, infotext, perfdata
 
     infotext = 'peak: %d, table limit: %s' % (fwPeakNumConn, fwConnTableLimit)
+
+    perfdata = [('fwconnectionstcp', fwConnectionsTcp),
+                ('fwconnectionsudp', fwConnectionsUdp),
+                ('fwconnectionsicmp', fwConnectionsIcmp),
+                ('fwconnectionsother', fwConnectionsOther),
+                ('fwconnectionssum', fwConnectionsSum),
+                ('fwpeaknumconn', fwPeakNumConn)
+                ]
+
     yield 0, infotext , perfdata
 
 
diff --git a/web/plugins/metrics/checkpoint_fw_connections.py b/web/plugins/metrics/checkpoint_fw_connections.py
index d14cfb0..a6dcbc4 100644
--- a/web/plugins/metrics/checkpoint_fw_connections.py
+++ b/web/plugins/metrics/checkpoint_fw_connections.py
@@ -31,17 +31,17 @@ metric_info['checkpoint_fw_connections_fwconnectionstcp'] = {
 metric_info['checkpoint_fw_connections_fwconnectionsudp'] = {
     'title': _('UDP connections'),
     'unit': '1/s',
-    'color': '14/a',
+    'color': '12/a',
 }
 metric_info['checkpoint_fw_connections_fwconnectionsicmp'] = {
     'title': _('ICMP connections'),
     'unit': '1/s',
-    'color': '31/a',
+    'color': '13/a',
 }
 metric_info['checkpoint_fw_connections_fwconnectionsother'] = {
     'title': _('Other connections'),
     'unit': '1/s',
-    'color': '34/a',
+    'color': '14/a',
 }
 metric_info['checkpoint_fw_connections_fwconnectionssum'] = {
     'title': _('Total connections'),
@@ -62,7 +62,7 @@ metric_info['checkpoint_fw_connections_fwcurrentnumconn'] = {
 metric_info['checkpoint_fw_connections_fwpeaknumconn'] = {
     'title': _('Peak Connections'),
     'unit': 'count',
-    'color': '13/a',
+    'color': '15/a',
 }
 
 
-- 
GitLab