nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-01 16:26:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated alerts table to show status messages

Browse Source
This commit is contained in:
laf
2015-03-31 18:47:10 +01:00
parent 49da368895
commit 85e83f5775
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/print-alerts.php
+4
View File
@@ -11,6 +11,7 @@ require_once('includes/modal/new_alert_rule.inc.php');
<table id="alerts" class="table table-hover table-condensed alerts"> <table id="alerts" class="table table-hover table-condensed alerts">
<thead> <thead>
<tr> <tr>
<th data-column-id="status" data-formatter="status" data-sortable="false">Status</th>
<th data-column-id="id" data-sortable="false">#</th> <th data-column-id="id" data-sortable="false">#</th>
<th data-column-id="rule">Rule</th> <th data-column-id="rule">Rule</th>
<th data-column-id="hostname">Hostname</th> <th data-column-id="hostname">Hostname</th>
@@ -35,6 +36,9 @@ var grid = $("#alerts").bootgrid({
}, },
url: "/ajax_table.php", url: "/ajax_table.php",
formatters: { formatters: {
"status": function(column,row) {
return "<span class='label label-"+row.extra+"'>" + row.msg + "</span>";
},
"ack": function(column,row) { "ack": function(column,row) {
return "<button type='button' class='btn btn-"+row.ack_col+" btn-sm command-ack-alert' data-target='#ack-alert' data-state='"+row.state+"' data-alert_id='"+row.alert_id+"' name='ack-alert' id='ack-alert' data-extra='"+row.extra+"'><span class='glyphicon glyphicon-"+row.ack_ico+"'aria-hidden='true'></span></button>"; return "<button type='button' class='btn btn-"+row.ack_col+" btn-sm command-ack-alert' data-target='#ack-alert' data-state='"+row.state+"' data-alert_id='"+row.alert_id+"' name='ack-alert' id='ack-alert' data-extra='"+row.extra+"'><span class='glyphicon glyphicon-"+row.ack_ico+"'aria-hidden='true'></span></button>";
} }
html/includes/table/alerts.inc.php
+13 -2
View File
@@ -49,17 +49,27 @@ foreach (dbFetchRows($sql,$param) as $alert) {
$ico = "ok"; $ico = "ok";
$col = "green"; $col = "green";
$extra = ""; $extra = "";
$msg = "";
if ( (int) $alert['state'] === 0 ) { if ( (int) $alert['state'] === 0 ) {
$ico = "ok"; $ico = "ok";
$col = "green"; $col = "green";
} elseif ( (int) $alert['state'] === 1 ) { $extra = "success";
$msg = "OK";
} elseif ( (int) $alert['state'] === 1 || (int) $alert['state'] === 3 || (int) $alert['state'] === 4) {
$ico = "volume-up"; $ico = "volume-up";
$col = "red"; $col = "red";
$extra = "danger"; $extra = "danger";
$msg = "ALERT";
if ( (int) $alert['state'] === 3) {
$msg = "WORSE";
} elseif ( (int) $alert['state'] === 4) {
$msg = "BETTER";
}
} elseif ( (int) $alert['state'] === 2) { } elseif ( (int) $alert['state'] === 2) {
$ico = "volume-off"; $ico = "volume-off";
$col = "#800080"; $col = "#800080";
$extra = "warning"; $extra = "warning";
$msg = "MUTED";
} }
$alert_checked = ''; $alert_checked = '';
$orig_ico = $ico; $orig_ico = $ico;
@@ -91,7 +101,8 @@ foreach (dbFetchRows($sql,$param) as $alert) {
'state'=>$alert['state'], 'state'=>$alert['state'],
'alert_id'=>$alert['id'], 'alert_id'=>$alert['id'],
'ack_ico'=>$ack_ico, 'ack_ico'=>$ack_ico,
'extra'=>$extra); 'extra'=>$extra,
'msg'=>$msg);
} }