IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 16:15:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Elasticsearch: Restore fields naming when using variables (#35624)

Browse Source
This commit is contained in:
Giordano Ricci 2021-06-17 11:50:00 +01:00 committed by GitHub
parent be5d032e8e
commit 185bf8f9a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ import {
import { bucketAggregationConfig } from './components/QueryEditor/BucketAggregationsEditor/utils';
import {
BucketAggregation,
BucketAggregationWithField,
isBucketAggregationWithField,
} from './components/QueryEditor/BucketAggregationsEditor/aggregations';
import { generate, Observable, of, throwError } from 'rxjs';
@ -390,7 +391,23 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
this.templateSrv.replace(JSON.stringify(expandedQueries), scopedVars)
);
return finalQueries;
// FIXME: with 8.0 we introduced an undocumented breaking change on how we name frames fields.
// Although the introduced behavior is correct, it wasn't documented.
// The following lines will restore the previous behaviour for 8.0, to be removed with a proper
// changelog in 8.1 by returning `finalQueries` without any further modification
return finalQueries.map((q, queryIndex) => ({
...q,
bucketAggs: q.bucketAggs?.map((bucketAgg, aggIndex) => {
if (isBucketAggregationWithField(bucketAgg)) {
return {
...bucketAgg,
field: (queries[queryIndex].bucketAggs?.[aggIndex] as BucketAggregationWithField).field,
};
}
return bucketAgg;
}),
}));
}
testDatasource() {