Skip to content

Commit a47d047

Browse files
Merge branch 'master' into resolver-scroll-zoom-fix
2 parents 7699d79 + a62c62e commit a47d047

File tree

774 files changed

+17207
-17012
lines changed

Some content is hidden

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

774 files changed

+17207
-17012
lines changed

.browserslistrc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
[production]
2-
last 2 versions
3-
> 5%
4-
Safari 7 # for PhantomJS support: https://github.com/elastic/kibana/issues/27136
2+
last 2 Firefox versions
3+
last 2 Chrome versions
4+
last 2 Safari versions
5+
> 0.25%
6+
not ie 11
57

68
[dev]
79
last 1 chrome versions

.ci/Jenkinsfile_baseline_capture

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ kibanaPipeline(timeoutMinutes: 120) {
88
catchError {
99
parallel([
1010
'oss-visualRegression': {
11-
workers.ci(name: 'oss-visualRegression', size: 's', ramDisk: false) {
11+
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
1212
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
1313
}
1414
},
1515
'xpack-visualRegression': {
16-
workers.ci(name: 'xpack-visualRegression', size: 's', ramDisk: false) {
16+
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
1717
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
1818
}
1919
},

.ci/Jenkinsfile_coverage

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ kibanaPipeline(timeoutMinutes: 240) {
1313
workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
1414
catchError {
1515
kibanaCoverage.runTests()
16+
kibanaTeamAssign.load('team_assignment', "### Upload Team Assignment JSON")
1617
handleIngestion(TIME_STAMP)
1718
}
1819
handleFail()

.ci/pipeline-library/src/test/prChanges.groovy

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,17 @@ class PrChangesTest extends KibanaBasePipelineTest {
8484

8585
assertFalse(prChanges.areChangesSkippable())
8686
}
87+
88+
@Test
89+
void 'areChangesSkippable() with skippable changes that are in notSkippablePaths'() {
90+
props([
91+
githubPrs: [
92+
getChanges: { [
93+
[filename: 'docs/developer/architecture/code-exploration.asciidoc'],
94+
] },
95+
],
96+
])
97+
98+
assertFalse(prChanges.areChangesSkippable())
99+
}
87100
}

.github/CODEOWNERS

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,20 @@
2424
/src/plugins/vis_type_xy/ @elastic/kibana-app
2525
/src/plugins/visualize/ @elastic/kibana-app
2626

27-
# Core UI
28-
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
29-
/src/plugins/home/public @elastic/kibana-core-ui
30-
/src/plugins/home/server/*.ts @elastic/kibana-core-ui
31-
/src/plugins/home/server/services/ @elastic/kibana-core-ui
32-
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
33-
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
34-
/src/legacy/core_plugins/kibana/public/home/*.scss @elastic/kibana-core-ui
35-
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
36-
3727
# App Architecture
28+
/examples/bfetch_explorer/ @elastic/kibana-app-arch
29+
/examples/dashboard_embeddable_examples/ @elastic/kibana-app-arch
30+
/examples/demo_search/ @elastic/kibana-app-arch
3831
/examples/developer_examples/ @elastic/kibana-app-arch
32+
/examples/embeddable_examples/ @elastic/kibana-app-arch
33+
/examples/embeddable_explorer/ @elastic/kibana-app-arch
34+
/examples/state_container_examples/ @elastic/kibana-app-arch
35+
/examples/ui_actions_examples/ @elastic/kibana-app-arch
36+
/examples/ui_actions_explorer/ @elastic/kibana-app-arch
3937
/examples/url_generators_examples/ @elastic/kibana-app-arch
4038
/examples/url_generators_explorer/ @elastic/kibana-app-arch
41-
/packages/kbn-interpreter/ @elastic/kibana-app-arch
4239
/packages/elastic-datemath/ @elastic/kibana-app-arch
43-
/src/legacy/core_plugins/embeddable_api/ @elastic/kibana-app-arch
44-
/src/legacy/core_plugins/interpreter/ @elastic/kibana-app-arch
45-
/src/legacy/core_plugins/kibana_react/ @elastic/kibana-app-arch
46-
/src/legacy/core_plugins/kibana/public/management/ @elastic/kibana-app-arch
47-
/src/legacy/core_plugins/kibana/server/routes/api/management/ @elastic/kibana-app-arch
48-
/src/legacy/core_plugins/visualizations/ @elastic/kibana-app-arch
49-
/src/legacy/server/index_patterns/ @elastic/kibana-app-arch
40+
/packages/kbn-interpreter/ @elastic/kibana-app-arch
5041
/src/plugins/advanced_settings/ @elastic/kibana-app-arch
5142
/src/plugins/bfetch/ @elastic/kibana-app-arch
5243
/src/plugins/data/ @elastic/kibana-app-arch
@@ -61,9 +52,10 @@
6152
/src/plugins/share/ @elastic/kibana-app-arch
6253
/src/plugins/ui_actions/ @elastic/kibana-app-arch
6354
/src/plugins/visualizations/ @elastic/kibana-app-arch
64-
/x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
55+
/x-pack/examples/ui_actions_enhanced_examples/ @elastic/kibana-app-arch
6556
/x-pack/plugins/data_enhanced/ @elastic/kibana-app-arch
66-
/x-pack/plugins/drilldowns/ @elastic/kibana-app-arch
57+
/x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-arch
58+
/x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-arch
6759

6860
# APM
6961
/x-pack/plugins/apm/ @elastic/apm-ui
@@ -79,6 +71,16 @@
7971
/x-pack/plugins/canvas/ @elastic/kibana-canvas
8072
/x-pack/test/functional/apps/canvas/ @elastic/kibana-canvas
8173

74+
# Core UI
75+
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
76+
/src/plugins/home/public @elastic/kibana-core-ui
77+
/src/plugins/home/server/*.ts @elastic/kibana-core-ui
78+
/src/plugins/home/server/services/ @elastic/kibana-core-ui
79+
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
80+
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
81+
/src/legacy/core_plugins/kibana/public/home/*.scss @elastic/kibana-core-ui
82+
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
83+
8284
# Observability UIs
8385
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
8486
/x-pack/plugins/infra/ @elastic/logs-metrics-ui

NOTICE.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ This module was heavily inspired by the externals plugin that ships with webpack
2626
MIT License http://www.opensource.org/licenses/mit-license.php
2727
Author Tobias Koppers @sokra
2828

29-
---
30-
This product has relied on ASTExplorer that is licensed under MIT.
31-
3229
---
3330
This product includes code that is based on Ace editor, which was available
3431
under a "BSD" license.

docs/dev-tools/grokdebugger/index.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ in ingest node and Logstash.
3232
This example walks you through using the *Grok Debugger*. This tool
3333
is automatically enabled in {kib}.
3434

35-
NOTE: If you're using {security}, you must have the `manage_pipeline`
35+
NOTE: If you're using {stack-security-features}, you must have the `manage_pipeline`
3636
permission to use the Grok Debugger.
3737

3838
. Open the menu, go to *Dev Tools*, then click *Grok Debugger*.

docs/developer/advanced/development-basepath.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[development-basepath]]
2-
=== Considerations for basepath
2+
== Considerations for basepath
33

44
In dev mode, {kib} by default runs behind a proxy which adds a random path component to its URL.
55

docs/developer/advanced/development-es-snapshots.asciidoc

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
[[development-es-snapshots]]
2-
=== Daily Elasticsearch Snapshots
2+
== Daily {es} Snapshots
33

4-
For local development and CI, {kib}, by default, uses Elasticsearch snapshots that are built daily when running tasks that require Elasticsearch (e.g. functional tests).
4+
For local development and CI, {kib}, by default, uses {es} snapshots that are built daily when running tasks that require {es} (e.g. functional tests).
55

6-
A snapshot is just a group of tarballs, one for each supported distribution/architecture/os of Elasticsearch, and a JSON-based manifest file containing metadata about the distributions.
6+
A snapshot is just a group of tarballs, one for each supported distribution/architecture/os of {es}, and a JSON-based manifest file containing metadata about the distributions.
77

8-
https://ci.kibana.dev/es-snapshots[A dashboard] is available that shows the current status and compatibility of the latest Elasticsearch snapshots.
8+
https://ci.kibana.dev/es-snapshots[A dashboard] is available that shows the current status and compatibility of the latest {es} snapshots.
99

10-
==== Process Overview
10+
=== Process Overview
1111

12-
1. Elasticsearch snapshots are built for each current tracked branch of {kib}.
12+
1. {es} snapshots are built for each current tracked branch of {kib}.
1313
2. Each snapshot is uploaded to a public Google Cloud Storage bucket, `kibana-ci-es-snapshots-daily`.
1414
** At this point, the snapshot is not automatically used in CI or local development. It needs to be tested/verified first.
1515
3. Each snapshot is tested with the latest commit of the corresponding {kib} branch, using the full CI suite.
1616
4. After CI
1717
** If the snapshot passes, it is promoted and automatically used in CI and local development.
18-
** If the snapshot fails, the issue must be investigated and resolved. A new incompatibility may exist between Elasticsearch and {kib}.
18+
** If the snapshot fails, the issue must be investigated and resolved. A new incompatibility may exist between {es} and {kib}.
1919

20-
==== Using the latest snapshot
20+
=== Using the latest snapshot
2121

22-
When developing locally, you may wish to use the most recent Elasticsearch snapshot, even if it's failing CI. To do so, prefix your commands with the follow environment variable:
22+
When developing locally, you may wish to use the most recent {es} snapshot, even if it's failing CI. To do so, prefix your commands with the follow environment variable:
2323

2424
["source","bash"]
2525
-----------
2626
KBN_ES_SNAPSHOT_USE_UNVERIFIED=true
2727
-----------
2828

29-
You can use this flag with any command that downloads and runs Elasticsearch snapshots, such as `scripts/es` or the FTR.
29+
You can use this flag with any command that downloads and runs {es} snapshots, such as `scripts/es` or the FTR.
3030

3131
For example, to run functional tests with the latest snapshot:
3232

@@ -35,7 +35,7 @@ For example, to run functional tests with the latest snapshot:
3535
KBN_ES_SNAPSHOT_USE_UNVERIFIED=true node scripts/functional_tests_server
3636
-----------
3737

38-
===== For Pull Requests
38+
==== For Pull Requests
3939

4040
Currently, there is not a way to run your pull request with the latest unverified snapshot without a code change. You can, however, do it with a small code change.
4141

@@ -45,9 +45,9 @@ Currently, there is not a way to run your pull request with the latest unverifie
4545

4646
Your pull request should then use the latest snapshot the next time that it runs. Just don't merge the change to `Jenkinsfile`!
4747

48-
==== Google Cloud Storage buckets
48+
=== Google Cloud Storage buckets
4949

50-
===== kibana-ci-es-snapshots-daily
50+
==== kibana-ci-es-snapshots-daily
5151

5252
This bucket stores snapshots that are created on a daily basis, and is the primary location used by `kbn-es` to download snapshots.
5353

@@ -61,7 +61,7 @@ The file structure for this bucket looks like this:
6161
* `<version>/archives/<unique id>/*.tar.gz.sha512`
6262
* `<version>/archives/<unique id>/manifest.json`
6363

64-
===== kibana-ci-es-snapshots-permanent
64+
==== kibana-ci-es-snapshots-permanent
6565

6666
This bucket stores only the most recently promoted snapshot for each version. Old snapshots are only deleted when new ones are uploaded.
6767

@@ -73,18 +73,18 @@ The file structure for this bucket looks like this:
7373
* `<version>/*.tar.gz.sha512`
7474
* `<version>/manifest.json`
7575

76-
==== How snapshots are built, tested, and promoted
76+
=== How snapshots are built, tested, and promoted
7777

78-
Each day, a https://kibana-ci.elastic.co/job/elasticsearch+snapshots+trigger/[Jenkins job] runs that triggers Elasticsearch builds for each currently tracked branch/version. This job is automatically updated with the correct branches whenever we release new versions of {kib}.
78+
Each day, a https://kibana-ci.elastic.co/job/elasticsearch+snapshots+trigger/[Jenkins job] runs that triggers {es} builds for each currently tracked branch/version. This job is automatically updated with the correct branches whenever we release new versions of {kib}.
7979

80-
===== Build
80+
==== Build
8181

82-
https://kibana-ci.elastic.co/job/elasticsearch+snapshots+build/[This Jenkins job] builds the Elasticsearch snapshots and uploads them to GCS.
82+
https://kibana-ci.elastic.co/job/elasticsearch+snapshots+build/[This Jenkins job] builds the {es} snapshots and uploads them to GCS.
8383

8484
The Jenkins job pipeline definition is https://github.com/elastic/kibana/blob/master/.ci/es-snapshots/Jenkinsfile_build_es[in the {kib} repo].
8585

86-
1. Checkout Elasticsearch repo for the given branch/version.
87-
2. Run `./gradlew -p distribution/archives assemble --parallel` to create all of the Elasticsearch distributions.
86+
1. Checkout {es} repo for the given branch/version.
87+
2. Run `./gradlew -p distribution/archives assemble --parallel` to create all of the {es} distributions.
8888
3. Create a tarball for each distribution.
8989
4. Create a manifest JSON file containing info about the distribution, as well as its download URL.
9090
5. Upload the tarballs and manifest to a unique location in the GCS bucket `kibana-ci-es-snapshots-daily`.
@@ -93,9 +93,9 @@ The Jenkins job pipeline definition is https://github.com/elastic/kibana/blob/ma
9393
** This allows the `KBN_ES_SNAPSHOT_USE_UNVERIFIED` flag to work.
9494
7. Trigger the verification job, to run the full {kib} CI test suite with this snapshot.
9595

96-
===== Verification and Promotion
96+
==== Verification and Promotion
9797

98-
https://kibana-ci.elastic.co/job/elasticsearch+snapshots+verify/[This Jenkins job] tests the latest Elasticsearch snapshot with the full {kib} CI pipeline, and promotes if it there are no test failures.
98+
https://kibana-ci.elastic.co/job/elasticsearch+snapshots+verify/[This Jenkins job] tests the latest {es} snapshot with the full {kib} CI pipeline, and promotes if it there are no test failures.
9999

100100
The Jenkins job pipeline definition is https://github.com/elastic/kibana/blob/master/.ci/es-snapshots/Jenkinsfile_verify_es[in the {kib} repo].
101101

docs/developer/advanced/index.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* <<development-es-snapshots>>
66
* <<development-basepath>>
77

8-
include::development-es-snapshots.asciidoc[]
8+
include::development-es-snapshots.asciidoc[leveloffset=+1]
99

10-
include::running-elasticsearch.asciidoc[]
10+
include::running-elasticsearch.asciidoc[leveloffset=+1]
1111

12-
include::development-basepath.asciidoc[]
12+
include::development-basepath.asciidoc[leveloffset=+1]

0 commit comments

Comments
 (0)