Skip to content

Commit a3894ba

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into move-apm-from-tests-folder
2 parents f5288d4 + 1d49166 commit a3894ba

421 files changed

Lines changed: 9769 additions & 5065 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ci/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=14.15.3
4+
ARG NODE_VERSION=14.15.4
55

66
FROM node:${NODE_VERSION} AS base
77

‎docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ readonly links: {
1515
readonly urlDrilldownTemplateSyntax: string;
1616
readonly urlDrilldownVariables: string;
1717
};
18+
readonly discover: Record<string, string>;
1819
readonly filebeat: {
1920
readonly base: string;
2021
readonly installation: string;

0 commit comments

Comments
 (0)