Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ML] Fix Anomaly Explorer charts time range to obey time picker range #80317

Merged
merged 2 commits into from
Oct 14, 2020
Merged

[ML] Fix Anomaly Explorer charts time range to obey time picker range #80317

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1709858
[ML] Fix Anomaly Explorer charts time range to obey time picker range
peteharverson Oct 13, 2020
e4fc5a3
[ML] Fix explorer_charts_container_service Jest tests
peteharverson Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions ...ugins/ml/public/application/explorer/explorer_charts/explorer_charts_container_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { get, each, find, sortBy, map, reduce } from 'lodash';

import { buildConfig } from './explorer_chart_config_builder';
import { chartLimits, getChartType } from '../../util/chart_utils';
import { getTimefilter } from '../../util/dependency_cache';

import { getEntityFieldList } from '../../../../common/util/anomaly_utils';
import {
Expand Down Expand Up @@ -50,8 +51,8 @@ const MAX_CHARTS_PER_ROW = 4;
export const anomalyDataChange = function (
chartsContainerWidth,
anomalyRecords,
earliestMs,
latestMs,
selectedEarliestMs,
selectedLatestMs,
severity = 0
) {
const data = getDefaultChartsData();
Expand Down Expand Up @@ -83,8 +84,8 @@ export const anomalyDataChange = function (
const chartWidth = Math.floor(chartsContainerWidth / chartsPerRow);
const { chartRange, tooManyBuckets } = calculateChartRange(
seriesConfigs,
earliestMs,
latestMs,
selectedEarliestMs,
selectedLatestMs,
chartWidth,
recordsToPlot,
data.timeFieldName
Expand Down Expand Up @@ -408,8 +409,8 @@ export const anomalyDataChange = function (
chartData: processedData[i],
plotEarliest: chartRange.min,
plotLatest: chartRange.max,
selectedEarliest: earliestMs,
selectedLatest: latestMs,
selectedEarliest: selectedEarliestMs,
selectedLatest: selectedLatestMs,
chartLimits: USE_OVERALL_CHART_LIMITS ? overallChartLimits : chartLimits(processedData[i]),
}));
explorerService.setCharts({ ...data });
Expand Down Expand Up @@ -561,19 +562,21 @@ function processRecordsForDisplay(anomalyRecords) {

function calculateChartRange(
seriesConfigs,
earliestMs,
latestMs,
selectedEarliestMs,
selectedLatestMs,
chartWidth,
recordsToPlot,
timeFieldName
) {
let tooManyBuckets = false;
// Calculate the time range for the charts.
// Fit in as many points in the available container width plotted at the job bucket span.
const midpointMs = Math.ceil((earliestMs + latestMs) / 2);
const midpointMs = Math.ceil((selectedEarliestMs + selectedLatestMs) / 2);
const maxBucketSpanMs = Math.max.apply(null, map(seriesConfigs, 'bucketSpanSeconds')) * 1000;

const pointsToPlotFullSelection = Math.ceil((latestMs - earliestMs) / maxBucketSpanMs);
const pointsToPlotFullSelection = Math.ceil(
(selectedLatestMs - selectedEarliestMs) / maxBucketSpanMs
);

// Optimally space points 5px apart.
const optimumPointSpacing = 5;
Expand All @@ -583,9 +586,12 @@ function calculateChartRange(
// at optimal point spacing.
const plotPoints = Math.max(optimumNumPoints, pointsToPlotFullSelection);
const halfPoints = Math.ceil(plotPoints / 2);
const timefilter = getTimefilter();
const bounds = timefilter.getActiveBounds();

let chartRange = {
min: midpointMs - halfPoints * maxBucketSpanMs,
max: midpointMs + halfPoints * maxBucketSpanMs,
min: Math.max(midpointMs - halfPoints * maxBucketSpanMs, bounds.min.valueOf()),
max: Math.min(midpointMs + halfPoints * maxBucketSpanMs, bounds.max.valueOf()),
};

if (plotPoints > CHART_MAX_POINTS) {
Expand Down Expand Up @@ -615,8 +621,8 @@ function calculateChartRange(

if (maxMs - minMs < maxTimeSpan) {
// Expand out to cover as much as the requested time span as possible.
minMs = Math.max(earliestMs, minMs - maxTimeSpan);
maxMs = Math.min(latestMs, maxMs + maxTimeSpan);
minMs = Math.max(selectedEarliestMs, minMs - maxTimeSpan);
maxMs = Math.min(selectedLatestMs, maxMs + maxTimeSpan);
}

chartRange = { min: minMs, max: maxMs };
Expand Down