Merge branch 'master' into alerts/index-threshold-non-array-index-param

Author: kibanamachine

x-pack/plugins/searchprofiler/server/routes/profile.ts

@@ -27,10 +27,6 @@ export const register = ({ router, getLicenseStatus, log }: RouteDependencies) =
         });
       }
 
-      const {
-        core: { elasticsearch },
-      } = ctx;
-
       const {
         body: { query, index },
       } = request;
@@ -46,21 +42,25 @@ export const register = ({ router, getLicenseStatus, log }: RouteDependencies) =
         body: JSON.stringify(parsed, null, 2),
       };
       try {
-        const resp = await elasticsearch.legacy.client.callAsCurrentUser('search', body);
+        const client = ctx.core.elasticsearch.client.asCurrentUser;
+        const resp = await client.search(body);
+
         return response.ok({
           body: {
             ok: true,
-            resp,
+            resp: resp.body,
           },
         });
       } catch (err) {
         log.error(err);
+        const { statusCode, body: errorBody } = err;
+
         return response.customError({
-          statusCode: err.status || 500,
-          body: err.body
+          statusCode: statusCode || 500,
+          body: errorBody
             ? {
-                message: err.message,
-                attributes: err.body,
+                message: errorBody.error?.reason,
+                attributes: errorBody,
               }
             : err,
         });

x-pack/test/api_integration/apis/index.ts

@@ -33,5 +33,6 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./transform'));
     loadTestFile(require.resolve('./lists'));
     loadTestFile(require.resolve('./upgrade_assistant'));
+    loadTestFile(require.resolve('./searchprofiler'));
   });
 }

x-pack/test/api_integration/apis/searchprofiler/index.ts

@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('Search Profiler', () => {
+    loadTestFile(require.resolve('./searchprofiler'));
+  });
+}

x-pack/test/api_integration/apis/searchprofiler/searchprofiler.ts

@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+const API_BASE_PATH = '/api/searchprofiler';
+
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+
+  describe('Profile', () => {
+    it('should return profile results for a valid index', async () => {
+      const payload = {
+        index: '_all',
+        query: {
+          query: {
+            match_all: {},
+          },
+        },
+      };
+
+      const { body } = await supertest
+        .post(`${API_BASE_PATH}/profile`)
+        .set('kbn-xsrf', 'xxx')
+        .set('Content-Type', 'application/json;charset=UTF-8')
+        .send(payload)
+        .expect(200);
+
+      expect(body.ok).to.eql(true);
+    });
+
+    it('should return error for invalid index', async () => {
+      const payloadWithInvalidIndex = {
+        index: 'index_does_not_exist',
+        query: {
+          query: {
+            match_all: {},
+          },
+        },
+      };
+
+      const { body } = await supertest
+        .post(`${API_BASE_PATH}/execute`)
+        .set('kbn-xsrf', 'xxx')
+        .set('Content-Type', 'application/json;charset=UTF-8')
+        .send(payloadWithInvalidIndex)
+        .expect(404);
+
+      expect(body.error).to.eql('Not Found');
+    });
+  });
+}

x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts

@@ -13,7 +13,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const appsMenu = getService('appsMenu');
   const managementMenu = getService('managementMenu');
 
-  describe('security', () => {
+  // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/89180
+  describe.skip('security', () => {
     before(async () => {
       await esArchiver.load('empty_kibana');
       await PageObjects.common.navigateToApp('home');

x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts

@@ -13,7 +13,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const appsMenu = getService('appsMenu');
   const managementMenu = getService('managementMenu');
 
-  describe('security', () => {
+  // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/89181
+  describe.skip('security', () => {
     before(async () => {
       await esArchiver.load('empty_kibana');
       await PageObjects.common.navigateToApp('home');