mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Merge pull request #857 from f0o/alerts-table
Provides ability to expand the alert triggers
This commit is contained in:
@@ -3,17 +3,13 @@
|
||||
<span id="message"></span>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
require_once('includes/modal/new_alert_rule.inc.php');
|
||||
?>
|
||||
|
||||
<div class="table-responsive">
|
||||
<table id="alerts" class="table table-hover table-condensed alerts">
|
||||
<thead>
|
||||
<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="rule">Rule</th>
|
||||
<th data-column-id="details" data-sortable="false"> </th>
|
||||
<th data-column-id="hostname">Hostname</th>
|
||||
<th data-column-id="timestamp">Timestamp</th>
|
||||
<th data-column-id="severity">Severity</th>
|
||||
@@ -22,9 +18,7 @@ require_once('includes/modal/new_alert_rule.inc.php');
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
|
||||
var grid = $("#alerts").bootgrid({
|
||||
ajax: true,
|
||||
post: function ()
|
||||
@@ -42,8 +36,27 @@ var grid = $("#alerts").bootgrid({
|
||||
"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>";
|
||||
}
|
||||
},
|
||||
templates: {
|
||||
}
|
||||
}).on("loaded.rs.jquery.bootgrid", function() {
|
||||
grid.find(".incident").each( function() {
|
||||
$(this).parent().addClass('col-md-12 col-sm-12 col-xs-12');
|
||||
$(this).parent().parent().on("mouseenter", function() {
|
||||
$(this).find(".incident-toggle").fadeIn(200);
|
||||
}).on("mouseleave", function() {
|
||||
$(this).find(".incident-toggle").fadeOut(200);
|
||||
}).on("click", function() {
|
||||
var target = $(this).find(".incident-toggle").data("target");
|
||||
$(this).find(".incident-toggle").toggleClass('glyphicon-plus glyphicon-minus');
|
||||
$(target).collapse('toggle');
|
||||
});
|
||||
});
|
||||
grid.find(".incident-toggle").on("click", function(e) {
|
||||
var target = $(this).data("target");
|
||||
$(this).toggleClass('glyphicon-plus glyphicon-minus');
|
||||
$(target).collapse('toggle');
|
||||
});
|
||||
grid.find(".command-ack-alert").on("click", function(e) {
|
||||
e.preventDefault();
|
||||
var alert_id = $(this).data("alert_id");
|
||||
@@ -64,5 +77,4 @@ var grid = $("#alerts").bootgrid({
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
|
@@ -7,8 +7,7 @@ if (is_numeric($_POST['device_id']) && $_POST['device_id'] > 0) {
|
||||
}
|
||||
|
||||
if (isset($searchPhrase) && !empty($searchPhrase)) {
|
||||
$sql .= " AND (`timestamp` LIKE '%?%' OR `rule` LIKE '%?%' OR `name` LIKE '%?%' OR `hostname` LIKE '%?%')";
|
||||
$param[] = array($searchPhrase,$searchPhrase,$searchPhrase,$serchPhrase);
|
||||
$sql .= " AND (`timestamp` LIKE '%$searchPhrase%' OR `rule` LIKE '%$searchPhrase%' OR `name` LIKE '%$searchPhrase%' OR `hostname` LIKE '%$searchPhrase%')";
|
||||
}
|
||||
|
||||
$sql = " FROM `alerts` LEFT JOIN `devices` ON `alerts`.`device_id`=`devices`.`device_id` RIGHT JOIN alert_rules ON alerts.rule_id=alert_rules.id WHERE $where AND `state` IN (1,2,3,4) $sql";
|
||||
@@ -37,17 +36,25 @@ if ($rowCount != -1) {
|
||||
$sql = "SELECT `alerts`.*, `devices`.`hostname` AS `hostname`,`alert_rules`.`rule` AS `rule`, `alert_rules`.`name` AS `name`, `alert_rules`.`severity` AS `severity` $sql";
|
||||
|
||||
$rulei = 0;
|
||||
$format = $_POST['format'];
|
||||
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_detail = json_decode(gzuncompress($log),true);
|
||||
foreach ( $log_detail['rule'] as $tmp_alerts ) {
|
||||
$fault_detail = '';
|
||||
$fault_detail = '';
|
||||
foreach ( $log_detail['rule'] as $o=>$tmp_alerts ) {
|
||||
$fault_detail .= "#".($o+1).": ";
|
||||
$tmp = generate_port_link($tmp_alerts);
|
||||
if( substr($tmp,-5,1) != ">" ) {
|
||||
$fault_detail .= $tmp;
|
||||
} else {
|
||||
foreach ($tmp_alerts as $k=>$v) {
|
||||
if (!empty($v) && $k != 'device_id' && (stristr($k,'id') || stristr($k,'desc')) && substr_count($k,'_') <= 1) {
|
||||
$fault_detail .= $k.' => '.$v."\n ";
|
||||
}
|
||||
if (!empty($v) && $k != 'device_id' && (stristr($k,'id') || stristr($k,'desc')) && substr_count($k,'_') <= 1) {
|
||||
$fault_detail .= "$k => '$v', ";
|
||||
}
|
||||
$fault_detail = rtrim($fault_detail,", ");
|
||||
}
|
||||
$fault_detail .= "\n";
|
||||
}
|
||||
$fault_detail .= "<br>";
|
||||
}
|
||||
|
||||
$ico = "ok";
|
||||
@@ -96,9 +103,16 @@ foreach (dbFetchRows($sql,$param) as $alert) {
|
||||
}
|
||||
}
|
||||
|
||||
$response[] = array('id'=>"<i>#".$rulei++."</i>",
|
||||
$hostname = '
|
||||
<div class="incident">
|
||||
'.generate_device_link($alert).'
|
||||
<div id="incident'.($rulei+1).'" class="collapse">'.$fault_detail.'</div>
|
||||
</div>';
|
||||
|
||||
$response[] = array('id'=>$rulei++,
|
||||
'rule'=>"<i title=\"".htmlentities($alert['rule'])."\">".htmlentities($alert['name'])."</i>",
|
||||
'hostname'=>"<a href=\"device/device=".$alert['device_id']."\"><i title='".htmlentities($fault_detail)."'>".$alert['hostname']."</i></a>",
|
||||
'details'=>'<a class="glyphicon glyphicon-plus incident-toggle" style="display:none" data-toggle="collapse" data-target="#incident'.($rulei).'" data-parent="#alerts"></a>',
|
||||
'hostname'=>$hostname,
|
||||
'timestamp'=>($alert['timestamp'] ? $alert['timestamp'] : "N/A"),
|
||||
'severity'=>$severity,
|
||||
'ack_col'=>$ack_col,
|
||||
|
Reference in New Issue
Block a user