mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix Fortinet HA-status polling state translations (#14921)" (#16202)

Browse Source 
This reverts commit 531009983c.
This commit is contained in:
Tozz
2024-07-15 00:30:30 +02:00
committed by GitHub
parent 863eee86d9
commit b0c7fe8c8d
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/discovery/sensors/state/fortigate.inc.php
View File

@@ -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';
$stateName = 'haSyncStatus ' . $index;
$descr = 'HA sync status ' . $cluster_member_name;
$states = [

4
tests/data/fortigate_1500d-sensors.json
View File

@@ -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",
"sensor_type": "haSyncStatus 1",
"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",
"sensor_type": "haSyncStatus 1",
"sensor_descr": "HA sync status sto-fw-01",
"group": "HA",
"sensor_divisor": 1,

8
tests/data/fortigate_1500d.json
View File

@@ -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",
"sensor_type": "haSyncStatus 1",
"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",
"sensor_type": "haSyncStatus 2",
"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",
"sensor_type": "haSyncStatus 1",
"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",
"sensor_type": "haSyncStatus 2",
"sensor_descr": "HA sync status redacted",
"group": "HA",
"sensor_divisor": 1,

8
tests/data/fortigate_cluster-60f.json
View File

@@ -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",
"sensor_type": "haSyncStatus 1",
"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",
"sensor_type": "haSyncStatus 2",
"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",
"sensor_type": "haSyncStatus 1",
"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",
"sensor_type": "haSyncStatus 2",
"sensor_descr": "HA sync status redacted",
"group": "HA",
"sensor_divisor": 1,

8
tests/data/fortigate_webfilter.json
View File

@@ -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",
"sensor_type": "haSyncStatus 1",
"sensor_descr": "HA sync status <private>-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",
"sensor_type": "haSyncStatus 2",
"sensor_descr": "HA sync status <private>-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",
"sensor_type": "haSyncStatus 1",
"sensor_descr": "HA sync status <private>-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",
"sensor_type": "haSyncStatus 2",
"sensor_descr": "HA sync status <private>-Sec",
"group": "HA",
"sensor_divisor": 1,