Skip to content

[7.x] [ML] Fix incorrect behaviors for Anomaly Detection jobs when resetting or converting to advanced job (#90078) #90503

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 2 commits into from
Feb 9, 2021
Merged

[7.x] [ML] Fix incorrect behaviors for Anomaly Detection jobs when resetting or converting to advanced job (#90078) #90503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3697a1
[ML] Fix incorrect behaviors for Anomaly Detection jobs when resettin…
qn895 Feb 5, 2021
5c00d76
Merge branch '7.x' into backport/7.x/pr-90078
kibanamachine Feb 8, 2021
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
9 changes: 6 additions & 3 deletions x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,11 +373,14 @@ export function filterJobs(jobs, clauses) {
// start datafeed modal.
export function checkForAutoStartDatafeed() {
const job = mlJobService.tempJobCloningObjects.job;
const datafeed = mlJobService.tempJobCloningObjects.datafeed;
if (job !== undefined) {
mlJobService.tempJobCloningObjects.job = undefined;
const hasDatafeed =
typeof job.datafeed_config === 'object' && Object.keys(job.datafeed_config).length > 0;
const datafeedId = hasDatafeed ? job.datafeed_config.datafeed_id : '';
mlJobService.tempJobCloningObjects.datafeed = undefined;
mlJobService.tempJobCloningObjects.createdBy = undefined;

const hasDatafeed = typeof datafeed === 'object' && Object.keys(datafeed).length > 0;
const datafeedId = hasDatafeed ? datafeed.datafeed_id : '';
return {
id: job.job_id,
hasDatafeed,
Expand Down
19 changes: 8 additions & 11 deletions x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,17 +229,14 @@ export function isSparseDataJob(job: Job, datafeed: Datafeed): boolean {
return false;
}

function stashCombinedJob(
function stashJobForCloning(
jobCreator: JobCreatorType,
skipTimeRangeStep: boolean = false,
includeTimeRange: boolean = false
) {
const combinedJob = {
...jobCreator.jobConfig,
datafeed_config: jobCreator.datafeedConfig,
};

mlJobService.tempJobCloningObjects.job = combinedJob;
mlJobService.tempJobCloningObjects.job = jobCreator.jobConfig;
mlJobService.tempJobCloningObjects.datafeed = jobCreator.datafeedConfig;
mlJobService.tempJobCloningObjects.createdBy = jobCreator.createdBy ?? undefined;

// skip over the time picker step of the wizard
mlJobService.tempJobCloningObjects.skipTimeRangeStep = skipTimeRangeStep;
Expand All @@ -259,21 +256,21 @@ export function convertToMultiMetricJob(
) {
jobCreator.createdBy = CREATED_BY_LABEL.MULTI_METRIC;
jobCreator.modelPlot = false;
stashCombinedJob(jobCreator, true, true);
stashJobForCloning(jobCreator, true, true);

navigateToPath(`jobs/new_job/${JOB_TYPE.MULTI_METRIC}`, true);
}

export function convertToAdvancedJob(jobCreator: JobCreatorType, navigateToPath: NavigateToPath) {
jobCreator.createdBy = null;
stashCombinedJob(jobCreator, true, true);
stashJobForCloning(jobCreator, true, true);

navigateToPath(`jobs/new_job/${JOB_TYPE.ADVANCED}`, true);
}

export function resetJob(jobCreator: JobCreatorType, navigateToPath: NavigateToPath) {
jobCreator.jobId = '';
stashCombinedJob(jobCreator, true, true);
stashJobForCloning(jobCreator, true, true);
navigateToPath('/jobs/new_job');
}

Expand All @@ -282,7 +279,7 @@ export function advancedStartDatafeed(
navigateToPath: NavigateToPath
) {
if (jobCreator !== null) {
stashCombinedJob(jobCreator, false, false);
stashJobForCloning(jobCreator, false, false);
}
navigateToPath('/jobs');
}
Expand Down
7 changes: 6 additions & 1 deletion x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {

let autoSetTimeRange = false;

if (mlJobService.tempJobCloningObjects.job !== undefined) {
if (
mlJobService.tempJobCloningObjects.job !== undefined &&
mlJobService.tempJobCloningObjects.datafeed !== undefined
) {
// cloning a job
const clonedJob = mlJobService.tempJobCloningObjects.job;
const clonedDatafeed = mlJobService.cloneDatafeed(mlJobService.tempJobCloningObjects.datafeed);
Expand All @@ -89,6 +92,8 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {

mlJobService.tempJobCloningObjects.skipTimeRangeStep = false;
mlJobService.tempJobCloningObjects.job = undefined;
mlJobService.tempJobCloningObjects.datafeed = undefined;
mlJobService.tempJobCloningObjects.createdBy = undefined;

if (
mlJobService.tempJobCloningObjects.start !== undefined &&
Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugins/ml/public/application/services/job_service.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { SearchResponse } from 'elasticsearch';
import { TimeRange } from 'src/plugins/data/common/query/timefilter/types';
import { CombinedJob, Datafeed } from '../../../common/types/anomaly_detection_jobs';
import { CombinedJob, Datafeed, Job } from '../../../common/types/anomaly_detection_jobs';
import { Calendar } from '../../../common/types/calendars';

export interface ExistingJobsAndGroups {
Expand All @@ -21,15 +21,15 @@ declare interface JobService {
tempJobCloningObjects: {
createdBy?: string;
datafeed?: Datafeed;
job: any;
job?: Job;
skipTimeRangeStep: boolean;
start?: number;
end?: number;
calendars: Calendar[] | undefined;
};
skipTimeRangeStep: boolean;
saveNewJob(job: any): Promise<any>;
cloneDatafeed(datafeed: any): Datafeed;
saveNewJob(job: Job): Promise<any>;
cloneDatafeed(Datafeed: Datafeed): Datafeed;
openJob(jobId: string): Promise<any>;
saveNewDatafeed(datafeedConfig: any, jobId: string): Promise<any>;
startDatafeed(
Expand Down