Merge branch 'i/88107' of github.com:szabosteve/kibana into i/88107

elastic · Jan 20, 2021 · 9f98ea9 · 9f98ea9
2 parents 933f797 + 4acd606
commit 9f98ea9
Show file tree

Hide file tree

Showing 80 changed files with 873 additions and 491 deletions.
diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -56,6 +56,8 @@ kibanaPipeline(timeoutMinutes: 150) {
             'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
             'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
             'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
+            'xpack-ciGroup12': kibanaPipeline.xpackCiGroupProcess(12),
+            'xpack-ciGroup13': kibanaPipeline.xpackCiGroupProcess(13),
           ]),
         ])
       }

diff --git a/.ci/jobs.yml b/.ci/jobs.yml
@@ -32,6 +32,8 @@ JOB:
   - x-pack-ciGroup9
   - x-pack-ciGroup10
   - x-pack-ciGroup11
+  - x-pack-ciGroup12
+  - x-pack-ciGroup13
   - x-pack-accessibility
   - x-pack-visualRegression
 

diff --git a/src/plugins/telemetry/server/fetcher.ts b/src/plugins/telemetry/server/fetcher.ts
@@ -169,13 +169,19 @@ export class FetcherTask {
     updateTelemetrySavedObject(this.internalRepository!, {
       reportFailureCount: 0,
       lastReported: this.lastReported,
+    }).catch((err) => {
+      err.message = `Failed to update the telemetry saved object: ${err.message}`;
+      this.logger.debug(err);
     });
   }
 
   private async updateReportFailure({ failureCount }: { failureCount: number }) {
     updateTelemetrySavedObject(this.internalRepository!, {
       reportFailureCount: failureCount + 1,
       reportFailureVersion: this.currentKibanaVersion,
+    }).catch((err) => {
+      err.message = `Failed to update the telemetry saved object: ${err.message}`;
+      this.logger.debug(err);
     });
   }
 

diff --git a/test/api_integration/apis/home/index.js → test/api_integration/apis/home/index.ts b/test/api_integration/apis/home/index.js → test/api_integration/apis/home/index.ts
@@ -6,7 +6,9 @@
  * Public License, v 1.
  */
 
