Merge pull request #144 from volter/grafana-3.0

Fix annotations
2016-01-21 19:22:24 +04:00
parent 782e8c3aa9 f32cd609f3
commit 7cee76f53e
1 changed files with 1 additions and 1 deletions
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -330,7 +330,7 @@ function (angular, _, dateMath) {
    this.annotationQuery = function(options) {
      var from = Math.ceil(dateMath.parse(options.rangeRaw.from) / 1000);
      var to = Math.ceil(dateMath.parse(options.rangeRaw.to) / 1000);
-      var annotation = annotation;
+      var annotation = options.annotation;
      var self = this;

      // Remove events below the chose severity