Skip to content

Commit 53a2235

Browse files
committed
Merge remote-tracking branch 'upstream/master' into 54012
# Conflicts: # src/plugins/data/server/server.api.md
2 parents 6bd8321 + fc9c195 commit 53a2235

File tree

371 files changed

+8688
-6516
lines changed

Some content is hidden

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

371 files changed

+8688
-6516
lines changed

.ci/build_docker.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ cd "$(dirname "${0}")"
77
cp /usr/local/bin/runbld ./
88
cp /usr/local/bin/bash_standard_lib.sh ./
99

10-
docker build -t kibana-ci -f ./Dockerfile .
10+
if which docker >/dev/null; then
11+
docker build -t kibana-ci -f ./Dockerfile .
12+
else
13+
echo "Docker binary is not available. Skipping the docker build this time."
14+
fi

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@
6969
/x-pack/plugins/apm/ @elastic/apm-ui
7070
/x-pack/test/functional/apps/apm/ @elastic/apm-ui
7171
/src/plugins/apm_oss/ @elastic/apm-ui
72-
/src/apm.js @watson @vigneshshanmugam
72+
/src/apm.js @elastic/kibana-core @vigneshshanmugam
73+
/packages/kbn-apm-config-loader/ @elastic/kibana-core @vigneshshanmugam
7374
#CC# /src/plugins/apm_oss/ @elastic/apm-ui
7475
#CC# /x-pack/plugins/observability/ @elastic/apm-ui
7576

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Kibana is your window into the [Elastic Stack](https://www.elastic.co/products).
1313

1414
If you just want to try Kibana out, check out the [Elastic Stack Getting Started Page](https://www.elastic.co/start) to give it a whirl.
1515

16-
If you're interested in diving a bit deeper and getting a taste of Kibana's capabilities, head over to the [Kibana Getting Started Page](https://www.elastic.co/guide/en/kibana/current/getting-started.html).
16+
If you're interested in diving a bit deeper and getting a taste of Kibana's capabilities, head over to the [Kibana Getting Started Page](https://www.elastic.co/guide/en/kibana/current/get-started.html).
1717

1818
### Using a Kibana Release
1919

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ Then register the tutorial object by calling `home.tutorials.registerTutorial(tu
2828
String values can contain variables that are substituted when rendered. Variables are specified by `{}`.
2929
For example: `{config.docs.version}` is rendered as `6.2` when running the tutorial in {kib} 6.2.
3030

31-
link:{kib-repo}tree/{branch}/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js#L23[Provided variables]
31+
link:{kib-repo}tree/{branch}/src/plugins/home/public/application/components/tutorial/replace_template_strings.js[Provided variables]
3232

3333
[discrete]
3434
==== Markdown
3535
String values can contain limited Markdown syntax.
3636

37-
link:{kib-repo}tree/{branch}/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js#L8[Enabled Markdown grammars]
37+
link:{kib-repo}tree/{branch}/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js[Enabled Markdown grammars]
3838

0 commit comments

Comments
 (0)