Merge pull request #1903 from craftytrickster/influx09-annotation-bugfix

Fixed Annotations with InfluxDb9 Datasources

public/app/plugins/datasource/influxdb/influxSeries.js

@@ -5,7 +5,8 @@ function (_) {
   'use strict';
   'use strict';
 
 
   function InfluxSeries(options) {
   function InfluxSeries(options) {
-    this.seriesList = options.seriesList;
+    this.seriesList = options.seriesList && options.seriesList.results && options.seriesList.results.length > 0
+      ? options.seriesList.results[0].series || [] : [];
     this.alias = options.alias;
     this.alias = options.alias;
     this.annotation = options.annotation;
     this.annotation = options.annotation;
   }
   }
@@ -17,12 +18,10 @@ function (_) {
     var self = this;
     var self = this;
 
 
     console.log(self.seriesList);
     console.log(self.seriesList);
-    if (!self.seriesList || !self.seriesList.results || !self.seriesList.results[0]) {
+    if (self.seriesList.length === 0) {
       return output;
       return output;
     }
     }
 
 
-    this.seriesList = self.seriesList.results[0].series;
-
     _.each(self.seriesList, function(series) {
     _.each(self.seriesList, function(series) {
       var datapoints = [];
       var datapoints = [];
       for (var i = 0; i < series.values.length; i++) {
       for (var i = 0; i < series.values.length; i++) {
@@ -63,19 +62,15 @@ function (_) {
         if (column === self.annotation.textColumn) { textCol = index; return; }
         if (column === self.annotation.textColumn) { textCol = index; return; }
       });
       });
 
 
-      _.each(series.points, function (point) {
+      _.each(series.values, function (value) {
         var data = {
         var data = {
           annotation: self.annotation,
           annotation: self.annotation,
-          time: point[timeCol],
-          title: point[titleCol],
-          tags: point[tagsCol],
-          text: point[textCol]
+          time: + new Date(value[timeCol]),
+          title: value[titleCol],
+          tags: value[tagsCol],
+          text: value[textCol]
         };
         };
 
 
-        if (tagsCol) {
-          data.tags = point[tagsCol];
-        }
-
         list.push(data);
         list.push(data);
       });
       });
     });
     });

public/app/plugins/datasource/influxdb/plugin.json

@@ -13,5 +13,6 @@
     "annotations": "app/plugins/datasource/influxdb/partials/annotations.editor.html"
     "annotations": "app/plugins/datasource/influxdb/partials/annotations.editor.html"
   },
   },
 
 
-  "metrics": true
+  "metrics": true,
+  "annotations": true
 }
 }