github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixing error with average bucket pipeline aggregation (#21400) (#21521)

Browse source
This commit is contained in:
Peter Pisljar 2018-08-01 11:27:05 +02:00 • committed by GitHub
parent 048c96aa41
commit 0ec3df5332
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ui/public/agg_types/metrics/bucket_avg.js
View file

@ -36,7 +36,7 @@ export const bucketAvgMetricAgg = new MetricAggType({
const scaleMetrics = customMetric.type && customMetric.type.isScalable();
let value = bucket[agg.id] && bucket[agg.id].value;
if (scaleMetrics) {
if (scaleMetrics && agg.params.customBucket.type.name === 'date_histogram') {
const aggInfo = agg.params.customBucket.write();
value *= get(aggInfo, 'bucketInterval.scale', 1);
}

2
src/ui/public/vis/editors/default/default.js
View file

@ -130,7 +130,7 @@ const defaultEditor = function ($rootScope, $compile) {
$scope.responseValueAggs = null;
try {
$scope.responseValueAggs = $scope.vis.aggs.getResponseAggs().filter(function (agg) {
$scope.responseValueAggs = $scope.state.aggs.getResponseAggs().filter(function (agg) {
return _.get(agg, 'schema.group') === 'metrics';
});
}

16
test/functional/apps/visualize/_data_table.js
View file

@ -103,6 +103,22 @@ export default function ({ getService, getPageObjects }) {
});
});
it('should show correct data when using average pipeline aggregation', async () => {
await PageObjects.visualize.navigateToNewVisualization();
await PageObjects.visualize.clickDataTable();
await PageObjects.visualize.clickNewSearch();
await PageObjects.header.setAbsoluteRange(fromTime, toTime);
await PageObjects.visualize.clickAddMetric();
await PageObjects.visualize.clickBucket('Metric');
await PageObjects.visualize.selectAggregation('Average Bucket', 'metrics');
await PageObjects.visualize.selectAggregation('Terms', 'metrics', 'buckets');
await PageObjects.visualize.selectField('geo.src', 'metrics', 'buckets');
await PageObjects.visualize.clickGo();
const data = await PageObjects.visualize.getTableVisData();
log.debug(data.split('\n'));
expect(data.trim().split('\n')).to.be.eql(['14,004 1,412.6']);
});
it('should show correct data for a data table with date histogram', async () => {
await PageObjects.visualize.navigateToNewVisualization();
await PageObjects.visualize.clickDataTable();

20
test/functional/page_objects/visualize_page.js
View file

@ -482,8 +482,14 @@ export function VisualizePageProvider({ getService, getPageObjects }) {
await Promise.all(getChartTypesPromises);
}
async selectAggregation(myString, groupName = 'buckets') {
const selector = `[group-name="${groupName}"] vis-editor-agg-params:not(.ng-hide) .agg-select`;
async selectAggregation(myString, groupName = 'buckets', childAggregationType = null) {
const selector = `
[group-name="${groupName}"]
vis-editor-agg-params:not(.ng-hide)
${childAggregationType ? `vis-editor-agg-params[group-name="'${childAggregationType}'"]:not(.ng-hide)` : ''}
.agg-select
`;
await retry.try(async () => {
await find.clickByCssSelector(selector);
const input = await find.byCssSelector(`${selector} input.ui-select-search`);
@ -569,8 +575,14 @@ export function VisualizePageProvider({ getService, getPageObjects }) {
return await field.getVisibleText();
}
async selectField(fieldValue, groupName = 'buckets') {
const selector = `[group-name="${groupName}"] vis-editor-agg-params:not(.ng-hide) .field-select`;
async selectField(fieldValue, groupName = 'buckets', childAggregationType = null) {
const selector = `
[group-name="${groupName}"]
vis-editor-agg-params:not(.ng-hide)
${childAggregationType ? `vis-editor-agg-params[group-name="'${childAggregationType}'"]:not(.ng-hide)` : ''}
.field-select
`;
await retry.try(async () => {
await find.clickByCssSelector(selector);
const input = await find.byCssSelector(`${selector} input.ui-select-search`);