diff --git a/checkman/checkpoint_fw_ls b/checkman/checkpoint_fw_ls
index 34dcffc1ea72faf0ab1285587e9247da87cc8125..5df3d275716896aac95b5ef827bc5a7ffde4cf79 100644
--- a/checkman/checkpoint_fw_ls
+++ b/checkman/checkpoint_fw_ls
@@ -1,4 +1,4 @@
-title: Checkpoint Firewalls: Status of Connection to log server
+title: Checkpoint Firewalls: Status of Connection to the log server
agents: snmp
catalog: hw/network/checkpoint
license: GPL
@@ -6,7 +6,7 @@ distribution: https://thl-cmk.hopto.org
description:
This check monitors the connection form the firewall to the log server.
The service for the log server connection will be in the state {CRIT} if there
- an connection error or the connection state changes (for example form connected
+ is an connection error or the connection state changes (for example form connected
to disconnected). The overall state changes to {WARN}/{CRIT} if the gateway
reports an overall state of error or warning. For "Local Logging" the over all
service changes to {WARN} if the gateway reports "local logging configured" or
diff --git a/checkman/checkpoint_fwm_ls b/checkman/checkpoint_fwm_ls
index eec17bca57c9248e6f5a6605cf8b41f17b687b32..bd7564584f154fb24a540f87611b3ae61d35b0ca 100644
--- a/checkman/checkpoint_fwm_ls
+++ b/checkman/checkpoint_fwm_ls
@@ -6,7 +6,7 @@ distribution: https://thl-cmk.hopto.org
description:
This check monitors the log server service on the SmartManagemet, SmartLog or SmartEvent server.
The service will be in the state {CRIT} if the server reports the log service is not alive or if there
- an other error. In this case the check output gives details on the log server status.
+ is an other error. In this case the check output gives details on the log server status.
On R80.10 the server does not always report the correct state. For ths reason you can disable
the the state check via WATO ("Ignore status and alive on Check Point R80.10")
diff --git a/checkpoint_log_server.mkp b/checkpoint_log_server.mkp
index c1560810d772e723c6e18ff4daa1fdf755e5d1cb..e4184d6975194ffcc35e10f3565ea35e39611ae1 100644
Binary files a/checkpoint_log_server.mkp and b/checkpoint_log_server.mkp differ
diff --git a/checks/checkpoint_fw_ls b/checks/checkpoint_fw_ls
index 48ea0c8b56d903120d6d291b56bd6b738fcd984e..4f7c0a3bfec515080ee487dfb066709e13c9e904 100644
--- a/checks/checkpoint_fw_ls
+++ b/checks/checkpoint_fw_ls
@@ -1,13 +1,17 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
-
#
-# 19.07.2016 : Th.L. : monitor Check Point FW Log server status
-# 24.07.2016 : Th.L. : changed for check state
-# 05.01.2018 : Th.L. : fix inventory function
-# 08.03.2018 : Th.L. : changed snmp scan function and inventory function
-# 15.03.2018 : Th.L. : code cleanup
-# 09.01.2020 : Th.L. : fix missing . in OID
+# License: GNU General Public License v2
+#
+# 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
#
# sample snmpwalk
#
@@ -160,13 +164,6 @@ check_info['checkpoint_fw_ls'] = {
'service_description' : 'FW Log server %s',
'group' : 'cp_fw_ls',
'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.1.30.1.0'), # todo: mib variable missing
@@ -187,4 +184,4 @@ check_info['checkpoint_fw_ls'] = {
'5', # fwLSConnSendRate
]),
],
-}
+}
\ No newline at end of file
diff --git a/checks/checkpoint_fwm_ls b/checks/checkpoint_fwm_ls
index e47fa9c09730e6210c5c9b191a4def3dc938b1db..450334872953bac490e5e5ee9f0cc039b7a2869c 100644
--- a/checks/checkpoint_fwm_ls
+++ b/checks/checkpoint_fwm_ls
@@ -1,13 +1,18 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
-
#
-# 29.07.2016 : Th.L. : monitor Check Point FWM log server status
-# 08.05.2018 : Th.L. : changed snmp scan and inventory function
-# 16.03.2018 : Th.L. : added R80.10 MIBs
-# 30.05.2018 : Th.L. : removed empty OIDs CHECKPOINT-MIB::lsConnectedClientsEntry,
-# CHECKPOINT-MIB::lsConnectedGatewaysEntry
-# CHECKPOINT-MIB::lsLoggingInfo
+# License: GNU General Public License v2
+#
+# 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
#
#
@@ -227,4 +232,4 @@ check_info['checkpoint_fwm_ls'] = {
# '5', # lsClientDbLock
# ]),
]
-}
+}
\ No newline at end of file
diff --git a/packages/checkpoint_log_server b/packages/checkpoint_log_server
index 60859201cca44f04af4b8f4b4b5d98009ef60f3a..9a2f8612447249a1132e4218285945372f997707 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': '20200109.v0.1.2d',
+ 'version': '20180731.v0.1.2c',
'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/wato/checkpoint_fwm_ls.py b/web/plugins/wato/checkpoint_fwm_ls.py
index 4dc832c9960befe915d29f7cd9105fbe8526e4c4..3137724db877c9f3dd5350f0ab9a27ba3947292d 100644
--- a/web/plugins/wato/checkpoint_fwm_ls.py
+++ b/web/plugins/wato/checkpoint_fwm_ls.py
@@ -1,6 +1,11 @@
#!/usr/bin/python
# -*- encoding: utf-8; py-indent-offset: 4 -*-
-
+#
+# License: GNU General Public License v2
+#
+# Author: thl-cmk[at]outlook[dot]com
+# URL : https://thl-cmk.hopto.org
+#
register_check_parameters(
subgroup_applications,
'checkpoint_fwm_ls',
@@ -17,4 +22,4 @@ register_check_parameters(
),
None,
match_type='dict',
-)
+)
\ No newline at end of file