Merge branch 'master' into issue-101944-disable-proto-protection

.buildkite/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "kibana-buildkite",
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "kibana-buildkite-library": "elastic/kibana-buildkite-library"
+  }
+}

.buildkite/pipelines/pull_request.yml

@@ -0,0 +1,17 @@
+env:
+  GITHUB_COMMIT_STATUS_ENABLED: 'true'
+  GITHUB_COMMIT_STATUS_CONTEXT: 'buildkite/kibana-pull-request'
+steps:
+  - command: .buildkite/scripts/lifecycle/pre_build.sh
+    label: Pre-Build
+
+  - wait
+
+  - command: echo 'Hello World'
+    label: Test
+
+  - wait: ~
+    continue_on_failure: true
+
+  - command: .buildkite/scripts/lifecycle/post_build.sh
+    label: Post-Build

.buildkite/scripts/lifecycle/build_status.js

@@ -0,0 +1,17 @@
+const { BuildkiteClient } = require('kibana-buildkite-library');
+
+(async () => {
+  try {
+    const client = new BuildkiteClient();
+    const status = await client.getCurrentBuildStatus();
+    console.log(status.success ? 'true' : 'false');
+    process.exit(0);
+  } catch (ex) {
+    if (ex.response) {
+      console.error('HTTP Error Response Body', ex.response.data);
+      console.error('HTTP Error Response Status', ex.response.status);
+    }
+    console.error(ex);
+    process.exit(1);
+  }
+})();

.buildkite/scripts/lifecycle/ci_stats_complete.js

@@ -1,15 +1,8 @@
-const ciStats = require('./ci_stats');
-
-// TODO - this is okay for now but should really be replaced with an API call, especially once retries are enabled
-const BUILD_STATUS = process.env.BUILD_FAILED === 'true' ? 'FAILURE' : 'SUCCESS';
+const { CiStats } = require('kibana-buildkite-library');
 
 (async () => {
   try {
-    if (process.env.CI_STATS_BUILD_ID) {
-      await ciStats.post(`/v1/build/_complete?id=${process.env.CI_STATS_BUILD_ID}`, {
-        result: BUILD_STATUS,
-      });
-    }
+    await CiStats.onComplete();
   } catch (ex) {
     console.error(ex);
     process.exit(1);

.buildkite/scripts/lifecycle/ci_stats_start.js

@@ -1,28 +1,8 @@
-const { execSync } = require('child_process');
-const ciStats = require('./ci_stats');
+const { CiStats } = require('kibana-buildkite-library');
 
 (async () => {
   try {
-    const build = await ciStats.post('/v1/build', {
-      jenkinsJobName: process.env.BUILDKITE_PIPELINE_NAME,
-      jenkinsJobId: process.env.BUILDKITE_BUILD_ID,
-      jenkinsUrl: process.env.BUILDKITE_BUILD_URL,
-      prId: process.env.GITHUB_PR_NUMBER || null,
-    });
-
-    execSync(`buildkite-agent meta-data set ci_stats_build_id "${build.id}"`);
-
-    // TODO Will need to set MERGE_BASE for PRs
-
-    await ciStats.post(`/v1/git_info?buildId=${build.id}`, {
-      branch: process.env.BUILDKITE_BRANCH.replace(/^(refs\/heads\/|origin\/)/, ''),
-      commit: process.env.BUILDKITE_COMMIT,
-      targetBranch:
-        process.env.GITHUB_PR_TARGET_BRANCH ||
-        process.env.BUILDKITE_PULL_REQUEST_BASE_BRANCH ||
-        null,
-      mergeBase: process.env.GITHUB_PR_MERGE_BASE || null, // TODO confirm GITHUB_PR_MERGE_BASE or switch to final var
-    });
+    await CiStats.onStart();
   } catch (ex) {
     console.error(ex);
     process.exit(1);

.buildkite/scripts/lifecycle/commit_status_complete.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 if [[ "${GITHUB_COMMIT_STATUS_ENABLED:-}" == "true" ]]; then
   COMMIT_STATUS=success
-  if [[ "${BUILD_FAILED:-}"  == "true" ]]; then
+  if [[ "${BUILD_SUCCESSFUL:-}"  != "true" ]]; then
     COMMIT_STATUS=failure
   fi
 

.buildkite/scripts/lifecycle/post_build.sh

@@ -2,8 +2,8 @@
 
 set -euo pipefail
 
-BUILD_FAILED=$(buildkite-agent meta-data get build_failed --default "false")
-export BUILD_FAILED
+BUILD_SUCCESSFUL=$(node "$(dirname "${0}")/build_status.js")
+export BUILD_SUCCESSFUL
 
 "$(dirname "${0}")/commit_status_complete.sh"
 

.buildkite/scripts/lifecycle/pre_command.sh

@@ -2,6 +2,13 @@
 
 set -euo pipefail
 
+cd '.buildkite'
+yarn install
+cd -
+
+BUILDKITE_TOKEN="$(vault read -field=buildkite_token_all_jobs secret/kibana-issues/dev/buildkite-ci)"
+export BUILDKITE_TOKEN
+
 # Set up a custom ES Snapshot Manifest if one has been specified for this build
 {
   ES_SNAPSHOT_MANIFEST=${ES_SNAPSHOT_MANIFEST:-$(buildkite-agent meta-data get ES_SNAPSHOT_MANIFEST --default '')}

.eslintrc.js

@@ -1567,7 +1567,6 @@ module.exports = {
     {
       files: [
         'src/plugins/security_oss/**/*.{js,mjs,ts,tsx}',
-        'src/plugins/spaces_oss/**/*.{js,mjs,ts,tsx}',
         'src/plugins/interactive_setup/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/encrypted_saved_objects/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/security/**/*.{js,mjs,ts,tsx}',

.github/CODEOWNERS

@@ -34,6 +34,7 @@
 /src/plugins/vis_types/pie/ @elastic/kibana-app
 /src/plugins/visualize/ @elastic/kibana-app
 /src/plugins/visualizations/ @elastic/kibana-app
+/src/plugins/chart_expressions/expression_tagcloud/ @elastic/kibana-app
 /src/plugins/url_forwarding/ @elastic/kibana-app
 /packages/kbn-tinymath/ @elastic/kibana-app
 
@@ -144,7 +145,6 @@
 /x-pack/plugins/dashboard_enhanced/ @elastic/kibana-presentation
 /x-pack/test/functional/apps/canvas/  @elastic/kibana-presentation
 #CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
-#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation
 
 # Machine Learning
 /x-pack/plugins/ml/  @elastic/ml-ui
@@ -280,7 +280,6 @@
 # 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
 /src/plugins/interactive_setup/ @elastic/kibana-security
 /test/security_functional/ @elastic/kibana-security
 /x-pack/plugins/spaces/ @elastic/kibana-security
@@ -424,6 +423,17 @@
 #CC# /x-pack/plugins/logstash/ @elastic/logstash
 
 # Reporting
+/x-pack/examples/reporting_example/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/plugins/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/test/functional/apps/dashboard/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/test/functional/apps/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/test/functional/apps/reporting_management/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/test/functional/es_archives/lens/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/test/functional/es_archives/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/test/functional/fixtures/kbn_archiver/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/test/reporting_api_integration/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/test/reporting_functional/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/test/stack_functional_integration/apps/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 #CC# /x-pack/plugins/reporting/ @elastic/kibana-reporting-services