[ES body removal] @elastic/obs-ux-logs-team

x-pack/platform/plugins/shared/dataset_quality/server/routes/data_streams/get_dataset_aggregated_paginated_results.ts

@@ -5,8 +5,11 @@
  * 2.0.
  */
 
-import { QueryDslBoolQuery } from '@elastic/elasticsearch/lib/api/types';
 import type { ElasticsearchClient } from '@kbn/core/server';
+import type {
+  AggregationsCompositeAggregation,
+  QueryDslBoolQuery,
+} from '@elastic/elasticsearch/lib/api/types';
 import { DataStreamDocsStat } from '../../../common/api_types';
 import { createDatasetQualityESClient } from '../../utils';
 import { rangeQuery } from '../../utils/queries';
@@ -32,7 +35,9 @@ export async function getAggregatedDatasetPaginatedResults(options: {
 
   const datasetQualityESClient = createDatasetQualityESClient(esClient);
 
-  const aggs = (afterKey?: Dataset) => ({
+  const aggs = (
+    afterKey?: Dataset
+  ): { datasets: { composite: AggregationsCompositeAggregation } } => ({
     datasets: {
       composite: {
         ...(afterKey ? { after: afterKey } : {}),
@@ -65,6 +70,7 @@ export async function getAggregatedDatasetPaginatedResults(options: {
 
   const currResults =
     response.aggregations?.datasets.buckets.map((bucket) => ({
+      // @ts-expect-error types above don't infer these bucket.key types
       dataset: `${bucket.key.type}-${bucket.key.dataset}-${bucket.key.namespace}`,
       count: bucket.doc_count,
     })) ?? [];

x-pack/platform/plugins/shared/dataset_quality/server/routes/data_streams/get_degraded_field_values/index.ts

@@ -36,7 +36,7 @@ export async function getDegradedFieldValues({
     ],
   });
 
-  const values = extractAndDeduplicateValues(response.hits.hits, degradedField);
+  const values = extractAndDeduplicateValues(response.hits.hits as SearchHit[], degradedField);
 
   return {
     field: degradedField,

x-pack/platform/plugins/shared/dataset_quality/server/routes/data_streams/get_degraded_fields/index.ts

@@ -6,6 +6,11 @@
  */
 
 import { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
+import type {
+  AggregationsDateHistogramAggregation,
+  AggregationsMaxAggregation,
+  AggregationsTermsAggregation,
+} from '@elastic/elasticsearch/lib/api/types';
 import { DegradedFieldResponse } from '../../../../common/api_types';
 import { MAX_DEGRADED_FIELDS } from '../../../../common/constants';
 import { INDEX, TIMESTAMP, _IGNORED } from '../../../../common/es_fields';
@@ -31,7 +36,16 @@ export async function getDegradedFields({
 
   const mustQuery = [...existsQuery(_IGNORED)];
 
-  const aggs = {
+  const aggs: {
+    degradedFields: {
+      terms: AggregationsTermsAggregation;
+      aggs: {
+        lastOccurrence: { max: AggregationsMaxAggregation };
+        index: { terms: AggregationsTermsAggregation };
+        timeSeries: { date_histogram: AggregationsDateHistogramAggregation };
+      };
+    };
+  } = {
     degradedFields: {
       terms: {
         size: MAX_DEGRADED_FIELDS,

x-pack/platform/plugins/shared/logs_shared/common/log_views/resolved_log_view.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { DataView, DataViewsContract, FieldSpec } from '@kbn/data-views-plugin/common';
 import { LogSourcesService } from '@kbn/logs-data-access-plugin/common/services/log_sources_service/types';
 import { TIEBREAKER_FIELD, TIMESTAMP_FIELD } from '../constants';

x-pack/platform/plugins/shared/logs_shared/common/search_strategies/log_entries/log_entries.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import * as rt from 'io-ts';
 import {
   logEntryAfterCursorRT,

x-pack/platform/plugins/shared/logs_shared/server/lib/adapters/framework/adapter_types.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { JsonArray, JsonValue } from '@kbn/utility-types';
 import { RouteMethod } from '@kbn/core/server';
 import { VersionedRouteConfig } from '@kbn/core-http-server';

x-pack/platform/plugins/shared/logs_shared/server/lib/adapters/framework/kibana_framework_adapter.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { TransportRequestParams } from '@elastic/elasticsearch';
 import { CoreSetup, IRouter, RouteMethod } from '@kbn/core/server';
 import { UI_SETTINGS } from '@kbn/data-plugin/server';

x-pack/platform/plugins/shared/logs_shared/server/lib/domains/log_entries_domain/log_entries_domain.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { JsonObject } from '@kbn/utility-types';
 import { LogColumn, LogEntry, LogEntryCursor } from '../../../../common/log_entry';
 import {

x-pack/platform/plugins/shared/logs_shared/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts

@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import { commonSearchSuccessResponseFieldsRT } from '../../../../utils/elasticsearch_runtime_types';
 

x-pack/platform/plugins/shared/logs_shared/server/services/log_entries/log_entry_search_strategy.test.ts

@@ -6,7 +6,7 @@
  */
 
 import { errors, TransportResult } from '@elastic/elasticsearch';
-import { AsyncSearchSubmitResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { AsyncSearchSubmitResponse } from '@elastic/elasticsearch/lib/api/types';
 import {
   elasticsearchServiceMock,
   httpServerMock,

x-pack/platform/plugins/shared/logs_shared/server/services/log_entries/queries/log_entries.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import * as rt from 'io-ts';
 import {
   LogEntryAfterCursor,
@@ -39,26 +39,24 @@ export const createGetLogEntriesQuery = (
   return {
     index: logEntriesIndex,
     allow_no_indices: true,
-    body: {
-      size,
-      track_scores: false,
-      track_total_hits: false,
-      query: {
-        bool: {
-          filter: [
-            ...(query ? [query] : []),
-            ...(highlightQuery ? [highlightQuery] : []),
-            ...createTimeRangeFilterClauses(startTimestamp, endTimestamp, timestampField),
-          ],
-        },
+    size,
+    track_scores: false,
+    track_total_hits: false,
+    query: {
+      bool: {
+        filter: [
+          ...(query ? [query] : []),
+          ...(highlightQuery ? [highlightQuery] : []),
+          ...createTimeRangeFilterClauses(startTimestamp, endTimestamp, timestampField),
+        ],
       },
-      fields,
-      runtime_mappings: runtimeMappings,
-      _source: false,
-      ...createSortClause(sortDirection, timestampField, tiebreakerField),
-      ...createSearchAfterClause(cursor),
-      ...createHighlightClause(highlightQuery, fields),
     },
+    fields,
+    runtime_mappings: runtimeMappings,
+    _source: false,
+    ...createSortClause(sortDirection, timestampField, tiebreakerField),
+    ...createSearchAfterClause(cursor),
+    ...createHighlightClause(highlightQuery, fields),
   };
 };
 

x-pack/platform/plugins/shared/logs_shared/server/services/log_entries/queries/log_entry.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import * as rt from 'io-ts';
 import { jsonArrayRT } from '../../../../common/typed_json';
 import {
@@ -21,30 +21,28 @@ export const createGetLogEntryQuery = (
   runtimeMappings?: estypes.MappingRuntimeFields
 ): estypes.AsyncSearchSubmitRequest => ({
   index: logEntryIndex,
-  body: {
-    size: 1,
-    terminate_after: 1,
-    track_scores: false,
-    track_total_hits: false,
-    query: {
-      ids: {
-        values: [logEntryId],
-      },
+  size: 1,
+  terminate_after: 1,
+  track_scores: false,
+  track_total_hits: false,
+  query: {
+    ids: {
+      values: [logEntryId],
     },
-    fields: ['*'],
-    runtime_mappings: runtimeMappings,
-    sort: [
-      {
-        [timestampField]: {
-          order: 'desc',
-          format: 'strict_date_optional_time_nanos',
-          numeric_type: 'date_nanos',
-        },
-      },
-      { [tiebreakerField]: 'desc' },
-    ],
-    _source: false,
   },
+  fields: ['*'],
+  runtime_mappings: runtimeMappings,
+  sort: [
+    {
+      [timestampField]: {
+        order: 'desc',
+        format: 'strict_date_optional_time_nanos',
+        numeric_type: 'date_nanos',
+      },
+    },
+    { [tiebreakerField]: 'desc' },
+  ],
+  _source: false,
 });
 
 export const logEntryHitRT = rt.intersection([

x-pack/solutions/observability/plugins/infra/common/search_strategies/log_entries/log_entries.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import {
   logEntryAfterCursorRT,
   logEntryBeforeCursorRT,

x-pack/solutions/observability/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import type { HttpHandler } from '@kbn/core/public';
 import { decodeOrThrow } from '@kbn/io-ts-utils';
 import {

x-pack/solutions/observability/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts

@@ -6,7 +6,7 @@
  */
 
 import type { HttpHandler } from '@kbn/core/public';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import { decodeOrThrow } from '@kbn/io-ts-utils';
 import type { ValidationIndicesFieldSpecification } from '../../../../../common/http_api';

x-pack/solutions/observability/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts

@@ -6,7 +6,7 @@
  */
 
 import type { HttpHandler } from '@kbn/core/public';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import type { IdFormat, JobType } from '../../../../common/http_api/latest';
 import type {
   ValidateLogEntryDatasetsResponsePayload,

x-pack/solutions/observability/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { i18n } from '@kbn/i18n';
 import type { HttpHandler } from '@kbn/core/public';
 import type { IdFormat } from '../../../../../../common/http_api/latest';

x-pack/solutions/observability/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx

@@ -6,7 +6,7 @@
  */
 
 import createContainer from 'constate';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { useMemo } from 'react';
 import type { IdFormat } from '../../../../../../common/http_api/latest';
 import { useLogAnalysisModule } from '../../log_analysis_module';

x-pack/solutions/observability/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts

@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import type { HttpHandler } from '@kbn/core/public';
 import type { IdFormat } from '../../../../../../common/http_api/latest';
 import type { DatasetFilter, LogEntryRateJobType } from '../../../../../../common/log_analysis';

x-pack/solutions/observability/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import createContainer from 'constate';
 import { useMemo } from 'react';
 import type { IdFormat } from '../../../../../../common/http_api/latest';

x-pack/solutions/observability/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import type { PersistedLogViewReference, ResolvedLogView } from '@kbn/logs-shared-plugin/common';
 import { decodeOrThrow } from '@kbn/io-ts-utils';
 import type { IdFormat, IdFormatByJobType } from '../../../common/http_api/latest';

x-pack/solutions/observability/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import type { ElasticsearchClient } from '@kbn/core/server';
 import type {
   LogEntryContext,