From be7130ad54abadb62832eb0b61f90525df72fb58 Mon Sep 17 00:00:00 2001
From: OMD site cmk16x <thl-cmk@outlook.com>
Date: Tue, 2 Jun 2020 19:29:49 +0200
Subject: [PATCH] update project

---
 checkman/checkpoint_sxl_status                |  45 -----
 checkpoint_securexl.mkp                       | Bin 0 -> 2092 bytes
 checkpoint_sxl_status.mkp                     | Bin 2107 -> 0 bytes
 ...ckpoint_sxl_status => checkpoint_securexl} | 176 +++++++++---------
 ...ckpoint_sxl_status => checkpoint_securexl} |  10 +-
 web/plugins/metrics/checkpoint_securexl.py    |  54 ++++++
 web/plugins/metrics/checkpoint_sxl_status.py  |  54 ------
 7 files changed, 146 insertions(+), 193 deletions(-)
 delete mode 100644 checkman/checkpoint_sxl_status
 create mode 100644 checkpoint_securexl.mkp
 delete mode 100644 checkpoint_sxl_status.mkp
 rename checks/{checkpoint_sxl_status => checkpoint_securexl} (79%)
 rename packages/{checkpoint_sxl_status => checkpoint_securexl} (59%)
 create mode 100644 web/plugins/metrics/checkpoint_securexl.py
 delete mode 100644 web/plugins/metrics/checkpoint_sxl_status.py

