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

Fix port module wrong null (#15431)

Browse Source 
* Fix port module wrong null

* Update test data

* revert incidental data changes
This commit is contained in:
Tony Murray
2023-10-11 20:42:05 -05:00
committed by GitHub
parent 2f33421aed
commit 7c5b0e3612
11 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/polling/ports.inc.php
+1 -1
View File
@@ -684,7 +684,7 @@ foreach ($ports as $port) {
}
if ($port[$oid] != $current_oid && ! isset($current_oid)) {
$port['update'][$oid] = ['NULL'];
$port['update'][$oid] = null;
log_event($oid . ': ' . $port[$oid] . ' -> NULL', $device, 'interface', 4, $port['port_id']);
d_echo($oid . ': ' . $port[$oid] . ' -> NULL ', $oid . ' ');
} elseif ($port[$oid] != $current_oid) {
tests/data/aviat-wtm.json
+2 -2
View File
@@ -548,7 +548,7 @@
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 14.0,
"sensor_current": 14,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
@@ -573,7 +573,7 @@
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 14.0,
"sensor_current": 14,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
tests/data/dell-compellent_scv3020.json
+3 -3
View File
@@ -340,7 +340,7 @@
"ifSpeed": null,
"ifSpeed_prev": 0,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -440,7 +440,7 @@
"ifSpeed": null,
"ifSpeed_prev": 0,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -540,7 +540,7 @@
"ifSpeed": null,
"ifSpeed_prev": 0,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
tests/data/drac.json
+8 -8
View File
@@ -3523,7 +3523,7 @@
"sensor_limit": 47,
"sensor_limit_warn": 42,
"sensor_limit_low": -7,
"sensor_limit_low_warn": 3.0,
"sensor_limit_low_warn": 3,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
@@ -3548,7 +3548,7 @@
"sensor_limit": 85,
"sensor_limit_warn": 80,
"sensor_limit_low": 3,
"sensor_limit_low_warn": 8.0,
"sensor_limit_low_warn": 8,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
@@ -3573,7 +3573,7 @@
"sensor_limit": 85,
"sensor_limit_warn": 80,
"sensor_limit_low": 3,
"sensor_limit_low_warn": 8.0,
"sensor_limit_low_warn": 8,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
@@ -3598,7 +3598,7 @@
"sensor_limit": 84,
"sensor_limit_warn": 79,
"sensor_limit_low": 3,
"sensor_limit_low_warn": 8.0,
"sensor_limit_low_warn": 8,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
@@ -7773,7 +7773,7 @@
"sensor_limit": 47,
"sensor_limit_warn": 42,
"sensor_limit_low": -7,
"sensor_limit_low_warn": 3.0,
"sensor_limit_low_warn": 3,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
@@ -7798,7 +7798,7 @@
"sensor_limit": 85,
"sensor_limit_warn": 80,
"sensor_limit_low": 3,
"sensor_limit_low_warn": 8.0,
"sensor_limit_low_warn": 8,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
@@ -7823,7 +7823,7 @@
"sensor_limit": 85,
"sensor_limit_warn": 80,
"sensor_limit_low": 3,
"sensor_limit_low_warn": 8.0,
"sensor_limit_low_warn": 8,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
@@ -7848,7 +7848,7 @@
"sensor_limit": 84,
"sensor_limit_warn": 79,
"sensor_limit_low": 3,
"sensor_limit_low_warn": 8.0,
"sensor_limit_low_warn": 8,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
tests/data/drac_3.json
+2 -2
View File
@@ -4748,7 +4748,7 @@
"sensor_limit": 47,
"sensor_limit_warn": 43,
"sensor_limit_low": -7,
"sensor_limit_low_warn": 3.0,
"sensor_limit_low_warn": 3,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
@@ -4773,7 +4773,7 @@
"sensor_limit": 80,
"sensor_limit_warn": 75,
"sensor_limit_low": 3,
"sensor_limit_low_warn": 8.0,
"sensor_limit_low_warn": 8,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
tests/data/drac_drac.json
+4 -4
View File
@@ -2848,7 +2848,7 @@
"sensor_limit": 47,
"sensor_limit_warn": 42,
"sensor_limit_low": -7,
"sensor_limit_low_warn": 3.0,
"sensor_limit_low_warn": 3,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
@@ -2873,7 +2873,7 @@
"sensor_limit": 75,
"sensor_limit_warn": 70,
"sensor_limit_low": 3,
"sensor_limit_low_warn": 8.0,
"sensor_limit_low_warn": 8,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
@@ -2898,7 +2898,7 @@
"sensor_limit": 91,
"sensor_limit_warn": 86,
"sensor_limit_low": 3,
"sensor_limit_low_warn": 8.0,
"sensor_limit_low_warn": 8,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
@@ -2923,7 +2923,7 @@
"sensor_limit": 91,
"sensor_limit_warn": 86,
"sensor_limit_low": 3,
"sensor_limit_low_warn": 8.0,
"sensor_limit_low_warn": 8,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
tests/data/fortivoice.json
+4 -4
View File
@@ -440,7 +440,7 @@
"ifSpeed": 1048576000,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -540,7 +540,7 @@
"ifSpeed": 1048576000,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -640,7 +640,7 @@
"ifSpeed": 1048576000,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -740,7 +740,7 @@
"ifSpeed": 1048576000,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
tests/data/istars.json
+1 -1
View File
@@ -1552,7 +1552,7 @@
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 224.0,
"sensor_current": 224,
"sensor_limit": 257.6,
"sensor_limit_warn": null,
"sensor_limit_low": 190.4,
tests/data/scs-ks.json
+2 -2
View File
@@ -240,7 +240,7 @@
"ifSpeed": 100000000,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -340,7 +340,7 @@
"ifSpeed": 0,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "down",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
tests/data/siteboss550.json
+9 -9
View File
@@ -940,7 +940,7 @@
"ifSpeed": 0,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "down",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -1040,7 +1040,7 @@
"ifSpeed": 0,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "down",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -1140,7 +1140,7 @@
"ifSpeed": 0,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "down",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -1240,7 +1240,7 @@
"ifSpeed": 0,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "down",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -1340,7 +1340,7 @@
"ifSpeed": 10000000,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -1440,7 +1440,7 @@
"ifSpeed": 0,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "down",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -1540,7 +1540,7 @@
"ifSpeed": 0,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "down",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -1640,7 +1640,7 @@
"ifSpeed": 100000000,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
@@ -1740,7 +1740,7 @@
"ifSpeed": 100000000,
"ifSpeed_prev": null,
"ifConnectorPresent": null,
"ifOperStatus": null,
"ifOperStatus": "up",
"ifOperStatus_prev": null,
"ifAdminStatus": null,
"ifAdminStatus_prev": null,
tests/data/vrp_nac.json
+6 -6
View File
@@ -28230,7 +28230,7 @@
{
"port_descr_type": "cust",
"port_descr_descr": "ACME-building-1er",
"port_descr_circuit": "",
"port_descr_circuit": null,
"port_descr_speed": "Access;PortDot1X",
"port_descr_notes": null,
"ifDescr": "GigabitEthernet1/0/11",
@@ -28830,7 +28830,7 @@
{
"port_descr_type": "cust",
"port_descr_descr": "ACME-building-1er",
"port_descr_circuit": "",
"port_descr_circuit": null,
"port_descr_speed": "Access;PortDot1X",
"port_descr_notes": null,
"ifDescr": "GigabitEthernet1/0/17",
@@ -34530,9 +34530,9 @@
{
"port_descr_type": "cust",
"port_descr_descr": "ACME-building-1er",
"port_descr_circuit": "",
"port_descr_circuit": null,
"port_descr_speed": "Access;ADSL",
"port_descr_notes": "",
"port_descr_notes": null,
"ifDescr": "GigabitEthernet2/0/22",
"ifName": "GigabitEthernet2/0/22",
"portName": null,
@@ -41230,7 +41230,7 @@
{
"port_descr_type": "cust",
"port_descr_descr": "ACME-building-1er",
"port_descr_circuit": "",
"port_descr_circuit": null,
"port_descr_speed": "Access;PortDot1X",
"port_descr_notes": null,
"ifDescr": "GigabitEthernet3/0/36",
@@ -42130,7 +42130,7 @@
{
"port_descr_type": "cust",
"port_descr_descr": "ACME-building-1er",
"port_descr_circuit": "",
"port_descr_circuit": null,
"port_descr_speed": "Access;ADSL",
"port_descr_notes": null,
"ifDescr": "GigabitEthernet3/0/45",