From fb46c3cb75f25baaf47b41697ffa5ac7c1014f18 Mon Sep 17 00:00:00 2001
From: "Th.L" <thl-cmk@outlook.com>
Date: Mon, 14 Jun 2021 21:49:48 +0200
Subject: [PATCH] update project

---
 agent_based/checkpoint_fw_ls.py          |   8 ++++----
 checkpoint_log_server.mkp                | Bin 7133 -> 7168 bytes
 web/plugins/metrics/checkpoint_fw_log.py |  19 +++++++++++++------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/agent_based/checkpoint_fw_ls.py b/agent_based/checkpoint_fw_ls.py
index d2ed960..ea8e3d7 100644
--- a/agent_based/checkpoint_fw_ls.py
+++ b/agent_based/checkpoint_fw_ls.py
@@ -12,7 +12,7 @@
 # 2018-03-08 : changed snmp scan function and inventory function
 # 2018-03-15 : code cleanup
 # 2020-06-08 : changed snmp-scan function
-# 2021-06-14 : rewrite for cmk 2.0
+# 2021-06-14 : rewrite for cmk 2.0, added wato
 #
 # sample snmpwalk
 #
@@ -150,8 +150,8 @@ def check_checkpoint_fw_ls(item, params, section: Dict) -> CheckResult:
 
     if item == 'over all':
         if over_all.fwLocalLoggingWriteRate is not None and over_all.fwLoggingHandlingRate is not None:  # R80.10 and up
-            yield Metric(name='checkpoint_fw_ls_fwlocalloggingwriterate', value=over_all.fwLocalLoggingWriteRate)
-            yield Metric(name='checkpoint_fw_ls_fwlogginghandlingrate', value=over_all.fwLoggingHandlingRate)
+            yield Metric(name='checkpoint_fw_ls_localloggingwriterate', value=over_all.fwLocalLoggingWriteRate)
+            yield Metric(name='checkpoint_fw_ls_logginghandlingrate', value=over_all.fwLoggingHandlingRate)
 
         yield Result(state=State(over_all.fwlsconnoverall), summary=over_all.fwlsconnoveralldesc)
         if over_all.fwlocalloggingdesc != '':
@@ -168,7 +168,7 @@ def check_checkpoint_fw_ls(item, params, section: Dict) -> CheckResult:
             return
 
         if log_server.fwLSConnSendRate is not None:  # R80.10 and up
-            yield Metric(name='checkpoint_fw_ls_fwlsconnsendrate', value=log_server.fwLSConnSendRate)
+            yield Metric(name='checkpoint_fw_ls_lsconnsendrate', value=log_server.fwLSConnSendRate)
 
         if log_server.fwLSConnState == 1:
             yield Result(state=State.CRIT, summary='State: Connection error')
diff --git a/checkpoint_log_server.mkp b/checkpoint_log_server.mkp
index 3f3a59422d6399682c2d8d33565570472b58d415..c45a05fbfcf7042183d6560867e9920ed8e3ff9f 100644
GIT binary patch
delta 6742
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

delta 6687
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

diff --git a/web/plugins/metrics/checkpoint_fw_log.py b/web/plugins/metrics/checkpoint_fw_log.py
index 4f184c8..90bf34c 100644
--- a/web/plugins/metrics/checkpoint_fw_log.py
+++ b/web/plugins/metrics/checkpoint_fw_log.py
@@ -89,7 +89,7 @@ metric_info['checkpoint_fwm_ls_readlogsratepeak'] = {
 #
 ##############################################################################
 
-graph_info['checkpoint_fw_ls.over_all'] = {
+graph_info['checkpoint_fw_ls_over_all'] = {
     'title': _('Check Point Firewall Logserver: over all'),
     'metrics': [
         ('checkpoint_fw_ls_localloggingwriterate', 'line'),
@@ -97,14 +97,14 @@ graph_info['checkpoint_fw_ls.over_all'] = {
     ],
 }
 
-graph_info['checkpoint_fw_ls.gateway'] = {
+graph_info['checkpoint_fw_ls_gateway'] = {
     'title': _('Check Point Firewall Log server'),
     'metrics': [
         ('checkpoint_fw_ls_lsconnsendrate', 'line'),
     ],
 }
 
-graph_info['checkpoint_fwm_ls.management'] = {
+graph_info['checkpoint_fwm_ls_management'] = {
     'title': _('Check Point Management Firewall Log server'),
     'metrics': [
         ('checkpoint_fwm_ls_updatesandlogsindexedratepeak', 'line'),
@@ -112,7 +112,7 @@ graph_info['checkpoint_fwm_ls.management'] = {
     ],
 }
 
-graph_info['checkpoint_fwm_ls.read_logs'] = {
+graph_info['checkpoint_fwm_ls_read_logs'] = {
     'title': _('Check Point Management Firewall Log server read logs'),
     'metrics': [
         ('checkpoint_fwm_ls_totalreadlogserrors', 'line'),
@@ -120,7 +120,7 @@ graph_info['checkpoint_fwm_ls.read_logs'] = {
     ],
 }
 
-graph_info['checkpoint_fwm_ls.updates'] = {
+graph_info['checkpoint_fwm_ls_updates'] = {
     'title': _('Check Point Management Firewall Log server updates and logs indexed'),
     'metrics': [
         ('checkpoint_fwm_ls_totalupdatesandlogsindexederrors', 'line'),
@@ -143,8 +143,15 @@ perfometer_info.append(('stacked', [
     },
     {
         'type': 'logarithmic',
-        'metric': 'checkpoint_fw_ls_localloggingwriterate',
+        'metric': 'checkpoint_fw_ls_logginghandlingrate',
         'half_value': 1000.0,
         'exponent': 2,
     },
 ]))
+
+perfometer_info.append({
+    'type': 'logarithmic',
+    'metric': 'checkpoint_fw_ls_lsconnsendrate',
+    'half_value': 500.0,
+    'exponent': 2,
+})
\ No newline at end of file
-- 
GitLab