Merge branch 'elastic:main' into mappings-editor/handle-unsupported-t…

…ypes

.buildkite/ftr_oblt_stateful_configs.yml

@@ -30,7 +30,6 @@ enabled:
   - x-pack/test/api_integration/apis/metrics_ui/config.ts
   - x-pack/test/api_integration/apis/osquery/config.ts
   - x-pack/test/api_integration/apis/synthetics/config.ts
-  - x-pack/test/api_integration/apis/slos/config.ts
   - x-pack/test/api_integration/apis/uptime/config.ts
   - x-pack/test/api_integration/apis/entity_manager/config.ts
   - x-pack/test/apm_api_integration/basic/config.ts

.buildkite/ftr_platform_stateful_configs.yml

@@ -249,6 +249,7 @@ enabled:
   - x-pack/test/functional/apps/ml/permissions/config.ts
   - x-pack/test/functional/apps/ml/short_tests/config.ts
   - x-pack/test/functional/apps/ml/stack_management_jobs/config.ts
+  - x-pack/test/functional/apps/ml/memory_usage/config.ts
   - x-pack/test/functional/apps/monitoring/config.ts
   - x-pack/test/functional/apps/painless_lab/config.ts
   - x-pack/test/functional/apps/remote_clusters/config.ts
@@ -341,7 +342,7 @@ enabled:
   - x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
   - x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
   - x-pack/test/spaces_api_integration/spaces_only/config.ts
-  - x-pack/test/task_manager_claimer_mget/config.ts
+  - x-pack/test/task_manager_claimer_update_by_query/config.ts
   - x-pack/test/ui_capabilities/security_and_spaces/config.ts
   - x-pack/test/ui_capabilities/spaces_only/config.ts
   - x-pack/test/upgrade_assistant_integration/config.ts

.buildkite/ftr_security_serverless_configs.yml

@@ -1,17 +1,17 @@
 disabled:
   # Base config files, only necessary to inform config finding script
-  - x-pack/test_serverless/functional/test_suites/security/cypress/security_config.base.ts
-  - x-pack/test_serverless/functional/test_suites/security/cypress/cypress.config.ts
   - x-pack/test/security_solution_api_integration/config/serverless/config.base.ts
   - x-pack/test/security_solution_api_integration/config/serverless/config.base.essentials.ts
   - x-pack/test/security_solution_api_integration/config/serverless/config.base.edr_workflows.ts
+  - x-pack/test/defend_workflows_cypress/serverless_config.base.ts
+  - x-pack/test/osquery_cypress/serverless_config.base.ts
 
   # Cypress configs, for now these are still run manually
   - x-pack/test/defend_workflows_cypress/serverless_config.ts
   - x-pack/test/osquery_cypress/serverless_cli_config.ts
-  - x-pack/test_serverless/functional/test_suites/security/cypress/security_config.ts
   - x-pack/test/security_solution_cypress/serverless_config.ts
 
+
   # Playwright
   - x-pack/test/security_solution_playwright/serverless_config.ts
 

.buildkite/pipeline-resource-definitions/kibana-deploy-project.yml

@@ -28,9 +28,11 @@ spec:
       pipeline_file: .buildkite/pipelines/serverless_deployment/project-build-and-deploy-pr.yml
       skip_intermediate_builds: true
       provider_settings:
+        build_pull_requests: true
         prefix_pull_request_fork_branch_names: false
         skip_pull_request_builds_for_existing_commits: true
         trigger_mode: none
+      cancel_intermediate_builds: true
       teams:
         kibana-operations:
           access_level: MANAGE_BUILD_AND_READ

.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml

@@ -62,7 +62,7 @@ spec:
           message: Daily build
           branch: '8.15'
         Daily build (7.17):
-          cronline: 0 22 * * * America/New_York
+          cronline: 0 20 * * * America/New_York
           message: Daily build
           branch: '7.17'
       tags:

.buildkite/pipeline-utils/github/github.ts

@@ -93,6 +93,26 @@ export const doAnyChangesMatch = async (
   return anyFilesMatchRequired;
 };
 
