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: use entPhysicalDescr if entPhysicalName is empty

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1635 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-08-03 14:21:54 +00:00
parent e1b3f25d94
commit ad4562dff1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios")
{ {
$entPhysicalIndex = $index; $entPhysicalIndex = $index;
$descr = snmp_get($device, "entPhysicalName.".$index, "-Oqv", "ENTITY-MIB"); $descr = snmp_get($device, "entPhysicalName.".$index, "-Oqv", "ENTITY-MIB");
if(!$descr) { snmp_get($device, "entPhysicalDescr.".$index, "-Oqv", "ENTITY-MIB"); } if(!$descr) { $descr = snmp_get($device, "entPhysicalDescr.".$index, "-Oqv", "ENTITY-MIB"); }
if(is_numeric($entry['entSensorMeasuredEntity']) && $entry['entSensorMeasuredEntity']) { if(is_numeric($entry['entSensorMeasuredEntity']) && $entry['entSensorMeasuredEntity']) {
$measured_descr = snmp_get($device, "entPhysicalName.".$entry['entSensorMeasuredEntity'],"-Oqv", "ENTITY-MIB"); $measured_descr = snmp_get($device, "entPhysicalName.".$entry['entSensorMeasuredEntity'],"-Oqv", "ENTITY-MIB");
if(!measured_descr) { $measured_descr = snmp_get($device, "entPhysicalDescr.".$entry['entSensorMeasuredEntity'],"-Oqv", "ENTITY-MIB");} if(!measured_descr) { $measured_descr = snmp_get($device, "entPhysicalDescr.".$entry['entSensorMeasuredEntity'],"-Oqv", "ENTITY-MIB");}

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

@@ -34,7 +34,7 @@ if(is_array($oids[$device['device_id']]))
#ENTITY-SENSOR-MIB::entPhySensorUnitsDisplay.11 = STRING: "C" #ENTITY-SENSOR-MIB::entPhySensorUnitsDisplay.11 = STRING: "C"
$descr = snmp_get($device, "entPhysicalName.".$index, "-Oqv", "ENTITY-MIB"); $descr = snmp_get($device, "entPhysicalName.".$index, "-Oqv", "ENTITY-MIB");
if(!$descr) { snmp_get($device, "entPhysicalDescr.".$index, "-Oqv", "ENTITY-MIB"); } if(!$descr) { $descr = snmp_get($device, "entPhysicalDescr.".$index, "-Oqv", "ENTITY-MIB"); }
$valid = TRUE; $valid = TRUE;