From 4e1d8c9ced423766d9831970c7b08c380f89138c Mon Sep 17 00:00:00 2001
From: Naoufel JAMALI <naoufelfalconjamali@gmail.com>
Date: Wed, 25 Jan 2017 11:29:41 +0000
Subject: [PATCH] Elasticsearch - Term aggregation limit fix  (should fix
 #7112) (#7338)

* Elasticsearch - Term aggregation limit fix  (should fix #7112)

* Elasticsearch - Term aggregation limit fix
---
 .../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 95d31a53be0..0cd592b0846 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -29,7 +29,6 @@ function (queryDef) {
     }
 
     queryNode.terms.size = parseInt(aggDef.settings.size, 10) === 0 ? 500 : parseInt(aggDef.settings.size, 10);
-
     if (aggDef.settings.orderBy !== void 0) {
       queryNode.terms.order = {};
       queryNode.terms.order[aggDef.settings.orderBy] = aggDef.settings.order;
@@ -243,19 +242,21 @@ function (queryDef) {
         }
       });
     }
-
+    var size = 500;
+    if(queryDef.size){
+      size = queryDef.size;
+    }
     query.aggs =  {
       "1": {
         "terms": {
           "field": queryDef.field,
-          "size": 500,
+          "size": size,
           "order": {
             "_term": "asc"
           }
         },
       }
     };
-
     return query;
   };