From b5fb78bfce877eba9ed6308151b807ddf53aed7c Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Tue, 28 Apr 2020 20:45:57 +0100
Subject: [PATCH] [ML] Fix new job wizard with multiple indices (#64567)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 x-pack/plugins/ml/common/util/job_utils.d.ts           |  2 ++
 x-pack/plugins/ml/common/util/job_utils.js             |  6 ++++++
 .../new_job/common/job_creator/util/default_configs.ts |  3 ++-
 .../index_or_search/preconfigured_job_redirect.ts      |  2 +-
 .../server/models/data_recognizer/data_recognizer.ts   | 10 ++++++----
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/ml/common/util/job_utils.d.ts b/x-pack/plugins/ml/common/util/job_utils.d.ts
index bfad422e0ab4..4528fbfbb774 100644
--- a/x-pack/plugins/ml/common/util/job_utils.d.ts
+++ b/x-pack/plugins/ml/common/util/job_utils.d.ts
@@ -52,3 +52,5 @@ export function getLatestDataOrBucketTimestamp(
 ): number;
 
 export function prefixDatafeedId(datafeedId: string, prefix: string): string;
+
+export function splitIndexPatternNames(indexPatternName: string): string[];
diff --git a/x-pack/plugins/ml/common/util/job_utils.js b/x-pack/plugins/ml/common/util/job_utils.js
index de0aa4b88662..8fe5733ce67b 100644
--- a/x-pack/plugins/ml/common/util/job_utils.js
+++ b/x-pack/plugins/ml/common/util/job_utils.js
@@ -588,3 +588,9 @@ export function processCreatedBy(customSettings) {
     delete customSettings.created_by;
   }
 }
+
+export function splitIndexPatternNames(indexPatternName) {
+  return indexPatternName.includes(',')
+    ? indexPatternName.split(',').map(i => i.trim())
+    : [indexPatternName];
+}
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/default_configs.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/default_configs.ts
index 306fd82dc875..9dda8eec206e 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/default_configs.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/default_configs.ts
@@ -7,6 +7,7 @@
 import { IndexPatternTitle } from '../../../../../../../common/types/kibana';
 import { Field, Aggregation, EVENT_RATE_FIELD_ID } from '../../../../../../../common/types/fields';
 import { Job, Datafeed, Detector } from '../../../../../../../common/types/anomaly_detection_jobs';
+import { splitIndexPatternNames } from '../../../../../../../common/util/job_utils';
 
 export function createEmptyJob(): Job {
   return {
@@ -28,7 +29,7 @@ export function createEmptyDatafeed(indexPatternTitle: IndexPatternTitle): Dataf
   return {
     datafeed_id: '',
     job_id: '',
-    indices: [indexPatternTitle],
+    indices: splitIndexPatternNames(indexPatternTitle),
     query: {},
   };
 }
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
index 50a84eb3d11c..69df2773f9f8 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
@@ -50,7 +50,7 @@ function getWizardUrlFromCloningJob(job: CombinedJob) {
       break;
   }
 
-  const indexPatternId = getIndexPatternIdFromName(job.datafeed_config.indices[0]);
+  const indexPatternId = getIndexPatternIdFromName(job.datafeed_config.indices.join());
 
   return `jobs/new_job/${page}?index=${indexPatternId}&_g=()`;
 }
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
index 84f81a30f36b..40b2a524151b 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -29,7 +29,11 @@ import {
   JobSpecificOverride,
   isGeneralJobOverride,
 } from '../../../common/types/modules';
-import { getLatestDataOrBucketTimestamp, prefixDatafeedId } from '../../../common/util/job_utils';
+import {
+  getLatestDataOrBucketTimestamp,
+  prefixDatafeedId,
+  splitIndexPatternNames,
+} from '../../../common/util/job_utils';
 import { mlLog } from '../../client/log';
 import { calculateModelMemoryLimitProvider } from '../calculate_model_memory_limit';
 import { fieldsServiceProvider } from '../fields_service';
@@ -828,9 +832,7 @@ export class DataRecognizer {
   updateDatafeedIndices(moduleConfig: Module) {
     // if the supplied index pattern contains a comma, split into multiple indices and
     // add each one to the datafeed
-    const indexPatternNames = this.indexPatternName.includes(',')
-      ? this.indexPatternName.split(',').map(i => i.trim())
-      : [this.indexPatternName];
+    const indexPatternNames = splitIndexPatternNames(this.indexPatternName);
 
     moduleConfig.datafeeds.forEach(df => {
       const newIndices: string[] = [];