Merge remote-tracking branch 'upstream/main' into simple-filters-schema

Author: nickpeihl

.buildkite/ftr_workplace_ai_serverless_configs.yml

@@ -3,13 +3,13 @@ disabled:
   - x-pack/platform/test/serverless/functional/config.workplace_ai.base.ts
 
   # Empty configs
-  - x-pack/solutions/workplace_ai/test/serverless/functional/configs/config.feature_flags.ts
-  - x-pack/solutions/workplace_ai/test/serverless/api_integration/configs/config.feature_flags.ts
+  - x-pack/solutions/workplaceai/test/serverless/functional/configs/config.feature_flags.ts
+  - x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.feature_flags.ts
 
 defaultQueue: 'n2-4-spot'
 enabled:
-  - x-pack/solutions/workplace_ai/test/serverless/api_integration/configs/config.ts
-  - x-pack/platform/test/serverless/api_integration/configs/workplace_ai/config.group1.ts
-  - x-pack/solutions/workplace_ai/test/serverless/functional/configs/config.ts
-  - x-pack/platform/test/serverless/functional/configs/workplace_ai/config.config_compat_mode.ts
-  - x-pack/platform/test/serverless/functional/configs/workplace_ai/config.group1.ts
+  - x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.ts
+  - x-pack/platform/test/serverless/api_integration/configs/workplaceai/config.group1.ts
+  - x-pack/solutions/workplaceai/test/serverless/functional/configs/config.ts
+  - x-pack/platform/test/serverless/functional/configs/workplaceai/config.config_compat_mode.ts
+  - x-pack/platform/test/serverless/functional/configs/workplaceai/config.group1.ts

.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts

