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

Add sysName for top-interfaces with force_ip_to_sysname for normal user

Browse Source
This commit is contained in:
Richard Lawley
2016-03-09 12:41:10 +00:00
parent 6199d36936
commit 60bb400202
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
html/includes/common/top-interfaces.inc.php
View File

@ -103,7 +103,7 @@ else {
$params = array('user' => $_SESSION['user_id'], 'lastpoll' => array($lastpoll_seconds), 'count' => array($interface_count), 'filter' => ($widget_settings['interface_filter']?:(int)1)); $params = array('user' => $_SESSION['user_id'], 'lastpoll' => array($lastpoll_seconds), 'count' => array($interface_count), 'filter' => ($widget_settings['interface_filter']?:(int)1));
if (is_admin() || is_read()) { if (is_admin() || is_read()) {
$query = ' $query = '
SELECT *, p.ifInOctets_rate + p.ifOutOctets_rate as total SELECT p.*, devices.*, p.ifInOctets_rate + p.ifOutOctets_rate as total
FROM ports as p FROM ports as p
INNER JOIN devices ON p.device_id = devices.device_id INNER JOIN devices ON p.device_id = devices.device_id
AND unix_timestamp() - p.poll_time <= :lastpoll AND unix_timestamp() - p.poll_time <= :lastpoll
@ -115,7 +115,7 @@ else {
} }
else { else {
$query = ' $query = '
SELECT ports.*, devices.hostname, ports.ifInOctets_rate + ports.ifOutOctets_rate as total SELECT ports.*, devices.*, ports.ifInOctets_rate + ports.ifOutOctets_rate as total
FROM ports FROM ports
INNER JOIN devices ON ports.device_id = devices.device_id INNER JOIN devices ON ports.device_id = devices.device_id
LEFT JOIN ports_perms ON ports.port_id = ports_perms.port_id LEFT JOIN ports_perms ON ports.port_id = ports_perms.port_id