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

feat(elasticsearch): lots of work on elasticsearch metrics query editor, #1034

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-09-03 16:35:11 +02:00
parent 590b155c6c
commit 977f538420
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/elasticsearch/datasource.js
View File

@@ -199,8 +199,8 @@ function (angular, _, config, kbn, moment, ElasticQueryBuilder) {
} }
if (select.field) { if (select.field) {
seriesName += ' ' + select.field; seriesName += ' ' + select.field + ' ' + select.agg;
value = bucket[select.field].value; value = bucket[y.toString()].value;
} else { } else {
seriesName += ' count'; seriesName += ' count';
value = bucket.doc_count; value = bucket.doc_count;

9
public/app/plugins/datasource/elasticsearch/queryBuilder.js
View File

@@ -67,12 +67,15 @@ function () {
nestedAggs = aggs; nestedAggs = aggs;
} }
nestedAggs.aggs = {};
for (var i = 0; i < target.select.length; i++) { for (var i = 0; i < target.select.length; i++) {
var select = target.select[i]; var select = target.select[i];
if (select.field) { if (select.field) {
nestedAggs.aggs = {}; var aggField = {};
nestedAggs.aggs[select.field] = {}; aggField[select.agg] = {field: select.field};
nestedAggs.aggs[select.field][select.agg] = {field: select.field};
nestedAggs.aggs[i.toString()] = aggField;
} }
} }

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

@@ -109,7 +109,7 @@ function (angular, _, ElasticQueryBuilder) {
if (segment.type === 'agg') { if (segment.type === 'agg') {
var nextSegment = $scope.selectSegments[index + 1]; var nextSegment = $scope.selectSegments[index + 1];
if (!segment.reqField && nextSegment && nextSegment.type === 'field') { if (segment.value === 'count' && nextSegment && nextSegment.type === 'field') {
$scope.selectSegments.splice(index + 1, 1); $scope.selectSegments.splice(index + 1, 1);
} else if (!nextSegment || nextSegment.type !== 'field') { } else if (!nextSegment || nextSegment.type !== 'field') {
$scope.selectSegments.splice(index + 1, 0, uiSegmentSrv.newSegment({value: 'select field', fake: true, type: 'field'})); $scope.selectSegments.splice(index + 1, 0, uiSegmentSrv.newSegment({value: 'select field', fake: true, type: 'field'}));

1
public/test/specs/elasticsearch-querybuilder-specs.js
View File

@@ -28,7 +28,6 @@ define([
var aggs = query.aggs.histogram; var aggs = query.aggs.histogram;
}); });
}); });
}); });

6
public/test/specs/elasticsearch-specs.js
View File

@@ -68,12 +68,12 @@ define([
histogram: { histogram: {
buckets: [ buckets: [
{ {
value: {value: 88}, "1": {value: 88},
doc_count: 10, doc_count: 10,
key: 1000 key: 1000
}, },
{ {
value: {value: 99}, "1": {value: 99},
doc_count: 15, doc_count: 15,
key: 2000 key: 2000
} }
@@ -90,7 +90,7 @@ define([
expect(result.data[0].datapoints[0][0]).to.be(10); expect(result.data[0].datapoints[0][0]).to.be(10);
expect(result.data[0].datapoints[0][1]).to.be(1000); expect(result.data[0].datapoints[0][1]).to.be(1000);
expect(result.data[1].target).to.be("A value"); expect(result.data[1].target).to.be("A value avg");
expect(result.data[1].datapoints[0][0]).to.be(88); expect(result.data[1].datapoints[0][0]).to.be(88);
expect(result.data[1].datapoints[1][0]).to.be(99); expect(result.data[1].datapoints[1][0]).to.be(99);
}); });