diff --git a/checkman/checkpoint_sxl_status b/checkman/checkpoint_sxl_status
deleted file mode 100644
index 08ef898..0000000
--- a/checkman/checkpoint_sxl_status
+++ /dev/null
@@ -1,45 +0,0 @@
-title: Dummy check man page - used as template for new check manuals
-agents: linux, windows, aix, solaris, hpux, vms, freebsd, snmp
-catalog: see modules/catalog.py for possible values
-license: GPL
-distribution: check_mk
-description:
- Describe here: (1) what the check actually does, (2) under which
- circumstances it goes warning/critical, (3) which devices are supported
- by the check, (4) if the check requires a separated plugin or
- tool or separate configuration on the target host.
-
-item:
- Describe the syntax and meaning of the check's item here. Provide all
- information one needs if coding a manual check with {checks +=} in {main.mk}.
- Give an example.  If the check uses {None} as sole item,
- then leave out this section.
-
-examples:
- # Give examples for configuration in {main.mk} here. If the check has
- # configuration variable, then give example for them here.
-
- # set default levels to 40 and 60 percent:
- foo_default_values = (40, 60)
-
- # another configuration variable here:
- inventory_foo_filter = [ "superfoo", "superfoo2" ]
-
-perfdata:
- Describe precisely the number and meaning of performance variables
- the check sends. If it outputs no performance data, then leave out this
- section.
-
-inventory:
- Describe how the inventory for the check works. Which items
- will it find? Describe the influence of check specific
- configuration parameters to the inventory.
-
-[parameters]
-foofirst(int): describe the first parameter here (if parameters are grouped
-        as tuple)
-fooother(string): describe another parameter here.
-
-[configuration]
-foo_default_levels(int, int): Describe global configuration variable of
-    foo here. Important: also tell the user how they are preset.
diff --git a/checkpoint_securexl.mkp b/checkpoint_securexl.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..a42cccbcc5c030695af2b6958ce87dfe9b745d7e
GIT binary patch
literal 2092
zcmV+{2-Ei;iwFpejMiQP|6^!nV{344X>N31b7f<7a%FgIEiy1MI50OeF)ns4FfK4I
zF)nRuZ~*OFZ;#qI8lTrA&3EupRfanVN%*^*=0$I|>Q&qBRy);hB^DtMF_4`Q=Mra_
zQ8nNF9y<vM5Ez(i=~egq+9BXP|NPkg*-0GNpNg}u3=`08xAhUQd9+NscV@M^-A>2s
z+7`%JrrER4h<SDb#F1nnAz!4D#mapr_)J+W=OUy764Q@!<DEgOa_%)Ii`yZSBN0na
zh})qf<Y*!mHCjI>)Zx)2bOY%MU#q<rzAHr-k*hhM+>#H%^(DFHlQ`s`-Vw;JjH5sO
zIg7{#9!?!58JUW3K-fgOcf3xR<8X&C-ysh7xP<Q$;ro1|9Dw2<Ec9J}M%-y?i}*qk
z?z0<@JAe8~NMh-Gf;r<j^dKfWmokV3&1PB^V=e+I3=z(>^wjlu1Y)1*L`AH=4wJ8e
zihUgE*zY|$0_hxd$#1l1;Kei7kD3cELw6E2OH_^EfsP)PGoLNE3aQM#J|8c}SwOZb
zkgoK&PHb5|way(6qa^#(Hm$zdYgxvfVZuMFc-~mJ{y60Sj@^(uO4u@Nqkq$1lL^@5
zmd&#BUBe9e^zjVw{{a{H-}oyM{<q|R_`c5nmf5n9|4+jI70o>rAj1mK8yts~!|1It
zs*_5>pIWO#ssap1DrIB@8kLlcDj=dbQWcfifYZqor39Xyp_II4P$gbQph}=PT`0Mo
z(}fN$Bj}1E=)67|aVB-q#97HttI|zw)~@r(Q;B@rxwG<^G@t=v;9HG<yInH=t*(jV
z{}d=0abL6jtzNs69J{S7RZ!H0_V0At(Ei=74ej5y%-)IHABMfvz2B3lC(eJTc=1Cs
zj>6`R>o<c3U|Ij-`~_+JtpOY{5e`rXtV89r(f<bt9vZIia9=jWbQ*CvAZ;ZG@=7J;
zv5aNJw3N_N;a8f^2Sl^ED)@;>P6*H|5N5+{HLSLlOvNLA5iFT^OCq)iJf4<b{p<DB
z&mVq$`^(41`?vob45rKLPw%d^d&4A`1Wvqu^ZK_z#&%V!wo~m2I5T>E??w`8thN6L
z1<>Zlhk%o6G#9bwkQ<)atPRK;7SDLg9*~Z;-|8zx(8rnVw#@xDe@dwS$Uu92WmWwd
zmeGO<%QD*VXLoH=6{z3VdgiRX!nPJ(*>9VBrCaOLFxdBsw>QMicGekmA0TSonwAWQ
zF@?(>xL#`a^`ZA;%TB-ayL2>4`_dHVOc6c+&q>wHQRyY$*x^$adorRU@c;SZ{86c1
zoI^4Ayo2tqOq3{ARYbMHg}z`6xr{@f46DBgA0}z_SsUesw0gM_$rp7Ju#hdHIw_h|
z1B*jQt>mXVCHcLC68aXD^t?V5vG34Cz=Li9Yoj36B57fetsySSP{*SReX$%%ccF}{
zgP}gEwd7o3P}RxyP$`z_j$SNCdnuSz!4A!pLsz9zRtvUk<noeOX-!vt*Ia2csnXhs
zTA7v(22^HTjzdUXwXCg;ml6D@<Rz)n4OQqqswryqRd(td?zI@47ydG2!R7VOZ$Feq
zl4s!=v82jRN0SO}#gj(_d;+~g!s0Y9D|Vu*eAzf4uk`AYyoC1D^&F6wreRN;&<Rpc
zs}ddZ^LoZwe8sK_8Ooy>Cre#g*8ghti{cHM6*df{ExOfshbTL%CMd~vxq(r!UMUrr
z^*q~uFAUE5s^Xav_aZ*n(zoh_g8Sm~ohF2mkcl2*<@c}>9@96l64`0&>&nqp#Dm?G
zl-7~v<hQOq*iVa@dc?y!cf!ZTdxwcS&F^fbvT(IC&ay%ad4&Z-81q!>1y##}aWr9m
z9?^h!Y;of-B3$U9@KL3!8OGN08%$cX1|gFnEt`Abr`=M=9yGWbGajrDc?gMr10#3I
z9#ZGzzr=p$oy7U8An;t~PxwikwiBnnUw=AjUG2o}30<~-OkDof>lrQcq@MeU=l8RP
z{3`zXX3vJ7(A7;C_bcZA-3?{TJaYXIsii{oo$JT<wbjskY8+K}4kSZeJjrP3%6WBP
z&0)xiu$(MQaLl+Z*0?^ZJyGR@Lr^zV*25@SD$`oR5xXx$(hSc+5eIbJ%dV#asam=e
z9eex^CWY}G3tdJ0J02$FE7!G#RTBf<bXz4mD+WDucu1P`k{fEjRof@j?1I|bTz-&t
zYg1d#<Oiv?H&xSF{1D}l8Z2-nfX@pM2m}IwKp+qZ1OkCTAP@)y0`Yxd$#1^y=FhX|
z?Ef^|y$<gGJOvKh>;1*rzij`f-RpEV_J8)&0r!8N0AFhV=dSJRaYWLtMUt+jgiAWv
zkvl^Zo4a?tj7v5U6*t0U?^uni#f?wtu6nw9G#>k|)Q?-$)~VHV)rs)*3v<-6nv5n-
z29FC!Z%8^M9xb>Pj@68|gR!3(Ot!)4fN(O=!vbpM0cE?C(yovOHD25{p4_pt-Hz(L
zy*)40jZ62AJ=V(%>hvCEFWpL3YA#F9F$VMPWsg~^W+4may73Ga1l)J3WzAAH-u89n
zH1+EJ#r%nP_3#8z7ILP|CF&y;ZtV-kt1{c%>S50eJ5MWZtO7rx)@d`-HQl_*7w2k!
znt<SVSXT3-_78#X0-l($(3SIrJE4Ur(yATPiwnwg=1s?U%!`!^8)i|%ES~1~f$)K=
z^*g0W`D49?%UuKlfj}S-2m}IwKp+qZ1OkCTAP@)y0)apv5C{YUfj}S-2m}IwKp+qZ
W1OkCTAP|WEdHe@xw>07acmM!wRT-@S

literal 0
HcmV?d00001

diff --git a/checkpoint_sxl_status.mkp b/checkpoint_sxl_status.mkp
deleted file mode 100644
index 1fbcd584d7fa47b50c5069455a6d5b39f0bb1936..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2107
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

diff --git a/checks/checkpoint_sxl_status b/checks/checkpoint_securexl
similarity index 79%
rename from checks/checkpoint_sxl_status
rename to checks/checkpoint_securexl
index 7c404ad..b597603 100644
--- a/checks/checkpoint_sxl_status
+++ b/checks/checkpoint_securexl
@@ -1,89 +1,87 @@
-#!/usr/bin/python
-# -*- encoding: utf-8; py-indent-offset: 4 -*-
-#
-# Monitor status of Check Point SecureXL
-#
-# Author: Th.L.
-# Date  : 2018-03-14
-#
-
-#
-# snmpwalk sample
-#
-# CHECKPOINT-MIB::fwSXLStatus.0 = INTEGER: enabled(1)
-# CHECKPOINT-MIB::fwSXLConnsExisting.0 = Wrong Type (should be INTEGER): Gauge32: 51
-# CHECKPOINT-MIB::fwSXLConnsAdded.0 = Wrong Type (should be INTEGER): Gauge32: 630
-# CHECKPOINT-MIB::fwSXLConnsDeleted.0 = Wrong Type (should be INTEGER): Gauge32: 578
-# 
-# .1.3.6.1.4.1.2620.1.36.1.1.0 = INTEGER: 1
-# .1.3.6.1.4.1.2620.1.36.1.2.0 = Gauge32: 40
-# .1.3.6.1.4.1.2620.1.36.1.3.0 = Gauge32: 645
-# .1.3.6.1.4.1.2620.1.36.1.4.0 = Gauge32: 604
-#
-# sample info
-#
-# [[u'1', u'48', u'7932', u'7986']]
-#
-
-factory_settings['checkpoint_sxl_status_defaults'] = {
-}
-
-
-def inventory_checkpoint_sxl_status(info):
-    return [(None, None)]
-
-
-def check_checkpoint_sxl_status(item, params, info):
-    state = 3
-    infotext = 'Item not found'
-    longoutput = ''
-    perfdata = []
-
-    now_time = time.time()
-    fwSXLStatus, fwSXLConnsExisting, fwSXLConnsAdded, fwSXLConnsDeleted = info[0]
-
-
-    # ToDo: in R80.30 status is allways zero :-(
-    if int(fwSXLStatus) == 1:
-        fwSXLConnsExisting = int(fwSXLConnsExisting)
-        fwSXLConnsAdded = get_rate('checkpoint_sxl_status.%s.%s' % ('fwSXLConnsAdded', item), now_time, int(fwSXLConnsAdded), onwrap=SKIP)
-        fwSXLConnsDeleted = get_rate('checkpoint_sxl_status.%s.%s' % ('fwSXLConnsDeleted', item), now_time, int(fwSXLConnsDeleted), onwrap=SKIP)
-
-        # Counters
-        infotext = 'Connections: Active %d, Added: %0.2f/s, Deleted: %0.2f/s' % (fwSXLConnsExisting, fwSXLConnsAdded, fwSXLConnsDeleted)
-
-        perfdata = [('connections_active', fwSXLConnsExisting),
-                    ('connections_added', fwSXLConnsAdded),
-                    ('connections_deleted', fwSXLConnsDeleted),
-                    ]
-
-        return 0, infotext + longoutput, perfdata
-
-    else:
-        return 1, 'SXL not enabled'
-
-
-check_info['checkpoint_sxl_status'] = {
-    'check_function'         : check_checkpoint_sxl_status,
-    'inventory_function'     : inventory_checkpoint_sxl_status,
-    'service_description'    : 'SecureXL',
-    'has_perfdata'           : True,
-    #'snmp_scan_function': lambda oid: oid('.1.3.6.1.2.1.1.2.0') in ['.1.3.6.1.4.1.2620.1.6.123.1.67',  # ClusterXL Gateway
-    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.65',  # Appliance
-    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.64',  # VSX Gateway
-    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.62',  # Gateway
-    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.49',  # R77.30 Gateway
-    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.48',  # Mgmt
-    #                                                                '.1.3.6.1.4.1.8072.3.2.10']        # Virtual System (Linux),
-    'snmp_scan_function': lambda oid: (oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.2620.1.6.123.1') or
-                                       oid('.1.3.6.1.2.1.1.2.0') in ['.1.3.6.1.4.1.8072.3.2.10',])       # Virtual System (Linux)
-                                       and oid('.1.3.6.1.4.1.2620.1.36.1.1.0'),  # CHECKPOINT-MIB::fwSXLStatus
-    'group'                  : 'checkpoint_sxl_status',
-    'default_levels_variable': 'checkpoint_sxl_status_defaults',
-    'snmp_info'              : ( '.1.3.6.1.4.1.2620.1.36.1', [
-                                  '1',  # fwSXLStatus
-                                  '2',  # fwSXLConnsExisting
-                                  '3',  # fwSXLConnsAdded
-                                  '4',  # fwSXLConnsDeleted
-                                  ]),
-}
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+#
+# Monitor status of Check Point SecureXL
+#
+# Author: Th.L.
+# Date  : 2018-03-14
+#
+
+#
+# snmpwalk sample
+#
+# CHECKPOINT-MIB::fwSXLStatus.0 = INTEGER: enabled(1)
+# CHECKPOINT-MIB::fwSXLConnsExisting.0 = Wrong Type (should be INTEGER): Gauge32: 51
+# CHECKPOINT-MIB::fwSXLConnsAdded.0 = Wrong Type (should be INTEGER): Gauge32: 630
+# CHECKPOINT-MIB::fwSXLConnsDeleted.0 = Wrong Type (should be INTEGER): Gauge32: 578
+# 
+# .1.3.6.1.4.1.2620.1.36.1.1.0 = INTEGER: 1
+# .1.3.6.1.4.1.2620.1.36.1.2.0 = Gauge32: 40
+# .1.3.6.1.4.1.2620.1.36.1.3.0 = Gauge32: 645
+# .1.3.6.1.4.1.2620.1.36.1.4.0 = Gauge32: 604
+#
+# sample info
+#
+# [[u'1', u'48', u'7932', u'7986']]
+#
+
+factory_settings['checkpoint_securexl_defaults'] = {
+}
+
+
+def inventory_checkpoint_securexl(info):
+    return [(None, None)]
+
+
+def check_checkpoint_securexl(item, params, info):
+    state = 3
+    infotext = 'Item not found'
+    longoutput = ''
+    perfdata = []
+
+    now_time = time.time()
+    fwSXLStatus, fwSXLConnsExisting, fwSXLConnsAdded, fwSXLConnsDeleted = info[0]
+
+    if int(fwSXLStatus) == 1:
+        fwSXLConnsExisting = int(fwSXLConnsExisting)
+        fwSXLConnsAdded = get_rate('checkpoint_securexl.%s.%s' % ('fwSXLConnsAdded', item), now_time, int(fwSXLConnsAdded), onwrap=SKIP)
+        fwSXLConnsDeleted = get_rate('checkpoint_securexl.%s.%s' % ('fwSXLConnsDeleted', item), now_time, int(fwSXLConnsDeleted), onwrap=SKIP)
+
+        # Counters
+        infotext = 'Connections: Active %d, Added: %0.2f/s, Deleted: %0.2f/s' % (fwSXLConnsExisting, fwSXLConnsAdded, fwSXLConnsDeleted)
+
+        perfdata = [('connections_active', fwSXLConnsExisting),
+                    ('connections_added', fwSXLConnsAdded),
+                    ('connections_deleted', fwSXLConnsDeleted),
+                    ]
+
+        return 0, infotext + longoutput, perfdata
+
+    else:
+        return 1, 'SXL not enabled'
+
+
+check_info['checkpoint_securexl'] = {
+    'check_function'         : check_checkpoint_securexl,
+    'inventory_function'     : inventory_checkpoint_securexl,
+    'service_description'    : 'SecureXL',
+    'has_perfdata'           : True,
+    #'snmp_scan_function': lambda oid: oid('.1.3.6.1.2.1.1.2.0') in ['.1.3.6.1.4.1.2620.1.6.123.1.67',  # ClusterXL Gateway
+    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.65',  # Appliance
+    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.64',  # VSX Gateway
+    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.62',  # Gateway
+    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.49',  # R77.30 Gateway
+    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.48',  # Mgmt
+    #                                                                '.1.3.6.1.4.1.8072.3.2.10']        # Virtual System (Linux),
+    'snmp_scan_function': lambda oid: (oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.2620.1.6.123.1') or
+                                       oid('.1.3.6.1.2.1.1.2.0') in ['.1.3.6.1.4.1.8072.3.2.10',])       # Virtual System (Linux)
+                                       and oid('.1.3.6.1.4.1.2620.1.36.1.1.0'),  # CHECKPOINT-MIB::fwSXLStatus
+    'group'                  : 'checkpoint_securexl',
+    'default_levels_variable': 'checkpoint_securexl_defaults',
+    'snmp_info'              : ( '.1.3.6.1.4.1.2620.1.36.1', [
+                                  '1',  # fwSXLStatus
+                                  '2',  # fwSXLConnsExisting
+                                  '3',  # fwSXLConnsAdded
+                                  '4',  # fwSXLConnsDeleted
+                                  ]),
+}
diff --git a/packages/checkpoint_sxl_status b/packages/checkpoint_securexl
similarity index 59%
rename from packages/checkpoint_sxl_status
rename to packages/checkpoint_securexl
index 1b3e80f..01c2ed7 100644
--- a/packages/checkpoint_sxl_status
+++ b/packages/checkpoint_securexl
@@ -1,11 +1,11 @@
 {'author': u'Th.L. (thl-cmk[at]outlook[dot]com)',
  'description': u'Monitors Check Point SecureXL status\nhas Perfdata for: active, added and deleted connections\nWarning if status not enabled\n',
  'download_url': 'https://thl-cmk.hopto.org',
- 'files': {'checks': ['checkpoint_sxl_status'],
-           'web': ['plugins/metrics/checkpoint_sxl_status.py']},
- 'name': 'checkpoint_sxl_status',
+ 'files': {'checks': ['checkpoint_securexl'],
+           'web': ['plugins/metrics/checkpoint_securexl.py']},
+ 'name': 'checkpoint_securexl',
  'num_files': 2,
- 'title': u'Check Point SecureXL status',
+ 'title': u'Check Point SecureXL',
  'version': '20180731.v.0.0.1',
  'version.min_required': '1.2.8b8',
- 'version.packaged': '1.4.0p35'}
\ No newline at end of file
+ 'version.packaged': '1.6.0p8'}
\ No newline at end of file
diff --git a/web/plugins/metrics/checkpoint_securexl.py b/web/plugins/metrics/checkpoint_securexl.py
new file mode 100644
index 0000000..c9bf78a
--- /dev/null
+++ b/web/plugins/metrics/checkpoint_securexl.py
@@ -0,0 +1,54 @@
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+#
+# Check Point SecureXL staus metrics plugin
+# checkpoint_securexl
+#
+# Author: Th.L.
+# Date  : 2018-03-14
+#
+metric_info['checkpoint_securexl_connections_active'] = {
+    'title': _('Connections active'),
+    'unit': 'count',
+    'color': '11/a',
+}
+metric_info['checkpoint_securexl_connections_added'] = {
+    'title': _('Connections added'),
+    'unit': '1/s',
+    'color': '21/a',
+}
+metric_info['checkpoint_securexl_connections_deleted'] = {
+    'title': _('Connections deleted'),
+    'unit': '1/s',
+    'color': '31/a',
+}
+
+check_metrics['check_mk-checkpoint_securexl'] = {
+    'connections_active': {'name': 'checkpoint_securexl_connections_active', },
+    'connections_added': {'name': 'checkpoint_securexl_connections_added', },
+    'connections_deleted': {'name': 'checkpoint_securexl_connections_deleted', },
+}
+
+graph_info.append({
+    'title': _('Check Point SecureXL Connections active'),
+    'metrics': [
+        ('checkpoint_securexl_connections_active', 'area'),
+
+    ],
+})
+
+graph_info.append({
+    'title': _('Check Point SecureXL Connections added/deleted'),
+    'metrics': [
+        ('checkpoint_securexl_connections_deleted', '-area'),
+        ('checkpoint_securexl_connections_added', 'area'),
+    ],
+})
+
+
+perfometer_info.append({
+        'type': 'logarithmic',
+        'metric': 'checkpoint_securexl_connections_active',
+        'half_value': 2000.0,
+        'exponent': 2,
+    },)
\ No newline at end of file
diff --git a/web/plugins/metrics/checkpoint_sxl_status.py b/web/plugins/metrics/checkpoint_sxl_status.py
deleted file mode 100644
index 15d3d97..0000000
--- a/web/plugins/metrics/checkpoint_sxl_status.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/python
-# -*- encoding: utf-8; py-indent-offset: 4 -*-
-#
-# Check Point SecureXL staus metrics plugin
-# checkpoint_sxl_status
-#
-# Author: Th.L.
-# Date  : 2018-03-14
-#
-metric_info['checkpoint_sxl_status_connections_active'] = {
-    'title': _('Connections active'),
-    'unit': 'count',
-    'color': '11/a',
-}
-metric_info['checkpoint_sxl_status_connections_added'] = {
-    'title': _('Connections added'),
-    'unit': '1/s',
-    'color': '21/a',
-}
-metric_info['checkpoint_sxl_status_connections_deleted'] = {
-    'title': _('Connections deleted'),
-    'unit': '1/s',
-    'color': '31/a',
-}
-
-check_metrics['check_mk-checkpoint_sxl_status'] = {
-    'connections_active': {'name': 'checkpoint_sxl_status_connections_active', },
-    'connections_added': {'name': 'checkpoint_sxl_status_connections_added', },
-    'connections_deleted': {'name': 'checkpoint_sxl_status_connections_deleted', },
-}
-
-graph_info.append({
-    'title': _('Check Point SecureXL Connections active'),
-    'metrics': [
-        ('checkpoint_sxl_status_connections_active', 'area'),
-
-    ],
-})
-
-graph_info.append({
-    'title': _('Check Point SecureXL Connections added/deleted'),
-    'metrics': [
-        ('checkpoint_sxl_status_connections_deleted', '-area'),
-        ('checkpoint_sxl_status_connections_added', 'area'),
-    ],
-})
-
-
-perfometer_info.append({
-        'type': 'logarithmic',
-        'metric': 'checkpoint_sxl_status_connections_active',
-        'half_value': 2000.0,
-        'exponent': 2,
-    },)
\ No newline at end of file
-- 
GitLab