From 233e07be95fee64009898179c220e098b43d75e5 Mon Sep 17 00:00:00 2001
From: Thl CMK <thl-cmk@outlook.com>
Date: Mon, 8 Jun 2020 20:21:01 +0200
Subject: [PATCH] update project
---
checkpoint_securexl.mkp | Bin 2088 -> 2057 bytes
checks/checkpoint_securexl | 41 +++++++++------------
packages/checkpoint_securexl | 6 +--
web/plugins/metrics/checkpoint_securexl.py | 12 ++++--
4 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/checkpoint_securexl.mkp b/checkpoint_securexl.mkp
index 5e354fd466179262b927ea49909fe66298ffb5cf..5df0c7d463d535e45a23a4b48349cfad085b6623 100644
GIT binary patch
delta 2019
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
B@-P4Z
delta 2074
zcmV+#2<7*Q5U3D;ABzYGx{cOe0{>%ZWn*h_Z)t9HUvp(+b#i5RY%MY{F*q<cGchi9
zE-)@IE-@}`Yj6PVTitHkI2O)zfV>08ML~PVmL>UjJjg{iQ*?`IXNyTOQ@~>gj78hp
z$f8!F;sizBeGe(gl4IF%GOdeZ&)3GX$@9lU@*`!@UN94XCtn#Rpx^E4E8yYPGVQ^M
z)#>+pJ+t2**e6f|WhcZuIRcVcvWSo`(#Ue-z7u?=ERhQl(Gf}L$A$6EAa%L$ThrzB
zn8}Gqq%Xwv*cEaz70U)~o)YTvcp7=3^hBW5-iyGKB8thyf={o>2jK;hT=HoW@lWpv
z<X0x~U%`TZ#pDBzW-gPA%tSOIY%0AQ-XzR*xl35!5|{g2!uzQR0zOp^K=Dr&1zs>G
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
E0Cu(yvj6}9
diff --git a/checks/checkpoint_securexl b/checks/checkpoint_securexl
index b597603..6a87022 100644
--- a/checks/checkpoint_securexl
+++ b/checks/checkpoint_securexl
@@ -1,12 +1,16 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
#
-# Monitor status of Check Point SecureXL
+# License: GNU General Public License v2
#
-# Author: Th.L.
+# Author: thl-cmk[at]outlook[dot]com
+# URL : https://thl-cmk.hopto.org
# Date : 2018-03-14
#
-
+# Monitor status of Check Point SecureXL
+#
+# 2020-06-08: changed snmp-scan function
+# renamed from checkpoint_securexl_status to checkpoint_securexl
#
# snmpwalk sample
#
@@ -33,16 +37,14 @@ 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()
+def check_checkpoint_securexl(_no_item, _no_params, info):
fwSXLStatus, fwSXLConnsExisting, fwSXLConnsAdded, fwSXLConnsDeleted = info[0]
if int(fwSXLStatus) == 1:
+ longoutput = ''
+
+ now_time = time.time()
+
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)
@@ -55,10 +57,10 @@ def check_checkpoint_securexl(item, params, info):
('connections_deleted', fwSXLConnsDeleted),
]
- return 0, infotext + longoutput, perfdata
+ yield 0, infotext + longoutput, perfdata
else:
- return 1, 'SXL not enabled'
+ yield 1, 'SXL not enabled'
check_info['checkpoint_securexl'] = {
@@ -66,22 +68,15 @@ check_info['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_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').startswith('.1.3.6.1.4.1.8072.3.2.10')) and
+ oid('.1.3.6.1.4.1.2620.1.6.1.0', '').lower().startswith('svn foundation'),
'snmp_info' : ( '.1.3.6.1.4.1.2620.1.36.1', [
'1', # fwSXLStatus
'2', # fwSXLConnsExisting
'3', # fwSXLConnsAdded
'4', # fwSXLConnsDeleted
]),
-}
+}
\ No newline at end of file
diff --git a/packages/checkpoint_securexl b/packages/checkpoint_securexl
index 01c2ed7..7741455 100644
--- a/packages/checkpoint_securexl
+++ b/packages/checkpoint_securexl
@@ -5,7 +5,7 @@
'web': ['plugins/metrics/checkpoint_securexl.py']},
'name': 'checkpoint_securexl',
'num_files': 2,
- 'title': u'Check Point SecureXL',
- 'version': '20180731.v.0.0.1',
+ 'title': u'Check Point SecureXL status',
+ 'version': '20200608.v.0.0.2',
'version.min_required': '1.2.8b8',
- 'version.packaged': '1.6.0p8'}
\ No newline at end of file
+ 'version.packaged': '1.4.0p38'}
\ No newline at end of file
diff --git a/web/plugins/metrics/checkpoint_securexl.py b/web/plugins/metrics/checkpoint_securexl.py
index fa238e9..1a501e0 100644
--- a/web/plugins/metrics/checkpoint_securexl.py
+++ b/web/plugins/metrics/checkpoint_securexl.py
@@ -1,16 +1,19 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
#
-# Check Point SecureXL staus metrics plugin
-# checkpoint_securexl
+# License: GNU General Public License v2
#
-# Author: Th.L.
+# Author: thl-cmk[at]outlook[dot]com
+# URL : https://thl-cmk.hopto.org
# Date : 2018-03-14
#
+# Check Point SecureXL staus metrics plugin
+# checkpoint_securexl
+#
metric_info['checkpoint_securexl_connections_active'] = {
'title': _('Connections active'),
'unit': 'count',
- 'color': '26/a',
+ 'color': '11/a',
}
metric_info['checkpoint_securexl_connections_added'] = {
'title': _('Connections added'),
@@ -33,6 +36,7 @@ graph_info.append({
'title': _('Check Point SecureXL Connections active'),
'metrics': [
('checkpoint_securexl_connections_active', 'area'),
+
],
})
--
GitLab