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

Final update for overwriting ifAlias

Browse Source
This commit is contained in:
laf
2015-08-30 14:34:37 -07:00
parent 5f5788e90c
commit e4fd45037c
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/forms/update-ifalias.inc.php
View File

@ -29,7 +29,7 @@ if (!empty($ifName) && is_numeric($port_id)) {
}
if (dbUpdate(array('ifAlias'=>$descr), 'ports', '`port_id`=?', array($port_id)) > 0) {
$device = device_by_id_cache($device_id);
if (empty($descr)) {
if ($descr === 'repoll') {
del_dev_attrib($device, 'ifName');
}
else {

9
includes/common.php
View File

@ -435,8 +435,13 @@ function get_dev_entity_state($device) {
return $state;
}
function get_dev_attrib($device, $attrib_type) {
if ($row = dbFetchRow("SELECT attrib_value FROM devices_attribs WHERE `device_id` = ? AND `attrib_type` = ?", array($device['device_id'], $attrib_type))) {
function get_dev_attrib($device, $attrib_type, $attrib_value='') {
$params = array($device['device_id'], $attrib_type);
if (!empty($attrib_value)) {
$sql = " AND `attrib_value`=?";
array_push($params, $attrib_value);
}
if ($row = dbFetchRow("SELECT attrib_value FROM devices_attribs WHERE `device_id` = ? AND `attrib_type` = ? $sql", $params)) {
return $row['attrib_value'];
}
else {

7
includes/polling/ports.inc.php
View File

@ -333,6 +333,13 @@ foreach ($ports as $port) {
// Update IF-MIB data
foreach ($data_oids as $oid) {
if ($oid == 'ifAlias') {
if (get_dev_attrib($device, 'ifName', $port['ifName'])) {
$this_port['ifAlias'] = $port['ifAlias'];
}
}
if ($port[$oid] != $this_port[$oid] && !isset($this_port[$oid])) {
$port['update'][$oid] = array('NULL');
log_event($oid.': '.$port[$oid].' -> NULL', $device, 'interface', $port['port_id']);