Skip to content

[ML][7.10] Fix zoom missing in Anomaly detection URLs #86400

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

Merged
qn895 merged 4 commits into from
Dec 23, 2020
Merged

[ML][7.10] Fix zoom missing in Anomaly detection URLs #86400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d68104
[ML] Fix issue with addItemToRecentlyAccessed
qn895 Dec 17, 2020
568e645
Merge remote-tracking branch 'upstream/7.10' into fix-7.10-zoom-params
qn895 Dec 22, 2020
5660067
[ML] Fix series
qn895 Dec 22, 2020
516cee6
Merge remote-tracking branch 'upstream/7.10' into fix-7.10-zoom-params
qn895 Dec 23, 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
19 changes: 9 additions & 10 deletions x-pack/plugins/ml/common/types/ml_url_generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,27 +123,26 @@ export interface TimeSeriesExplorerGlobalState {
refreshInterval?: RefreshInterval;
}

export interface TimeSeriesExplorerAppState {
export interface TimeSeriesExplorerParams {
forecastId?: string;
detectorIndex?: number;
entities?: Record<string, string>;
zoom?: {
from?: string;
to?: string;
};
mlTimeSeriesExplorer?: {
forecastId?: string;
detectorIndex?: number;
entities?: Record<string, string>;
};
}
export interface TimeSeriesExplorerAppState {
mlTimeSeriesExplorer?: TimeSeriesExplorerParams;
query?: any;
}

export interface TimeSeriesExplorerPageState
extends Pick<TimeSeriesExplorerAppState, 'zoom' | 'query'>,
extends TimeSeriesExplorerParams,
Pick<TimeSeriesExplorerAppState, 'query'>,
Pick<TimeSeriesExplorerGlobalState, 'refreshInterval'> {
jobIds?: JobId[];
timeRange?: TimeRange;
detectorIndex?: number;
entities?: Record<string, string>;
forecastId?: string;
globalState?: MlCommonGlobalState;
}

Expand Down
16 changes: 9 additions & 7 deletions x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import React, { useCallback } from 'react';
import React, { useCallback, useMemo } from 'react';

import {
EuiButtonEmpty,
Expand Down Expand Up @@ -56,10 +56,15 @@ function getChartId(series) {
function ExplorerChartContainer({ series, severity, tooManyBuckets, wrapLabel, mlUrlGenerator }) {
const redirectToSingleMetricViewer = useCallback(async () => {
const singleMetricViewerLink = await getExploreSeriesLink(mlUrlGenerator, series);
addItemToRecentlyAccessed('timeseriesexplorer', series.jobId, singleMetricViewerLink);
// need to get the relative link for addItemToRecentlyAccessed
// whereas for user to navigate to link it needs the full path
const relativeLinkParts = singleMetricViewerLink.split('app/ml');
if (Array.isArray(relativeLinkParts) && relativeLinkParts.length === 2) {
addItemToRecentlyAccessed('timeseriesexplorer', series.jobId, relativeLinkParts[1]);
}

window.open(singleMetricViewerLink, '_blank');
}, [mlUrlGenerator]);
}, [mlUrlGenerator, series]);

const { detectorLabel, entityFields } = series;

Expand Down Expand Up @@ -168,14 +173,12 @@ export const ExplorerChartsContainerUI = ({
}) => {
const {
services: {
application: { navigateToApp },

share: {
urlGenerators: { getUrlGenerator },
},
},
} = kibana;
const mlUrlGenerator = getUrlGenerator(ML_APP_URL_GENERATOR);
const mlUrlGenerator = useMemo(() => getUrlGenerator(ML_APP_URL_GENERATOR), [getUrlGenerator]);

// <EuiFlexGrid> doesn't allow a setting of `columns={1}` when chartsPerRow would be 1.
// If that's the case we trick it doing that with the following settings:
Expand All @@ -198,7 +201,6 @@ export const ExplorerChartsContainerUI = ({
severity={severity}
tooManyBuckets={tooManyBuckets}
wrapLabel={wrapLabel}
navigateToApp={navigateToApp}
mlUrlGenerator={mlUrlGenerator}
/>
</EuiFlexItem>
Expand Down
5 changes: 4 additions & 1 deletion x-pack/plugins/ml/public/ml_url_generator/anomaly_detection_urls_generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,12 @@ export function createSingleMetricViewerUrl(
if (entities !== undefined) {
mlTimeSeriesExplorer.entities = entities;
}
if (zoom !== undefined) {
mlTimeSeriesExplorer.zoom = zoom;
}

appState.mlTimeSeriesExplorer = mlTimeSeriesExplorer;

if (zoom) appState.zoom = zoom;
if (query)
appState.query = {
query_string: query,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ describe('MlUrlGenerator', () => {
},
});
expect(url).toBe(
"/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(logs_categorization_1)),refreshInterval:(pause:!f,value:0),time:(from:'2020-07-12T00:39:02.912Z',mode:absolute,to:'2020-07-22T15:52:18.613Z'))&_a=(mlTimeSeriesExplorer:(detectorIndex:0,entities:(mlcategory:'2')),query:(query_string:(analyze_wildcard:!t,query:'*')),zoom:(from:'2020-07-20T23:58:29.367Z',to:'2020-07-21T11:00:13.173Z'))"
"/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(logs_categorization_1)),refreshInterval:(pause:!f,value:0),time:(from:'2020-07-12T00:39:02.912Z',mode:absolute,to:'2020-07-22T15:52:18.613Z'))&_a=(mlTimeSeriesExplorer:(detectorIndex:0,entities:(mlcategory:'2'),zoom:(from:'2020-07-20T23:58:29.367Z',to:'2020-07-21T11:00:13.173Z')),query:(query_string:(analyze_wildcard:!t,query:'*')))"
);
});
});
Expand Down