From c3bf7d038dd1ac8936fac314bfb6188a08847fed Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Thu, 11 Jun 2015 11:01:01 +0300 Subject: [PATCH] Add zabbix acknowledges to annotations. --- zabbix/datasource.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zabbix/datasource.js b/zabbix/datasource.js index 577368b..23004fb 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 = '\n'; + var formatted_acknowledges = '
'; var acknowledges = _.each(_.map(e.acknowledges, function (ack) { - return ack.name + ' ' + ack.surname + '(' + ack.alias + '): ' + ack.message; + return '' + ack.name + ' ' + ack.surname + ' (' + ack.alias + '): ' + ack.message; }), function (ack) { - formatted_acknowledges = formatted_acknowledges.concat(ack, '\n') + formatted_acknowledges = formatted_acknowledges.concat(ack, '
') }); + events.push({ annotation: annotation, time: e.clock * 1000,