Merge branch 'master' into Add_ILM_Functional_Tests

.bazeliskversion

@@ -1 +1 @@
-1.7.3
+1.7.5

.ci/Jenkinsfile_baseline_capture

@@ -3,40 +3,48 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
-kibanaPipeline(timeoutMinutes: 120) {
+kibanaPipeline(timeoutMinutes: 210) {
  githubCommitStatus.trackBuild(params.commit, 'kibana-ci-baseline') {
  ciStats.trackBuild {
- catchError {
- withEnv([
- 'CI_PARALLEL_PROCESS_NUMBER=1'
- ]) {
- parallel([
- 'oss-baseline': {
- workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false, bootstrapped: false) {
- // bootstrap ourselves, but with the env needed to upload the ts refs cache
- withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
- withEnv([
- 'BUILD_TS_REFS_CACHE_ENABLE=true',
- 'BUILD_TS_REFS_CACHE_CAPTURE=true'
- ]) {
- kibanaPipeline.doSetup()
- }
- }
+ catchErrors {
+ slackNotifications.onFailure(
+ title: "*<${env.BUILD_URL}|[${params.branch}] Baseline Capture Failure>*",
+ message: "[${params.branch}/${params.commit}] Baseline Capture Failure",
+ ) {
+ retryable.enable(2)
 
- kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
+ catchErrors {
+ workers.ci(
+ name: 'baseline-worker',
+ size: 'xl',
+ ramDisk: true,
+ runErrorReporter: false,
+ bootstrapped: false
+ ) {
+ withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
+ withEnv([
+ 'BUILD_TS_REFS_CACHE_ENABLE=true',
+ 'BUILD_TS_REFS_CACHE_CAPTURE=true',
+ 'DISABLE_BOOTSTRAP_VALIDATIONS=true',
+ ]) {
+ kibanaPipeline.doSetup()
+ }
  }
- },
- 'xpack-baseline': {
- workers.ci(name: 'xpack-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
- kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()
+
+ kibanaPipeline.withCiTaskQueue([parallel: 2]) {
+ catchErrors {
+ tasks([
+ kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh'),
+ kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh'),
+ ])
+ }
  }
- },
- ])
+ }
+ }
  }
  }
-
- kibanaPipeline.sendMail()
- slackNotifications.onFailure()
  }
+
+ kibanaPipeline.sendMail()
  }
 }

.eslintrc.js

@@ -1316,7 +1316,7 @@ module.exports = {
 
  {
  files: [
- // platform-team owned code
+ // core-team owned code
  'src/core/**',
  'x-pack/plugins/features/**',
  'x-pack/plugins/licensing/**',
@@ -1325,6 +1325,14 @@ module.exports = {
  'packages/kbn-config-schema',
  'src/plugins/status_page/**',
  'src/plugins/saved_objects_management/**',
+ 'packages/kbn-analytics/**',
+ 'packages/kbn-telemetry-tools/**',
+ 'src/plugins/kibana_usage_collection/**',
+ 'src/plugins/usage_collection/**',
+ 'src/plugins/telemetry/**',
+ 'src/plugins/telemetry_collection_manager/**',
+ 'src/plugins/telemetry_management_section/**',
+ 'x-pack/plugins/telemetry_collection_xpack/**',
  ],
  rules: {
  '@typescript-eslint/prefer-ts-expect-error': 'error',

.github/CODEOWNERS

@@ -240,6 +240,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/ @elastic/kibana-core @elastic/
 # Security
 /src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
 /src/plugins/security_oss/ @elastic/kibana-security
+/src/plugins/spaces_oss/ @elastic/kibana-security
 /test/security_functional/ @elastic/kibana-security
 /x-pack/plugins/spaces/ @elastic/kibana-security
 /x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security

.gitignore

@@ -1,6 +1,5 @@
 .aws-config.json
 .signing-config.json
-/api_docs
 .ackrc
 /.es
 /.chromium

.telemetryrc.json

@@ -2,15 +2,6 @@
  {
  "output": "src/plugins/telemetry/schema/oss_plugins.json",
  "root": "src/plugins/",
- "exclude": [
- "src/plugins/kibana_react/",
- "src/plugins/testbed/",
- "src/plugins/kibana_utils/"
- ]
- },
- {
- "output": "src/plugins/telemetry/schema/legacy_plugins.json",
- "root": "src/legacy/server/",
  "exclude": []
  }
 ]