Gaia SecureXL current status and Management Connected Gateways (#12821)

* Create Checkpoint Gaia Sensor State

Checkpoint Gaia Gateway Cluster HA State
Checkpoint Gaia Management Connected Gateways

* Update gaia.yaml

* Add SecureXL current status and Management Connected Gateways

* Add SecureXL current status, Management Connected Gateways and Changed haState color to gray

* Add SecureXL current status, Management Connected Gateways and review haState

* Add SecureXL current status, Management Connected Gateways and review haState

includes/definitions/discovery/gaia.yaml

@@ -13,6 +13,7 @@ modules:
                         - fanSpeedSensorName
                         - voltageSensorName
                         - fwLSConnName
+                        - mglsGWIP
         state:
             data:
                 -
@@ -65,7 +66,7 @@ modules:
                     states:
                         - { value: 1, descr: active , graph: 3, generic: 0 }
                         - { value: 2, descr: standby, graph: 2, generic: 0 }
-                        - { value: 3, descr: 'active attention', graph: 1, generic: 1 }
+                        - { value: 3, descr: 'Active Attention', graph: 1, generic: 1 }
                         - { value: 0, descr: down, graph: 0, generic: 2 }
                 -
                     oid: haStatCode
@@ -78,6 +79,26 @@ modules:
                         - { value: 0, descr: Up , graph: 2, generic: 0 }
                         - { value: 1, descr: Attention, graph: 1, generic: 3 }
                         - { value: 2, descr: Down, graph: 0, generic: 1 }
+                -
+                    oid: mglsGWState
+                    num_oid: '.1.3.6.1.4.1.2620.1.7.14.4.1.3.{{ $index }}'
+                    index: 'mglsGWState.{{ $index }}'
+                    descr: '{{ $mglsGWIP }}'
+                    group: 'Management Connected Gateways'
+                    value: mglsGWState
+                    states:
+                        - { value: 1, descr: Connected, graph: 1, generic: 0 }
+                        - { value: 0, descr: Disconnected, graph: 0, generic: 2 }
+                -
+                    oid: fwSXLStatus
+                    num_oid: '.1.3.6.1.4.1.2620.1.36.1.1.{{ $index }}'
+                    index: 'fwSXLStatus.{{ $index }}'
+                    descr: 'SecureXL current status'
+                    group: HA
+                    value: fwSXLStatus
+                    states:
+                        - { value: 1, descr: Enabled , graph: 0, generic: 0 }
+                        - { value: 0, descr: Disabled, graph: 1, generic: 1 }
                 -
                     oid: raidVolumeState
                     num_oid: '.1.3.6.1.4.1.2620.1.6.7.7.1.1.6.{{ $index }}'
@@ -167,8 +188,8 @@ modules:
                     descr: 'FWM Daemon Status'
                     group: HA
                     states:
-                        - { value: 0, generic: 1, graph: 1, descr: 'down' }
+                        - { value: 0, generic: 1, graph: 1, descr: 'Down' }
-                        - { value: 1, generic: 0, graph: 1, descr: 'up' }
+                        - { value: 1, generic: 0, graph: 1, descr: 'Up' }
 #Update Status
                 -
                     oid: advancedUrlFilteringUpdateStatus

tests/data/gaia_15600.json

@@ -4822,7 +4822,7 @@
                 },
                 {
                     "state_name": "haState",
-                    "state_descr": "active attention",
+                    "state_descr": "Active Attention",
                     "state_draw_graph": 1,
                     "state_value": 3,
                     "state_generic_value": 1

tests/data/gaia_23900.json

@@ -793,7 +793,7 @@
                 },
                 {
                     "state_name": "haState",
-                    "state_descr": "active attention",
+                    "state_descr": "Active Attention",
                     "state_draw_graph": 1,
                     "state_value": 3,
                     "state_generic_value": 1

tests/data/gaia_logserver.json

@@ -983,6 +983,78 @@
                     "user_func": null,
                     "state_name": "mgFwmIsAlive"
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.2620.1.7.14.4.1.3.1.0",
+                    "sensor_index": "mglsGWState.1.0",
+                    "sensor_type": "mglsGWState",
+                    "sensor_descr": "Local Clients",
+                    "group": "Management Connected Gateways",
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": "mglsGWState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.2620.1.7.14.4.1.3.2.0",
+                    "sensor_index": "mglsGWState.2.0",
+                    "sensor_type": "mglsGWState",
+                    "sensor_descr": "gw1-ckp-gaia",
+                    "group": "Management Connected Gateways",
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": "mglsGWState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.2620.1.7.14.4.1.3.3.0",
+                    "sensor_index": "mglsGWState.3.0",
+                    "sensor_type": "mglsGWState",
+                    "sensor_descr": "gw2-ckp-gaia",
+                    "group": "Management Connected Gateways",
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": "mglsGWState"
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -2438,14 +2510,28 @@
                 },
                 {
                     "state_name": "mgFwmIsAlive",
-                    "state_descr": "down",
+                    "state_descr": "Down",
                     "state_draw_graph": 1,
                     "state_value": 0,
                     "state_generic_value": 1
                 },
                 {
                     "state_name": "mgFwmIsAlive",
-                    "state_descr": "up",
+                    "state_descr": "Up",
+                    "state_draw_graph": 1,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "mglsGWState",
+                    "state_descr": "Disconnected",
+                    "state_draw_graph": 0,
+                    "state_value": 0,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "mglsGWState",
+                    "state_descr": "Connected",
                     "state_draw_graph": 1,
                     "state_value": 1,
                     "state_generic_value": 0

tests/snmpsim/gaia_logserver.snmprec

@@ -156,5 +156,11 @@
 1.3.6.1.4.1.2620.1.7.5.0|4|active
 1.3.6.1.4.1.2620.1.7.6.0|66|1
 1.3.6.1.4.1.2620.1.7.14.1.0|66|913
+1.3.6.1.4.1.2620.1.7.14.4.1.2.1.0|4|Local Clients
+1.3.6.1.4.1.2620.1.7.14.4.1.2.2.0|4|gw1-ckp-gaia
+1.3.6.1.4.1.2620.1.7.14.4.1.2.3.0|4|gw2-ckp-gaia
+1.3.6.1.4.1.2620.1.7.14.4.1.3.1.0|4|Connected
+1.3.6.1.4.1.2620.1.7.14.4.1.3.2.0|4|Connected
+1.3.6.1.4.1.2620.1.7.14.4.1.3.3.0|4|Connected
 1.3.6.1.4.1.2620.1.7.101.0|66|0
 1.3.6.1.6.3.10.2.1.3.0|2|11523417