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

[ML] Fix a call stack size exception triggered by a negative tickInterval. (#24742) (#24815)

Browse source 
In certain cases tickInterval mistakenly could end up being negative which made getTickValues() run into a call stack size exception. This PR fixes it by a) adding a check to getTickValues() that interval must not be 0 or smaller and b) changing the way the tickInterval is determined in the Anomaly Explorer Charts.
This commit is contained in:
Walter Rafelsberger 2018-10-30 11:40:37 +01:00 committed by GitHub
parent cb024dd4b4
commit a302580162
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_distribution.js
View file

@ -239,11 +239,10 @@ export class ExplorerChartDistribution extends React.Component {
timeBuckets.setInterval('auto');
const xAxisTickFormat = timeBuckets.getScaledDateFormat();
const emphasisStart = Math.max(config.selectedEarliest, config.plotEarliest);
const emphasisEnd = Math.min(config.selectedLatest, config.plotLatest);
const tickValuesStart = Math.max(config.selectedEarliest, config.plotEarliest);
// +1 ms to account for the ms that was substracted for query aggregations.
const interval = emphasisEnd - emphasisStart + 1;
const tickValues = getTickValues(emphasisStart, interval, config.plotEarliest, config.plotLatest);
const interval = config.selectedLatest - config.selectedEarliest + 1;
const tickValues = getTickValues(tickValuesStart, interval, config.plotEarliest, config.plotLatest);
const xAxis = d3.svg.axis().scale(lineChartXScale)
.orient('bottom')
@ -283,7 +282,7 @@ export class ExplorerChartDistribution extends React.Component {
.call(yAxis);
if (tooManyBuckets === false) {
removeLabelOverlap(gAxis, emphasisStart, interval, vizWidth);
removeLabelOverlap(gAxis, tickValuesStart, interval, vizWidth);
}
}

9
x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_single_metric.js
View file

@ -192,11 +192,10 @@ export class ExplorerChartSingleMetric extends React.Component {
timeBuckets.setInterval('auto');
const xAxisTickFormat = timeBuckets.getScaledDateFormat();
const emphasisStart = Math.max(config.selectedEarliest, config.plotEarliest);
const emphasisEnd = Math.min(config.selectedLatest, config.plotLatest);
const tickValuesStart = Math.max(config.selectedEarliest, config.plotEarliest);
// +1 ms to account for the ms that was substracted for query aggregations.
const interval = emphasisEnd - emphasisStart + 1;
const tickValues = getTickValues(emphasisStart, interval, config.plotEarliest, config.plotLatest);
const interval = config.selectedLatest - config.selectedEarliest + 1;
const tickValues = getTickValues(tickValuesStart, interval, config.plotEarliest, config.plotLatest);
const xAxis = d3.svg.axis().scale(lineChartXScale)
.orient('bottom')
@ -236,7 +235,7 @@ export class ExplorerChartSingleMetric extends React.Component {
.call(yAxis);
if (tooManyBuckets === false) {
removeLabelOverlap(gAxis, emphasisStart, interval, vizWidth);
removeLabelOverlap(gAxis, tickValuesStart, interval, vizWidth);
}
}

6
x-pack/plugins/ml/public/util/chart_utils.js
View file

@ -239,6 +239,12 @@ const TICK_DIRECTION = {
// the bounds of earliest and latest. This is useful for the Anomaly Explorer Charts
// to align axis ticks with the gray area resembling the swimlane cell selection.
export function getTickValues(startTimeMs, tickInterval, earliest, latest) {
// A tickInterval equal or smaller than 0 would trigger a call stack exception,
// so we're trying to catch that before it happens.
if (tickInterval <= 0) {
throw Error('tickInterval must be larger than 0.');
}
const tickValues = [startTimeMs];
function addTicks(ts, operator) {

9
x-pack/plugins/ml/public/util/chart_utils.test.js
View file

@ -136,6 +136,15 @@ describe('getTickValues', () => {
1519257600000
]);
});
test('invalid tickIntervals trigger an error', () => {
expect(() => {
getTickValues(1518652800000, 0, 1518274800000, 1519635600000);
}).toThrow();
expect(() => {
getTickValues(1518652800000, -604800000, 1518274800000, 1519635600000);
}).toThrow();
});
});
describe('isLabelLengthAboveThreshold', () => {