Merge branch 'alerting/cancel-alerting-tasks' into alerting/skip-writ…

…ing-aad-on-timeout-2
elastic · Oct 12, 2021 · 90ab82e · 90ab82e
2 parents 7fac6a2 + cff64f1
commit 90ab82e
Show file tree

Hide file tree

Showing 570 changed files with 17,108 additions and 6,000 deletions.
diff --git a/.buildkite/scripts/lifecycle/pre_command.sh b/.buildkite/scripts/lifecycle/pre_command.sh
@@ -4,16 +4,17 @@ set -euo pipefail
 
 source .buildkite/scripts/common/util.sh
 
-node .buildkite/scripts/lifecycle/print_agent_links.js || true
-
-echo '--- Job Environment Setup'
+BUILDKITE_TOKEN="$(retry 5 5 vault read -field=buildkite_token_all_jobs secret/kibana-issues/dev/buildkite-ci)"
+export BUILDKITE_TOKEN
 
+echo '--- Install buildkite dependencies'
 cd '.buildkite'
 retry 5 15 yarn install
 cd -
 
-BUILDKITE_TOKEN="$(retry 5 5 vault read -field=buildkite_token_all_jobs secret/kibana-issues/dev/buildkite-ci)"
-export BUILDKITE_TOKEN
+node .buildkite/scripts/lifecycle/print_agent_links.js || true
+
+echo '--- Job Environment Setup'
 
 # Set up a custom ES Snapshot Manifest if one has been specified for this build
 {

diff --git a/api_docs/apm.json b/api_docs/apm.json
diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx
@@ -10,7 +10,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 ---
 import apmObj from './apm.json';
 
-
+The user interface for Elastic APM
 
 Contact [APM UI](https://github.com/orgs/elastic/teams/apm-ui) for questions regarding this plugin.
-Original file line number
+Diff line change
@@ Expand Up @@
     ---
     import apmObj from './apm.json';
+    The user interface for Elastic APM
     Contact [APM UI](https://github.com/orgs/elastic/teams/apm-ui) for questions regarding this plugin.
@@ Expand Down @@