Merge branch 'master' of github.com:elastic/kibana into threshold-dupes

.ci/build_docker.sh

@@ -7,4 +7,8 @@ cd "$(dirname "${0}")"
 cp /usr/local/bin/runbld ./
 cp /usr/local/bin/bash_standard_lib.sh ./
 
-docker build -t kibana-ci -f ./Dockerfile .
+if which docker >/dev/null; then
+    docker build -t kibana-ci -f ./Dockerfile .
+else
+    echo "Docker binary is not available. Skipping the docker build this time."
+fi

.github/CODEOWNERS

@@ -69,7 +69,8 @@
 /x-pack/plugins/apm/  @elastic/apm-ui
 /x-pack/test/functional/apps/apm/  @elastic/apm-ui
 /src/plugins/apm_oss/  @elastic/apm-ui
-/src/apm.js @watson @vigneshshanmugam
+/src/apm.js @elastic/kibana-core @vigneshshanmugam
+/packages/kbn-apm-config-loader/ @elastic/kibana-core @vigneshshanmugam
 #CC# /src/plugins/apm_oss/ @elastic/apm-ui
 #CC# /x-pack/plugins/observability/ @elastic/apm-ui
 

docs/developer/architecture/add-data-tutorials.asciidoc

@@ -28,11 +28,11 @@ Then register the tutorial object by calling `home.tutorials.registerTutorial(tu
 String values can contain variables that are substituted when rendered. Variables are specified by `{}`.
 For example: `{config.docs.version}` is rendered as `6.2` when running the tutorial in {kib} 6.2.
 
-link:{kib-repo}tree/{branch}/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js#L23[Provided variables]
+link:{kib-repo}tree/{branch}/src/plugins/home/public/application/components/tutorial/replace_template_strings.js[Provided variables]
 
 [discrete]
 ==== Markdown
 String values can contain limited Markdown syntax.
 
-link:{kib-repo}tree/{branch}/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js#L8[Enabled Markdown grammars]
+link:{kib-repo}tree/{branch}/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js[Enabled Markdown grammars]