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

Merge pull request #2767 from Rosiak/issue-2723

Browse Source 
Fix 2723
This commit is contained in:
Mike Rostermund
2016-01-21 18:54:14 +01:00
parent 207a7e1caa e2775bd45f
commit aec0453c76
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/sensors/cisco-entity-sensor.inc.php
+2 -3
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
includes/rewrites.php
+1
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);