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

[elasticsearch] Fix bug when switching from "Raw Document" metric type

Browse Source 
when switch to "raw Document" metric type we do free all "Group by"
however when we switch back to another type we do not reset the default aggregation (date histogram)
Thus all modification will through exception as no "Group by" is defined and panel should be recreated
the fix will reintialize the "Group by" by setting default value
This commit is contained in:
Dhia MOAKHAR 2017-06-03 02:55:26 +00:00
parent d55cc4e2a3
commit 045f5e11fc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/plugins/datasource/elasticsearch/query_builder.js
View File

@ -194,11 +194,12 @@ function (queryDef) {
if (target.bucketAggs.length === 0) {
metric = target.metrics[0];
if (metric && metric.type !== 'raw_document') {
throw {message: 'Invalid query'};
}
var size = metric && metric.hasOwnProperty("settings") && metric.settings.hasOwnProperty("size")
target.bucketAggs = [{type: 'date_histogram', id: '2', settings: {interval: 'auto'}}];
} else {
var size = metric && metric.hasOwnProperty("settings") && metric.settings.hasOwnProperty("size")
&& metric.settings["size"] !== null ? metric.settings["size"] : 500 ;
return this.documentQuery(query,size);
return this.documentQuery(query,size);
}
}
nestedAggs = query;