Skip to content

Commit 5959969

Browse files
committed
add support for variables
1 parent 11f7e39 commit 5959969

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": "grafana-toolkit plugin:test",
88
"dev": "grafana-toolkit plugin:dev",
99
"watch": "grafana-toolkit plugin:dev --watch",
10-
"copy": "cp -R dist /usr/local/var/lib/grafana/plugins"
10+
"copy": "cp -R dist ~/grafana-plugins"
1111
},
1212
"author": "Tomas Tauer",
1313
"license": "MIT",

src/DataSource.ts

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import defaults from 'lodash/defaults';
2-
import { BackendSrv, BackendSrvRequest } from '@grafana/runtime';
2+
import { BackendSrv, BackendSrvRequest, getTemplateSrv } from '@grafana/runtime';
33
import { DataQueryRequest, DataQueryResponse, DataSourceApi, DataSourceInstanceSettings } from '@grafana/data';
44

55
import { MyQuery, MyDataSourceOptions, defaultQuery } from './types';
@@ -25,10 +25,13 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
2525
const plainQuery = defaults(target, defaultQuery);
2626
const query = new Query(plainQuery.nrql);
2727

28-
const finalQuery = query.builder
29-
.withDateConstraints(from, to)
30-
.builder.withTimeSeriesClause(intervalMs ?? 0, from, to)
31-
.toString();
28+
const finalQuery = getTemplateSrv().replace(
29+
query.builder
30+
.withDateConstraints(from, to)
31+
.builder.withTimeSeriesClause(intervalMs ?? 0, from, to)
32+
.toString(),
33+
options.scopedVars
34+
);
3235

3336
const request: BackendSrvRequest = {
3437
method: 'GET',

0 commit comments

Comments
 (0)