diff --git a/includes/discovery/sensors/state/fortigate.inc.php b/includes/discovery/sensors/state/fortigate.inc.php index bba5812898..f996870c67 100644 --- a/includes/discovery/sensors/state/fortigate.inc.php +++ b/includes/discovery/sensors/state/fortigate.inc.php @@ -44,7 +44,7 @@ if ($systemMode == 'activePassive' || $systemMode == 'activeActive') { // Setup a sensor for the cluster sync state $fgHaStatsSyncStatus_num = '.1.3.6.1.4.1.12356.101.13.2.1.1.12'; $fgHaStatsSyncStatus_txt = 'fgHaStatsSyncStatus'; - $stateName = 'haSyncStatus ' . $index; + $stateName = 'haSyncStatus'; $descr = 'HA sync status ' . $cluster_member_name; $states = [ diff --git a/tests/data/fortigate_1500d-sensors.json b/tests/data/fortigate_1500d-sensors.json index 262010f3b5..55b9f94f50 100644 --- a/tests/data/fortigate_1500d-sensors.json +++ b/tests/data/fortigate_1500d-sensors.json @@ -1847,7 +1847,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.1", "sensor_index": "fgHaStatsSyncStatus.1", - "sensor_type": "haSyncStatus 1", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status sto-fw-01", "group": "HA", "sensor_divisor": 1, @@ -3756,7 +3756,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.1", "sensor_index": "fgHaStatsSyncStatus.1", - "sensor_type": "haSyncStatus 1", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status sto-fw-01", "group": "HA", "sensor_divisor": 1, diff --git a/tests/data/fortigate_1500d.json b/tests/data/fortigate_1500d.json index 5c4ecba6e8..b92ced4b2f 100644 --- a/tests/data/fortigate_1500d.json +++ b/tests/data/fortigate_1500d.json @@ -38988,7 +38988,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.1", "sensor_index": "fgHaStatsSyncStatus.1", - "sensor_type": "haSyncStatus 1", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status redacted", "group": "HA", "sensor_divisor": 1, @@ -39013,7 +39013,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.2", "sensor_index": "fgHaStatsSyncStatus.2", - "sensor_type": "haSyncStatus 2", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status redacted", "group": "HA", "sensor_divisor": 1, @@ -41072,7 +41072,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.1", "sensor_index": "fgHaStatsSyncStatus.1", - "sensor_type": "haSyncStatus 1", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status redacted", "group": "HA", "sensor_divisor": 1, @@ -41097,7 +41097,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.2", "sensor_index": "fgHaStatsSyncStatus.2", - "sensor_type": "haSyncStatus 2", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status redacted", "group": "HA", "sensor_divisor": 1, diff --git a/tests/data/fortigate_cluster-60f.json b/tests/data/fortigate_cluster-60f.json index 8b4d93df2c..01d13b3d84 100644 --- a/tests/data/fortigate_cluster-60f.json +++ b/tests/data/fortigate_cluster-60f.json @@ -5722,7 +5722,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.1", "sensor_index": "fgHaStatsSyncStatus.1", - "sensor_type": "haSyncStatus 1", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status redacted", "group": "HA", "sensor_divisor": 1, @@ -5747,7 +5747,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.2", "sensor_index": "fgHaStatsSyncStatus.2", - "sensor_type": "haSyncStatus 2", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status redacted", "group": "HA", "sensor_divisor": 1, @@ -6256,7 +6256,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.1", "sensor_index": "fgHaStatsSyncStatus.1", - "sensor_type": "haSyncStatus 1", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status redacted", "group": "HA", "sensor_divisor": 1, @@ -6281,7 +6281,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.2", "sensor_index": "fgHaStatsSyncStatus.2", - "sensor_type": "haSyncStatus 2", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status redacted", "group": "HA", "sensor_divisor": 1, diff --git a/tests/data/fortigate_webfilter.json b/tests/data/fortigate_webfilter.json index 6d1e339383..dac31755df 100644 --- a/tests/data/fortigate_webfilter.json +++ b/tests/data/fortigate_webfilter.json @@ -8163,7 +8163,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.1", "sensor_index": "fgHaStatsSyncStatus.1", - "sensor_type": "haSyncStatus 1", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status -Pri", "group": "HA", "sensor_divisor": 1, @@ -8188,7 +8188,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.2", "sensor_index": "fgHaStatsSyncStatus.2", - "sensor_type": "haSyncStatus 2", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status -Sec", "group": "HA", "sensor_divisor": 1, @@ -9097,7 +9097,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.1", "sensor_index": "fgHaStatsSyncStatus.1", - "sensor_type": "haSyncStatus 1", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status -Pri", "group": "HA", "sensor_divisor": 1, @@ -9122,7 +9122,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.12356.101.13.2.1.1.12.2", "sensor_index": "fgHaStatsSyncStatus.2", - "sensor_type": "haSyncStatus 2", + "sensor_type": "haSyncStatus", "sensor_descr": "HA sync status -Sec", "group": "HA", "sensor_divisor": 1,