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

Merge pull request #857 from f0o/alerts-table

Browse Source 
Provides ability to expand the alert triggers
This commit is contained in:
Neil Lathwood
2015-04-23 17:02:22 +01:00
parent 33a8e956e5 ab6de0180b
commit 4ef0e6b4ca
2 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/table/alerts.inc.php
+24 -10
View File
@@ -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,