[ES body removal] @elastic/stack-monitoring (elastic#204865)

x-pack/platform/plugins/private/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts

@@ -7,7 +7,7 @@
 
 import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { StackProductUsage } from '../types';
 
 interface ESIndicesBucket {
@@ -37,49 +37,47 @@ export async function fetchESUsage(
       'hits.hits._source.cluster_stats.nodes.count.total',
       'aggregations.indices.buckets',
     ],
-    body: {
-      size: 1,
-      sort: [
-        {
-          timestamp: {
-            order: 'desc',
-            unmapped_type: 'long',
-          },
+    size: 1,
+    sort: [
+      {
+        timestamp: {
+          order: 'desc',
+          unmapped_type: 'long',
         },
-      ],
-      query: {
-        bool: {
-          must: [
-            {
-              term: {
-                type: {
-                  value: 'cluster_stats',
-                },
+      },
+    ],
+    query: {
+      bool: {
+        must: [
+          {
+            term: {
+              type: {
+                value: 'cluster_stats',
               },
             },
-            {
-              term: {
-                cluster_uuid: {
-                  value: clusterUuid,
-                },
+          },
+          {
+            term: {
+              cluster_uuid: {
+                value: clusterUuid,
               },
             },
-            {
-              range: {
-                timestamp: {
-                  gte: 'now-1h',
-                },
+          },
+          {
+            range: {
+              timestamp: {
+                gte: 'now-1h',
               },
             },
-          ],
-        },
-      },
-      aggs: {
-        indices: {
-          terms: {
-            field: '_index',
-            size: 2,
           },
+        ],
+      },
+    },
+    aggs: {
+      indices: {
+        terms: {
+          field: '_index',
+          size: 2,
         },
       },
     },

x-pack/platform/plugins/private/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts

@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import { ElasticsearchClient } from '@kbn/core/server';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { INDEX_PATTERN_ELASTICSEARCH } from '../../../../common/constants';
 import { getCcsIndexPattern } from '../../../lib/alerts/get_ccs_index_pattern';
 
@@ -23,35 +23,33 @@ export async function fetchLicenseType(
   const params: estypes.SearchRequest = {
     index,
     filter_path: ['hits.hits._source.license'],
-    body: {
-      size: 1,
-      sort: [
-        {
-          timestamp: {
-            order: 'desc',
-            unmapped_type: 'long',
-          },
+    size: 1,
+    sort: [
+      {
+        timestamp: {
+          order: 'desc',
+          unmapped_type: 'long',
         },
-      ],
-      query: {
-        bool: {
-          must: [
-            {
-              term: {
-                cluster_uuid: {
-                  value: clusterUuid,
-                },
+      },
+    ],
+    query: {
+      bool: {
+        must: [
+          {
+            term: {
+              cluster_uuid: {
+                value: clusterUuid,
               },
             },
-            {
-              term: {
-                type: {
-                  value: 'cluster_stats',
-                },
+          },
+          {
+            term: {
+              type: {
+                value: 'cluster_stats',
               },
             },
-          ],
-        },
+          },
+        ],
       },
     },
   };

x-pack/platform/plugins/private/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.test.ts

@@ -54,10 +54,10 @@ describe('fetchStackProductUsage', () => {
       ]
     );
     const params = searchMock.mock.calls[0][0];
-    expect(params.body.query.bool.must[0].term.type.value).toBe('kibana_stats');
-    expect(params.body.query.bool.must[1].term.cluster_uuid.value).toBe(clusterUuid);
-    expect(params.body.query.bool.must[2].range.timestamp.gte).toBe('now-1h');
-    expect(params.body.query.bool.must[3].term.type.value).toBe('foo');
+    expect(params.query.bool.must[0].term.type.value).toBe('kibana_stats');
+    expect(params.query.bool.must[1].term.cluster_uuid.value).toBe(clusterUuid);
+    expect(params.query.bool.must[2].range.timestamp.gte).toBe('now-1h');
+    expect(params.query.bool.must[3].term.type.value).toBe('foo');
   });
 
   it('should get the usage data', async () => {

x-pack/platform/plugins/private/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts

@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import { ElasticsearchClient } from '@kbn/core/server';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { MonitoringConfig } from '../../../config';
 import { StackProductUsage } from '../types';
 
@@ -44,48 +44,46 @@ export async function fetchStackProductUsage(
     index,
     ignore_unavailable: true,
     filter_path: ['aggregations.uuids.buckets'],
-    body: {
-      size: 0,
-      query: {
-        bool: {
-          must: [
-            {
-              term: {
-                type: {
-                  value: type,
-                },
+    size: 0,
+    query: {
+      bool: {
+        must: [
+          {
+            term: {
+              type: {
+                value: type,
               },
             },
-            {
-              term: {
-                cluster_uuid: {
-                  value: clusterUuid,
-                },
+          },
+          {
+            term: {
+              cluster_uuid: {
+                value: clusterUuid,
               },
             },
-            {
-              range: {
-                timestamp: {
-                  gte: 'now-1h',
-                },
+          },
+          {
+            range: {
+              timestamp: {
+                gte: 'now-1h',
               },
             },
-            ...filters,
-          ],
-        },
-      },
-      aggs: {
-        uuids: {
-          terms: {
-            field: uuidPath,
-            size,
           },
-          aggs: {
-            indices: {
-              terms: {
-                field: '_index',
-                size: 2,
-              },
+          ...filters,
+        ],
+      },
+    },
+    aggs: {
+      uuids: {
+        terms: {
+          field: uuidPath,
+          size,
+        },
+        aggs: {
+          indices: {
+            terms: {
+              field: '_index',
+              size: 2,
             },
           },
         },

x-pack/platform/plugins/private/monitoring/server/lib/alerts/fetch_available_ccs.test.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 { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchAvailableCcs } from './fetch_available_ccs';
 

x-pack/platform/plugins/private/monitoring/server/lib/alerts/fetch_cluster_health.test.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 { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
 import { fetchClusterHealth } from './fetch_cluster_health';
 

x-pack/platform/plugins/private/monitoring/server/lib/alerts/fetch_clusters.test.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 { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchClusters } from './fetch_clusters';
 

x-pack/platform/plugins/private/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.test.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 { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
 import { fetchCpuUsageNodeStats } from './fetch_cpu_usage_node_stats';
 

x-pack/platform/plugins/private/monitoring/server/lib/alerts/fetch_elasticsearch_versions.test.ts

@@ -7,7 +7,7 @@
 
 import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchElasticsearchVersions } from './fetch_elasticsearch_versions';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 jest.mock('../../static_globals', () => ({
   Globals: {

x-pack/platform/plugins/private/monitoring/server/lib/elasticsearch_settings/cluster.test.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ClusterGetSettingsResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { ClusterGetSettingsResponse } from '@elastic/elasticsearch/lib/api/types';
 import { checkClusterSettings } from '.';
 import { LegacyRequest } from '../../types';
 

x-pack/platform/plugins/private/monitoring/server/lib/elasticsearch_settings/cluster.ts

@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ClusterGetSettingsResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { ClusterGetSettingsResponse } from '@elastic/elasticsearch/lib/api/types';
 import { findReason } from './find_reason';
 import { ClusterSettingsReasonResponse, LegacyRequest } from '../../types';
 

x-pack/platform/plugins/private/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.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 { RequestHandlerContext } from '@kbn/core/server';
 import { prefixIndexPatternWithCcs } from '../../../../../../common/ccs_utils';
 import {

x-pack/platform/plugins/private/monitoring/server/static_globals.ts

@@ -6,7 +6,7 @@
  */
 
 import { CoreSetup, ElasticsearchClient, Logger, PluginInitializerContext } from '@kbn/core/server';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { MonitoringConfig } from './config';
 import { PluginsSetup } from './types';
 import { mbSafeQuery } from './lib/mb_safe_query';

x-pack/platform/plugins/private/monitoring/server/telemetry_collection/get_beats_stats.test.ts

@@ -37,7 +37,7 @@ describe('Get Beats Stats', () => {
       searchMock.returns(Promise.resolve({}));
       await fetchBeatsStats(callCluster, clusterUuids, start, end, {} as any);
       const { args } = searchMock.firstCall;
-      const [{ body }] = args;
+      const [body] = args;
 
       expect(body.from).toEqual(0);
       expect(body.size).toEqual(10000);
@@ -47,7 +47,7 @@ describe('Get Beats Stats', () => {
       searchMock.returns(Promise.resolve({}));
       await fetchBeatsStats(callCluster, clusterUuids, start, end, { page: 1 } as any);
       const { args } = searchMock.firstCall;
-      const [{ body }] = args;
+      const [body] = args;
 
       expect(body.from).toEqual(10000);
       expect(body.size).toEqual(10000);
@@ -57,7 +57,7 @@ describe('Get Beats Stats', () => {
       searchMock.returns(Promise.resolve({}));
       await fetchBeatsStats(callCluster, clusterUuids, start, end, { page: 2 } as any);
       const { args } = searchMock.firstCall;
-      const [{ body }] = args;
+      const [body] = args;
 
       expect(body.from).toEqual(20000);
       expect(body.size).toEqual(10000);