Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add zabbix acknowledges to annotations.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-06-11 11:01:01 +03:00
parent 4fca46ef6a
commit c3bf7d038d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zabbix/datasource.js
View File

@@ -637,12 +637,13 @@ function (angular, _, kbn) {
.then(function (result) { .then(function (result) {
var events = []; var events = [];
_.each(result, function(e) { _.each(result, function(e) {
var formatted_acknowledges = '\n'; var formatted_acknowledges = '<br>';
var acknowledges = _.each(_.map(e.acknowledges, function (ack) { var acknowledges = _.each(_.map(e.acknowledges, function (ack) {
return ack.name + ' ' + ack.surname + '(' + ack.alias + '): ' + ack.message; return '<b>' + ack.name + ' ' + ack.surname + ' (' + ack.alias + '): </b>' + ack.message;
}), function (ack) { }), function (ack) {
formatted_acknowledges = formatted_acknowledges.concat(ack, '\n') formatted_acknowledges = formatted_acknowledges.concat(ack, '<br>')
}); });
events.push({ events.push({
annotation: annotation, annotation: annotation,
time: e.clock * 1000, time: e.clock * 1000,