-export default function ({ loadTestFile }) {
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
   describe('home apis', () => {
     loadTestFile(require.resolve('./sample_data'));
   });

diff --git a/.../api_integration/apis/home/sample_data.js → .../api_integration/apis/home/sample_data.ts b/.../api_integration/apis/home/sample_data.js → .../api_integration/apis/home/sample_data.ts
@@ -7,10 +7,11 @@
  */
 
 import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-export default function ({ getService }) {
+export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
 
   const MILLISECOND_IN_WEEK = 1000 * 60 * 60 * 24 * 7;
 
@@ -43,7 +44,7 @@ export default function ({ getService }) {
       });
 
       it('should load elasticsearch index containing sample data with dates relative to current time', async () => {
-        const resp = await es.search({
+        const { body: resp } = await es.search({
           index: 'kibana_sample_data_flights',
         });
 
@@ -61,7 +62,7 @@ export default function ({ getService }) {
             .post(`/api/sample_data/flights?now=${nowString}`)
             .set('kbn-xsrf', 'kibana');
 
-          const resp = await es.search({
+          const { body: resp } = await es.search({
             index: 'kibana_sample_data_flights',
           });
 
@@ -80,7 +81,7 @@ export default function ({ getService }) {
       });
 
       it('should remove elasticsearch index containing sample data', async () => {
-        const resp = await es.indices.exists({
+        const { body: resp } = await es.indices.exists({
           index: 'kibana_sample_data_flights',
         });
         expect(resp).to.be(false);

diff --git a/test/api_integration/apis/index.js → test/api_integration/apis/index.ts b/test/api_integration/apis/index.js → test/api_integration/apis/index.ts
@@ -6,7 +6,9 @@
  * Public License, v 1.
  */
 
-export default function ({ loadTestFile }) {
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
   describe('apis', () => {
     loadTestFile(require.resolve('./core'));
     loadTestFile(require.resolve('./general'));

diff --git a/...i_integration/apis/kql_telemetry/index.js → ...i_integration/apis/kql_telemetry/index.ts b/...i_integration/apis/kql_telemetry/index.js → ...i_integration/apis/kql_telemetry/index.ts
@@ -6,7 +6,9 @@
  * Public License, v 1.
  */
 
-export default function ({ loadTestFile }) {
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
   describe('KQL', () => {
     loadTestFile(require.resolve('./kql_telemetry'));
   });

diff --git a/...ation/apis/kql_telemetry/kql_telemetry.js → ...ation/apis/kql_telemetry/kql_telemetry.ts b/...ation/apis/kql_telemetry/kql_telemetry.js → ...ation/apis/kql_telemetry/kql_telemetry.ts
@@ -9,11 +9,12 @@
 import expect from '@kbn/expect';
 import Bluebird from 'bluebird';
 import { get } from 'lodash';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-export default function ({ getService }) {
+export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
-  const es = getService('legacyEs');
+  const es = getService('es');
 
   describe('telemetry API', () => {
     before(() => esArchiver.load('saved_objects/basic'));
@@ -31,7 +32,7 @@ export default function ({ getService }) {
           index: '.kibana',
           q: 'type:kql-telemetry',
         })
-        .then((response) => {
+        .then(({ body: response }) => {
           const kqlTelemetryDoc = get(response, 'hits.hits[0]._source.kql-telemetry');
           expect(kqlTelemetryDoc.optInCount).to.be(1);
         });
@@ -49,7 +50,7 @@ export default function ({ getService }) {
           index: '.kibana',
           q: 'type:kql-telemetry',
         })
-        .then((response) => {
+        .then(({ body: response }) => {
           const kqlTelemetryDoc = get(response, 'hits.hits[0]._source.kql-telemetry');
           expect(kqlTelemetryDoc.optOutCount).to.be(1);
         });

diff --git a/...gration/apis/saved_objects/bulk_create.js → ...gration/apis/saved_objects/bulk_create.ts b/...gration/apis/saved_objects/bulk_create.js → ...gration/apis/saved_objects/bulk_create.ts
@@ -7,10 +7,11 @@
  */
 
 import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-export default function ({ getService }) {
+export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esArchiver = getService('esArchiver');
 
   const BULK_REQUESTS = [
@@ -74,11 +75,10 @@ export default function ({ getService }) {
       it('should not return raw id when object id is unspecified', async () =>
         await supertest
           .post(`/api/saved_objects/_bulk_create`)
-          // eslint-disable-next-line no-unused-vars
           .send(BULK_REQUESTS.map(({ id, ...rest }) => rest))
           .expect(200)
           .then((resp) => {
-            resp.body.saved_objects.map(({ id }) =>
+            resp.body.saved_objects.map(({ id }: { id: string }) =>
               expect(id).not.match(/visualization|dashboard/)
             );
           }));
@@ -88,10 +88,7 @@ export default function ({ getService }) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({
-            index: '.kibana',
-            ignore: [404],
-          })
+          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
       );
 
       it('should return 200 with individual responses', async () =>

diff --git a/...ntegration/apis/saved_objects/bulk_get.js → ...ntegration/apis/saved_objects/bulk_get.ts b/...ntegration/apis/saved_objects/bulk_get.js → ...ntegration/apis/saved_objects/bulk_get.ts
@@ -7,10 +7,11 @@
  */
 
 import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-export default function ({ getService }) {
+export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esArchiver = getService('esArchiver');
 
   const BULK_REQUESTS = [
@@ -98,10 +99,7 @@ export default function ({ getService }) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({
-            index: '.kibana',
-            ignore: [404],
-          })
+          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
       );
 
       it('should return 200 with individual responses', async () =>

diff --git a/...gration/apis/saved_objects/bulk_update.js → ...gration/apis/saved_objects/bulk_update.ts b/...gration/apis/saved_objects/bulk_update.js → ...gration/apis/saved_objects/bulk_update.ts
@@ -8,10 +8,11 @@
 
 import expect from '@kbn/expect';
 import _ from 'lodash';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-export default function ({ getService }) {
+export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esArchiver = getService('esArchiver');
 
   describe('bulkUpdate', () => {
@@ -234,10 +235,7 @@ export default function ({ getService }) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({
-            index: '.kibana',
-            ignore: [404],
-          })
+          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
       );
 
       it('should return generic 404', async () => {

diff --git a/..._integration/apis/saved_objects/create.js → ..._integration/apis/saved_objects/create.ts b/..._integration/apis/saved_objects/create.js → ..._integration/apis/saved_objects/create.ts
@@ -7,10 +7,11 @@
  */
 
 import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-export default function ({ getService }) {
+export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esArchiver = getService('esArchiver');
 
   describe('create', () => {
@@ -58,10 +59,7 @@ export default function ({ getService }) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({
-            index: '.kibana',
-            ignore: [404],
-          })
+          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
       );
 
       it('should return 200 and create kibana index', async () => {
@@ -99,7 +97,7 @@ export default function ({ getService }) {
             expect(resp.body.migrationVersion).to.be.ok();
           });
 
-        expect(await es.indices.exists({ index: '.kibana' })).to.be(true);
+        expect((await es.indices.exists({ index: '.kibana' })).body).to.be(true);
       });
     });
   });

diff --git a/..._integration/apis/saved_objects/delete.js → ..._integration/apis/saved_objects/delete.ts b/..._integration/apis/saved_objects/delete.js → ..._integration/apis/saved_objects/delete.ts
@@ -7,10 +7,11 @@
  */
 
 import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-export default function ({ getService }) {
+export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esArchiver = getService('esArchiver');
 
   describe('delete', () => {
@@ -43,10 +44,7 @@ export default function ({ getService }) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({
-            index: '.kibana',
-            ignore: [404],
-          })
+          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
       );
 
       it('returns generic 404 when kibana index is missing', async () =>

diff --git a/test/api_integration/apis/saved_objects/export.ts b/test/api_integration/apis/saved_objects/export.ts
@@ -14,7 +14,7 @@ function ndjsonToObject(input: string) {
 }
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esArchiver = getService('esArchiver');
 
   describe('export', () => {
@@ -524,10 +524,7 @@ export default function ({ getService }: FtrProviderContext) {
       before(
         async () =>
           // just in case the kibana server has recreated it
-          await es.indices.delete({
-            index: '.kibana',
-            ignore: [404],
-          })
+          await es.indices.delete({ index: '.kibana' }, { ignore: [404] })
       );
 
       it('should return empty response', async () => {