nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 16:04:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

add ability to chose only one module in discovery.php. give module name for cemp mempools. use sensor name for cisco-entity-sensors.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2015 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-04-04 09:52:09 +00:00
parent 136ba2d1ff
commit 317333f47d
3 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/cisco-entity-sensor.inc.php
+8 -5
View File
@@ -60,10 +60,10 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios")
if ($entitysensor[$entry['entSensorType']] && is_numeric($entry['entSensorValue']) && is_numeric($index))
{
$entPhysicalIndex = $index;
$descr = $entity_array[$index]['entPhysicalName'];
if ($descr || $device['os'] == "iosxr")
if ($entity_array[$index]['entPhysicalName'] || $device['os'] == "iosxr")
{
$descr = rewrite_entity_descr($descr);
$descr = rewrite_entity_descr($entity_array[$index]['entPhysicalName']) . " - " . rewrite_entity_descr($entity_array[$index]['entPhysicalDescr']);
} else {
$descr = $entity_array[$index]['entPhysicalDescr'];
$descr = rewrite_entity_descr($descr);
@@ -73,10 +73,13 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios")
if (is_numeric($entry['entSensorMeasuredEntity']) && $entry['entSensorMeasuredEntity'])
{
$measured_descr = $entity_array[$entry['entSensorMeasuredEntity']]['entPhysicalName'];
if (!measured_descr)
if (!$measured_descr)
{
$measured_descr = $entity_array[$entry['entSensorMeasuredEntity']]['entPhysicalDescr'];
}
echo("descr: $descr | measured: $measured_descr\n");
$descr = $measured_descr . " - " . $descr;
}
@@ -152,4 +155,4 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios")
}
}
?>
?>
includes/discovery/mempools/cemp.inc.php
+4 -3
View File
@@ -15,8 +15,9 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios")
if (is_numeric($entry['cempMemPoolUsed']) && $entry['cempMemPoolValid'] == "true")
{
list($entPhysicalIndex) = explode(".", $index);
$entPhysicalName = snmp_get($device, "entPhysicalDescr.".$entPhysicalIndex, "-Oqv", "ENTITY-MIB");
$descr = $entPhysicalDescr." - ".$entry['cempMemPoolName'];
$entPhysicalName = snmp_get($device, "entPhysicalName.".$entPhysicalIndex, "-Oqv", "ENTITY-MIB");
$descr = $entPhysicalName." - ".$entry['cempMemPoolName'];
$descr = str_replace("Cisco ", "", $descr);
$descr = str_replace("Network Processing Engine", "", $descr);
@@ -27,4 +28,4 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios")
}
}
?>
?>