From dbfb0a6535d5129e788a96d30ce3f002e16185d9 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sun, 29 Sep 2024 19:18:17 -0500 Subject: [PATCH] OcNOS transceiver temperature display fix (#16460) * OcNOS transceiver temperature display fix Temperatures were not displayed in the transceiver area. Update the group to fix that issue. * Update test data --- .../sensors/temperature/ocnos.inc.php | 2 +- tests/data/ocnos_s9600-32x.json | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/includes/discovery/sensors/temperature/ocnos.inc.php b/includes/discovery/sensors/temperature/ocnos.inc.php index b177b00ccc..8b4eb60615 100644 --- a/includes/discovery/sensors/temperature/ocnos.inc.php +++ b/includes/discovery/sensors/temperature/ocnos.inc.php @@ -31,7 +31,7 @@ if ($os instanceof \LibreNMS\OS\Ocnos) { 'entPhysicalIndex' => $cmmStackUnitIndex * 10000 + $cmmTransIndex, 'entPhysicalIndex_measured' => 'port', 'user_func' => null, - 'group' => $ifName, + 'group' => 'transceiver', ])); continue 2; // common across channels diff --git a/tests/data/ocnos_s9600-32x.json b/tests/data/ocnos_s9600-32x.json index 32f6bcf78a..75b28a4608 100644 --- a/tests/data/ocnos_s9600-32x.json +++ b/tests/data/ocnos_s9600-32x.json @@ -4039,7 +4039,7 @@ "sensor_index": "1.10", "sensor_type": "transceiver", "sensor_descr": "ce5 xcvr temperature", - "group": "ce5", + "group": "transceiver", "sensor_divisor": 100, "sensor_multiplier": 1, "sensor_current": 35.96, @@ -4064,7 +4064,7 @@ "sensor_index": "1.11", "sensor_type": "transceiver", "sensor_descr": "ce6 xcvr temperature", - "group": "ce6", + "group": "transceiver", "sensor_divisor": 100, "sensor_multiplier": 1, "sensor_current": 38.63, @@ -4089,7 +4089,7 @@ "sensor_index": "1.12", "sensor_type": "transceiver", "sensor_descr": "ce7 xcvr temperature", - "group": "ce7", + "group": "transceiver", "sensor_divisor": 100, "sensor_multiplier": 1, "sensor_current": 32.89, @@ -4114,7 +4114,7 @@ "sensor_index": "1.13", "sensor_type": "transceiver", "sensor_descr": "ce8 xcvr temperature", - "group": "ce8", + "group": "transceiver", "sensor_divisor": 100, "sensor_multiplier": 1, "sensor_current": 30.82, @@ -4139,7 +4139,7 @@ "sensor_index": "1.14", "sensor_type": "transceiver", "sensor_descr": "ce9 xcvr temperature", - "group": "ce9", + "group": "transceiver", "sensor_divisor": 100, "sensor_multiplier": 1, "sensor_current": 29.49, @@ -4164,7 +4164,7 @@ "sensor_index": "1.21", "sensor_type": "transceiver", "sensor_descr": "ce16 xcvr temperature", - "group": "ce16", + "group": "transceiver", "sensor_divisor": 100, "sensor_multiplier": 1, "sensor_current": 31.23, @@ -4189,7 +4189,7 @@ "sensor_index": "1.22", "sensor_type": "transceiver", "sensor_descr": "ce17 xcvr temperature", - "group": "ce17", + "group": "transceiver", "sensor_divisor": 100, "sensor_multiplier": 1, "sensor_current": 30.38, @@ -4214,7 +4214,7 @@ "sensor_index": "1.23", "sensor_type": "transceiver", "sensor_descr": "ce18 xcvr temperature", - "group": "ce18", + "group": "transceiver", "sensor_divisor": 100, "sensor_multiplier": 1, "sensor_current": 30.23, @@ -4239,7 +4239,7 @@ "sensor_index": "1.24", "sensor_type": "transceiver", "sensor_descr": "ce19 xcvr temperature", - "group": "ce19", + "group": "transceiver", "sensor_divisor": 100, "sensor_multiplier": 1, "sensor_current": 30.15, @@ -4264,7 +4264,7 @@ "sensor_index": "1.3", "sensor_type": "transceiver", "sensor_descr": "xe1 xcvr temperature", - "group": "xe1", + "group": "transceiver", "sensor_divisor": 100, "sensor_multiplier": 1, "sensor_current": 27.34, @@ -4289,7 +4289,7 @@ "sensor_index": "1.9", "sensor_type": "transceiver", "sensor_descr": "ce4 xcvr temperature", - "group": "ce4", + "group": "transceiver", "sensor_divisor": 100, "sensor_multiplier": 1, "sensor_current": 36.15,