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 severity filter to webui alert history (#10918)

Browse Source 
* Add severity filter to webui alert history
* Selected options displayed by default
* Fix selected critical
* fix upper
* Fix CI
* fix code climate
This commit is contained in:
louis-oui
2019-12-16 23:58:54 +01:00
committed by PipoCanaja
parent 9ca6b4c0b8
commit 7d9770c9ff
4 changed files with 91 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,16 +24,6 @@ $alert_states = array(
'better' => 4,
);
$alert_severities = array(
// alert_rules.status is enum('ok','warning','critical')
'ok' => 1,
'warning' => 2,
'critical' => 3,
'ok only' => 4,
'warning only' => 5,
'critical only' => 6,
);
$show_recovered = false;
if (is_numeric($vars['device_id']) && $vars['device_id'] > 0) {
@@ -57,14 +47,7 @@ if (is_numeric($vars['state'])) {
}
if (isset($vars['min_severity'])) {
if (is_numeric($vars['min_severity'])) {
$min_severity_id = $vars['min_severity'];
} elseif (!empty($vars['min_severity'])) {
$min_severity_id = $alert_severities[$vars['min_severity']];
}
if (isset($min_severity_id)) {
$where .= " AND `alert_rules`.`severity` " . ($min_severity_id > 3 ? "" : ">") . "= " . ($min_severity_id > 3 ? $min_severity_id - 3 : $min_severity_id);
}
$where .= get_sql_filter_min_severity($vars['min_severity'], "alert_rules");
}
if (is_numeric($vars['group'])) {