[ML] Removing use of ignore_throttled (elastic#199107)

`ignore_throttled` is being removed, we can remove it from the various searches we run. I'm leaving it in the schema for the datafeed config for now, just in case we have a situation where a very old job is used in the UI with an endpoint which validates the datafeed config. Even though the setting would be ignored, we don't want the route to reject the datafeed because it doesn't know what `ignore_throttled` is. When cloning very old jobs jobs, I'm removing `ignore_throttled` from the `indices_options` --------- Co-authored-by: kibanamachine <[email protected]>
CAWilson94 · Dec 12, 2024 · af45ab8 · af45ab8
1 parent b33fae3
commit af45ab8
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 43 deletions.
diff --git a/x-pack/packages/ml/aiops_log_pattern_analysis/schema.ts b/x-pack/packages/ml/aiops_log_pattern_analysis/schema.ts
@@ -38,7 +38,6 @@ export const indicesOptionsSchema = schema.object({
   ),
   ignore_unavailable: schema.maybe(schema.boolean()),
   allow_no_indices: schema.maybe(schema.boolean()),
-  ignore_throttled: schema.maybe(schema.boolean()),
 });
 
 /**

diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/api/schema_v2.ts b/x-pack/packages/ml/aiops_log_rate_analysis/api/schema_v2.ts
@@ -45,6 +45,7 @@ export const aiopsLogRateAnalysisBase = schema.object({
   end: schema.number(),
   searchQuery: schema.string(),
   timeFieldName: schema.string(),
+  // when v2 is removed, includeFrozen should not carry over to v3+
   includeFrozen: schema.maybe(schema.boolean()),
   grouping: schema.maybe(schema.boolean()),
   /** Analysis selection time ranges */

diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/queries/__mocks__/params_match_all.ts b/x-pack/packages/ml/aiops_log_rate_analysis/queries/__mocks__/params_match_all.ts
@@ -14,6 +14,5 @@ export const paramsMock = {
   baselineMax: 20,
   deviationMin: 30,
   deviationMax: 40,
-  includeFrozen: false,
   searchQuery: '{ "match_all": {} }',
 };
diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/queries/get_request_base.test.ts b/x-pack/packages/ml/aiops_log_rate_analysis/queries/get_request_base.test.ts
diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/queries/get_request_base.ts b/x-pack/packages/ml/aiops_log_rate_analysis/queries/get_request_base.ts
@@ -7,8 +7,7 @@
 
 import type { AiopsLogRateAnalysisSchema } from '../api/schema';
 
-export const getRequestBase = ({ index, includeFrozen }: AiopsLogRateAnalysisSchema) => ({
+export const getRequestBase = ({ index }: AiopsLogRateAnalysisSchema) => ({
   index,
-  ...(includeFrozen ? { ignore_throttled: false } : {}),
   ignore_unavailable: true,
 });
diff --git a/x-pack/packages/ml/json_schemas/src/put___ml_anomaly_detectors__job_id__schema.json b/x-pack/packages/ml/json_schemas/src/put___ml_anomaly_detectors__job_id__schema.json
@@ -10765,10 +10765,6 @@
           "ignore_unavailable": {
             "description": "If true, missing or closed indices are not included in the response.",
             "type": "boolean"
-          },
-          "ignore_throttled": {
-            "description": "If true, concrete, expanded or aliased indices are ignored when frozen.",
-            "type": "boolean"
           }
         }
       },
@@ -10884,4 +10880,4 @@
       }
     }
   }
-}
+}
diff --git a/x-pack/packages/ml/json_schemas/src/put___ml_datafeeds__datafeed_id__schema.json b/x-pack/packages/ml/json_schemas/src/put___ml_datafeeds__datafeed_id__schema.json
@@ -7932,10 +7932,6 @@
           "ignore_unavailable": {
             "description": "If true, missing or closed indices are not included in the response.",
             "type": "boolean"
-          },
-          "ignore_throttled": {
-            "description": "If true, concrete, expanded or aliased indices are ignored when frozen.",
-            "type": "boolean"
           }
         }
       },
@@ -8051,4 +8047,4 @@
       }
     }
   }
-}
+}
diff --git a/x-pack/plugins/ml/server/models/job_service/jobs.ts b/x-pack/plugins/ml/server/models/job_service/jobs.ts
@@ -354,6 +354,10 @@ export function jobsProvider(
     const result: { datafeed?: Datafeed; job?: Job } = { job: undefined, datafeed: undefined };
     if (datafeedResult && datafeedResult.job_id === jobId) {
       result.datafeed = datafeedResult;
+      if (result.datafeed.indices_options?.ignore_throttled !== undefined) {
+        // ignore_throttled is a deprecated setting, remove it from the response
+        delete result.datafeed.indices_options.ignore_throttled;
+      }
     }
 
     if (jobResults?.jobs?.length > 0) {

diff --git a/x-pack/plugins/ml/server/routes/schemas/datafeeds_schema.ts b/x-pack/plugins/ml/server/routes/schemas/datafeeds_schema.ts
@@ -27,7 +27,10 @@ export const indicesOptionsSchema = schema.object({
   ),
   ignore_unavailable: schema.maybe(schema.boolean()),
   allow_no_indices: schema.maybe(schema.boolean()),
+  // retaining the deprecated ignore_throttled in case an older jobs are used
+  // we don't want to fail the schema validation if this is present
   ignore_throttled: schema.maybe(schema.boolean()),
+  failure_store: schema.maybe(schema.string()),
 });
 
 export const datafeedConfigSchema = schema.object({

diff --git a/x-pack/test/functional/apps/ml/anomaly_detection_result_views/aggregated_scripted_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection_result_views/aggregated_scripted_job.ts
@@ -59,7 +59,6 @@ export default function ({ getService }: FtrProviderContext) {
           expand_wildcards: ['open'],
           ignore_unavailable: false,
           allow_no_indices: true,
-          ignore_throttled: true,
         },
         query: {
           match_all: {},
@@ -140,7 +139,6 @@ export default function ({ getService }: FtrProviderContext) {
           expand_wildcards: ['open'],
           ignore_unavailable: false,
           allow_no_indices: true,
-          ignore_throttled: true,
         },
         query: {
           bool: {
@@ -217,7 +215,6 @@ export default function ({ getService }: FtrProviderContext) {
           expand_wildcards: ['open'],
           ignore_unavailable: false,
           allow_no_indices: true,
-          ignore_throttled: true,
         },
         query: {
           match_all: {},
@@ -317,7 +314,6 @@ export default function ({ getService }: FtrProviderContext) {
           expand_wildcards: ['open'],
           ignore_unavailable: false,
           allow_no_indices: true,
-          ignore_throttled: true,
         },
         query: {
           bool: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,6 @@ export const indicesOptionsSchema = schema.object({ @@
       ),
       ignore_unavailable: schema.maybe(schema.boolean()),
       allow_no_indices: schema.maybe(schema.boolean()),
-      ignore_throttled: schema.maybe(schema.boolean()),
     });
     /**
@@ Expand Down @@