update project

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')

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