Skip to content

Commit 0ed0e2e

Browse files
thomasneirynckthomasneirynck
committed
Merge branch 'master' of github.com:elastic/kibana into maps/tracktileloadstatus
2 parents 3f08698 + ef09312 commit 0ed0e2e

File tree

2,791 files changed

+349190
-4168417
lines changed

Some content is hidden

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

2,791 files changed

+349190
-4168417
lines changed

‎.bazeliskversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.3
1+
1.7.5

‎.bazelrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,12 @@ build --workspace_status_command="node ./src/dev/bazel_workspace_status.js"
1616
# build --build_metadata=VISIBILITY=PUBLIC
1717
build --build_metadata=TEST_GROUPS=//packages
1818

19+
###############################
20+
# Offline Support #
21+
# Turn on these settings with #
22+
# --config=offline #
23+
###############################
24+
25+
## Reset remote cache and backend support
26+
build:offline --bes_backend="" --remote_cache=""
27+
run:offline --bes_backend="" --remote_cache=""

‎.bazelrc.common‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
# Local Cache Settings
99
## Avoid cache results from being corrupt when changing source during build
10-
common --experimental_guard_against_concurrent_changes
10+
build --experimental_guard_against_concurrent_changes
11+
run --experimental_guard_against_concurrent_changes
12+
test --experimental_guard_against_concurrent_changes
1113

1214
## Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
1315
build --disk_cache=~/.bazel-cache/disk-cache

‎.ci/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=14.15.4
4+
ARG NODE_VERSION=14.16.0
55

66
FROM node:${NODE_VERSION} AS base
77

‎.ci/Jenkinsfile_baseline_capture‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,48 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

