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: Make various Cisco sensor descriptions start with upper case (#6891)

Browse Source
This commit is contained in:
Søren Rosiak
2017-06-26 22:40:50 +02:00
committed by Neil Lathwood
parent 1ba6381d61
commit 5d5d3816ef
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/discovery/mempools/cemp.inc.php
View File

@@ -16,7 +16,7 @@ if ($device['os_group'] == 'cisco') {
$descr = str_replace('Cisco ', '', $descr);
$descr = str_replace('Network Processing Engine', '', $descr);
discover_mempool($valid_mempool, $device, $index, 'cemp', $descr, '1', $entPhysicalIndex, null);
discover_mempool($valid_mempool, $device, $index, 'cemp', ucwords($descr), '1', $entPhysicalIndex, null);
}
}
}

2
includes/discovery/processors/ios.inc.php
View File

@@ -32,7 +32,7 @@ if ($device['os_group'] == 'cisco' || $device['os'] == 'acsw') {
rrd_file_rename($device, $old_name, $new_name);
if (!strstr($descr, 'No') && !strstr($usage, 'No') && $descr != '') {
discover_processor($valid['processor'], $device, $usage_oid, $index, 'cpm', $descr, '1', $usage, $entPhysicalIndex, null);
discover_processor($valid['processor'], $device, $usage_oid, $index, 'cpm', ucwords($descr), '1', $usage, $entPhysicalIndex, null);
}
}//end if
}//end foreach

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

@@ -159,7 +159,7 @@ if ($device['os_group'] == 'cisco') {
} //end if
if ($ok) {
discover_sensor($valid['sensor'], $type, $device, $oid, $index, 'cisco-entity-sensor', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entry['entSensorMeasuredEntity']);
discover_sensor($valid['sensor'], $type, $device, $oid, $index, 'cisco-entity-sensor', ucwords($descr), $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entry['entSensorMeasuredEntity']);
#Cisco IOS-XR : add a fake sensor to graph as dbm
if ($type == "power" and $device['os'] == "iosxr" and (preg_match("/power (R|T)x/i", $descr) or preg_match("/(R|T)x Power/i", $descr))) {
// convert Watts to dbm