Merge branch 'setup-cloud-connector-save-objects-infra' of github.com:Omolola-Akinleye/kibana into reusable-cloud-connector

Author: Omolola-Akinleye

.buildkite/ftr_base_serverless_configs.yml

@@ -5,9 +5,6 @@ disabled:
   - x-pack/platform/test/api_integration_deployment_agnostic/default_configs/serverless.config.base.ts
   - x-pack/platform/test/api_integration_deployment_agnostic/default_configs/feature_flag.serverless.config.base.ts
   # Serverless base config files
-  - x-pack/test_serverless/api_integration/config.base.ts
-  - x-pack/test_serverless/functional/config.base.ts
-  - x-pack/test_serverless/shared/config.base.ts
   - x-pack/platform/test/serverless/shared/config.base.ts
   - x-pack/platform/test/serverless/api_integration/config.base.ts
   - x-pack/platform/test/serverless/functional/config.base.ts

.buildkite/ftr_platform_stateful_configs.yml

@@ -334,6 +334,7 @@ enabled:
   - x-pack/platform/test/ui_capabilities/security_and_spaces/config.ts
   - x-pack/platform/test/ui_capabilities/spaces_only/config.ts
   - x-pack/platform/test/upgrade_assistant_integration/config.ts
+  - x-pack/platform/test/reindex_service/config.ts
   - x-pack/platform/test/usage_collection/config.ts
   - x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts
   - x-pack/performance/journeys_e2e/ecommerce_dashboard.ts

.buildkite/ftr_search_serverless_configs.yml

@@ -11,6 +11,7 @@ enabled:
   - x-pack/platform/test/serverless/functional/configs/search/config.examples.ts
   - x-pack/solutions/search/test/serverless/functional/configs/config.feature_flags.ts
   - x-pack/solutions/search/test/serverless/functional/configs/config.screenshots.ts
+  - x-pack/solutions/search/test/serverless/functional/configs/config.nav_v2.ts
   - x-pack/platform/test/serverless/functional/configs/search/config.saved_objects_management.ts
   - x-pack/platform/test/serverless/functional/configs/search/config.context_awareness.ts
   - x-pack/platform/test/serverless/functional/configs/search/config.config_compat_mode.ts

.buildkite/ftr_search_stateful_configs.yml

@@ -7,6 +7,8 @@ enabled:
   - x-pack/solutions/search/test/functional_search/config.ts
   - x-pack/solutions/search/test/functional_search/config/config.search_playground.ts
   - x-pack/solutions/search/test/functional_search/config/config.feature_flags.ts
+  - x-pack/solutions/search/test/functional_search/config/config.nav_v2.ts
   - x-pack/solutions/search/test/api_integration/apis/search_playground/config.ts
   - x-pack/solutions/search/test/functional_solution_sidenav/config.ts
+  - x-pack/solutions/search/test/functional_solution_sidenav/config.nav_v2.ts
   - x-pack/solutions/search/test/accessibility/config.ts

.buildkite/ftr_security_serverless_configs.yml

@@ -108,6 +108,8 @@ enabled:
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/basic_license_essentials_tier/configs/serverless.config.ts
+  - x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/conversations/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/conversations/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/serverless.config.ts

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

@@ -22,7 +22,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.1 9.0 8.19 8.18 8.17 7.17
+      branch_configuration: main 9.1 9.0 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -64,10 +64,6 @@ spec:
           cronline: 0 22 * * * America/New_York
           message: Daily build
           branch: '8.18'
-        Daily build (8.17):
-          cronline: 0 22 * * * America/New_York
-          message: Daily build
-          branch: '8.17'
         Daily build (7.17):
           cronline: 0 20 * * * America/New_York
           message: Daily build
@@ -99,7 +95,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.1 9.0 8.19 8.18 8.17 7.17
+      branch_configuration: main 9.1 9.0 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -148,7 +144,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         REPORT_FAILED_TESTS_TO_GITHUB: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.1 9.0 8.19 8.18 8.17 7.17
+      branch_configuration: main 9.1 9.0 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml

.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml

@@ -23,7 +23,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         SCOUT_REPORTER_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.1 9.0 8.19 8.18 8.17 7.17
+      branch_configuration: main 9.1 9.0 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml

.buildkite/pipeline-resource-definitions/kibana-on-merge.yml

@@ -26,7 +26,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         SCOUT_REPORTER_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.1 9.0 8.19 8.18 8.17 7.17
+      branch_configuration: main 9.1 9.0 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/on_merge.yml

.buildkite/pipeline-resource-definitions/kibana-otel-semconv-sync.yml

