Merge branch 'master' into scottybollinger/ws-role-mapping

elastic · Mar 1, 2021 · 9210060 · 9210060
2 parents 65bc917 + a55d8b6
commit 9210060
Show file tree

Hide file tree

Showing 1,149 changed files with 30,138 additions and 4,156,900 deletions.
diff --git a/.bazeliskversion b/.bazeliskversion
@@ -1 +1 @@
-1.7.3
+1.7.5
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.4
+ARG NODE_VERSION=14.16.0
 
 FROM node:${NODE_VERSION} AS base
 

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .aws-config.json
 .signing-config.json
+/api_docs
 .ackrc
 /.es
 /.chromium

diff --git a/.telemetryrc.json b/.telemetryrc.json
@@ -2,15 +2,6 @@
  {
  "output": "src/plugins/telemetry/schema/oss_plugins.json",
  "root": "src/plugins/",
- "exclude": [
- "src/plugins/kibana_react/",
- "src/plugins/testbed/",
- "src/plugins/kibana_utils/"
- ]
- },
- {
- "output": "src/plugins/telemetry/schema/legacy_plugins.json",
- "root": "src/legacy/server/",
  "exclude": []
  }
 ]