+export function addComment(
+  comment: string,
+  owner = process.env.GITHUB_PR_BASE_OWNER,
+  repo = process.env.GITHUB_PR_BASE_REPO,
+  prNumber: undefined | string | number = process.env.GITHUB_PR_NUMBER
+) {
+  if (!owner || !repo || !prNumber) {
+    throw Error(
+      "Couldn't retrieve Github PR info from environment variables in order to add a comment"
+    );
+  }
+
+  return github.issues.createComment({
+    owner,
+    repo,
+    issue_number: typeof prNumber === 'number' ? prNumber : parseInt(prNumber, 10),
+    body: comment,
+  });
+}
+
 export function getGithubClient() {
   return github;
 }

.buildkite/pipelines/chrome_forward_testing.yml

@@ -300,7 +300,7 @@ steps:
           limit: 1
 
   - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
-    label: 'Serverless Osquery Cypress Tests'
+    label: 'Osquery Cypress Tests on Serverless'
     agents:
       machineType: n2-standard-4
       preemptible: true

.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml

@@ -218,7 +218,7 @@ steps:
               limit: 1
 
       - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
-        label: "Serverless Osquery Cypress Tests"
+        label: "Osquery Cypress Tests on Serverless"
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
           image: family/kibana-ubuntu-2004

.buildkite/pipelines/on_merge.yml

@@ -46,6 +46,36 @@ steps:
         - exit_status: '-1'
           limit: 3
 
+  - command: .buildkite/scripts/steps/lint.sh
+    label: 'Linting'
+    agents:
+      image: family/kibana-ubuntu-2004
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-16
+      preemptible: true
+    key: linting
+    timeout_in_minutes: 60
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
+  - command: .buildkite/scripts/steps/lint_with_types.sh
+    label: 'Linting (with types)'
+    agents:
+      image: family/kibana-ubuntu-2004
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-32
+      preemptible: true
+    key: linting_with_types
+    timeout_in_minutes: 90
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
   - wait
 
   - command: .buildkite/scripts/steps/on_merge_api_docs.sh
@@ -109,6 +139,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 3
     retry:
@@ -127,6 +159,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -145,6 +179,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -163,6 +199,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -181,6 +219,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -199,6 +239,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 4
     retry:
@@ -217,6 +259,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -235,6 +279,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -253,6 +299,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -271,6 +319,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -289,6 +339,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -307,6 +359,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -325,6 +379,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -343,6 +399,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -361,6 +419,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -379,6 +439,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -397,6 +459,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -405,7 +469,7 @@ steps:
           limit: 1
 
   - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
-    label: 'Serverless Osquery Cypress Tests'
+    label: 'Osquery Cypress Tests on Serverless'
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod
@@ -415,6 +479,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -435,6 +501,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 20
     retry:
@@ -455,6 +523,8 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 14
     retry:
@@ -468,42 +538,14 @@ steps:
     depends_on:
       - build
       - quick_checks
+      - linting
+      - linting_with_types
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-2
 
-  - command: .buildkite/scripts/steps/lint.sh
-    label: 'Linting'
-    agents:
-      image: family/kibana-ubuntu-2004
-      imageProject: elastic-images-prod
-      provider: gcp
-      machineType: n2-standard-8
-      preemptible: true
-    key: linting
-    timeout_in_minutes: 60
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
-  - command: .buildkite/scripts/steps/lint_with_types.sh
-    label: 'Linting (with types)'
-    agents:
-      image: family/kibana-ubuntu-2004
-      imageProject: elastic-images-prod
-      provider: gcp
-      machineType: n2-standard-16
-      preemptible: true
-    key: linting_with_types
-    timeout_in_minutes: 90
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
   - command: .buildkite/scripts/steps/checks.sh
     label: 'Checks'
     agents:

.buildkite/pipelines/pointer_compression.yml

@@ -339,7 +339,7 @@ steps:
           limit: 1
 
   - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
-    label: 'Serverless Osquery Cypress Tests'
+    label: 'Osquery Cypress Tests on Serverless'
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod