From 761a1f0b8f1ef5e8a9f54a9ac4dbbbd8bfffb4df Mon Sep 17 00:00:00 2001
From: Thl CMK <thl-cmk@outlook.com>
Date: Mon, 8 Jun 2020 21:27:59 +0200
Subject: [PATCH] update project
---
checkpoint_log_server.mkp | Bin 5927 -> 5936 bytes
checks/checkpoint_fw_ls | 7 +++--
checks/checkpoint_fwm_ls | 19 ++++++++++---
packages/checkpoint_log_server | 2 +-
web/plugins/metrics/checkpoint_fw_log.py | 34 +++++++++++------------
web/plugins/wato/checkpoint_fwm_ls.py | 12 ++++----
6 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/checkpoint_log_server.mkp b/checkpoint_log_server.mkp
index e4184d6975194ffcc35e10f3565ea35e39611ae1..126699a5e6c73459a33ebd136b273a74b2f7b317 100644
GIT binary patch
literal 5936
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
literal 5927
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
W=WF|4Yx;u`O-pdBD~NT9h4mlLEZyP&
diff --git a/checks/checkpoint_fw_ls b/checks/checkpoint_fw_ls
index 4f7c0a3..154b62b 100644
--- a/checks/checkpoint_fw_ls
+++ b/checks/checkpoint_fw_ls
@@ -6,12 +6,12 @@
# Author: thl-cmk[at]outlook[dot]com
# URL : https://thl-cmk.hopto.org
#
-#
# 19.07.2016 : monitor Check Point FW Log server status
# 24.07.2016 : changed for check state
# 05.01.2018 : fix inventory function
# 08.03.2018 : changed snmp scan function and inventory function
# 15.03.2018 : code cleanup
+# 08.06.2020 : changed snmp-scan function
#
# sample snmpwalk
#
@@ -165,8 +165,9 @@ check_info['checkpoint_fw_ls'] = {
'group' : 'cp_fw_ls',
'has_perfdata' : True,
'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.1.30.1.0'), # todo: mib variable missing
+ 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.1.30', [ # CHECKPOINT-MIB:fwLSConn
'1', # fwLSConnOverall
diff --git a/checks/checkpoint_fwm_ls b/checks/checkpoint_fwm_ls
index 4503348..83e158d 100644
--- a/checks/checkpoint_fwm_ls
+++ b/checks/checkpoint_fwm_ls
@@ -6,13 +6,13 @@
# Author: thl-cmk[at]outlook[dot]com
# URL : https://thl-cmk.hopto.org
#
-#
# 29.07.2016 : monitor Check Point FWM log server status
# 08.05.2018 : changed snmp scan and inventory function
# 16.03.2018 : added R80.10 MIBs
# 30.05.2018 : removed empty OIDs CHECKPOINT-MIB::lsConnectedClientsEntry,
# CHECKPOINT-MIB::lsConnectedGatewaysEntry
# CHECKPOINT-MIB::lsLoggingInfo
+# 08.06.2020 : changed snmp-scan function
#
#
@@ -132,6 +132,12 @@
# .1.3.6.1.4.1.2620.1.11.102.0 = STRING: "Problem"
# .1.3.6.1.4.1.2620.1.11.103.0 = STRING: "Log Server is not running"
#
+# sample info
+# [[[u'Check Point Log Server', u'6', u'0', u'4663', u'1', u'0', u'OK', u'OK']], []]
+#
+# no logserver active
+# [[], []]
+#
factory_settings['checkpoint_fwm_ls_defaults'] = {
'ignore_status_on_r80_10': False,
@@ -139,7 +145,11 @@ factory_settings['checkpoint_fwm_ls_defaults'] = {
def inventory_checkpoint_fwm_ls(info):
- return [(None, None)]
+ try:
+ if info[0][0][0] == 'Check Point Log Server':
+ return [(None, None)]
+ except IndexError:
+ pass
def check_checkpoint_fwm_ls(item, params, info):
@@ -184,8 +194,9 @@ check_info['checkpoint_fwm_ls'] = {
'service_description' : 'FWM Log Server',
'group' : 'checkpoint_fwm_ls',
'has_perfdata' : True,
- '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')
- and oid('.1.3.6.1.4.1.2620.1.11.1.0') == 'Check Point Log Server',
+ '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.11', [ # CHECKPOINT-MIB::ls
'1', # lsProdName
'2', # lsVerMajor
diff --git a/packages/checkpoint_log_server b/packages/checkpoint_log_server
index 9a2f861..3019e8d 100644
--- a/packages/checkpoint_log_server
+++ b/packages/checkpoint_log_server
@@ -8,6 +8,6 @@
'name': 'checkpoint_log_server',
'num_files': 6,
'title': u'Check Point Log service status',
- 'version': '20180731.v0.1.2c',
+ 'version': '20200608.v0.1.2d',
'version.min_required': '1.2.8b8',
'version.packaged': '1.4.0p38'}
\ No newline at end of file
diff --git a/web/plugins/metrics/checkpoint_fw_log.py b/web/plugins/metrics/checkpoint_fw_log.py
index c06f5a1..a53ef72 100644
--- a/web/plugins/metrics/checkpoint_fw_log.py
+++ b/web/plugins/metrics/checkpoint_fw_log.py
@@ -1,25 +1,27 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
#
-# Check Point Logserver metrics plugins
-# checkpoint_fw_ls / checkpoint_fwm_ls
-
+# 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-17
#
+# Check Point Logserver metrics plugins
+# checkpoint_fw_ls / checkpoint_fwm_ls
+#
-#####################################################################################################################
+##############################################################################
#
# define units for perfdata
#
-#####################################################################################################################
+##############################################################################
-#####################################################################################################################
+##############################################################################
#
# define metrics for perfdata
#
-#####################################################################################################################
+##############################################################################
metric_info['checkpoint_fw_ls_localloggingwriterate'] = {
'title': _('Local Logging Writing Rate'),
@@ -37,7 +39,6 @@ metric_info['checkpoint_fw_ls_lsconnsendrate'] = {
'color': '31/a',
}
-
metric_info['checkpoint_fwm_ls_totalreadlogs'] = {
'title': _('Total read logs'),
'unit': '1/s',
@@ -81,11 +82,11 @@ metric_info['checkpoint_fwm_ls_readlogsratepeak'] = {
'color': '22/a',
}
-######################################################################################################################
+##############################################################################
#
# map perfdata to metric
#
-######################################################################################################################
+##############################################################################
check_metrics['check_mk-checkpoint_fw_ls'] = {
@@ -105,12 +106,11 @@ check_metrics['check_mk-checkpoint_fwm_ls'] = {
}
-
-######################################################################################################################
+##############################################################################
#
# how to graph perdata
#
-######################################################################################################################
+##############################################################################
graph_info.append({
'title': _('Check Point Firewall Logserver: over all'),
@@ -151,11 +151,11 @@ graph_info.append({
],
})
-######################################################################################################################
+##############################################################################
#
# define perf-o-meter
#
-######################################################################################################################
+##############################################################################
perfometer_info.append(('stacked', [
{
@@ -170,4 +170,4 @@ perfometer_info.append(('stacked', [
'half_value': 1000.0,
'exponent': 2,
},
-]))
+]))
\ No newline at end of file
diff --git a/web/plugins/wato/checkpoint_fwm_ls.py b/web/plugins/wato/checkpoint_fwm_ls.py
index 3137724..2eed3c7 100644
--- a/web/plugins/wato/checkpoint_fwm_ls.py
+++ b/web/plugins/wato/checkpoint_fwm_ls.py
@@ -13,13 +13,13 @@ register_check_parameters(
Dictionary(
elements=[
('ignore_status_on_r80_10',
- FixedValue(
- True,
- help=_('Ignore status and alive on Check Point R80.10'),
- title=_('Ignore status and alive on Check Point R80.10'),
- )),
+ FixedValue(
+ True,
+ help=_('Ignore status and alive on Check Point R80.10'),
+ title=_('Ignore status and alive on Check Point R80.10'),
+ )),
],
),
None,
match_type='dict',
-)
\ No newline at end of file
+)
--
GitLab