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 for maps now working when devices hostname != the same in the links table

Browse Source
This commit is contained in:
laf
2015-03-29 02:11:55 +01:00
parent 1b4274bb54
commit 0da3cb8996
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
html/includes/print-map.inc.php
View File

@@ -42,13 +42,13 @@ $nodes = json_encode($tmp_devices);
if (is_array($tmp_devices[0])) { if (is_array($tmp_devices[0])) {
$tmp_links = array(); $tmp_links = array();
foreach (dbFetchRows("SELECT `devices`.`hostname` AS `hostname`, `remote_hostname`,`ports`.`ifName` AS `local_port`, `remote_port`,`ports`.`ifSpeed` AS ifSpeed FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` WHERE (`local_device_id` IN ($tmp_ids) AND `remote_device_id` IN ($tmp_ids))") as $link_devices) { foreach (dbFetchRows("SELECT local_device_id, remote_device_id, `remote_hostname`,`ports`.`ifName` AS `local_port`, `remote_port`,`ports`.`ifSpeed` AS ifSpeed FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` WHERE (`local_device_id` IN ($tmp_ids) AND `remote_device_id` IN ($tmp_ids))") as $link_devices) {
foreach ($tmp_devices as $k=>$v) { foreach ($tmp_devices as $k=>$v) {
if ($v['label'] == $link_devices['hostname']) { if ($v['id'] == $link_devices['local_device_id']) {
$from = $v['id']; $from = $v['id'];
$port = $link_devices['local_port']; $port = $link_devices['local_port'];
} }
if ($v['label'] == $link_devices['remote_hostname']) { if ($v['id'] == $link_devices['remote_device_id']) {
$to = $v['id']; $to = $v['id'];
$port .= ' > ' .$link_devices['remote_port']; $port .= ' > ' .$link_devices['remote_port'];
} }
@@ -75,6 +75,7 @@ if (is_array($tmp_devices[0])) {
?> ?>
<div id="visualization"></div> <div id="visualization"></div>
<script src="js/vis.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
// create an array with nodes // create an array with nodes