Merge branch 'master' into reporting/add-link-to-kibana-app

.bazelrc

@@ -3,12 +3,12 @@
 import %workspace%/.bazelrc.common
 
 # Remote cache settings for local env
-build --remote_cache=grpcs://cloud.buildbuddy.io
-build --incompatible_remote_results_ignore_disk=true
-build --noremote_upload_local_results
-build --remote_timeout=30
-build --remote_header=x-buildbuddy-api-key=3EYk49W2NefOx2n3yMze
-build --remote_accept_cached=true
+# build --remote_cache=grpcs://cloud.buildbuddy.io
+# build --incompatible_remote_results_ignore_disk=true
+# build --noremote_upload_local_results
+# build --remote_timeout=30
+# build --remote_header=x-buildbuddy-api-key=3EYk49W2NefOx2n3yMze
+# build --remote_accept_cached=true
 
 # Enable this in case you want to share your build info
 # build --build_metadata=VISIBILITY=PUBLIC

.buildkite/pipelines/flaky_tests/pipeline.js

@@ -27,6 +27,8 @@ for (let i = 1; i <= XPACK_CI_GROUPS; i++) {
   inputs.push(stepInput(`xpack/cigroup/${i}`, `Default CI Group ${i}`));
 }
 
+inputs.push(stepInput(`xpack/cigroup/Docker`, 'Default CI Group Docker'));
+
 const pipeline = {
   steps: [
     {

.buildkite/scripts/pipelines/pull_request/pipeline.js

@@ -66,12 +66,12 @@ const uploadPipeline = (pipelineContent) => {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/security_solution.yml'));
     }
 
-    // if (
-    //   (await doAnyChangesMatch([/^x-pack\/plugins\/apm/])) ||
-    //   process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
-    // ) {
-    //   pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
-    // }
+    if (
+      (await doAnyChangesMatch([/^x-pack\/plugins\/apm/])) ||
+      process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
+    ) {
+      pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
+    }
 
     if (await doAnyChangesMatch([/^x-pack\/plugins\/uptime/])) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/uptime.yml'));

.buildkite/scripts/steps/functional/apm_cypress.sh

@@ -2,7 +2,10 @@
 
 set -euo pipefail
 
-source .buildkite/scripts/steps/functional/common.sh
+source .buildkite/scripts/common/util.sh
+
+.buildkite/scripts/bootstrap.sh
+.buildkite/scripts/download_build_artifacts.sh
 
 export JOB=kibana-apm-cypress
 
@@ -11,4 +14,5 @@ echo "--- APM Cypress Tests"
 cd "$XPACK_DIR"
 
 checks-reporter-with-killswitch "APM Cypress Tests" \
-  node plugins/apm/scripts/test/e2e.js
+  node plugins/apm/scripts/test/e2e.js \
+  --kibana-install-dir "$KIBANA_BUILD_LOCATION"

.github/CODEOWNERS

@@ -95,15 +95,15 @@
 # Observability Shared
 /x-pack/plugins/observability/ @elastic/observability-ui
 
-# Logs and Metrics (Infra)
-/x-pack/plugins/infra/ @elastic/logs-metrics-ui
-/x-pack/plugins/infra/server/routes/log* @elastic/logs-metrics-ui @elastic/logs-ui
-/x-pack/plugins/infra/public/pages/logs/ @elastic/logs-metrics-ui @elastic/logs-ui
-/x-pack/plugins/infra/server/routes/metrics* @elastic/logs-metrics-ui @elastic/metrics-ui
-/x-pack/plugins/infra/public/pages/metrics/ @elastic/logs-metrics-ui @elastic/metrics-ui
+# Infra Monitoring
+/x-pack/plugins/infra/ @elastic/infra-monitoring-ui
+/x-pack/test/functional/apps/infra @elastic/infra-monitoring-ui
+/x-pack/test/api_integration/apis/infra @elastic/infra-monitoring-ui
 
-# Stack Monitoring
-/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui @elastic/logs-metrics-ui @elastic/metrics-ui
+# Elastic Stack Monitoring
+/x-pack/plugins/monitoring/ @elastic/infra-monitoring-ui
+/x-pack/test/functional/apps/monitoring @elastic/infra-monitoring-ui
+/x-pack/test/api_integration/apis/monitoring @elastic/infra-monitoring-ui
 
 # Fleet
 /x-pack/plugins/fleet/ @elastic/fleet
@@ -289,6 +289,7 @@
 /src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
 /src/plugins/interactive_setup/ @elastic/kibana-security
 /test/interactive_setup_api_integration/ @elastic/kibana-security
+/test/interactive_setup_functional/ @elastic/kibana-security
 /x-pack/plugins/spaces/ @elastic/kibana-security
 /x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
 /x-pack/plugins/security/ @elastic/kibana-security

.github/workflows/add-to-apm-project.yml

@@ -0,0 +1,28 @@
+name: Add to APM Project
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add_to_project:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/[email protected]
+        id: add_to_project
+        if: |
+          github.event.label.name == 'Team:apm'
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAGc3Zs0VSg"
+          GITHUB_TOKEN: ${{ secrets.APM_TECH_KIBANA_USER_TOKEN }}

api_docs/cases.json

@@ -7610,10 +7610,10 @@
       },
       {
         "parentPluginId": "cases",
-        "id": "def-common.ConnectorResillientTypeFields",
+        "id": "def-common.ConnectorResilientTypeFields",
         "type": "Type",
         "tags": [],
-        "label": "ConnectorResillientTypeFields",
+        "label": "ConnectorResilientTypeFields",
         "description": [],
         "signature": [
           "{ type: ",