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

Loki: Fix Loki with repeated panels and interpolation for Explore (#21685)

Browse Source
This commit is contained in:
Ivana Huckova
2020-01-24 09:50:09 +01:00
committed by GitHub
parent f91a495875
commit e75840737e
11 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
import _ from 'lodash';
import { dateMath, DataSourceApi, DataSourceInstanceSettings } from '@grafana/data';
import { dateMath, DataSourceApi, DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
import InfluxSeries from './influx_series';
import InfluxQueryModel from './influx_query_model';
import ResponseParser from './response_parser';
@@ -167,7 +167,7 @@ export default class InfluxDatasource extends DataSourceApi<InfluxQuery, InfluxO
return false;
}
interpolateVariablesInQueries(queries: InfluxQuery[]): InfluxQuery[] {
interpolateVariablesInQueries(queries: InfluxQuery[], scopedVars: ScopedVars): InfluxQuery[] {
if (!queries || queries.length === 0) {
return [];
}
@@ -178,11 +178,11 @@ export default class InfluxDatasource extends DataSourceApi<InfluxQuery, InfluxO
const expandedQuery = {
...query,
datasource: this.name,
measurement: this.templateSrv.replace(query.measurement, null, 'regex'),
measurement: this.templateSrv.replace(query.measurement, scopedVars, 'regex'),
};
if (query.rawQuery) {
expandedQuery.query = this.templateSrv.replace(query.query, null, 'regex');
expandedQuery.query = this.templateSrv.replace(query.query, scopedVars, 'regex');
}
if (query.tags) {