Skip to content

Commit 55629da

Browse files
patrykkopycinskipatrykkopycinski
committed
Merge branch 'master' of github.com:elastic/kibana into enhance/use-bfetch-in-search
# Conflicts: # x-pack/plugins/security_solution/cypress/support/commands.js
2 parents 4413f8a + dc15aa8 commit 55629da

1,159 files changed

Lines changed: 28728 additions & 13742 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/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

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ kibanaPipeline(timeoutMinutes: 150) {
5555
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
5656
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
5757
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
58+
'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
5859
]),
5960
])
6061
}

‎.ci/jobs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ JOB:
3131
- x-pack-ciGroup8
3232
- x-pack-ciGroup9
3333
- x-pack-ciGroup10
34+
- x-pack-ciGroup11
3435
- x-pack-accessibility
3536
- x-pack-visualRegression
3637

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 5 deletions
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

@@ -132,7 +133,7 @@
132133
/x-pack/test/functional_basic/apps/transform/ @elastic/ml-ui
133134

134135
# Maps
135-
/x-pack/plugins/maps/ @elastic/kibana-gis
136+
#CC# /x-pack/plugins/maps/ @elastic/kibana-gis
136137
/x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
137138
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
138139
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
@@ -141,9 +142,8 @@
141142
#CC# /src/plugins/maps_oss/ @elastic/kibana-gis
142143
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
143144
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
144-
#CC# /src/plugins/home/server/tutorials @elastic/kibana-gis
145-
#CC# /src/plugins/tile_map/ @elastic/kibana-gis
146-
#CC# /src/plugins/region_map/ @elastic/kibana-gis
145+
/src/plugins/tile_map/ @elastic/kibana-gis
146+
/src/plugins/region_map/ @elastic/kibana-gis
147147

148148
# Operations
149149
/src/dev/ @elastic/kibana-operations

‎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)