@@ -254,7 +254,7 @@ export async function pickTestGroupRunOrder() {
         .filter(Boolean)
     : undefined;
   if (LIMIT_SOLUTIONS) {
-    const validSolutions = ['observability', 'search', 'security', 'workplace_ai'];
+    const validSolutions = ['observability', 'search', 'security', 'workplaceai'];
     const invalidSolutions = LIMIT_SOLUTIONS.filter((s) => !validSolutions.includes(s));
     if (invalidSolutions.length) throw new Error('Unsupported LIMIT_SOLUTIONS value');
   }

.buildkite/scripts/steps/artifacts/docker_image.sh

@@ -17,7 +17,7 @@ fi
 KIBANA_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless"
 export KIBANA_IMAGE="$KIBANA_BASE_IMAGE:$KIBANA_IMAGE_TAG"
 
-KIBANA_WORKPLACE_AI_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless-workplace_ai"
+KIBANA_WORKPLACE_AI_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless-workplaceai"
 export KIBANA_WORKPLACE_AI_IMAGE="$KIBANA_WORKPLACE_AI_BASE_IMAGE:$KIBANA_IMAGE_TAG"
 
 KIBANA_OBSERVABILITY_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless-observability"
@@ -77,7 +77,7 @@ if [[ "$SKIP_BUILD" == "false" ]]; then
 
   echo "--- Tag images"
   retag_image_with_architecture "$KIBANA_IMAGE" "kibana-serverless-$BASE_VERSION-docker-image"
-  retag_image_with_architecture "$KIBANA_WORKPLACE_AI_IMAGE" "kibana-serverless-workplace_ai-$BASE_VERSION-docker-image"
+  retag_image_with_architecture "$KIBANA_WORKPLACE_AI_IMAGE" "kibana-serverless-workplaceai-$BASE_VERSION-docker-image"
   retag_image_with_architecture "$KIBANA_OBSERVABILITY_IMAGE" "kibana-serverless-observability-$BASE_VERSION-docker-image"
   retag_image_with_architecture "$KIBANA_SEARCH_IMAGE" "kibana-serverless-search-$BASE_VERSION-docker-image"
   retag_image_with_architecture "$KIBANA_SECURITY_IMAGE" "kibana-serverless-security-$BASE_VERSION-docker-image"

.buildkite/scripts/steps/checks/telemetry.sh

@@ -9,6 +9,9 @@ echo --- Check Telemetry Schema
 if is_pr && ! is_auto_commit_disabled; then
   node scripts/telemetry_check --baseline "${GITHUB_PR_MERGE_BASE:-}" --fix
   check_for_changed_files "node scripts/telemetry_check" true
-else
+elif is_pr; then
   node scripts/telemetry_check --baseline "${GITHUB_PR_MERGE_BASE:-}"
+else
+  # assume on-merge pipeline
+  node scripts/telemetry_check --baseline "${BUILDKITE_BRANCH:-main}"
 fi

.buildkite/scripts/steps/cloud/purge_projects.ts

@@ -14,7 +14,7 @@ import { getKibanaDir } from '#pipeline-utils';
 async function getPrProjects() {
   // BOOKMARK - List of Kibana project types
   const match =
-    /^(keep.?)?kibana-pr-([0-9]+)-(elasticsearch|security|observability|workplace_ai)(?:-(ai_soc|logs_essentials))?$/;
+    /^(keep.?)?kibana-pr-([0-9]+)-(elasticsearch|security|observability|workplaceai)(?:-(ai_soc|logs_essentials))?$/;
   try {
     // BOOKMARK - List of Kibana project types
     return (
@@ -52,12 +52,12 @@ async function deleteProject({
   name,
 }: {
   // BOOKMARK - List of Kibana project types
-  type: 'elasticsearch' | 'security' | 'observability' | 'workplace_ai';
+  type: 'elasticsearch' | 'security' | 'observability' | 'workplaceai';
   id: number;
   name: string;
 }) {
   try {
-    // TODO handle the new 'workplace_ai' project type, and ideally rename 'elasticsearch' to 'search'
+    // TODO handle the new 'workplaceai' project type, and ideally rename 'elasticsearch' to 'search'
     await projectRequest.delete(`/api/v1/serverless/projects/${type}/${id}`);
 
     execSync(`.buildkite/scripts/common/deployment_credentials.sh unset ${name}`, {
@@ -103,7 +103,7 @@ async function purgeProjects() {
     } else if (
       !Boolean(
         pullRequest.labels.filter((label: any) =>
-          /^ci:project-deploy-(elasticsearch|observability|log_essentials|security|workplace_ai|ai4soc)$/.test(
+          /^ci:project-deploy-(elasticsearch|observability|log_essentials|security|workplaceai|ai4soc)$/.test(
             label.name
           )
         ).length

.buildkite/scripts/steps/serverless/deploy.sh

@@ -27,7 +27,7 @@ deploy() {
     security)
       PROJECT_TYPE_LABEL='Security'
     ;;
-    workplace_ai)
+    workplaceai)
       PROJECT_TYPE_LABEL='Workplace AI'
     ;;
   esac
@@ -190,7 +190,7 @@ is_pr_with_label "ci:project-deploy-elasticsearch" && deploy "elasticsearch"
 is_pr_with_label "ci:project-deploy-security" && deploy "security"
 is_pr_with_label "ci:project-deploy-ai4soc" && deploy "security" "ai_soc"
 is_pr_with_label "ci:project-deploy-log_essentials" && deploy "observability" "logs_essentials"
-is_pr_with_label "ci:project-deploy-workplace_ai" && deploy "workplace_ai"
+is_pr_with_label "ci:project-deploy-workplace_ai" && deploy "workplaceai"
 if is_pr_with_label "ci:project-deploy-observability" ; then
   # Only deploy observability if the PR is targeting main
   if [[ "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" == "main" ]]; then

.eslintrc.js

@@ -1275,6 +1275,15 @@ module.exports = {
         ],
       },
     },
+    // Allow node.js imports only for the prebuilt rules package generation scripts
+    {
+      files: [
+        'x-pack/solutions/security/packages/test-api-clients/prebuilt_rules_package_generation/*.{js,mjs,ts,tsx}',
+      ],
+      rules: {
+        'import/no-nodejs-modules': 'off',
+      },
+    },
     {
       // typescript only for front and back end, but excludes the test files.
       // We use this section to add rules in which we do not want to apply to test files.

.github/CODEOWNERS

@@ -1192,9 +1192,9 @@ x-pack/solutions/security/plugins/security_solution_serverless @elastic/security
 x-pack/solutions/security/plugins/session_view @elastic/contextual-security-apps
 x-pack/solutions/security/test
 x-pack/solutions/security/test/plugin_functional/plugins/resolver_test @elastic/security-solution
-x-pack/solutions/workplace_ai/plugins/serverless_workplace_ai @elastic/search-kibana @elastic/workchat-eng
-x-pack/solutions/workplace_ai/plugins/workplace_ai_app @elastic/search-kibana @elastic/workchat-eng
-x-pack/solutions/workplace_ai/test @elastic/workchat-eng
+x-pack/solutions/workplaceai/plugins/serverless_workplace_ai @elastic/search-kibana @elastic/workchat-eng
+x-pack/solutions/workplaceai/plugins/workplace_ai_app @elastic/search-kibana @elastic/workchat-eng
+x-pack/solutions/workplaceai/test @elastic/workchat-eng
 ####
 ## Everything below this line overrides the default assignments for each package.
 ## Items lower in the file have higher precedence:
@@ -1214,6 +1214,8 @@ x-pack/platform/test/serverless/api_integration/test_suites/platform_security @e
 
 # Data Discovery
 /x-pack/platform/test/api_integration/services/data_view_api.ts @elastic/kibana-data-discovery
+/src/platform/test/functional/page_objects/unified_field_list.ts @elastic/kibana-data-discovery
+/src/platform/test/functional/page_objects/unified_tabs.ts @elastic/kibana-data-discovery
 /src/platform/test/functional/fixtures/es_archiver/makelogs @elastic/kibana-data-discovery
 /src/platform/test/functional/fixtures/es_archiver/large_fields @elastic/kibana-data-discovery # Assigned per only use: test/functional/apps/management/data_views/_test_huge_fields.ts
 /x-pack/platform/test/functional/fixtures/kbn_archives/kibana_scripted_fields_on_logstash.json @elastic/kibana-data-discovery # Assigned per only use: https://github.com/elastic/kibana/blob/main/x-pack/platform/test/functional/apps/discover/async_scripted_fields.ts#L35
@@ -1893,19 +1895,15 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
 /src/platform/test/functional/services/global_nav.ts @elastic/appex-qa
 /src/platform/test/functional/services/flyout.ts @elastic/appex-qa
 /src/platform/test/functional/services/filter_bar.ts @elastic/appex-qa
-/src/platform/test/functional/services/field_editor.ts @elastic/appex-qa
+/src/platform/test/functional/services/field_editor.ts @elastic/kibana-data-discovery
 /src/platform/test/functional/services/embedding.ts @elastic/appex-qa
-/src/platform/test/functional/services/doc_table.ts @elastic/appex-qa
-/src/platform/test/functional/services/data_grid.ts @elastic/appex-qa
+/src/platform/test/functional/services/data_grid.ts @elastic/kibana-data-discovery
 /src/platform/test/functional/services/combo_box.ts @elastic/appex-qa
-/src/platform/test/functional/page_objects/unified_field_list.ts @elastic/appex-qa
-/src/platform/test/functional/page_objects/unified_tabs.ts @elastic/appex-qa
 /src/platform/test/functional/page_objects/time_picker.ts @elastic/appex-qa
 /src/platform/test/functional/page_objects/index.ts @elastic/appex-qa
 /src/platform/test/functional/page_objects/header_page.ts @elastic/appex-qa
 /src/platform/test/functional/page_objects/error_page.ts @elastic/appex-qa
 /src/platform/test/functional/page_objects/common_page.ts @elastic/appex-qa
-/src/platform/test/functional/page_objects/space_settings.ts @elastic/appex-qa
 /src/platform/test/functional/jest.config.js @elastic/appex-qa
 /src/platform/test/functional/ftr_provider_context.ts @elastic/appex-qa
 /src/platform/test/functional/fixtures/es_archiver/README.md @elastic/appex-qa
@@ -1946,7 +1944,6 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
 /src/platform/packages/shared/kbn-test/src/functional_test_runner @elastic/appex-qa
 /packages/kbn-performance-testing-dataset-extractor @elastic/appex-qa
 /x-pack/platform/test/serverless/api_integration/test_suites/elasticsearch_api @elastic/appex-qa
-/x-pack/solutions/security/test/serverless/functional/test_suites/ftr/ @elastic/appex-qa
 /x-pack/platform/test/serverless/functional/test_suites/home_page/  @elastic/appex-qa
 /src/platform/packages/shared/kbn-es/src/stateful_resources/roles.yml @elastic/appex-qa
 /x-pack/solutions/observability/test/api_integration_deployment_agnostic/ftr_provider_context.d.ts @elastic/appex-qa
@@ -1961,28 +1958,23 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
 /x-pack/platform/test/api_integration_basic/config.basic_license.ts @elastic/appex-qa
 /x-pack/platform/test/api_integration_basic/ftr_provider_context.d.ts @elastic/appex-qa
 /x-pack/solutions/security/test/README.md @elastic/appex-qa
-/x-pack/solutions/security/test/kibana.jsonc @elastic/appex-qa
-/x-pack/solutions/security/test/tsconfig.json @elastic/appex-qa
 /x-pack/solutions/security/test/api_integration/config.ts @elastic/appex-qa
 /x-pack/solutions/security/test/api_integration/ftr_provider_context.d.ts @elastic/appex-qa
 /x-pack/solutions/security/test/api_integration/services/index.ts @elastic/appex-qa
 /x-pack/solutions/security/test/alerting_api_integration/ftr_provider_context.d.ts @elastic/appex-qa
 /x-pack/platform/test/serverless/shared @elastic/appex-qa
-/x-pack/platform/test/functional/services/ml/api.ts @elastic/appex-qa # temporarily due to SKA tests relocation
 /x-pack/platform/test/.gitignore @elastic/appex-qa
 /x-pack/solutions/**/test/.gitignore @elastic/appex-qa
-/x-pack/platform/test/functional/services/pipeline_list.ts @elastic/appex-qa
-/x-pack/platform/test/functional/services/pipeline_editor.ts @elastic/appex-qa
 /x-pack/platform/test/accessibility/ftr_provider_context.d.ts @elastic/appex-qa
 /x-pack/platform/test/accessibility/page_objects.ts @elastic/appex-qa
 /x-pack/platform/test/accessibility/services.ts @elastic/appex-qa
 /x-pack/platform/test/serverless/api_integration/config.base.ts @elastic/appex-qa
 /x-pack/platform/test/serverless/api_integration/ftr_provider_context.d.ts @elastic/appex-qa
 /x-pack/platform/test/serverless/api_integration/services/ @elastic/appex-qa
 /x-pack/platform/test/serverless/api_integration/configs/ @elastic/appex-qa
-/x-pack/platform/test/serverless/functional/configs/ @elastic/appex-qa # temporarily due to SKA tests relocation
-/x-pack/platform/test/serverless/functional/page_objects/ @elastic/appex-qa # temporarily due to SKA tests relocation
-/x-pack/platform/test/serverless/functional/services/ @elastic/appex-qa # temporarily due to SKA tests relocation
+/x-pack/platform/test/serverless/functional/configs/ @elastic/appex-qa
+/x-pack/platform/test/serverless/functional/page_objects/ @elastic/appex-qa
+/x-pack/platform/test/serverless/functional/services/ @elastic/appex-qa
 /x-pack/platform/test/serverless/functional/config* @elastic/appex-qa
 /x-pack/platform/test/serverless/functional/ftr_provider_context.d.ts @elastic/appex-qa
 
@@ -2077,7 +2069,7 @@ x-pack/platform/test/plugin_api_integration/test_suites/platform/ @elastic/kiban
 /config/ @elastic/kibana-core
 /config/serverless.yml @elastic/kibana-core @elastic/kibana-security
 /config/serverless.*.yml @elastic/kibana-core @elastic/kibana-security
-/config/serverless.workplace_ai.yml @elastic/kibana-core @elastic/kibana-security @elastic/search-kibana
+/config/serverless.workplaceai.yml @elastic/kibana-core @elastic/kibana-security @elastic/search-kibana
 /config/serverless.es.yml @elastic/kibana-core @elastic/kibana-security @elastic/search-kibana
 /config/serverless.oblt.yml @elastic/kibana-core @elastic/kibana-security @elastic/observability-ui
 /config/serverless.oblt.complete.yml @elastic/kibana-core @elastic/kibana-security @elastic/observability-ui
@@ -2141,6 +2133,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
 /x-pack/platform/test/api_integration/apis/cloud @elastic/kibana-security # Assigned per https://github.com/elastic/kibana/pull/198444
 /src/platform/test/plugin_functional/snapshots/baseline/hardening @elastic/kibana-security # Assigned per https://github.com/elastic/kibana/pull/190716
 /src/platform/test/functional/page_objects/login_page.ts @elastic/kibana-security
+/src/platform/test/functional/page_objects/space_settings.ts @elastic/kibana-security
 /x-pack/solutions/observability/test/serverless/functional/test_suites/role_management @elastic/kibana-security
 /x-pack/platform/test/functional/config_security_basic.ts @elastic/kibana-security
 /x-pack/platform/test/functional/page_objects/user_profile_page.ts @elastic/kibana-security
@@ -2283,9 +2276,9 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
 /x-pack/solutions/search/test/functional_search/ @elastic/search-kibana
 /x-pack/solutions/search/test/api_integration/apis/search_playground/ @elastic/search-kibana
 
-# workplace_ai
-/x-pack/solutions/workplace_ai/test/serverless/api_integration/configs/config.ts @elastic/search-kibana @elastic/appex-qa
-/x-pack/solutions/workplace_ai/test/serverless/functional/configs/config.ts @elastic/search-kibana @elastic/appex-qa
+# workplaceai
+/x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.ts @elastic/search-kibana @elastic/appex-qa
+/x-pack/solutions/workplaceai/test/serverless/functional/configs/config.ts @elastic/search-kibana @elastic/appex-qa
 /x-pack/platform/test/onechat_api_integration @elastic/search-kibana @elastic/workchat-eng
 /x-pack/platform/test/onechat_functional @elastic/search-kibana @elastic/workchat-eng
 /x-pack/platform/test/functional/page_objects/onechat_page.ts @elastic/workchat-eng
@@ -2383,6 +2376,8 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
 #CC# /x-pack/plugins/cross_cluster_replication/ @elastic/kibana-management
 
 # Security Solution
+/x-pack/solutions/security/test/kibana.jsonc @elastic/security-solution
+/x-pack/solutions/security/test/tsconfig.json @elastic/security-solution
 /x-pack/solutions/security/test/fixtures/kbn_archives/timelines/7.15.0_space @elastic/security-solution # Assigned per only use: https://github.com/elastic/kibana/blob/main/x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline_migrations.ts#L58
 /x-pack/solutions/security/test/fixtures/es_archives/packetbeat @elastic/security-solution
 /x-pack/solutions/security/test/fixtures/es_archives/security_solution @elastic/security-solution

.github/copilot-instructions.md

@@ -277,7 +277,7 @@ yarn start --no-base-path   # Disable basePath
 yarn es serverless --projectType=oblt          # Observability
 yarn es serverless --projectType=security      # Security
 yarn es serverless --projectType=es            # Elasticsearch
-yarn es serverless --projectType=workplace_ai  # Workplace AI
+yarn es serverless --projectType=workplaceai  # Workplace AI
 
 # 2. THEN: Start Kibana in MATCHING serverless mode
 # Kibana uses --serverless flag (NOT --projectType)
@@ -286,7 +286,7 @@ yarn serverless              # Generic (uses config or defaults to 'es')
 yarn serverless-oblt         # Matches ES projectType=oblt
 yarn serverless-security     # Matches ES projectType=security
 yarn serverless-es           # Matches ES projectType=es
-yarn serverless-workplace-ai # Matches ES projectType=workplace_ai
+yarn serverless-workplace-ai # Matches ES projectType=workplaceai
 
 # Login: elastic_serverless / changeme (or system_indices_superuser / changeme)
 # Note: Cannot use basePath in serverless mode

.gitignore

@@ -67,7 +67,7 @@ webpackstats.json
 !/config/README.md
 !/config/serverless.yml
 !/config/serverless.es.yml
-!/config/serverless.workplace_ai.yml
+!/config/serverless.workplaceai.yml
 !/config/serverless.oblt.yml
 !/config/serverless.oblt.complete.yml
 !/config/serverless.oblt.logs_essentials.yml