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

5
public/app/plugins/datasource/elasticsearch/datasource.ts
View File

@@ -6,6 +6,7 @@ import {
DataQueryRequest,
DataQueryResponse,
DataFrame,
ScopedVars,
} from '@grafana/data';
import { ElasticResponse } from './elastic_response';
import { IndexPattern } from './index_pattern';
@@ -263,14 +264,14 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
});
}
interpolateVariablesInQueries(queries: ElasticsearchQuery[]): ElasticsearchQuery[] {
interpolateVariablesInQueries(queries: ElasticsearchQuery[], scopedVars: ScopedVars): ElasticsearchQuery[] {
let expandedQueries = queries;
if (queries && queries.length > 0) {
expandedQueries = queries.map(query => {
const expandedQuery = {
...query,
datasource: this.name,
query: this.templateSrv.replace(query.query, {}, 'lucene'),
query: this.templateSrv.replace(query.query, scopedVars, 'lucene'),
};
return expandedQuery;
});