From 045f5e11fccee952312b77c792e4cdeb13797955 Mon Sep 17 00:00:00 2001 From: Dhia MOAKHAR Date: Sat, 3 Jun 2017 02:55:26 +0000 Subject: [PATCH] [elasticsearch] Fix bug when switching from "Raw Document" metric type 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 --- .../plugins/datasource/elasticsearch/query_builder.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js index ee7e9265f08..d753a2666c6 100644 --- a/public/app/plugins/datasource/elasticsearch/query_builder.js +++ b/public/app/plugins/datasource/elasticsearch/query_builder.js @@ -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;