IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 20:24:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: Elasticsearch table aggregation and support for many aggregations of same type, now uses field name if more than 1 aggregation of same type, fixes #4709

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-17 11:33:08 +02:00
parent 820671d6cc
commit 8e03f321eb
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,14 @@ function (_, queryDef) {
}
default: {
metricName = this._getMetricName(metric.type);
doc[metricName] =bucket[metric.id].value;
var otherMetrics = _.filter(target.metrics, {type: metric.type});
// if more of the same metric type include field field name in property
if (otherMetrics.length > 1) {
metricName += ' ' + metric.field;
}
doc[metricName] = bucket[metric.id].value;
break;
}
}

40
public/app/plugins/datasource/elasticsearch/specs/elastic_response_specs.ts
View File

@ -541,6 +541,46 @@ describe('ElasticResponse', function() {
});
});
describe('Multiple metrics of same type', function() {
beforeEach(function() {
targets = [{
refId: 'A',
metrics: [
{type: 'avg', id: '1', field: 'test'},
{type: 'avg', id: '2', field: 'test2'}
],
bucketAggs: [{id: '2', type: 'terms', field: 'host'}],
}];
response = {
responses: [{
aggregations: {
"2": {
buckets: [
{
"1": { value: 1000},
"2": { value: 3000},
key: "server-1",
doc_count: 369,
}
]
}
}
}]
};
result = new ElasticResponse(targets, response).getTimeSeries();
});
it('should include field in metric name', function() {
expect(result.data[0].type).to.be('docs');
expect(result.data[0].datapoints[0].Average).to.be(undefined);
expect(result.data[0].datapoints[0]['Average test']).to.be(1000);
expect(result.data[0].datapoints[0]['Average test2']).to.be(3000);
});
});
describe('Raw documents query', function() {
beforeEach(function() {
targets = [{ refId: 'A', metrics: [{type: 'raw_document', id: '1'}], bucketAggs: [] }];