diff --git a/checkpoint_threat_emulation.mkp b/checkpoint_threat_emulation.mkp
index 6c1fcc6595a5d36931df99c13230aa626fc0267c..d28ec4a6de74c47b7a51ae9d864843ecf5771e11 100644
Binary files a/checkpoint_threat_emulation.mkp and b/checkpoint_threat_emulation.mkp differ
diff --git a/checks/checkpoint_threat_emulation b/checks/checkpoint_threat_emulation
index 751445b06850c94454efc0ebaf42d406817fbbfe..ed0e89202519cdd12645fb2e26da0a36ee185a85 100644
--- a/checks/checkpoint_threat_emulation
+++ b/checks/checkpoint_threat_emulation
@@ -13,6 +13,7 @@
# 2018-05-30: removed 'unknown' OIDs
# removed counters for last day, last week, last month
# code cleanup
+# 2020-06-08: changed snmp-scan function
#
# snmpwalk sample
#
@@ -131,17 +132,9 @@ check_info['checkpoint_threat_emulation'] = {
'inventory_function' : inventory_checkpoint_threat_emulation,
'service_description' : 'Threat Emulation 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.49.16.0'), # CHECKPOINT-MIB::teUpdateStatus.0
- 'group' : 'checkpoint_threat_emulation',
+ 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'), 'group' : 'checkpoint_threat_emulation',
'default_levels_variable': 'checkpoint_threat_emulation_defaults',
'snmp_info' : [('.1.3.6.1.4.1.2620.1.49', [ # CHECKPOINT-MIB::te (status)
'3', # monthly_quota_on_cloud_used
diff --git a/packages/checkpoint_threat_emulation b/packages/checkpoint_threat_emulation
index e0001d4467a05c0f8a8253604f6866b7aaaa2d40..269c380ecc203aadfc1c776627b457fad3daf9e9 100644
--- a/packages/checkpoint_threat_emulation
+++ b/packages/checkpoint_threat_emulation
@@ -7,6 +7,6 @@
'name': 'checkpoint_threat_emulation',
'num_files': 3,
'title': u'Check Point Threat Emulation',
- 'version': '20180731.v.0.0.3',
+ 'version': '20200608.v.0.0.3a',
'version.min_required': '1.2.8b8',
'version.packaged': '1.4.0p38'}
\ No newline at end of file
diff --git a/web/plugins/metrics/checkpoint_threat_emulation.py b/web/plugins/metrics/checkpoint_threat_emulation.py
index 46a14cde2968684be0ced251516f4ac3caf65b48..e19c01308f53e848ab0c6ab979c524ccef481c67 100644
--- a/web/plugins/metrics/checkpoint_threat_emulation.py
+++ b/web/plugins/metrics/checkpoint_threat_emulation.py
@@ -1,12 +1,15 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
#
-# Check Point Threat Emulation metrics plugin
-# checkpoint_threat_emulation
+# 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-19
#
+# Check Point Threat Emulation metrics plugin
+# checkpoint_threat_emulation
+#
metric_info['checkpoint_threat_emulation_remaining_quota_on_cloud'] = {
'title': _('Remaining quota on cloud'),
@@ -73,20 +76,22 @@ metric_info['checkpoint_threat_emulation_peak_queue_size_current'] = {
}
check_metrics['check_mk-checkpoint_threat_emulation'] = {
- 'remaining_quota_on_cloud': {'name': 'checkpoint_threat_emulation_remaining_quota_on_cloud',},
- 'monthly_quota_on_cloud_used': {'name': 'checkpoint_threat_emulation_monthly_quota_on_cloud_used',},
- 'current_files_waiting_for_emulation': {'name': 'checkpoint_threat_emulation_current_files_waiting_for_emulation',},
- 'scanned_files_current': {'name': 'checkpoint_threat_emulation_scanned_files_current',},
- 'malicious_files_detected_current': {'name': 'checkpoint_threat_emulation_malicious_files_detected_current',},
- 'files_scanned_by_threat_cloud_current': {'name': 'checkpoint_threat_emulation_files_scanned_by_threat_cloud_current',},
- 'malicious_files_detected_by_threat_cloud_current': {'name': 'checkpoint_threat_emulation_malicious_files_detected_by_threat_cloud_current',},
- 'average_process_time_current': {'name': 'checkpoint_threat_emulation_average_process_time_current',},
- 'average_emulated_file_size_current': {'name': 'checkpoint_threat_emulation_average_emulated_file_size_current',},
- 'average_queue_size_current': {'name': 'checkpoint_threat_emulation_average_queue_size_current',},
+ 'remaining_quota_on_cloud': {'name': 'checkpoint_threat_emulation_remaining_quota_on_cloud', },
+ 'monthly_quota_on_cloud_used': {'name': 'checkpoint_threat_emulation_monthly_quota_on_cloud_used', },
+ 'current_files_waiting_for_emulation': {
+ 'name': 'checkpoint_threat_emulation_current_files_waiting_for_emulation', },
+ 'scanned_files_current': {'name': 'checkpoint_threat_emulation_scanned_files_current', },
+ 'malicious_files_detected_current': {'name': 'checkpoint_threat_emulation_malicious_files_detected_current', },
+ 'files_scanned_by_threat_cloud_current': {
+ 'name': 'checkpoint_threat_emulation_files_scanned_by_threat_cloud_current', },
+ 'malicious_files_detected_by_threat_cloud_current': {
+ 'name': 'checkpoint_threat_emulation_malicious_files_detected_by_threat_cloud_current', },
+ 'average_process_time_current': {'name': 'checkpoint_threat_emulation_average_process_time_current', },
+ 'average_emulated_file_size_current': {'name': 'checkpoint_threat_emulation_average_emulated_file_size_current', },
+ 'average_queue_size_current': {'name': 'checkpoint_threat_emulation_average_queue_size_current', },
'peak_queue_size_current': {'name': 'checkpoint_threat_emulation_peak_queue_size_current', },
}
-
graph_info.append({
'title': _('Check Point Threat Emulation remaining quota on cloud'),
'metrics': [
@@ -164,4 +169,4 @@ graph_info.append({
'metrics': [
('checkpoint_threat_emulation_peak_queue_size_current', 'line'),
],
-})
+})
\ No newline at end of file