clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 2723

Browse Source
This commit is contained in:
Rosiak 2016-01-14 20:50:08 +01:00
parent 2d3367f7cd
commit e2775bd45f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/discovery/sensors/cisco-entity-sensor.inc.php
View File

@ -52,11 +52,10 @@ if ($device['os_group'] == 'cisco') {
if ($entitysensor[$entry['entSensorType']] && is_numeric($entry['entSensorValue']) && is_numeric($index)) {
$entPhysicalIndex = $index;
if ($entity_array[$index]['entPhysicalName'] || $device['os'] == 'iosxr') {
$descr = rewrite_entity_descr($entity_array[$index]['entPhysicalName']).' - '.rewrite_entity_descr($entity_array[$index]['entPhysicalDescr']);
$descr = rewrite_entity_descr($entity_array[$index]['entPhysicalName']);
}
else {
$descr = $entity_array[$index]['entPhysicalDescr'];
$descr = rewrite_entity_descr($descr);
$descr = rewrite_entity_descr($entity_array[$index]['entPhysicalDescr']);
}
// Set description based on measured entity if it exists

1
includes/rewrites.php
View File

@ -36,6 +36,7 @@ function rewrite_entity_descr($descr) {
$descr = str_replace('Centralized Forwarding Card', 'CFC', $descr);
$descr = str_replace('Power Supply Module', 'PSU ', $descr);
$descr = str_replace('/Voltage Sensor/', 'Voltage', $descr);
$descr = str_replace('Sensor', '', $descr);
$descr = preg_replace('/^temperatures /', '', $descr);
$descr = preg_replace('/^voltages /', '', $descr);