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

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-06-22 22:30:03 +02:00
commit ba2deb5f7b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/influxdb/datasource.js
View File

@ -49,9 +49,9 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
query = query.replace(/\$interval/g, (target.interval || options.interval)); query = query.replace(/\$interval/g, (target.interval || options.interval));
// replace templated variables // 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); var handleResponse = _.partial(handleInfluxQueryResponse, alias);
return this._seriesQuery(query).then(handleResponse); return this._seriesQuery(query).then(handleResponse);