From 1d4cace849d0e18915dee6f0e29ace6c4c2ae15c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 9 Nov 2016 12:52:56 +0100
Subject: [PATCH] fix(testdata): fixed query in default grafana data source
---
.../plugins/datasource/grafana/datasource.ts | 34 +++++++++++++++----
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index 3ae030e4423..c1c0ce6388a 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -1,17 +1,39 @@
///<reference path="../../../headers/common.d.ts" />
+import _ from 'lodash';
+
class GrafanaDatasource {
/** @ngInject */
constructor(private backendSrv) {}
query(options) {
- return this.backendSrv.get('/api/metrics/test', {
- from: options.range.from.valueOf(),
- to: options.range.to.valueOf(),
- scenario: 'random_walk',
- interval: options.intervalMs,
- maxDataPoints: options.maxDataPoints
+ return this.backendSrv.post('/api/tsdb/query', {
+ from: options.range.from.valueOf().toString(),
+ to: options.range.to.valueOf().toString(),
+ queries: [
+ {
+ "refId": "A",
+ "scenarioId": "random_walk",
+ "intervalMs": options.intervalMs,
+ "maxDataPoints": options.maxDataPoints,
+ }
+ ]
+ }).then(res => {
+
+ var data = [];
+ if (res.results) {
+ _.forEach(res.results, queryRes => {
+ for (let series of queryRes.series) {
+ data.push({
+ target: series.name,
+ datapoints: series.points
+ });
+ }
+ });
+ }
+
+ return {data: data};
});
}