update project

web/plugins/metrics/checkpoint_remoteaccess.py

@@ -21,18 +21,11 @@
 #
 #####################################################################################################################
 
-metric_info['checkpoint_remoteaccess_dtpsConnectedUsers'] = {
-    'title': _('Dtps Connected users'),
-    'unit': 'count',
-    'color': '11/a',
-}
-
 metric_info['checkpoint_remoteaccess_raUsers'] = {
     'title': _('RA Connected users'),
     'unit': 'count',
-    'color': '12/a',
+    'color': '26/a',
 }
-
 metric_info['checkpoint_remoteaccess_raUsersActive'] = {
     'title': _('RA users active'),
     'unit': 'count',
@@ -64,11 +57,43 @@ metric_info['checkpoint_remoteaccess_raUsersInit'] = {
     'color': '22/a',
 }
 
+metric_info['checkpoint_remoteaccess_dtpsConnectedUsers'] = {
+    'title': _('Dtps Connected users'),
+    'unit': 'count',
+    'color': '11/b',
+}
+metric_info['checkpoint_remoteaccess_UsersOfficeMode'] = {
+    'title': _('RA users with office mode'),
+    'unit': 'count',
+    'color': '12/b',
+}
+metric_info['checkpoint_remoteaccess_UsersIkeOverTcp'] = {
+    'title': _('RA users with IKE over TCP'),
+    'unit': 'count',
+    'color': '13/b',
+}
+metric_info['checkpoint_remoteaccess_UsersUDPEncap'] = {
+    'title': _('RA users with UDP encapsulation'),
+    'unit': 'count',
+    'color': '14/b',
+}
+metric_info['checkpoint_remoteaccess_UsersVisitorMode'] = {
+    'title': _('RA users in visitor mode'),
+    'unit': 'count',
+    'color': '15/b',
+}
+metric_info['checkpoint_remoteaccess_UsersRouteTraffic'] = {
+    'title': _('RA users with route all traffic'),
+    'unit': 'count',
+    'color': '16/b',
+}
+
 metric_info['checkpoint_remoteaccess_raBadEncryption'] = {
     'title': _('RA users with bad encryption'),
     'unit': 'count',
-    'color': '22/a',
+    'color': '21/b',
 }
+
 ######################################################################################################################
 #
 # map perfdata to metric
@@ -85,6 +110,11 @@ check_metrics['check_mk-checkpoint_remoteaccess'] = {
     'raUsersDown': {'name': 'checkpoint_remoteaccess_raUsersDown', },
     'raUsersInit': {'name': 'checkpoint_remoteaccess_raUsersInit', },
     'raBadEncryption': {'name': 'checkpoint_remoteaccess_raBadEncryption', },
+    'raUsersOfficeMode': {'name': 'checkpoint_remoteaccess_UsersOfficeMode', },
+    'raUsersIkeOverTcp': {'name': 'checkpoint_remoteaccess_UsersIkeOverTcp', },
+    'raUsersUDPEncap': {'name': 'checkpoint_remoteaccess_UsersUDPEncap', },
+    'raUsersVisitorMode': {'name': 'checkpoint_remoteaccess_UsersVisitorMode', },
+    'raUsersRouteTraffic': {'name': 'checkpoint_remoteaccess_UsersRouteTraffic', },
 }
 
 ######################################################################################################################
@@ -94,16 +124,15 @@ check_metrics['check_mk-checkpoint_remoteaccess'] = {
 ######################################################################################################################
 
 graph_info.append({
-    'title': _('Check Point Remote Access Users'),
+    'title': _('Check Point remote access users status'),
     'metrics': [
-        ('checkpoint_remoteaccess_dtpsConnectedUsers', 'line'),
-        ('checkpoint_remoteaccess_raUsers', '-line'),
-        ('checkpoint_remoteaccess_raUsersActive', '-stack', ),
-        ('checkpoint_remoteaccess_raUsersDestroy', '-stack', ),
-        ('checkpoint_remoteaccess_raUsersIdle', '-stack', ),
-        ('checkpoint_remoteaccess_raUsersPhase1', '-stack', ),
-        ('checkpoint_remoteaccess_raUsersDown', '-stack', ),
-        ('checkpoint_remoteaccess_raUsersInit', '-stack', ),
+        ('checkpoint_remoteaccess_raUsers', 'line'),
+        ('checkpoint_remoteaccess_raUsersActive', 'stack', ),
+        ('checkpoint_remoteaccess_raUsersDestroy', 'stack', ),
+        ('checkpoint_remoteaccess_raUsersIdle', 'stack', ),
+        ('checkpoint_remoteaccess_raUsersPhase1', 'stack', ),
+        ('checkpoint_remoteaccess_raUsersDown', 'stack', ),
+        ('checkpoint_remoteaccess_raUsersInit', 'stack', ),
     ],
     'scalars': [
         ('checkpoint_remoteaccess_dtpsConnectedUsers:crit', _('crit')),
@@ -113,7 +142,19 @@ graph_info.append({
 
 
 graph_info.append({
-    'title': _('Check Point Remote Access bad encryption'),
+    'title': _('Check Point remote access type'),
+    'metrics': [
+        ('checkpoint_remoteaccess_dtpsConnectedUsers', 'line'),
+        ('checkpoint_remoteaccess_UsersOfficeMode', 'line', ),
+        ('checkpoint_remoteaccess_UsersIkeOverTcp', 'line', ),
+        ('checkpoint_remoteaccess_UsersUDPEncap', 'line', ),
+        ('checkpoint_remoteaccess_UsersVisitorMode', 'line', ),
+        ('checkpoint_remoteaccess_UsersRouteTraffic', 'line', ),
+    ],
+})
+
+graph_info.append({
+    'title': _('Check Point remote access bad encryption'),
     'metrics': [
         ('checkpoint_remoteaccess_raBadEncryption', 'line'),
     ],