wip: began work on support for testdata tables & annotations support

pkg/tsdb/testdata/scenarios.go

@@ -221,6 +221,33 @@ func init() {
 			return queryRes
 			return queryRes
 		},
 		},
 	})
 	})
+
+	registerScenario(&Scenario{
+		Id:   "annotations",
+		Name: "Annotations",
+
+		Handler: func(query *tsdb.Query, tsdbQuery *tsdb.TsdbQuery) *tsdb.QueryResult {
+			timeWalkerMs := tsdbQuery.TimeRange.GetFromAsMsEpoch()
+			to := tsdbQuery.TimeRange.GetToAsMsEpoch()
+
+			table := tsdb.Table{
+				Columns: []tsdb.TableColumn{
+					{Text: "time"},
+					{Text: "message"},
+				},
+				Rows: []tsdb.RowValues{},
+			}
+
+			for i := int64(0); i < 10 && timeWalkerMs < to; i++ {
+				table.Rows = append(table.Rows, tsdb.RowValues{float64(timeWalkerMs), "hello"})
+				timeWalkerMs += query.IntervalMs
+			}
+
+			queryRes := tsdb.NewQueryResult()
+			queryRes.Tables = append(queryRes.Tables, &table)
+			return queryRes
+		},
+	})
 }
 }
 
 
 func registerScenario(scenario *Scenario) {
 func registerScenario(scenario *Scenario) {

public/app/plugins/datasource/testdata/datasource.ts

 import _ from 'lodash';
 import _ from 'lodash';
+import TableModel from 'app/core/table_model';
 
 
 class TestDataDatasource {
 class TestDataDatasource {
   id: any;
   id: any;
@@ -29,16 +30,29 @@ class TestDataDatasource {
     }
     }
 
 
     return this.backendSrv
     return this.backendSrv
-      .post('/api/tsdb/query', {
-        from: options.range.from.valueOf().toString(),
-        to: options.range.to.valueOf().toString(),
-        queries: queries,
+      .datasourceRequest({
+        method: 'POST',
+        url: '/api/tsdb/query',
+        data: {
+          from: options.range.from.valueOf().toString(),
+          to: options.range.to.valueOf().toString(),
+          queries: queries,
+        },
       })
       })
       .then(res => {
       .then(res => {
         const data = [];
         const data = [];
 
 
-        if (res.results) {
-          _.forEach(res.results, queryRes => {
+        if (res.data.results) {
+          _.forEach(res.data.results, queryRes => {
+            if (queryRes.tables) {
+              for (const table of queryRes.tables) {
+                const model = new TableModel();
+                model.rows = table.rows;
+                model.columns = table.columns;
+
+                data.push(model);
+              }
+            }
             for (const series of queryRes.series) {
             for (const series of queryRes.series) {
               data.push({
               data.push({
                 target: series.name,
                 target: series.name,
@@ -48,17 +62,35 @@ class TestDataDatasource {
           });
           });
         }
         }
 
 
+        console.log(res);
         return { data: data };
         return { data: data };
       });
       });
   }
   }
 
 
   annotationQuery(options) {
   annotationQuery(options) {
-    return this.backendSrv.get('/api/annotations', {
-      from: options.range.from.valueOf(),
-      to: options.range.to.valueOf(),
-      limit: options.limit,
-      type: options.type,
-    });
+    return this.backendSrv
+      .datasourceRequest({
+        method: 'POST',
+        url: '/api/tsdb/query',
+        data: {
+          from: options.range.from.valueOf().toString(),
+          to: options.range.to.valueOf().toString(),
+          queries: [
+            {
+              refId: 'A',
+              scenarioId: 'annotations',
+              intervalMs: 100,
+              maxDataPoints: 100,
+              stringInput: '',
+              datasourceId: this.id,
+            },
+          ],
+        },
+      })
+      .then(resp => {
+        console.log(resp);
+        return [];
+      });
   }
   }
 }
 }
 
 

public/app/plugins/datasource/testdata/module.ts

@@ -6,7 +6,7 @@ class TestDataAnnotationsQueryCtrl {
 
 
   constructor() {}
   constructor() {}
 
 
-  static template = '<h2>test data</h2>';
+  static template = '<h2>Annotation scenario</h2>';
 }
 }
 
 
 export {
 export {