[ML] Fix categorization job view examples link when datafeed uses mul…

…tiple indices (#100789) * [ML] Fix categorization job view examples link when datafeed uses multiple indices * [ML] Fix operator in index pattern check Co-authored-by: Kibana Machine <[email protected]>
elastic · May 28, 2021 · b5cc13c · b5cc13c
1 parent 228cc94
commit b5cc13c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js b/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js
@@ -232,6 +232,7 @@ class LinksMenuUI extends Component {
     }
     const categorizationFieldName = job.analysis_config.categorization_field_name;
     const datafeedIndices = job.datafeed_config.indices;
+
     // Find the type of the categorization field i.e. text (preferred) or keyword.
     // Uses the first matching field found in the list of indices in the datafeed_config.
     // attempt to load the field type using each index. we have to do it this way as _field_caps
@@ -349,7 +350,7 @@ class LinksMenuUI extends Component {
       getFieldTypeFromMapping(index, categorizationFieldName)
         .then((resp) => {
           if (resp !== '') {
-            createAndOpenUrl(index, resp);
+            createAndOpenUrl(datafeedIndices.join(), resp);
           } else {
             i++;
             if (i < datafeedIndices.length) {

diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.js b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.js
@@ -15,6 +15,7 @@ import { DASHBOARD_APP_URL_GENERATOR } from '../../../../../../../../src/plugins
 import { getPartitioningFieldNames } from '../../../../../common/util/job_utils';
 import { parseInterval } from '../../../../../common/util/parse_interval';
 import { replaceTokensInUrlValue, isValidLabel } from '../../../util/custom_url_utils';
+import { getIndexPatternIdFromName } from '../../../util/index_utils';
 import { ml } from '../../../services/ml_api_service';
 import { mlJobService } from '../../../services/job_service';
 import { escapeForElasticsearchQuery } from '../../../util/string_utils';
@@ -38,7 +39,7 @@ export function getNewCustomUrlDefaults(job, dashboards, indexPatterns) {
   }
 
   // For the Discover option, set the default index pattern to that
-  // which matches the (first) index configured in the job datafeed.
+  // which matches the indices configured in the job datafeed.
   const datafeedConfig = job.datafeed_config;
   if (
     indexPatterns !== undefined &&
@@ -47,16 +48,9 @@ export function getNewCustomUrlDefaults(job, dashboards, indexPatterns) {
     datafeedConfig.indices !== undefined &&
     datafeedConfig.indices.length > 0
   ) {
-    const datafeedIndex = datafeedConfig.indices[0];
-    let defaultIndexPattern = indexPatterns.find((indexPattern) => {
-      return indexPattern.title === datafeedIndex;
-    });
-
-    if (defaultIndexPattern === undefined) {
-      defaultIndexPattern = indexPatterns[0];
-    }
-
-    kibanaSettings.discoverIndexPatternId = defaultIndexPattern.id;
+    const defaultIndexPatternId =
+      getIndexPatternIdFromName(datafeedConfig.indices.join()) ?? indexPatterns[0].id;
+    kibanaSettings.discoverIndexPatternId = defaultIndexPatternId;
   }
 
   return {