Browse Source

change size in raw_document from text to number
update query builder and specs

Dhia MOAKHAR 8 years ago
parent
commit
7c1dc2444d

+ 1 - 1
public/app/plugins/datasource/elasticsearch/partials/metric_agg.html

@@ -74,7 +74,7 @@
   </div>
   </div>
   <div class="gf-form offset-width-7" ng-if="agg.type === 'raw_document'">
   <div class="gf-form offset-width-7" ng-if="agg.type === 'raw_document'">
     <label class="gf-form-label width-10">Size</label>
     <label class="gf-form-label width-10">Size</label>
-    <input type="text" class="gf-form-input max-width-12" ng-model="agg.settings.size" ng-blur="onChange()"></input>
+    <input type="number" class="gf-form-input max-width-12" ng-model="agg.settings.size" ng-blur="onChange()"></input>
   </div>
   </div>
 
 
 
 

+ 1 - 1
public/app/plugins/datasource/elasticsearch/query_builder.js

@@ -110,7 +110,7 @@ function (queryDef) {
   };
   };
 
 
   ElasticQueryBuilder.prototype.documentQuery = function(query, size) {
   ElasticQueryBuilder.prototype.documentQuery = function(query, size) {
-    query.size = size === undefined ? 500 : parseInt(size , 10);
+    query.size = size === undefined ? 500 : size;
     query.sort = {};
     query.sort = {};
     query.sort[this.timeField] = {order: 'desc', unmapped_type: 'boolean'};
     query.sort[this.timeField] = {order: 'desc', unmapped_type: 'boolean'};
 
 

+ 1 - 1
public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts

@@ -165,7 +165,7 @@ describe('ElasticQueryBuilder', function() {
   });
   });
   it('with raw_document metric size set', function() {
   it('with raw_document metric size set', function() {
     var query = builder.build({
     var query = builder.build({
-      metrics: [{type: 'raw_document', id: '1',settings: {size: '1337'}}],
+      metrics: [{type: 'raw_document', id: '1',settings: {size: 1337}}],
       timeField: '@timestamp',
       timeField: '@timestamp',
       bucketAggs: [],
       bucketAggs: [],
     });
     });