@@ -0,0 +1,58 @@
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: bk-kibana-otel-semconv-sync
+  description: Updates OpenTelemetry semantic conventions and regenerates field metadata
+  links:
+    - url: 'https://buildkite.com/elastic/kibana-otel-semconv-sync'
+      title: Pipeline link
+spec:
+  type: buildkite-pipeline
+  owner: 'group:obs-ux-logs-team'
+  system: buildkite
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: kibana / OpenTelemetry semantic conventions sync
+      description: Updates OTel semantic conventions and regenerates TypeScript field definitions
+    spec:
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#obs-ux-logs'
+      allow_rebuilds: false
+      branch_configuration: main
+      default_branch: main
+      repository: elastic/kibana
+      pipeline_file: .buildkite/pipelines/otel_semconv_sync.yml
+      provider_settings:
+        build_branches: false
+        build_pull_requests: false
+        publish_commit_status: false
+        trigger_mode: none
+        build_tags: false
+        prefix_pull_request_fork_branch_names: false
+        skip_pull_request_builds_for_existing_commits: true
+      teams:
+        obs-ux-logs-team:
+          access_level: MANAGE_BUILD_AND_READ
+        kibana-operations:
+          access_level: MANAGE_BUILD_AND_READ
+        appex-qa:
+          access_level: MANAGE_BUILD_AND_READ
+        kibana-tech-leads:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: BUILD_AND_READ
+      schedules:
+        Weekly build:
+          cronline: 0 2 * * 1 America/New_York  # Monday 2 AM EST (matches GitHub Actions)
+          message: Weekly OpenTelemetry semantic conventions sync
+          branch: main
+      tags:
+        - kibana
+        - observability
+        - opentelemetry
+        - obs-ux-logs

.buildkite/pipeline-resource-definitions/kibana-vm-images.yml

@@ -27,66 +27,36 @@ spec:
       provider_settings:
         trigger_mode: none
       schedules:
-        "[ubuntu20.04] Daily Base Image Build":
-          branch: main
-          cronline: '0 0 * * *'
-          env:
-            IMAGES_CONFIG: kibana/base_image.yml
-          message: [20.04] Daily build of Kibana base VM image
-
-        "[ubuntu20.04] Daily Cache Layer Build":
-          branch: main
-          cronline: '0 1 * * *'
-          env:
-            IMAGES_CONFIG: kibana/image_cache.yml
-            BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml'
-          message: [20.04] Daily build of Kibana cache-warmed VM image
-
-        "[ubuntu20.04] Daily FIPS Image Build":
-          branch: main
-          cronline: '0 4 * * *'
-          env:
-            BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml,kibana/image_cache.yml'
-            IMAGES_CONFIG: kibana/fips.yml
-          message: [20.04] Daily build of Kibana FIPS VM image
-
         "[ubuntu24.04] Weekly Base Image Build":
-          branch: kibana-upgrade-ubuntu
+          branch: main
           cronline: '0 0 * * 0'
           env:
             IMAGES_CONFIG: kibana/base_image.yml
-            FORCE_PROMOTE: "true"
-          message: [24.04] Weekly build of Kibana base VM image
+          message: '[24.04] Weekly build of Kibana base VM image'
 
         "[ubuntu24.04] Weekly Packages Layer Build":
-          branch: kibana-upgrade-ubuntu
+          branch: main
           cronline: '0 1 * * 0'
           env:
             IMAGES_CONFIG: kibana/packages_layer.yml
             BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml'
-            KIBANA_BRANCH: 'adopt-moon-clean'
-            FORCE_PROMOTE: "true"
-          message: [24.04] Weekly build of Kibana packages layer VM image
+          message: '[24.04] Weekly build of Kibana packages layer VM image'
 
         "[ubuntu24.04] Daily Cache Layer Build":
-          branch: kibana-upgrade-ubuntu
+          branch: main
           cronline: '0 2 * * *'
           env:
             IMAGES_CONFIG: kibana/image_cache.tpl.yml
             BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml,kibana/packages_layer.yml'
-            KIBANA_BRANCH: 'adopt-moon-clean'
-            FORCE_PROMOTE: "true"
-          message: [24.04] Daily build of Kibana cache-warmed VM image
+          message: '[24.04] Daily build of Kibana cache-warmed VM image'
 
         "[ubuntu24.04] Daily FIPS Image Build":
-          branch: kibana-upgrade-ubuntu
+          branch: main
           cronline: '0 4 * * *'
           env:
             BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml,kibana/packages_layer.yml,kibana/image_cache.tpl.yml'
             IMAGES_CONFIG: kibana/fips.yml
-            KIBANA_BRANCH: 'adopt-moon-clean'
-            FORCE_PROMOTE: "true"
-          message: [24.04] Daily build of Kibana FIPS VM image
+          message: '[24.04] Daily build of Kibana FIPS VM image'
       teams:
         kibana-operations:
           access_level: MANAGE_BUILD_AND_READ