clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 10:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix device creation using overwrited ip (#11388)

Browse Source 
* Fix device creation using overwrited ip

`deviceArray` was creating a device missing the `overwrite_ip` field, so it was not used by `isSNMPable`

* Fix device creation using overwrited ip

Part 2: Fix using not yet set variable

* Fix device creation using overwrited ip

Part 3: remove double space

* Useless commit to trigger Travis
This commit is contained in:
Alexandre L 2020-04-08 11:47:40 +02:00 committed by GitHub
parent 820a98bdcb
commit a4cf77b26b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
includes/functions.php
View File

@ -523,12 +523,10 @@ function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $
throw new InvalidPortAssocModeException("Invalid port association_mode '$port_assoc_mode'. Valid modes are: " . join(', ', get_port_assoc_modes()));
}
if ($additional['overwrite_ip']) {
$overwrite_ip = $additional['overwrite_ip'];
}
// check if we have the host by IP
if (!empty($overwrite_ip)) {
$overwrite_ip = null;
if (!empty($additional['overwrite_ip'])) {
$overwrite_ip = $additional['overwrite_ip'];
$ip = $overwrite_ip;
} elseif (Config::get('addhost_alwayscheckip') === true) {
$ip = gethostbyname($host);
@ -569,7 +567,7 @@ function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $
if ($snmpver === "v3") {
// Try each set of parameters from config
foreach (Config::get('snmp.v3') as $v3) {
$device = deviceArray($host, null, $snmpver, $port, $transport, $v3, $port_assoc_mode);
$device = deviceArray($host, null, $snmpver, $port, $transport, $v3, $port_assoc_mode, $overwrite_ip);
if ($force_add === true || isSNMPable($device)) {
return createHost($host, null, $snmpver, $port, $transport, $v3, $poller_group, $port_assoc_mode, $force_add, $overwrite_ip);
} else {
@ -579,7 +577,7 @@ function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $
} elseif ($snmpver === "v2c" || $snmpver === "v1") {
// try each community from config
foreach (Config::get('snmp.community') as $community) {
$device = deviceArray($host, $community, $snmpver, $port, $transport, null, $port_assoc_mode);
$device = deviceArray($host, $community, $snmpver, $port, $transport, null, $port_assoc_mode, $overwrite_ip);
if ($force_add === true || isSNMPable($device)) {
return createHost($host, $community, $snmpver, $port, $transport, array(), $poller_group, $port_assoc_mode, $force_add, $overwrite_ip);
@ -599,10 +597,11 @@ function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $
throw $host_unreachable_exception;
}
function deviceArray($host, $community, $snmpver, $port = 161, $transport = 'udp', $v3 = array(), $port_assoc_mode = 'ifIndex')
function deviceArray($host, $community, $snmpver, $port = 161, $transport = 'udp', $v3 = array(), $port_assoc_mode = 'ifIndex', $overwrite_ip = null)
{
$device = array();
$device['hostname'] = $host;
$device['overwrite_ip'] = $overwrite_ip;
$device['port'] = $port;
$device['transport'] = $transport;
@ -626,7 +625,7 @@ function deviceArray($host, $community, $snmpver, $port = 161, $transport = 'udp
}
return $device;
}
}//end deviceArray()
function formatUptime($diff, $format = "long")