6-
kibanaPipeline(timeoutMinutes: 120) {
6+
kibanaPipeline(timeoutMinutes: 210) {
77
githubCommitStatus.trackBuild(params.commit, 'kibana-ci-baseline') {
88
ciStats.trackBuild {
9-
catchError {
10-
withEnv([
11-
'CI_PARALLEL_PROCESS_NUMBER=1'
12-
]) {
13-
parallel([
14-
'oss-baseline': {
15-
workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false, bootstrapped: false) {
16-
// bootstrap ourselves, but with the env needed to upload the ts refs cache
17-
withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
18-
withEnv([
19-
'BUILD_TS_REFS_CACHE_ENABLE=true',
20-
'BUILD_TS_REFS_CACHE_CAPTURE=true'
21-
]) {
22-
kibanaPipeline.doSetup()
23-
}
24-
}
9+
catchErrors {
10+
slackNotifications.onFailure(
11+
title: "*<${env.BUILD_URL}|[${params.branch}] Baseline Capture Failure>*",
12+
message: "[${params.branch}/${params.commit}] Baseline Capture Failure",
13+
) {
14+
retryable.enable(2)
2515

26-
kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
16+
catchErrors {
17+
workers.ci(
18+
name: 'baseline-worker',
19+
size: 'xl',
20+
ramDisk: true,
21+
runErrorReporter: false,
22+
bootstrapped: false
23+
) {
24+
withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
25+
withEnv([
26+
'BUILD_TS_REFS_CACHE_ENABLE=true',
27+
'BUILD_TS_REFS_CACHE_CAPTURE=true',
28+
'DISABLE_BOOTSTRAP_VALIDATION=true',
29+
]) {
30+
kibanaPipeline.doSetup()
31+
}
2732
}
28-
},
29-
'xpack-baseline': {
30-
workers.ci(name: 'xpack-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
31-
kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()
33+
34+
kibanaPipeline.withCiTaskQueue([parallel: 2]) {
35+
catchErrors {
36+
tasks([
37+
kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh'),
38+
kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh'),
39+
])
40+
}
3241
}
33-
},
34-
])
42+
}
43+
}
3544
}
3645
}
37-
38-
kibanaPipeline.sendMail()
39-
slackNotifications.onFailure()
4046
}
47+
48+
kibanaPipeline.sendMail()
4149
}
4250
}

‎.eslintrc.js‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,22 @@ module.exports = {
789789
},
790790
},
791791

792+
/**
793+
* Fleet overrides
794+
*/
795+
{
796+
files: ['x-pack/plugins/fleet/**/*.{js,mjs,ts,tsx}'],
797+
rules: {
798+
'import/order': [
799+
'warn',
800+
{
801+
groups: ['builtin', 'external', 'internal', 'parent'],
802+
'newlines-between': 'always-and-inside-groups',
803+
},
804+
],
805+
},
806+
},
807+
792808
/**
793809
* Security Solution overrides
794810
*/
@@ -1316,7 +1332,7 @@ module.exports = {
13161332

13171333
{
13181334
files: [
1319-
// platform-team owned code
1335+
// core-team owned code
13201336
'src/core/**',
13211337
'x-pack/plugins/features/**',
13221338
'x-pack/plugins/licensing/**',
@@ -1325,6 +1341,14 @@ module.exports = {
13251341
'packages/kbn-config-schema',
13261342
'src/plugins/status_page/**',
13271343
'src/plugins/saved_objects_management/**',
1344+
'packages/kbn-analytics/**',
1345+
'packages/kbn-telemetry-tools/**',
1346+
'src/plugins/kibana_usage_collection/**',
1347+
'src/plugins/usage_collection/**',
1348+
'src/plugins/telemetry/**',
1349+
'src/plugins/telemetry_collection_manager/**',
1350+
'src/plugins/telemetry_management_section/**',
1351+
'x-pack/plugins/telemetry_collection_xpack/**',
13281352
],
13291353
rules: {
13301354
'@typescript-eslint/prefer-ts-expect-error': 'error',

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,12 @@
117117
/x-pack/plugins/ml/ @elastic/ml-ui
118118
/x-pack/test/functional/apps/ml/ @elastic/ml-ui
119119
/x-pack/test/functional/services/ml/ @elastic/ml-ui
120+
/x-pack/test/accessibility/apps/ml.ts @elastic/ml-ui
120121
# ML team owns and maintains the transform plugin despite it living in the Elasticsearch management section.
121122
/x-pack/plugins/transform/ @elastic/ml-ui
122123
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
123124
/x-pack/test/functional/services/transform/ @elastic/ml-ui
125+
/x-pack/test/accessibility/apps/transform.ts @elastic/ml-ui
124126
/x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
125127
/x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui
126128

@@ -240,6 +242,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/ @elastic/kibana-core @elastic/
240242
# Security
241243
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
242244
/src/plugins/security_oss/ @elastic/kibana-security
245+
/src/plugins/spaces_oss/ @elastic/kibana-security
243246
/test/security_functional/ @elastic/kibana-security
244247
/x-pack/plugins/spaces/ @elastic/kibana-security
245248
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security

‎.telemetryrc.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
{
33
"output": "src/plugins/telemetry/schema/oss_plugins.json",
44
"root": "src/plugins/",
5-
"exclude": [
6-
"src/plugins/kibana_react/",
7-
"src/plugins/testbed/",
8-
"src/plugins/kibana_utils/"
9-
]
10-
},
11-
{
12-
"output": "src/plugins/telemetry/schema/legacy_plugins.json",
13-
"root": "src/legacy/server/",
145
"exclude": []
156
}
167
]

‎.yarnrc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@ yarn-offline-mirror ".yarn-local-mirror"
33

44
# Always look into the cache first before fetching online
55
--install.prefer-offline true
6+
7+
# Disable interactive and progress logs as yarn install is now
8+
# managed by Bazel and we are piping the logs from the underlying
9+
# process running bazel into the parent one running kbn
10+
--install.non-interactive true
11+
--install.no-progress true

‎BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Expose those targets as they are required as part of
2+
# other packages builds and need to be included as inputs
13
exports_files(
24
[
35
"tsconfig.json",

0 commit comments

Comments
 (0)