Merge branch 'master' into pr/jportner/80945

Fixed merge conflicts from #88720.
elastic · Jan 20, 2021 · 9f88c39 · 9f88c39
2 parents 717efcf + ef40806
commit 9f88c39
Show file tree

Hide file tree

Showing 267 changed files with 40,346 additions and 1,743 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/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -231,8 +231,7 @@ which also contains the timelion APIs and backend, look at the vis_type_timelion
 
 
 |{kib-repo}blob/{branch}/src/plugins/usage_collection/README.md[usageCollection]
-|Usage Collection allows collecting usage data for other services to consume (telemetry and monitoring).
-To integrate with the telemetry services for usage collection of your feature, there are 2 steps:
+|The Usage Collection Service defines a set of APIs for other plugins to report the usage of their features. At the same time, it provides necessary the APIs for other services (i.e.: telemetry, monitoring, ...) to consume that usage data.
 
 
 |{kib-repo}blob/{branch}/src/plugins/vis_default_editor/README.md[visDefaultEditor]

diff --git a/src/dev/typescript/projects.ts b/src/dev/typescript/projects.ts
@@ -24,6 +24,10 @@ export const PROJECTS = [
     name: 'apm/cypress',
     disableTypeCheck: true,
   }),
+  new Project(resolve(REPO_ROOT, 'x-pack/plugins/apm/ftr_e2e/tsconfig.json'), {
+    name: 'apm/ftr_e2e',
+    disableTypeCheck: true,
+  }),
   new Project(resolve(REPO_ROOT, 'x-pack/plugins/apm/scripts/tsconfig.json'), {
     name: 'apm/scripts',
     disableTypeCheck: true,

diff --git a/src/plugins/data/public/search/session/sessions_client.ts b/src/plugins/data/public/search/session/sessions_client.ts
@@ -56,8 +56,8 @@ export class SessionsClient {
     });
   }
 
-  public find(options: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse> {
-    return this.http!.post(`/internal/session`, {
+  public find(options: Omit<SavedObjectsFindOptions, 'type'>): Promise<SavedObjectsFindResponse> {
+    return this.http!.post(`/internal/session/_find`, {
       body: JSON.stringify(options),
     });
   }

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);
     });
   }