Upgrade ES client to 9.0.0-alpha.3

examples/eso_model_version_example/server/plugin.ts

@@ -330,7 +330,7 @@ export class EsoModelVersionExample
           const objectsCreated = await Promise.all(
             documentVersionConstants.map(async (obj) => {
               const createdDoc: WriteResponseBase =
-                await elasticsearch.client.asInternalUser.create(obj);
+                await elasticsearch.client.asInternalUser.create<unknown>(obj);
               const parts = createdDoc._id.split(':', 2);
               return { type: parts[0], id: parts[1] };
             })

examples/search_examples/public/search/app.tsx

@@ -181,13 +181,15 @@ export const SearchExamplesApp = ({
     const aggs = [{ type: metricAggType, params: { field: selectedNumericField!.name } }];
     const aggsDsl = data.search.aggs.createAggConfigs(dataView, aggs).toDsl();
 
+    const body = {
+      aggs: aggsDsl,
+      query,
+    };
+
     const req = {
       params: {
         index: dataView.title,
-        body: {
-          aggs: aggsDsl,
-          query,
-        },
+        ...body,
       },
       // Add a custom request parameter to be consumed by `MyStrategy`.
       ...(strategy ? { get_cool: getCool } : {}),
@@ -197,7 +199,7 @@ export const SearchExamplesApp = ({
     setAbortController(abortController);
 
     // Submit the search request using the `data.search` service.
-    setRequest(req.params.body);
+    setRequest(body);
     setRawResponse({});
     setWarningContents([]);
     setIsLoading(true);

examples/search_examples/public/search_sessions/app.tsx

@@ -707,10 +707,8 @@ function doSearch(
   const req = {
     params: {
       index: dataView.title,
-      body: {
-        aggs: aggsDsl,
-        query,
-      },
+      aggs: aggsDsl,
+      query,
     },
   };
 

examples/search_examples/server/routes/server_search_route.ts

@@ -39,12 +39,10 @@ export function registerServerSearchRoute(router: IRouter<DataRequestHandlerCont
             {
               params: {
                 index,
-                body: {
-                  aggs: {
-                    '1': {
-                      avg: {
-                        field,
-                      },
+                aggs: {
+                  '1': {
+                    avg: {
+                      field,
                     },
                   },
                 },

examples/unified_doc_viewer/public/application.tsx

@@ -44,10 +44,8 @@ function UnifiedDocViewerExamplesApp({ data }: { data: DataPublicPluginStart })
         .search({
           params: {
             index: dataView?.getIndexPattern(),
-            body: {
-              fields: ['*'],
-              _source: false,
-            },
+            fields: ['*'],
+            _source: false,
           },
         })
         .toPromise();

package.json

@@ -115,7 +115,7 @@
     "@elastic/datemath": "5.0.3",
     "@elastic/ebt": "^1.1.1",
     "@elastic/ecs": "^8.11.5",
-    "@elastic/elasticsearch": "^8.17.0",
+    "@elastic/elasticsearch": "9.0.0-alpha.3",
     "@elastic/ems-client": "8.6.3",
     "@elastic/eui": "99.2.0-borealis.0",
     "@elastic/eui-theme-borealis": "0.0.10",

packages/kbn-apm-synthtrace/src/cli/utils/get_apm_es_client.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { Client } from '@elastic/elasticsearch';
+import { Client, HttpConnection } from '@elastic/elasticsearch';
 import { ApmSynthtraceEsClient } from '../../..';
 import { Logger } from '../../lib/utils/create_logger';
 import { RunOptions } from './parse_run_cli_flags';
@@ -26,6 +26,8 @@ export function getApmEsClient({
   const client = new Client({
     node: target,
     tls: getEsClientTlsSettings(target),
+    Connection: HttpConnection,
+    requestTimeout: 30_000,
   });
 
   const apmEsClient = new ApmSynthtraceEsClient({

packages/kbn-apm-synthtrace/src/cli/utils/get_entities_es_client.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { Client } from '@elastic/elasticsearch';
+import { Client, HttpConnection } from '@elastic/elasticsearch';
 import { EntitiesSynthtraceEsClient } from '../../lib/entities/entities_synthtrace_es_client';
 import { Logger } from '../../lib/utils/create_logger';
 import { RunOptions } from './parse_run_cli_flags';
@@ -24,6 +24,8 @@ export function getEntitiesEsClient({
   const client = new Client({
     node: target,
     tls: getEsClientTlsSettings(target),
+    Connection: HttpConnection,
+    requestTimeout: 30_000,
   });
 
   return new EntitiesSynthtraceEsClient({

packages/kbn-apm-synthtrace/src/cli/utils/get_infra_es_client.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { Client } from '@elastic/elasticsearch';
+import { Client, HttpConnection } from '@elastic/elasticsearch';
 import { InfraSynthtraceEsClient } from '../../lib/infra/infra_synthtrace_es_client';
 import { Logger } from '../../lib/utils/create_logger';
 import { RunOptions } from './parse_run_cli_flags';
@@ -24,6 +24,8 @@ export function getInfraEsClient({
   const client = new Client({
     node: target,
     tls: getEsClientTlsSettings(target),
+    Connection: HttpConnection,
+    requestTimeout: 30_000,
   });
 
   return new InfraSynthtraceEsClient({

packages/kbn-apm-synthtrace/src/cli/utils/get_logs_es_client.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { Client } from '@elastic/elasticsearch';
+import { Client, HttpConnection } from '@elastic/elasticsearch';
 import { LogsSynthtraceEsClient } from '../../lib/logs/logs_synthtrace_es_client';
 import { Logger } from '../../lib/utils/create_logger';
 import { RunOptions } from './parse_run_cli_flags';
@@ -24,6 +24,8 @@ export function getLogsEsClient({
   const client = new Client({
     node: target,
     tls: getEsClientTlsSettings(target),
+    Connection: HttpConnection,
+    requestTimeout: 30_000,
   });
 
   return new LogsSynthtraceEsClient({

packages/kbn-apm-synthtrace/src/cli/utils/get_otel_es_client.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { Client } from '@elastic/elasticsearch';
+import { Client, HttpConnection } from '@elastic/elasticsearch';
 import { Logger } from '../../lib/utils/create_logger';
 import { RunOptions } from './parse_run_cli_flags';
 import { getEsClientTlsSettings } from './ssl';
@@ -24,6 +24,8 @@ export function getOtelSynthtraceEsClient({
   const client = new Client({
     node: target,
     tls: getEsClientTlsSettings(target),
+    Connection: HttpConnection,
+    requestTimeout: 30_000,
   });
 
   return new OtelSynthtraceEsClient({

packages/kbn-apm-synthtrace/src/cli/utils/get_synthetics_es_client.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { Client } from '@elastic/elasticsearch';
+import { Client, HttpConnection } from '@elastic/elasticsearch';
 import { Logger } from '../../lib/utils/create_logger';
 import { RunOptions } from './parse_run_cli_flags';
 import { getEsClientTlsSettings } from './ssl';
@@ -24,6 +24,8 @@ export function getSyntheticsEsClient({
   const client = new Client({
     node: target,
     tls: getEsClientTlsSettings(target),
+    Connection: HttpConnection,
+    requestTimeout: 30_000,
   });
 
   return new SyntheticsSynthtraceEsClient({

packages/kbn-es-archiver/src/cli.ts

@@ -110,6 +110,7 @@ export function runCli() {
         node: esUrl,
         tls: esCa ? { ca: esCa } : undefined,
         Connection: HttpConnection,
+        requestTimeout: 30_000,
       });
       addCleanupTask(() => client.close());
 

packages/kbn-es-archiver/src/lib/indices/__mocks__/stubs.ts

@@ -109,7 +109,7 @@ export const createStubClient = (
 
         return { statusCode: 404 };
       }),
-      updateAliases: sinon.spy(async ({ body }) => {
+      updateAliases: sinon.spy(async (body) => {
         body.actions.forEach(
           ({ add: { index, alias } }: { add: { index: string; alias: string } }) => {
             if (!existingIndices.includes(index)) {

packages/kbn-es-archiver/src/lib/indices/create_index_stream.test.ts

@@ -141,16 +141,12 @@ describe('esArchiver: createCreateIndexStream()', () => {
 
       sinon.assert.calledWith(client.indices.create as sinon.SinonSpy, {
         index: 'index',
-        body: {
-          settings: undefined,
-          mappings: undefined,
-        },
+        settings: undefined,
+        mappings: undefined,
       });
 
       sinon.assert.calledWith(client.indices.updateAliases as sinon.SinonSpy, {
-        body: {
-          actions: [{ add: { alias: 'foo', index: 'index' } }],
-        },
+        actions: [{ add: { alias: 'foo', index: 'index' } }],
       });
     });
 
@@ -343,9 +339,10 @@ describe('esArchiver: createCreateIndexStream()', () => {
 
       // only update aliases for the 'new-index'
       sinon.assert.callCount(client.indices.updateAliases as sinon.SinonSpy, 1);
-      expect((client.indices.updateAliases as sinon.SinonSpy).args[0][0]).toHaveProperty('body', {
-        actions: [{ add: { alias: 'new-index-alias', index: 'new-index' } }],
-      });
+      expect((client.indices.updateAliases as sinon.SinonSpy).args[0][0]).toHaveProperty(
+        'actions',
+        [{ add: { alias: 'new-index-alias', index: 'new-index' } }]
+      );
     });
 
     it('filters documents for skipped indices', async () => {

packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts

@@ -10,7 +10,7 @@
 import { Transform, Readable } from 'stream';
 import { inspect } from 'util';
 
-import * as estypes from '@elastic/elasticsearch/lib/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import type { Client } from '@elastic/elasticsearch';
 import { ToolingLog } from '@kbn/tooling-log';
 
@@ -162,10 +162,8 @@ export function createCreateIndexStream({
         await client.indices.create(
           {
             index,
-            body: {
-              settings,
-              mappings,
-            },
+            settings,
+            mappings,
           },
           {
             headers: ES_CLIENT_HEADERS,
@@ -184,7 +182,7 @@ export function createCreateIndexStream({
         );
 
         if (actions.length) {
-          await client.indices.updateAliases({ body: { actions } });
+          await client.indices.updateAliases({ actions });
         }
 
         stats.createdIndex(index, { settings });

packages/kbn-es-archiver/src/lib/indices/kibana_index.ts

@@ -45,7 +45,7 @@ export async function deleteSavedObjectIndices({
   await client.indices.putSettings(
     {
       index: indexNames,
-      body: { blocks: { read_only: false } },
+      settings: { blocks: { read_only: false } },
     },
     {
       headers: ES_CLIENT_HEADERS,
@@ -123,13 +123,11 @@ export async function cleanSavedObjectIndices({
       {
         index,
         refresh: true,
-        body: {
-          query: {
-            bool: {
-              must_not: {
-                ids: {
-                  values: ['space:default'],
-                },
+        query: {
+          bool: {
+            must_not: {
+              ids: {
+                values: ['space:default'],
               },
             },
           },
@@ -168,7 +166,7 @@ export async function createDefaultSpace({ index, client }: { index: string; cli
       index,
       id: 'space:default',
       refresh: 'wait_for',
-      body: {
+      document: {
         type: 'space',
         updated_at: new Date().toISOString(),
         space: {

packages/kbn-es/src/cluster.ts

@@ -14,7 +14,7 @@ import * as path from 'path';
 import execa from 'execa';
 import { Readable } from 'stream';
 import { combineLatest, fromEvent, first } from 'rxjs';
-import { Client } from '@elastic/elasticsearch';
+import { Client, HttpConnection } from '@elastic/elasticsearch';
 import { promisify } from 'util';
 import { CA_CERT_PATH, ES_NOPASSWORD_P12_PATH, extract } from '@kbn/dev-utils';
 import { ToolingLog } from '@kbn/tooling-log';
@@ -428,6 +428,8 @@ export class Cluster {
               rejectUnauthorized: true,
             }
           : undefined,
+        Connection: HttpConnection,
+        requestTimeout: 30_000,
       });
 
       if (!skipReadyCheck) {

packages/kbn-es/src/utils/docker.ts

@@ -771,6 +771,7 @@ export async function runServerlessEsNode(
 function getESClient(clientOptions: ClientOptions): Client {
   return new Client({
     Connection: HttpConnection,
+    requestTimeout: 30_000,
     ...clientOptions,
   });
 }

packages/kbn-es/src/utils/native_realm.js

@@ -27,9 +27,7 @@ exports.NativeRealm = class NativeRealm {
         await this._client.security.changePassword({
           username,
           refresh: 'wait_for',
-          body: {
-            password,
-          },
+          password,
         });
       } catch (err) {
         const isAnonymousUserPasswordChangeError =