diff --git a/includes/html/common/alert-log.inc.php b/includes/html/common/alert-log.inc.php index 6fe8586bf2..81b425279c 100644 --- a/includes/html/common/alert-log.inc.php +++ b/includes/html/common/alert-log.inc.php @@ -77,11 +77,12 @@ $common_output[] = ' - + +
State Timestamp   Device AlertSeverity
diff --git a/includes/html/table/alertlog.inc.php b/includes/html/table/alertlog.inc.php index f6fac7f4de..dd813e20b7 100644 --- a/includes/html/table/alertlog.inc.php +++ b/includes/html/table/alertlog.inc.php @@ -78,7 +78,7 @@ if ($rowCount != -1) { $sql .= " LIMIT $limit_low,$limit_high"; } -$sql = "SELECT D.device_id,name AS alert,rule_id, state,time_logged,DATE_FORMAT(time_logged, '" . \LibreNMS\Config::get('dateformat.mysql.compact') . "') as humandate,details $sql"; +$sql = "SELECT R.severity, D.device_id,name AS alert,rule_id, state,time_logged,DATE_FORMAT(time_logged, '" . \LibreNMS\Config::get('dateformat.mysql.compact') . "') as humandate,details $sql"; $rulei = 0; foreach (dbFetchRows($sql, $param) as $alertlog) { @@ -102,14 +102,14 @@ foreach (dbFetchRows($sql, $param) as $alertlog) { $status = 'label-primary'; }//end if - $response[] = array( 'id' => $rulei++, 'time_logged' => $alertlog['humandate'], 'details' => '', 'hostname' => '
' . generate_device_link($dev, shorthost($dev['hostname'])) . '
' . $fault_detail . '
', 'alert' => htmlspecialchars($alertlog['alert']), - 'status' => "" + 'status' => "", + 'severity' => $alertlog['severity'] ); }//end foreach