From 015cb875fae3d81f1202c4abba5f7a35073e3a55 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Thu, 11 Jun 2015 13:19:04 +0300 Subject: [PATCH] Format acknowledges as table. --- zabbix/datasource.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zabbix/datasource.js b/zabbix/datasource.js index 23004fb..cb04753 100644 --- a/zabbix/datasource.js +++ b/zabbix/datasource.js @@ -637,12 +637,13 @@ function (angular, _, kbn) { .then(function (result) { var events = []; _.each(result, function(e) { - var formatted_acknowledges = '
'; + var formatted_acknowledges = "

Acknowledges:
"; var acknowledges = _.each(_.map(e.acknowledges, function (ack) { - return '' + ack.name + ' ' + ack.surname + ' (' + ack.alias + '): ' + ack.message; + return ''; }), function (ack) { - formatted_acknowledges = formatted_acknowledges.concat(ack, '
') + formatted_acknowledges = formatted_acknowledges.concat(ack) }); + formatted_acknowledges = formatted_acknowledges.concat('
TimeUserMessage
' + ack.clock + '' + ack.name + ' ' + ack.surname + ' (' + ack.alias + ')' + '' + ack.message + '
') events.push({ annotation: annotation,