diff --git a/checkpoint_identity_awareness.mkp b/checkpoint_identity_awareness.mkp
index 1afe5a3a6ec3933beeaa8689ae9b7efb1d757667..c418891959721aec540ef31b364c218367a9e62a 100644
Binary files a/checkpoint_identity_awareness.mkp and b/checkpoint_identity_awareness.mkp differ
diff --git a/checks/checkpoint_ia_adquery b/checks/checkpoint_ia_adquery
index 61a9acafc7a3fcf1adc0a8ceb6ccace38b4bc23e..ce11a7ee66d20a279a00ea62ae8bf9a048ffe99b 100644
--- a/checks/checkpoint_ia_adquery
+++ b/checks/checkpoint_ia_adquery
@@ -1,12 +1,15 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
#
-# Check Point Identity Awareness status
+# License: GNU General Public License v2
#
-# Author: Th.L.
+# Author: thl-cmk[at]outlook[dot]com
+# URL : https://thl-cmk.hopto.org
# Date : 2017-17-05
#
-# Monitor status of virtual systems in Check Point vsx/vsls cluster
+# Check Point Identity Awareness status
+#
+# 2020.06.08: changed snmp-scan function
#
# snmpwalk sample
# .1.3.6.1.4.1.2620.1.38.25.1.1.1.0 = Counter32: 1
@@ -54,7 +57,7 @@ def inventory_checkpoint_ia_adquery(info):
dc_ip_address = dc[3]
if not domain in domains and not domain == '' and len(dc_ip_address.split('.')) == 4:
domains.append(domain)
- yield domain, {}
+ yield domain, None
def check_checkpoint_ia_adquery(item, params, info):
@@ -64,7 +67,7 @@ def check_checkpoint_ia_adquery(item, params, info):
2: 'Connectivity Error',
3: 'Internal Error',
4: 'Connection Time Out'}
- state = 0
+
infotext = ''
longoutput = ''
perfdata = []
@@ -105,26 +108,19 @@ def check_checkpoint_ia_adquery(item, params, info):
infotext += "# of DCs %s, Events: %.2f/s" % (len(dcs), events_sum)
- yield state, infotext + longoutput, perfdata
+ yield 0, infotext + longoutput, perfdata
+
check_info['checkpoint_ia_adquery'] = {
'check_function' : check_checkpoint_ia_adquery,
'inventory_function' : inventory_checkpoint_ia_adquery,
'service_description' : 'Identity Awareness AD Domain %s',
'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.38.25.1.1.1.0'),
- 'group' : 'checkpoint_ia_adquery',
+ 'group': 'checkpoint_ia_adquery',
'default_levels_variable': 'checkpoint_ia_adquery_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.38.25.1', [ # CHECKPOINT-MIB::identityAwarenessADQueryStatusEntry
'1', # identityAwarenessADQueryStatusTableIndex
'2', # identityAwarenessADQueryStatusCurrStatus
@@ -132,4 +128,4 @@ check_info['checkpoint_ia_adquery'] = {
'4', # identityAwarenessADQueryStatusDomainIP
'5', # identityAwarenessADQueryStatusEvents
]),
-}
+}
\ No newline at end of file
diff --git a/checks/checkpoint_identity_awareness b/checks/checkpoint_identity_awareness
index 651644d04759cdeb3e4eafe59bf1457bcbcf2dc1..e01b0602c592154211eb80046be5f0cc74f1bcb4 100644
--- a/checks/checkpoint_identity_awareness
+++ b/checks/checkpoint_identity_awareness
@@ -1,12 +1,16 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
#
-# Check Point Identity Awareness status
+# License: GNU General Public License v2
#
-# Author: Th.L.
+# Author: thl-cmk[at]outlook[dot]com
+# URL : https://thl-cmk.hopto.org
# Date : 2017-17-05
#
-# 2018-03-15 : code cleanup, added identity counters 39-44
+# Check Point Identity Awareness status
+#
+# 2018-03-15 : code cleanup, added identity counters 39-44
+# 2020-06-08 : changed snmp-scan function
#
# snmpwalk sample
#
@@ -57,7 +61,6 @@ def inventory_checkpoint_identity_awareness(info):
def check_checkpoint_identity_awareness(item, params, info):
- state = 0
infotext = ''
longoutput = ''
perfdata = []
@@ -111,8 +114,7 @@ def check_checkpoint_identity_awareness(item, params, info):
infotext = 'authenticated users: %s, unauthenticated guests: %s' % (iaAuthUsers, iaUnAuthUsers)
if not iaStatus == '0':
- infotext += ' %s' % iaStatusLongDesc
- state = max(1, state)
+ yield 1, '%s' % iaStatusLongDesc
iaSuccUserLDAP = get_rate('checkpoint_identity_awareness.%s' % 'iaSuccUserLDAP', now_time, int(iaSuccUserLDAP), onwrap=SKIP)
iaUnSuccUserLDAP = get_rate('checkpoint_identity_awareness.%s' % 'iaUnSuccUserLDAP', now_time, int(iaUnSuccUserLDAP), onwrap=SKIP)
@@ -165,26 +167,18 @@ def check_checkpoint_identity_awareness(item, params, info):
if entry[0] == counter:
perfdata.remove(entry)
- return state, infotext + longoutput, perfdata
+ yield 0, infotext + longoutput, perfdata
check_info['checkpoint_identity_awareness'] = {
'check_function' : check_checkpoint_identity_awareness,
'inventory_function' : inventory_checkpoint_identity_awareness,
'service_description' : 'Identity Awareness status',
- '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.38.1.0') == 'Identity Awareness',
- 'group' : 'checkpoint_identity_awareness',
+ 'group': 'checkpoint_identity_awareness',
'default_levels_variable': 'checkpoint_identity_awareness_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.38', [ # CHECKPOINT-MIB::identityAwareness
'1', # identityAwarenessProductName
'2', # identityAwarenessAuthUsers
@@ -221,4 +215,4 @@ check_info['checkpoint_identity_awareness'] = {
'102', # identityAwarenessStatusShortDesc
'103', # identityAwarenessStatusLongDesc
]),
-}
+}
\ No newline at end of file
diff --git a/packages/checkpoint_identity_awareness b/packages/checkpoint_identity_awareness
index 672e20b9ac1393aa0f9156ea9798df26e8cb47f2..31f53e2cf5f0c3f8f3f25e052fad54a2d4ffecfd 100644
--- a/packages/checkpoint_identity_awareness
+++ b/packages/checkpoint_identity_awareness
@@ -9,6 +9,6 @@
'name': 'checkpoint_identity_awareness',
'num_files': 5,
'title': u'Check Point Identity Awareness checks',
- 'version': '20180731.v.0.1c',
+ 'version': '20200608.v.0.1d',
'version.min_required': '1.2.8b8',
- 'version.packaged': '1.4.0p35'}
\ No newline at end of file
+ 'version.packaged': '1.4.0p38'}
\ No newline at end of file
diff --git a/web/plugins/metrics/checkpoint_ia_adquery.py b/web/plugins/metrics/checkpoint_ia_adquery.py
index b7400c385984319353640d55f722a2eda8659da8..cc9811a0b32b7c72c658f76d88a8356c6502a7a9 100644
--- a/web/plugins/metrics/checkpoint_ia_adquery.py
+++ b/web/plugins/metrics/checkpoint_ia_adquery.py
@@ -1,12 +1,14 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
#
-# Check Point Identity Awareness AD Query metrics plugin
-# checkpoint_ia_query
+# 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.12
#
+# Check Point Identity Awareness AD Query metrics plugin
+# checkpoint_ia_query
#
metric_info['checkpoint_ia_adquery_summary'] = {
'title': _('Events summary'),
@@ -41,7 +43,6 @@ metric_info['checkpoint_ia_adquery_dc_10_225_110_240'] = {
'color': '42/a',
}
-
metric_info['checkpoint_ia_adquery_dc_10_250_1_112'] = {
'title': _('S250AD01 (10.250.1.112)'),
'unit': '1/s',
@@ -66,7 +67,6 @@ check_metrics['check_mk-checkpoint_ia_adquery'] = {
'dc_10_250_1_113': {'name': 'checkpoint_ia_adquery_dc_10_250_1_113', },
}
-
# igepa graph
graph_info.append({
'title': _('Check Point Identity Awareness AD queries'),
@@ -98,12 +98,9 @@ graph_info.append({
],
})
-
-
-
perfometer_info.append({
- 'type': 'linear',
- 'segments': ['checkpoint_ia_adquery_summary',
- ],
- 'total': 100,
+ 'type': 'linear',
+ 'segments': ['checkpoint_ia_adquery_summary',
+ ],
+ 'total': 100,
})
diff --git a/web/plugins/metrics/checkpoint_identity_awareness.py b/web/plugins/metrics/checkpoint_identity_awareness.py
index 15b738f8e4c649ff67dd9a94ef4b12db51f22e55..3f37f854ddd08f4eefa9138eaec1e206932ae691 100644
--- a/web/plugins/metrics/checkpoint_identity_awareness.py
+++ b/web/plugins/metrics/checkpoint_identity_awareness.py
@@ -1,12 +1,15 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
#
-# Check Point Identity Awareness metrics plugin
-# checkpoint_identity_awareness
+# License: GNU General Public License v2
#
-# Author: Th.L.
+# Author: thl-cmk[at]outlook[dot]com
+# URL : https://thl-cmk.hopto.org
# Date : 2018-01-02
#
+# Check Point Identity Awareness metrics plugin
+# checkpoint_identity_awareness
+#
metric_info['checkpoint_identity_awareness_iaSuccUserLoginADQuery'] = {
'title': _('Successfull ADQuery user login attempts'),
diff --git a/web/plugins/wato/checkpoint_identity_awareness.py b/web/plugins/wato/checkpoint_identity_awareness.py
index e4cb3b478958015074ad775e9d26c73b3be3df71..f75fd95c79d6efea99f410e8361fff41f942dff1 100644
--- a/web/plugins/wato/checkpoint_identity_awareness.py
+++ b/web/plugins/wato/checkpoint_identity_awareness.py
@@ -1,14 +1,13 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
-
#
-# Check_MK checkpoint_identity_awareness WATO plugin
+# License: GNU General Public License v2
#
-# Author: Th.L.
+# Author: thl-cmk[at]outlook[dot]com
+# URL : https://thl-cmk.hopto.org
# Date: 2017-12-20
#
-#
-#
+# Check_MK checkpoint_identity_awareness WATO plugin
#
ignorecounters = [
# ('iaAuthUsers', 'Authenticated users and machines'), # will be used in perf-o-meter