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

Updated ack/status for alerts to be better suited (#7955)

Browse Source
This commit is contained in:
Neil Lathwood
2017-12-27 05:29:28 +00:00
committed by Tony Murray
parent a644057a68
commit e219af707d
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,8 +117,10 @@ foreach (dbFetchRows($sql, $param) as $alert) {
$log = dbFetchCell('SELECT details FROM alert_log WHERE rule_id = ? AND device_id = ? ORDER BY id DESC LIMIT 1', array($alert['rule_id'], $alert['device_id'])); $log = dbFetchCell('SELECT details FROM alert_log WHERE rule_id = ? AND device_id = ? ORDER BY id DESC LIMIT 1', array($alert['rule_id'], $alert['device_id']));
$fault_detail = alert_details($log); $fault_detail = alert_details($log);
$alert_to_ack = '<button type="button" class="btn btn-success command-ack-alert fa fa-eye" aria-hidden="true" title="Mark as acknowledged" data-target="ack-alert" data-state="' . $alert['state'] . '" data-alert_id="' . $alert['id'] . '" name="ack-alert"></button>'; $alert_to_ack = '<button type="button" class="btn btn-danger command-ack-alert fa fa-eye" aria-hidden="true" title="Mark as acknowledged" data-target="ack-alert" data-state="' . $alert['state'] . '" data-alert_id="' . $alert['id'] . '" name="ack-alert"></button>';
$alert_to_nack = '<button type="button" class="btn btn-danger command-ack-alert fa fa-eye-slash" aria-hidden="true" title="Mark as not acknowledged" data-target="ack-alert" data-state="' . $alert['state'] . '" data-alert_id="' . $alert['id'] . '" name="ack-alert"></button>'; $alert_to_nack = '<button type="button" class="btn btn-warning command-ack-alert fa fa-eye-slash" aria-hidden="true" title="Mark as not acknowledged" data-target="ack-alert" data-state="' . $alert['state'] . '" data-alert_id="' . $alert['id'] . '" name="ack-alert"></button>';
$ack_ico = $alert_to_ack;
if ((int)$alert['state'] === 0) { if ((int)$alert['state'] === 0) {
$ico = ''; $ico = '';
@@ -132,6 +134,7 @@ foreach (dbFetchRows($sql, $param) as $alert) {
} }
} elseif ((int)$alert['state'] === 2) { } elseif ((int)$alert['state'] === 2) {
$ico = $alert_to_nack; $ico = $alert_to_nack;
$ack_ico = $alert_to_nack;
} }
$severity = $alert['severity']; $severity = $alert['severity'];
@@ -141,12 +144,6 @@ foreach (dbFetchRows($sql, $param) as $alert) {
$severity .= ' <strong>-</strong>'; $severity .= ' <strong>-</strong>';
} }
$ack_ico = $alert_to_ack;
if ($alert['state'] == 2) {
$ack_ico = $alert_to_nack;
}
$hostname = '<div class="incident">' . generate_device_link($alert, shorthost($alert['hostname'])) . '<div id="incident' . ($rulei + 1) . '" class="collapse">' . $fault_detail . '</div></div>'; $hostname = '<div class="incident">' . generate_device_link($alert, shorthost($alert['hostname'])) . '<div id="incident' . ($rulei + 1) . '" class="collapse">' . $fault_detail . '</div></div>';
switch ($severity) { switch ($severity) {
@@ -164,6 +161,10 @@ foreach (dbFetchRows($sql, $param) as $alert) {
break; break;
} }
if ((int)$alert['state'] === 2) {
$severity_ico = '<span class="alert-status label-warning">&nbsp;</span>';
}
$proc = dbFetchCell('SELECT proc FROM alerts,alert_rules WHERE alert_rules.id = alerts.rule_id AND alerts.id = ?', array($alert['id'])); $proc = dbFetchCell('SELECT proc FROM alerts,alert_rules WHERE alert_rules.id = alerts.rule_id AND alerts.id = ?', array($alert['id']));
if (($proc == "") || ($proc == "NULL")) { if (($proc == "") || ($proc == "NULL")) {
$has_proc = ''; $has_proc = '';