From 2c75593c1a61a391235b3f0a3b448ae984718d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 8 Jun 2017 11:53:12 +0200
Subject: [PATCH] refactoring: elasticsearch raw doc size limit option PR,
 #8527

---
 .../datasource/elasticsearch/query_builder.js       | 13 ++++++-------
 .../elasticsearch/specs/datasource_specs.ts         |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js
index 1493fd3eb95..b3d623b6189 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -110,7 +110,7 @@ function (queryDef) {
   };
 
   ElasticQueryBuilder.prototype.documentQuery = function(query, size) {
-    query.size = size === undefined ? 500 : size;
+    query.size = size;
     query.sort = {};
     query.sort[this.timeField] = {order: 'desc', unmapped_type: 'boolean'};
 
@@ -193,13 +193,12 @@ function (queryDef) {
     // handle document query
     if (target.bucketAggs.length === 0) {
       metric = target.metrics[0];
-      if (metric && metric.type !== 'raw_document') {
-        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);
+      if (!metric || metric.type !== 'raw_document') {
+        throw {message: 'Invalid query'};
       }
+
+      var size = (metric.settings && metric.settings.size) || 500;
+      return this.documentQuery(query, size);
     }
 
     nestedAggs = query;
diff --git a/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
index 944aeae1bc4..f9684a3cd3f 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
@@ -62,7 +62,7 @@ describe('ElasticDatasource', function() {
           from: moment.utc([2015, 4, 30, 10]),
           to: moment.utc([2015, 5, 1, 10])
         },
-        targets: [{ bucketAggs: [], metrics: [], query: 'escape\\:test' }]
+        targets: [{ bucketAggs: [], metrics: [{type: 'raw_document'}], query: 'escape\\:test' }]
       });
 
       ctx.$rootScope.$apply();