maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Metrics UI] Ensure inventory view buckets never drop below 60 seconds (#58503)

Browse source 
* [Metrics UI] Ensure inventory view buckets never drop below 60 seconds

* Fixing tests

* Fixing tests... again

* Fixing tests... rounding issue?

* Trying to fix the tests... again

* updating test for custom metric

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
Chris Cowan 2020-02-27 09:32:44 -07:00 committed by GitHub
parent 2a756bbb81
commit 43be649f50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
x-pack/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
View file

@ -21,7 +21,7 @@ export const createTimeRangeWithInterval = async (
): Promise<InfraTimerangeInput> => {
const aggregations = getMetricsAggregations(options);
const modules = await aggregationsToModules(framework, requestContext, aggregations, options);
const interval =
const interval = Math.max(
(await calculateMetricInterval(
framework,
requestContext,
@ -32,7 +32,9 @@ export const createTimeRangeWithInterval = async (
},
modules,
options.nodeType
)) || 60000;
)) || 60,
60
);
return {
interval: `${interval}s`,
from: options.timerange.to - interval * 5000, // We need at least 5 buckets worth of data

24
x-pack/test/api_integration/apis/infra/waffle.ts
View file

@ -192,9 +192,9 @@ export default function({ getService }: FtrProviderContext) {
expect(firstNode).to.have.property('metric');
expect(firstNode.metric).to.eql({
name: 'cpu',
value: 0.009285714285714286,
max: 0.009285714285714286,
avg: 0.0015476190476190477,
value: 0.0032,
max: 0.0038333333333333336,
avg: 0.0027944444444444444,
});
}
});
@ -231,9 +231,9 @@ export default function({ getService }: FtrProviderContext) {
expect(firstNode).to.have.property('metric');
expect(firstNode.metric).to.eql({
name: 'custom',
value: 0.0041964285714285714,
max: 0.0041964285714285714,
avg: 0.0006994047619047619,
value: 0.0016,
max: 0.0018333333333333333,
avg: 0.0013666666666666669,
});
}
});
@ -320,9 +320,9 @@ export default function({ getService }: FtrProviderContext) {
expect(firstNode).to.have.property('metric');
expect(firstNode.metric).to.eql({
name: 'cpu',
value: 0.009285714285714286,
max: 0.009285714285714286,
avg: 0.0015476190476190477,
value: 0.0032,
max: 0.0038333333333333336,
avg: 0.0027944444444444444,
});
const secondNode = nodes[1];
expect(secondNode).to.have.property('path');
@ -332,9 +332,9 @@ export default function({ getService }: FtrProviderContext) {
expect(secondNode).to.have.property('metric');
expect(secondNode.metric).to.eql({
name: 'cpu',
value: 0.009285714285714286,
max: 0.009285714285714286,
avg: 0.0015476190476190477,
value: 0.0032,
max: 0.0038333333333333336,
avg: 0.0027944444444444444,
});
}
});