[ML] Update cloning for jobs to use exclude_generated #88898
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
qn895
added
:ml
Feature:Anomaly Detection
qn895
requested review from
alvarezmelissa87,
peteharverson and
jgowdyelastic
|
Pinging @elastic/ml-ui (:ml) |
peteharverson
changed the title
| jobs(jobIds: string[]) { | ||
| const body = JSON.stringify({ jobIds }); | ||
| jobs(jobIds: string[], excludeGenerated?: boolean) { | ||
| const body = JSON.stringify({ jobIds, excludeGenerated }); |
There was a problem hiding this comment.
as excludeGenerated could be undefined, it should be optionally added to the body
There was a problem hiding this comment.
Removed here as it's no longer needed
e9ad8f1
| const analyticsIdString = analyticsId !== undefined ? `/${analyticsId}` : ''; | ||
| return http<GetDataFrameAnalyticsResponse>({ | ||
| path: `${basePath()}/data_frame/analytics${analyticsIdString}`, | ||
| method: 'GET', | ||
| query: { excludeGenerated }, |
There was a problem hiding this comment.
excludeGenerated shouldn't be added to the query if it is undefined
There was a problem hiding this comment.
Removed here as it's no longer needed
e9ad8f1
| @@ -42,6 +42,7 @@ export const forceStartDatafeedSchema = schema.object({ | |||
| export const jobIdsSchema = schema.object({ | |||
| /** Optional list of job IDs. */ | |||
| jobIds: schema.maybe(schema.arrayOf(schema.maybe(schema.string()))), | |||
| excludeGenerated: schema.maybe(schema.boolean()), | |||
There was a problem hiding this comment.
this should also be added to the datafeeds schema
There was a problem hiding this comment.
I removed this here as it's no longer needed
e9ad8f1
| const job = await loadFullJob(jobId); | ||
| if (job.custom_settings && job.custom_settings.created_by) { | ||
| const [cloneableJob, originalJob] = await Promise.all([ | ||
| loadFullJob(jobId, true), |
There was a problem hiding this comment.
loadFullJob shouldn't be used here anymore as it adds job and datafeed stats to the job object.
The job and datafeed should be loaded directly from es. Ideally they would also not be combined and we would have a separate datafeed object in tempJobCloningObjects. but if that has unexpected side effects we can continue to combine them into a CombinedJob.
There was a problem hiding this comment.
I have updated added a new method called loadJobForExport which will only get the CombinedJob with datafeed and the job config with exclude_generated: true. I also tried fetching them separately but encountered some side effects with the wizard behaving unpredictably, but if that's still the preferred method I can revert the change to do that instead.
There was a problem hiding this comment.
Updated this to getJobForCloning which will return them separately with exclude_generated to always be true.
| loadFullJob(jobId, true), | ||
| loadFullJob(jobId, false), | ||
| ]); | ||
| if (cloneableJob.custom_settings && originalJob?.custom_settings?.created_by) { |
There was a problem hiding this comment.
if custom_settings does not exist in cloneableJob this entire block will be skipped.
To be safe we should only check for originalJob?.custom_settings?.created_by and then create cloneableJob.custom_settings if it doesn't exist.
| const tempJob = cloneDeep(job); | ||
|
|
||
| // remove all of the items which should not be copied | ||
| // such as counts, state and times | ||
| delete tempJob.state; | ||
| delete tempJob.job_version; | ||
| delete tempJob.calendars; |
There was a problem hiding this comment.
none of these deletes should be needed, this should be solved by not using loadFullJob when loading the job for cloning.
The same goes for the datafeed below.
There was a problem hiding this comment.
I removed this cloneJob utility completely now 9f446c2#diff-bfe918c1ce7b408b4f1552aa1cf94e37bea099c0b11f239abd55e7567bfc5eccR76 as the new getJobForCloning service no longer includes these.
This reverts commit ebb0174
x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js
Outdated
Show resolved
Hide resolved
x-pack/plugins/ml/public/application/services/ml_api_service/jobs.ts
Outdated
Show resolved
Hide resolved
| * @apiGroup JobService | ||
| * | ||
| * @api {post} /api/ml/jobs/job_for_cloning Get job for cloning | ||
| * @apiName GetJobForCloning |
There was a problem hiding this comment.
GetJobForCloning needs to be added to ml/server/routes/apidoc.json too, so that API docs are generated for this new endpoint.
qn895
changed the title
peteharverson
approved these changes
Jan 27, 2021
alvarezmelissa87
approved these changes
Jan 27, 2021
| if (Array.isArray(datafeedsResults)) { | ||
| if (datafeedsResults.length === 1) { | ||
| const datafeed = datafeedsResults[0]; | ||
| if (datafeed.job_id === jobId) { |
There was a problem hiding this comment.
if the job id doesn't match, this should load all of the datafeeds to find one that does.
| // if the job was doesn't use the standard datafeedId format | ||
| // get all the datafeeds and match it with the jobId | ||
| const { | ||
| body: { datafeeds: allDatafeedsResults }, |
There was a problem hiding this comment.
nit, i think the variable name allDatafeedsResults is unnecessary
| datafeed = datafeedResults?.datafeeds[0]; | ||
| } | ||
|
|
||
| // create jobs objects containing job stats, datafeeds, datafeed stats and calendars |
There was a problem hiding this comment.
looks like this comment has been copied from somewhere else.
the check below to find the job could be the same as the datafeed check above.
| if (jobResults && jobResults.jobs) { | ||
| const job = jobResults.jobs.find((j) => j.job_id === jobId); | ||
| if (job && datafeed) { | ||
| return { job, datafeed }; |
There was a problem hiding this comment.
there is a chance that the datafeed for a job can be missing.
I think this should always return an object, but with job and datafeed possibly being undefined
💛 Build succeeded, but was flaky
Test FailuresKibana Pipeline / general / X-Pack Alerting API Integration Tests.x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy·ts.alerting api integration security and spaces enabled Alerts legacy alerts alerts superuser at space1 should schedule actions on legacy alertsStandard OutStack TraceMetrics [docs]Async chunks
History
To update your PR or re-run it, just comment with: |
qn895
added a commit
that referenced
this pull request
Feb 2, 2021
jgowdyelastic
added a commit
that referenced
this pull request
Sep 27, 2023
…167319) When exporting an anomaly detection job, it would be useful if the original `created_by` property was not removed from the job config. Related to #167021 (comment) Related PR #88898
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR addresses #79281. It adds a
exclude_generatedflag when fetching data when cloning an Anomaly Detection job or a Data Frame Analytics job.