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

Trim whitespaces from device data (#14429)

Browse Source 
* Trim whitespace from sensor and ports data

* Update arista_eos_vrf.json

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update Os.php

* wip

* wip

* wip

* Update querybuilder.json
This commit is contained in:
Jellyfrog
2022-10-11 19:50:38 +02:00
committed by GitHub
parent 8ddb612919
commit 7207614437
113 changed files with 1340 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
includes/functions.php
View File

@@ -670,12 +670,22 @@ function is_port_valid($port, $device)
/**
* Try to fill in data for ifDescr, ifName, and ifAlias if devices do not provide them.
* Will not fill ifAlias if the user has overridden it
* Also trims the data
*
* @param array $port
* @param array $device
*/
function port_fill_missing(&$port, $device)
function port_fill_missing_and_trim(&$port, $device)
{
if (isset($port['ifDescr'])) {
$port['ifDescr'] = trim($port['ifDescr']);
}
if (isset($port['ifAlias'])) {
$port['ifAlias'] = trim($port['ifAlias']);
}
if (isset($port['ifName'])) {
$port['ifName'] = trim($port['ifName']);
}
// When devices do not provide data, populate with other data if available
if (! isset($port['ifDescr']) || $port['ifDescr'] == '') {
$port['ifDescr'] = $port['ifName'];