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

Elastic: Fix building of raw document queries resulting in error Unknown BaseAggregationBuilder error (#24403)

Browse Source 
* Fix building of elastic document query

* Update comments
This commit is contained in:
Ivana Huckova 2020-05-07 21:43:41 +02:00 committed by GitHub
parent 5e50409000
commit f37c64c80c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/plugins/datasource/elasticsearch/query_builder.ts
View File

@ -205,14 +205,21 @@ export class ElasticQueryBuilder {
this.addAdhocFilters(query, adhocFilters); this.addAdhocFilters(query, adhocFilters);
// handle document query // If target doesn't have bucketAggs and type is not raw_document, it is invalid query.
if (target.bucketAggs.length === 0) { if (target.bucketAggs.length === 0) {
metric = target.metrics[0]; metric = target.metrics[0];
if (!metric || metric.type !== 'raw_document') { if (!metric || metric.type !== 'raw_document') {
throw { message: 'Invalid query' }; throw { message: 'Invalid query' };
} }
}
const size = (metric.settings && metric.settings.size) || 500; /* Handle document query:
* Check if metric type is raw_document. If metric doesn't have size (or size is 0), update size to 500.
* Otherwise it will not be a valid query and error will be thrown.
*/
if (target.metrics[0].type === 'raw_document') {
metric = target.metrics[0];
const size = (metric.settings && metric.settings.size !== 0 && metric.settings.size) || 500;
return this.documentQuery(query, size); return this.documentQuery(query, size);
} }