From 7aa38e22db0045478c4b7696d4602cba6ece0a33 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Mon, 28 Dec 2015 14:15:21 +0300 Subject: [PATCH] Fixed #133 - Annotations don't work at Grafana 2.6. --- plugins/datasource-zabbix/datasource.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js index 447d827..9c31e7a 100644 --- a/plugins/datasource-zabbix/datasource.js +++ b/plugins/datasource-zabbix/datasource.js @@ -336,9 +336,10 @@ function (angular, _, dateMath) { // Annotations // ///////////////// - ZabbixAPIDatasource.prototype.annotationQuery = function(annotation, rangeUnparsed) { - var from = Math.ceil(dateMath.parse(rangeUnparsed.from) / 1000); - var to = Math.ceil(dateMath.parse(rangeUnparsed.to) / 1000); + ZabbixAPIDatasource.prototype.annotationQuery = function(options) { + var from = Math.ceil(dateMath.parse(options.range.from) / 1000); + var to = Math.ceil(dateMath.parse(options.range.to) / 1000); + var annotation = options.annotation; var self = this; var params = {