Merge branch 'master' into move-apm-from-tests-folder

elastic · Jan 7, 2021 · a3894ba · a3894ba
2 parents f5288d4 + 1d49166
commit a3894ba
Show file tree

Hide file tree

Showing 421 changed files with 9,769 additions and 5,065 deletions.
diff --git a/.ci/Dockerfile b/.ci/Dockerfile
@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=14.15.3
+ARG NODE_VERSION=14.15.4
 
 FROM node:${NODE_VERSION} AS base
 

diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
@@ -15,6 +15,7 @@ readonly links: {
             readonly urlDrilldownTemplateSyntax: string;
             readonly urlDrilldownVariables: string;
         };
+        readonly discover: Record<string, string>;
         readonly filebeat: {
             readonly base: string;
             readonly installation: string;