Merge branch 'main' into security/genai/conversations/bulk-update-conflicts

Author: e40pud

.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/pipeline-resource-definitions/kibana-otel-semconv-sync.yml

@@ -0,0 +1,57 @@
+# 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:
+        SLACK_NOTIFICATIONS_CHANNEL: '#obs-ux-logs'
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+      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/locations.yml

@@ -32,6 +32,7 @@ spec:
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-migration-staging.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml
+    - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-otel-semconv-sync.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-package-registry.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-performance-daily.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-performance-data-set-extraction-daily.yml

.buildkite/pipelines/otel_semconv_sync.yml

@@ -0,0 +1,13 @@
+steps:
+  - command: .buildkite/scripts/steps/otel_semconv_sync.sh
+    label: OpenTelemetry Semantic Conventions Sync
+    timeout_in_minutes: 15
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-2
+      preemptible: true
+    env:
+      # Docker is available on these agents
+      DOCKER_REQUIRED: 'true'

.buildkite/pipelines/pull_request/build_project.yml

@@ -4,6 +4,7 @@ steps:
     agents:
       machineType: n2-standard-16
       preemptible: true
+      diskSizeGb: 150
     timeout_in_minutes: 60
     soft_fail: true
     retry:

.buildkite/pipelines/pull_request/deploy_project.yml

@@ -5,6 +5,7 @@ steps:
     agents:
       machineType: n2-standard-16
       preemptible: true
+      diskSizeGb: 150
     timeout_in_minutes: 60
     retry:
       automatic:

.buildkite/pipelines/serverless_deployment/build_pr_and_deploy_project.yml

@@ -62,6 +62,7 @@ steps:
           imageProject: elastic-images-prod
           machineType: n2-standard-16
           preemptible: true
+          diskSizeGb: 150
         timeout_in_minutes: 60
         retry:
           automatic:

.buildkite/scripts/common/setup_job_env.sh

@@ -193,6 +193,14 @@ EOF
   vault_get kibana-ci-sa-proxy-key key | base64 -d > "$KIBANA_SERVICE_ACCOUNT_PROXY_KEY"
 }
 
+# Acquire credentials for legacy vault if needed
+{
+  VAULT_ROLE_ID="$(vault_get kibana-buildkite-vault-credentials role-id)"
+  export VAULT_ROLE_ID
+  VAULT_SECRET_ID="$(vault_get kibana-buildkite-vault-credentials secret-id)"
+  export VAULT_SECRET_ID
+}
+
 # Inject moon remote-cache credentials on CI
 if [[ "${CI:-}" =~ ^(1|true)$ ]]; then
   MOON_REMOTE_CACHE_TOKEN=$(vault_get moon-remote-cache token)

.buildkite/scripts/common/vault_fns.sh

@@ -67,33 +67,11 @@ vault_kv_set() {
   vault kv put "$VAULT_KV_PREFIX/$kv_path" "${fields[@]}"
 }
 
-function get_vault_role_id() {
-  if [[ "$IS_LEGACY_VAULT_ADDR" == "true" ]]; then
-    VAULT_ROLE_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-role-id)"
-  else
-    VAULT_ROLE_ID="$(vault_get kibana-buildkite-vault-credentials role-id)"
-  fi
-
-  echo "$VAULT_ROLE_ID"
-}
-
-function get_vault_secret_id() {
-    if [[ "$IS_LEGACY_VAULT_ADDR" == "true" ]]; then
-      VAULT_SECRET_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-secret-id)"
-    else
-      VAULT_SECRET_ID="$(vault_get kibana-buildkite-vault-credentials secret-id)"
-    fi
-
-    echo "$VAULT_SECRET_ID"
-}
-
 function set_in_legacy_vault() {
   key_path=$1
   shift
   fields=("$@")
 
-  VAULT_ROLE_ID="$(get_vault_role_id)"
-  VAULT_SECRET_ID="$(get_vault_secret_id)"
   VAULT_TOKEN_BAK="$VAULT_TOKEN"
 
   # Make sure to either keep this variable name `VAULT_TOKEN` or unset `VAULT_TOKEN`,
@@ -115,8 +93,6 @@ function set_in_legacy_vault() {
 function unset_in_legacy_vault() {
   key_path=$1
 
-  VAULT_ROLE_ID="$(get_vault_role_id)"
-  VAULT_SECRET_ID="$(get_vault_secret_id)"
   VAULT_TOKEN_BAK="$VAULT_TOKEN"
 
   # Make sure to either keep this variable name `VAULT_TOKEN` or unset `VAULT_TOKEN`,