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] Ensures jobs from saved searches are cloned in advanced wizard #26002

Merged
merged 2 commits into from
Nov 21, 2018
Merged

[ML] Ensures jobs from saved searches are cloned in advanced wizard #26002

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
d4879d4
[ML] Ensures jobs from saved searches are cloned in advanced wizard
peteharverson Nov 21, 2018
155a9c9
[ML] Use useSavedSearch property for setting job created_by
peteharverson Nov 21, 2018
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
1 change: 1 addition & 0 deletions ...ck/plugins/ml/public/jobs/new_job/simple/multi_metric/create_job/create_job_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ module
query,
filters,
combinedQuery,
usesSavedSearch: (savedSearch.id !== undefined),
jobId: '',
description: '',
jobGroups: [],
Expand Down
10 changes: 7 additions & 3 deletions x-pack/plugins/ml/public/jobs/new_job/simple/multi_metric/create_job/create_job_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,13 @@ export function MultiMetricJobServiceProvider() {
job.results_index_name = job.job_id;
}

job.custom_settings = {
created_by: WIZARD_TYPE.MULTI_METRIC
};
if (formConfig.usesSavedSearch === false) {
// Jobs created from saved searches cannot be cloned in the wizard as the
// ML job config holds no reference to the saved search ID.
job.custom_settings = {
created_by: WIZARD_TYPE.MULTI_METRIC
};
}

return job;
}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/ml/public/jobs/new_job/simple/population/create_job/create_job_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,13 @@ module
end: 0,
overField: undefined,
timeField: indexPattern.timeFieldName,
// splitField: undefined,
influencerFields: [],
firstSplitFieldName: undefined,
indexPattern: indexPattern,
query,
filters,
combinedQuery,
usesSavedSearch: (savedSearch.id !== undefined),
jobId: '',
description: '',
jobGroups: [],
Expand Down
10 changes: 7 additions & 3 deletions x-pack/plugins/ml/public/jobs/new_job/simple/population/create_job/create_job_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,13 @@ export function PopulationJobServiceProvider(Private) {
job.results_index_name = job.job_id;
}

job.custom_settings = {
created_by: WIZARD_TYPE.POPULATION
};
if (formConfig.usesSavedSearch === false) {
// Jobs created from saved searches cannot be cloned in the wizard as the
// ML job config holds no reference to the saved search ID.
job.custom_settings = {
created_by: WIZARD_TYPE.POPULATION
};
}

return job;
}
Expand Down
1 change: 1 addition & 0 deletions ...k/plugins/ml/public/jobs/new_job/simple/single_metric/create_job/create_job_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ module
end: 0,
timeField: indexPattern.timeFieldName,
indexPattern: undefined,
usesSavedSearch: (savedSearch.id !== undefined),
query,
filters,
combinedQuery,
Expand Down
10 changes: 7 additions & 3 deletions x-pack/plugins/ml/public/jobs/new_job/simple/single_metric/create_job/create_job_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,13 @@ export function SingleMetricJobServiceProvider() {
job.results_index_name = job.job_id;
}

job.custom_settings = {
created_by: WIZARD_TYPE.SINGLE_METRIC
};
if (formConfig.usesSavedSearch === false) {
// Jobs created from saved searches cannot be cloned in the wizard as the
// ML job config holds no reference to the saved search ID.
job.custom_settings = {
created_by: WIZARD_TYPE.SINGLE_METRIC
};
}

// Use the original es agg type rather than the ML version
// e.g. count rather than high_count
Expand Down