update project

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
 
 

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',
 }