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

Order alerts by state so that we can indicate rules which have triggered

Browse Source
This commit is contained in:
laf
2016-06-20 23:23:17 +01:00
parent 7bc3e3e33e
commit 04778eadaa
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
html/includes/print-alert-rules.php
View File

@@ -155,7 +155,7 @@ $start = (($page_number - 1) * $results);
$full_query = $full_query.$query." LIMIT $start,$results"; $full_query = $full_query.$query." LIMIT $start,$results";
foreach (dbFetchRows($full_query, $param) as $rule) { foreach (dbFetchRows($full_query, $param) as $rule) {
$sub = dbFetchRows('SELECT * FROM alerts WHERE rule_id = ? ORDER BY id DESC LIMIT 1', array($rule['id'])); $sub = dbFetchRows('SELECT * FROM alerts WHERE rule_id = ? ORDER BY `state` DESC, `id` DESC LIMIT 1', array($rule['id']));
$ico = 'ok'; $ico = 'ok';
$col = 'success'; $col = 'success';
$extra = ''; $extra = '';
@@ -165,16 +165,11 @@ foreach (dbFetchRows($full_query, $param) as $rule) {
$ico = 'ok'; $ico = 'ok';
$col = 'success'; $col = 'success';
} }
else if ((int) $sub['state'] === 1) { elseif ((int) $sub['state'] === 1 || (int) $sub['state'] === 2) {
$ico = 'remove'; $ico = 'remove';
$col = 'danger'; $col = 'danger';
$extra = 'danger'; $extra = 'danger';
} }
else if ((int) $sub['state'] === 2) {
$ico = 'time';
$col = 'default';
$extra = 'warning';
}
} }
$alert_checked = ''; $alert_checked = '';