mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge branch 'master' of github.com:grafana/grafana
This commit is contained in:
commit
ba2deb5f7b
@ -49,9 +49,9 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
|
||||
query = query.replace(/\$interval/g, (target.interval || options.interval));
|
||||
|
||||
// replace templated variables
|
||||
query = templateSrv.replace(query);
|
||||
query = templateSrv.replace(query, options.scopedVars);
|
||||
|
||||
var alias = target.alias ? templateSrv.replace(target.alias) : '';
|
||||
var alias = target.alias ? templateSrv.replace(target.alias, options.scopedVars) : '';
|
||||
|
||||
var handleResponse = _.partial(handleInfluxQueryResponse, alias);
|
||||
return this._seriesQuery(query).then(handleResponse);
|
||||
|
Loading…
Reference in New Issue
Block a user