Merge remote-tracking branch 'upstream/main' into disable-log-stream-…

…and-settings
elastic · Dec 13, 2024 · e7c2afb · e7c2afb
2 parents 7e202e6 + a69a456
commit e7c2afb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/x-pack/platform/plugins/shared/ml/common/util/datafeed_utils.ts b/x-pack/platform/plugins/shared/ml/common/util/datafeed_utils.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { omit } from 'lodash';
 import type { Aggregation, Datafeed } from '../types/anomaly_detection_jobs';
 
 export function getAggregations<T>(obj: any): T | undefined {
@@ -18,3 +19,10 @@ export const getDatafeedAggregations = (
 ): Aggregation | undefined => {
   return getAggregations<Aggregation>(datafeedConfig);
 };
+
+export function getIndicesOptions(datafeedConfig?: Datafeed) {
+  // remove ignore_throttled from indices_options to avoid deprecation warnings in the logs
+  return datafeedConfig?.indices_options
+    ? omit(datafeedConfig.indices_options, 'ignore_throttled')
+    : {};
+}
diff --git a/...ublic/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts b/...ublic/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts
@@ -6,6 +6,7 @@
  */
 
 import { getSeverityType } from '@kbn/ml-anomaly-utils';
+import { getIndicesOptions } from '../../../../../common/util/datafeed_utils';
 import type { MlResultsService } from '../../../services/results_service';
 import type { CombinedJobWithStats } from '../../../../../common/types/anomaly_detection_jobs';
 import type { Anomaly } from '../../../jobs/new_job/common/results_loader/results_loader';
@@ -32,7 +33,7 @@ export function chartLoaderProvider(mlResultsService: MlResultsService) {
       job.data_counts.latest_record_timestamp!,
       intervalMs,
       job.datafeed_config.runtime_mappings,
-      job.datafeed_config.indices_options
+      getIndicesOptions(job.datafeed_config)
     );
     if (resp.error !== undefined) {
       throw resp.error;

diff --git a/x-pack/platform/plugins/shared/ml/server/models/fields_service/fields_service.ts b/x-pack/platform/plugins/shared/ml/server/models/fields_service/fields_service.ts
@@ -17,7 +17,7 @@ import { parseInterval } from '@kbn/ml-parse-interval';
 
 import { initCardinalityFieldsCache } from './fields_aggs_cache';
 import { isValidAggregationField } from '../../../common/util/validation_utils';
-import { getDatafeedAggregations } from '../../../common/util/datafeed_utils';
+import { getDatafeedAggregations, getIndicesOptions } from '../../../common/util/datafeed_utils';
 import type { Datafeed, IndicesOptions } from '../../../common/types/anomaly_detection_jobs';
 
 /**
@@ -190,7 +190,7 @@ export function fieldsServiceProvider({ asCurrentUser }: IScopedClusterClient) {
       {
         index,
         body,
-        ...(datafeedConfig?.indices_options ?? {}),
+        ...getIndicesOptions(datafeedConfig),
       },
       { maxRetries: 0 }
     );
@@ -418,7 +418,7 @@ export function fieldsServiceProvider({ asCurrentUser }: IScopedClusterClient) {
       {
         index,
         body,
-        ...(datafeedConfig?.indices_options ?? {}),
+        ...getIndicesOptions(datafeedConfig),
       },
       { maxRetries: 0 }
     );

diff --git a/x-pack/platform/plugins/shared/ml/server/models/job_validation/job_validation.ts b/x-pack/platform/plugins/shared/ml/server/models/job_validation/job_validation.ts
@@ -25,7 +25,7 @@ import { validateTimeRange, isValidTimeField } from './validate_time_range';
 import type { validateJobSchema } from '../../routes/schemas/job_validation_schema';
 import type { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 import type { MlClient } from '../../lib/ml_client';
-import { getDatafeedAggregations } from '../../../common/util/datafeed_utils';
+import { getDatafeedAggregations, getIndicesOptions } from '../../../common/util/datafeed_utils';
 import type { AuthorizationHeader } from '../../lib/request_authorization';
 
 export type ValidateJobPayload = TypeOf<typeof validateJobSchema>;
@@ -74,7 +74,7 @@ export async function validateJob(
           timeField,
           job.datafeed_config.query,
           job.datafeed_config.runtime_mappings,
-          job.datafeed_config.indices_options
+          getIndicesOptions(job.datafeed_config)
         );
       }
 

diff --git a/x-pack/platform/plugins/shared/ml/server/models/results_service/results_service.ts b/x-pack/platform/plugins/shared/ml/server/models/results_service/results_service.ts
@@ -19,6 +19,7 @@ import {
   ML_JOB_ID,
   ML_PARTITION_FIELD_VALUE,
 } from '@kbn/ml-anomaly-utils';
+import { getIndicesOptions } from '../../../common/util/datafeed_utils';
 import { buildAnomalyTableItems } from './build_anomaly_table_items';
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
 import { getPartitionFieldsValuesFactory } from './get_partition_fields_values';
@@ -727,7 +728,7 @@ export function resultsServiceProvider(mlClient: MlClient, client?: IScopedClust
         },
         size: 0,
       },
-      ...(datafeedConfig?.indices_options ?? {}),
+      ...getIndicesOptions(datafeedConfig),
     };
 
     if (client) {