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: top-devices widget now will honour for ip to sysName config #5388 (#5643)

Browse Source
This commit is contained in:
Neil Lathwood
2017-01-28 00:58:43 +00:00
committed by GitHub
parent 340935e5b0
commit fa92cc5e24
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
html/includes/common/top-devices.inc.php
View File

@@ -175,13 +175,13 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
}
} elseif ($top_query === 'uptime') {
if (is_admin() || is_read()) {
$query = 'SELECT `uptime`, `hostname`, `last_polled`, `device_id`
$query = 'SELECT `uptime`, `hostname`, `last_polled`, `device_id`, `sysName`
FROM `devices`
WHERE unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval
ORDER BY `uptime` ' . $sort_order . '
LIMIT :count';
} else {
$query = 'SELECT `uptime`, `hostname`, `last_polled`, `d`.`device_id`
$query = 'SELECT `uptime`, `hostname`, `last_polled`, `d`.`device_id`, `d`.`sysName`
FROM `devices` as `d`, `devices_perms` AS `P`
WHERE `P`.`user_id` = :user
AND `P`.`device_id` = `d`.`device_id`
@@ -191,13 +191,13 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
}
} elseif ($top_query === 'ping') {
if (is_admin() || is_read()) {
$query = 'SELECT `last_ping_timetaken`, `hostname`, `last_polled`, `device_id`
$query = 'SELECT `last_ping_timetaken`, `hostname`, `last_polled`, `device_id`, `sysName`
FROM `devices`
WHERE unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval
ORDER BY `last_ping_timetaken` ' . $sort_order . '
LIMIT :count';
} else {
$query = 'SELECT `last_ping_timetaken`, `hostname`, `last_polled`, `d`.`device_id`
$query = 'SELECT `last_ping_timetaken`, `hostname`, `last_polled`, `d`.`device_id`, `d`.`sysName`
FROM `devices` as `d`, `devices_perms` AS `P`
WHERE `P`.`user_id` = :user
AND `P`.`device_id` = `d`.`device_id`
@@ -207,25 +207,25 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
}
} elseif ($top_query === 'cpu') {
if (is_admin() || is_read()) {
$query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, avg(`processor_usage`) as `cpuload`
$query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, avg(`processor_usage`) as `cpuload`, `d`.`sysName`
FROM `processors` AS `procs`, `devices` AS `d`
WHERE `d`.`device_id` = `procs`.`device_id`
AND unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval
GROUP BY `d`.`device_id`
GROUP BY `d`.`device_id`, `d`.`hostname`, `d`.`last_polled`, `d`.`sysName`
ORDER BY `cpuload` ' . $sort_order . '
LIMIT :count';
} else {
$query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, avg(`processor_usage`) as `cpuload`
$query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, avg(`processor_usage`) as `cpuload`, `d`.`sysName`
FROM `processors` AS procs, `devices` AS `d`, `devices_perms` AS `P`
WHERE `P`.`user_id` = :user AND `P`.`device_id` = `procs`.`device_id`
AND unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval
GROUP BY `procs`.`device_id`
GROUP BY `procs`.`device_id`, `d`.`hostname`, `d`.`last_polled`, `d`.`sysName`
ORDER BY `cpuload` ' . $sort_order . '
LIMIT :count';
}
} elseif ($top_query === 'ram') {
if (is_admin() || is_read()) {
$query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, `mempool_perc`
$query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, `mempool_perc`, `d`.`sysName`
FROM `mempools` as `mem`, `devices` as `d`
WHERE `d`.`device_id` = `mem`.`device_id`
AND `mempool_descr` IN (\'Physical memory\',\'Memory\')
@@ -233,7 +233,7 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
ORDER BY `mempool_perc` ' . $sort_order . '
LIMIT :count';
} else {
$query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, `mempool_perc`
$query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, `mempool_perc`, `d`.`sysName`
FROM `mempools` as `mem`, `devices` as `d`, `devices_perms` AS `P`
WHERE `P`.`user_id` = :user AND `P`.`device_id` = `mem`.`device_id`
AND `mempool_descr` IN (\'Physical memory\',\'Memory\')
@@ -243,13 +243,13 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
}
} elseif ($top_query === 'poller') {
if (is_admin() || is_read()) {
$query = 'SELECT `last_polled_timetaken`, `hostname`, `last_polled`, `device_id`
$query = 'SELECT `last_polled_timetaken`, `hostname`, `last_polled`, `device_id`, `sysName`
FROM `devices`
WHERE unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval
ORDER BY `last_polled_timetaken` ' . $sort_order . '
LIMIT :count';
} else {
$query = 'SELECT `last_polled_timetaken`, `hostname`, `last_polled`, `d`.`device_id`
$query = 'SELECT `last_polled_timetaken`, `hostname`, `last_polled`, `d`.`device_id`, `d`.`sysName`
FROM `devices` as `d`, `devices_perms` AS `P`
WHERE `P`.`user_id` = :user
AND `P`.`device_id` = `d`.`device_id`