From b54dc288c31213ae81f9e86f64ba6166db55de37 Mon Sep 17 00:00:00 2001 From: f0o Date: Fri, 19 Jun 2015 16:52:59 +0000 Subject: [PATCH] Replace Alert-ID with Alert-Name/Rule in titles --- alerts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alerts.php b/alerts.php index e0fe2769d..abb070bb0 100755 --- a/alerts.php +++ b/alerts.php @@ -329,7 +329,7 @@ function DescribeAlert($alert) { $obj['device_id'] = $alert['device_id']; $extra = $alert['details']; if( $alert['state'] >= 1 ) { - $obj['title'] = 'Alert for device '.$device['hostname'].' Alert-ID #'.$alert['id']; + $obj['title'] = 'Alert for device '.$device['hostname'].' - '.($alert['name'] ? $alert['name'] : $alert['rule']); if( $alert['state'] == 2 ) { $obj['title'] .= " got acknowledged"; } elseif( $alert['state'] == 3 ) { @@ -352,7 +352,7 @@ function DescribeAlert($alert) { return false; } $extra = json_decode(gzuncompress($id['details']),true); - $obj['title'] = 'Device '.$device['hostname'].' recovered from Alert-ID #'.$id['id']; + $obj['title'] = 'Device '.$device['hostname'].' recovered from '.($alert['name'] ? $alert['name'] : $alert['rule']); $obj['elapsed'] = TimeFormat(strtotime($alert['time_logged'])-strtotime($id['time_logged'])); $obj['id'] = $id['id']; $obj['faults'] = false;