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 location to alert hostname tooltip (#9991)

Browse Source
This commit is contained in:
Ryan Medlyn
2019-03-19 04:07:05 -06:00
committed by PipoCanaja
parent 4a9ee7ae56
commit b237e42615
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/includes/table/alerts.inc.php
View File

@@ -92,6 +92,8 @@ if (!LegacyAuth::user()->hasGlobalRead()) {
$param[] = LegacyAuth::id(); $param[] = LegacyAuth::id();
} }
$sql .= " LEFT JOIN `locations` ON `devices`.`location_id` = `locations`.`id`";
$sql .= " RIGHT JOIN `alert_rules` ON `alerts`.`rule_id`=`alert_rules`.`id` WHERE $where"; $sql .= " RIGHT JOIN `alert_rules` ON `alerts`.`rule_id`=`alert_rules`.`id` WHERE $where";
$count_sql = "SELECT COUNT(`alerts`.`id`) $sql"; $count_sql = "SELECT COUNT(`alerts`.`id`) $sql";
@@ -117,7 +119,7 @@ if ($rowCount != -1) {
$sql .= " LIMIT $limit_low,$limit_high"; $sql .= " LIMIT $limit_low,$limit_high";
} }
$sql = "SELECT `alerts`.*, `devices`.`hostname`, `devices`.`sysName`, `devices`.`hardware`, `alert_rules`.`rule`, `alert_rules`.`name`, `alert_rules`.`severity` $sql"; $sql = "SELECT `alerts`.*, `devices`.`hostname`, `devices`.`sysName`, `devices`.`hardware`, `locations`.`location`, `alert_rules`.`rule`, `alert_rules`.`name`, `alert_rules`.`severity` $sql";
$rulei = 0; $rulei = 0;
$format = $vars['format']; $format = $vars['format'];