IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

interpolate variables in tags & values during autocomplete

Browse Source
This commit is contained in:
Dan Cech 2018-01-08 16:52:28 -05:00
parent 92086bc858
commit 60ba6ee6a2
No known key found for this signature in database
GPG Key ID: 6F1146C5B66FBD41
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/graphite/datasource.ts
View File

@ -286,7 +286,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
let httpOptions: any = { let httpOptions: any = {
method: 'GET', method: 'GET',
url: '/tags/' + tag, url: '/tags/' + templateSrv.replace(tag),
// for cancellations // for cancellations
requestId: options.requestId, requestId: options.requestId,
}; };
@ -317,7 +317,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
method: 'GET', method: 'GET',
url: '/tags/autoComplete/tags', url: '/tags/autoComplete/tags',
params: { params: {
expr: expressions, expr: _.map(expressions, expression => templateSrv.replace(expression)),
}, },
// for cancellations // for cancellations
requestId: options.requestId, requestId: options.requestId,
@ -352,8 +352,8 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
method: 'GET', method: 'GET',
url: '/tags/autoComplete/values', url: '/tags/autoComplete/values',
params: { params: {
expr: expressions, expr: _.map(expressions, expression => templateSrv.replace(expression)),
tag: tag, tag: templateSrv.replace(tag),
}, },
// for cancellations // for cancellations
requestId: options.requestId, requestId: options.requestId,