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

change size in raw_document from text to number

Browse Source 
update query builder and specs
This commit is contained in:
Dhia MOAKHAR 2017-06-04 13:20:58 +00:00
parent 045f5e11fc
commit 7c1dc2444d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/elasticsearch/partials/metric_agg.html
View File

@ -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>

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

@ -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'};

2
public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
View File

@ -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: [],
}); });