Merge branch 'main' into feature/chrome-next

Author: kowalczyk-krzysztof

.buildkite/ftr-manifests/ftr_oblt_stateful_configs.yml

@@ -29,7 +29,6 @@ enabled:
   - x-pack/solutions/observability/test/apm_api_integration/rules/config.ts
   - x-pack/solutions/observability/test/apm_api_integration/trial/config.ts
   - x-pack/solutions/observability/test/functional/apps/dataset_quality/config.ts
-  - x-pack/solutions/observability/test/functional/apps/uptime/config.ts
   - x-pack/solutions/observability/test/observability_api_integration/basic/config.ts
   - x-pack/solutions/observability/test/observability_api_integration/trial/config.ts
   - x-pack/solutions/observability/test/observability_functional/with_rac_write.config.ts
@@ -38,7 +37,6 @@ enabled:
   - x-pack/solutions/observability/test/functional/apps/apm/config.ts
   - x-pack/solutions/observability/test/functional_with_es_ssl/config.ts
   - x-pack/solutions/observability/test/api_integration/apis/cases/config.ts
-  - x-pack/solutions/observability/test/functional/apps/slo/embeddables/config.ts
   - x-pack/solutions/observability/test/api_integration/apis/security/config.ts
   - x-pack/solutions/observability/test/accessibility/config.ts
   - x-pack/solutions/observability/test/functional/apps/infra/config.ts

.buildkite/ftr-manifests/ftr_platform_stateful_configs.yml

@@ -339,14 +339,12 @@ enabled:
   - x-pack/platform/test/functional/apps/transform/edit_clone/config.ts
   - x-pack/platform/test/functional/apps/transform/permissions/config.ts
   - x-pack/platform/test/functional/apps/transform/feature_controls/config.ts
-  - x-pack/platform/test/functional/apps/upgrade_assistant/config.ts
   - x-pack/platform/test/functional/apps/user_profiles/config.ts
   - x-pack/platform/test/functional/apps/visualize/config.ts
   - x-pack/platform/test/functional/apps/watcher/config.ts
   - x-pack/platform/test/functional/config_security_basic.ts
   - x-pack/platform/test/functional/config.ccs.ts
   - x-pack/platform/test/functional/config.firefox.ts
-  - x-pack/platform/test/functional/config.upgrade_assistant.ts
   - x-pack/platform/test/functional_cloud/config.ts
   - x-pack/platform/test/functional_cloud/saml.config.ts
   - x-pack/platform/test/functional_cloud/intercepts.config.ts
@@ -411,7 +409,6 @@ enabled:
   - x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
   - 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
@@ -463,7 +460,6 @@ enabled:
   - x-pack/platform/test/api_integration/apis/stats/config.ts
   - x-pack/platform/test/api_integration/apis/status/config.ts
   - x-pack/platform/test/api_integration/apis/telemetry/config.ts
-  - x-pack/platform/test/api_integration/apis/upgrade_assistant/config.ts
   - x-pack/platform/test/api_integration/apis/watcher/config.ts
   - x-pack/platform/test/api_integration_basic/apis/aiops/config.ts
   - x-pack/platform/test/api_integration_basic/apis/security/config.ts

.buildkite/pipeline-utils/affected-packages/const.ts

@@ -47,20 +47,3 @@ export const CRITICAL_FILES_JEST_INTEGRATION_TESTS = [
   '.buildkite/pipeline-utils/affected-packages/**/*.{ts,js,sh}',
   '.buildkite/pipeline-utils/ci-stats/**/*.{ts,js}',
 ];
-
-export const CRITICAL_FILES_SCOUT = [
-  'package.json',
-  'yarn.lock',
-  'tsconfig.json',
-  '.node-version',
-  '.nvmrc',
-  'src/setup_node_env/**/*',
-  'packages/kbn-babel-preset/**/*',
-  'src/platform/packages/shared/kbn-repo-info/**/*',
-  'src/platform/packages/shared/kbn-scout/**/*',
-  'src/platform/packages/private/kbn-scout-reporting/**/*',
-  'scripts/scout.js',
-  '.buildkite/scripts/steps/test/scout/**/*',
-  '.buildkite/pipeline-utils/affected-packages/**/*.{ts,js,sh}',
-  '.buildkite/pipeline-utils/ci-stats/**/*.{ts,js}',
-];

.buildkite/pipeline-utils/affected-packages/utils.ts

@@ -7,7 +7,16 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import minimatch from 'minimatch';
+import { Minimatch } from 'minimatch';
+
+// Don't annotate the return type as `Minimatch[]`: the installed
+// @types/minimatch exports `Minimatch` as a value (not a type), and ts-node
+// will reject it. Inference + `ReturnType` keeps the file ts-node-clean.
+const compileMatchers = (patterns: readonly string[]) =>
+  patterns.map((p) => new Minimatch(p, { dot: true }));
+
+const matchesAny = (file: string, matchers: ReturnType<typeof compileMatchers>): boolean =>
+  matchers.some((m) => m.match(file));
 
 /**
  * Returns file paths that don't match any of the given glob patterns.
@@ -17,14 +26,35 @@ export function filterIgnoredFiles(files: string[], patterns: string[]): string[
   if (patterns.length === 0) {
     return files;
   }
-  return files.filter((file) => !patterns.some((p) => minimatch(file, p, { dot: true })));
+  const matchers = compileMatchers(patterns);
+  return files.filter((file) => !matchesAny(file, matchers));
 }
 
 /**
  * Returns true when any pattern matches any file in the list
  */
 export function touchedCriticalFiles(files: string[], criticalFiles: string[]): boolean {
-  return files.some((file) =>
-    criticalFiles.some((criticalFile) => minimatch(file, criticalFile, { dot: true }))
-  );
+  const matchers = compileMatchers(criticalFiles);
+  return files.some((file) => matchesAny(file, matchers));
+}
+
+/**
+ * Returns true when every file matches a `scope` pattern, treating files
+ * that match an `ignore` pattern as irrelevant. Returns false on an empty
+ * list or as soon as a file matches neither.
+ */
+export function allChangedFilesInScope(
+  files: readonly string[],
+  scope: readonly string[],
+  ignore: readonly string[] = []
+): boolean {
+  const ignoreMatchers = compileMatchers(ignore);
+  const scopeMatchers = compileMatchers(scope);
+  let hasScopedChange = false;
+  for (const file of files) {
+    if (matchesAny(file, ignoreMatchers)) continue;
+    if (!matchesAny(file, scopeMatchers)) return false;
+    hasScopedChange = true;
+  }
+  return hasScopedChange;
 }

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

@@ -9,6 +9,7 @@
 
 import * as Fs from 'fs';
 
+import { listChangedFiles } from '../../affected-packages';
 import type { BuildkiteStep } from '../../buildkite';
 import { BuildkiteClient } from '../../buildkite';
 import { getTrackedBranch } from '../../utils';
@@ -20,6 +21,7 @@ import { loadRunOrderConfig } from './env_config';
 import { getEnabledFtrConfigs } from './ftr_manifests';
 import { discoverJestIntegrationConfigs, discoverJestUnitConfigs } from './jest_configs';
 import { getRunGroup, getRunGroups, labelJestSubgroups } from './run_groups';
+import { isScoutTestsOnlyDiff } from './selective_scout';
 import {
   filterJestIntegrationConfigsByAffected,
   filterJestUnitConfigsByAffected,
@@ -41,6 +43,26 @@ export async function pickTestGroupRunOrder() {
   const ciStats = new CiStatsClient();
   const config = loadRunOrderConfig();
 
+  // Holds the merge base only when selective testing is enabled; the two
+  // `if` blocks below both use it (Scout skip check, then Jest filter).
+  const selectiveTestingMergeBase = config.useSelectiveTesting ? config.prMergeBase : undefined;
+
+  // Fast path: a PR whose diff is exclusively Scout test files cannot affect
+  // any Jest unit/integration or FTR config — skip emitting them entirely.
+  // The Scout pipeline still runs its own selective testing in parallel.
+  if (selectiveTestingMergeBase) {
+    const changedFiles = listChangedFiles({ mergeBase: selectiveTestingMergeBase, commit: 'HEAD' });
+    if (isScoutTestsOnlyDiff(changedFiles)) {
+      console.log('Scout-tests-only diff detected — skipping Jest/FTR test steps');
+      bk.setAnnotation(
+        'selective-testing-scout-tests-only',
+        'info',
+        'Selective testing: Scout-tests-only diff — Jest/FTR test steps were skipped.'
+      );
+      return;
+    }
+  }
+
   const unitIncluded = config.limitConfigType.includes('unit');
   const integrationIncluded = config.limitConfigType.includes('integration');
   const ftrConfigsIncluded = config.limitConfigType.includes('functional');
@@ -55,8 +77,8 @@ export async function pickTestGroupRunOrder() {
   );
   if (!ftrConfigsIncluded) ftrConfigsByQueue.clear();
 
-  if (config.useSelectiveTesting && config.prMergeBase) {
-    const selectiveCtx = await resolveSelectiveTestingContext(config.prMergeBase);
+  if (selectiveTestingMergeBase) {
+    const selectiveCtx = await resolveSelectiveTestingContext(selectiveTestingMergeBase);
     if (selectiveCtx !== null) {
       jestUnitConfigs = filterJestUnitConfigsByAffected(jestUnitConfigs, selectiveCtx);
       jestIntegrationConfigs = filterJestIntegrationConfigsByAffected(

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

@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { isScoutTestsOnlyDiff } from './selective_scout';
+
+describe('isScoutTestsOnlyDiff', () => {
+  it('returns false for an empty diff (no signal)', () => {
+    expect(isScoutTestsOnlyDiff([])).toBe(false);
+  });
+
+  it('returns true for a single Scout UI spec', () => {
+    expect(
+      isScoutTestsOnlyDiff([
+        'src/platform/plugins/shared/discover/test/scout/ui/parallel_tests/foo.spec.ts',
+      ])
+    ).toBe(true);
+  });
+
+  it('returns true for a single Scout API spec', () => {
+    expect(
+      isScoutTestsOnlyDiff([
+        'x-pack/platform/plugins/shared/maps/test/scout/api/tests/health.spec.ts',
+      ])
+    ).toBe(true);
+  });
+
+  it('returns true for shared test code (fixtures, page objects) inside a scope', () => {
+    expect(
+      isScoutTestsOnlyDiff([
+        'src/platform/plugins/shared/discover/test/scout/ui/fixtures/page_objects/landing.ts',
+        'src/platform/plugins/shared/discover/test/scout/ui/helpers/build_query.ts',
+      ])
+    ).toBe(true);
+  });
+
+  it('returns true for custom Scout server directories (scout_*)', () => {
+    expect(
+      isScoutTestsOnlyDiff([
+        'x-pack/solutions/security/plugins/cloud_security_posture/test/scout_with_setup/ui/tests/findings.spec.ts',
+      ])
+    ).toBe(true);
+  });
+
+  it('returns true for generated manifests under .meta', () => {
+    expect(
+      isScoutTestsOnlyDiff([
+        'src/platform/plugins/shared/discover/test/scout/.meta/ui/configs.json',
+      ])
+    ).toBe(true);
+  });
+
+  it('treats README / *.md / CHANGELOG as noise (still true if every other file is Scout)', () => {
+    expect(
+      isScoutTestsOnlyDiff([
+        'README.md',
+        'src/platform/plugins/shared/discover/test/scout/ui/README',
+        'CHANGELOG.asciidoc.md',
+        'src/platform/plugins/shared/discover/test/scout/ui/tests/foo.spec.ts',
+      ])
+    ).toBe(true);
+  });
+
+  it('returns false when the diff is noise-only (no Scout signal)', () => {
+    expect(isScoutTestsOnlyDiff(['README.md', 'docs/extend/scout/best-practices.md'])).toBe(false);
+  });
+
+  it('returns false when any non-Scout, non-noise file is present', () => {
+    expect(
+      isScoutTestsOnlyDiff([
+        'src/platform/plugins/shared/discover/test/scout/ui/tests/foo.spec.ts',
+        'src/platform/plugins/shared/discover/public/application/main.tsx',
+      ])
+    ).toBe(false);
+  });
+
+  it('returns false for plugin source changes that are not under a Scout scope', () => {
+    expect(
+      isScoutTestsOnlyDiff(['src/platform/plugins/shared/discover/public/application/main.tsx'])
+    ).toBe(false);
+  });
+
+  it('does not confuse `test/scout_<custom>/<not-api-or-ui>` with a Scout scope', () => {
+    expect(
+      isScoutTestsOnlyDiff([
+        'src/platform/plugins/shared/discover/test/scout_setup/playwright.config.ts',
+      ])
+    ).toBe(false);
+  });
+});

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { allChangedFilesInScope } from '../../affected-packages';
+
+/**
+ * Scout-tests-only fast path for the Jest/FTR orchestrator.
+ *
+ * When a PR's diff contains only Scout test files (Playwright configs, specs,
+ * page objects, fixtures, generated `.meta` manifests), no Jest unit/integration
+ * or FTR config can be affected, so the orchestrator skips emitting them entirely.
+ * The Scout pipeline still runs its own selective testing in parallel.
+ *
+ * The two arrays below duplicate constants in `@kbn/scout-info`'s `paths.ts`
+ * (the source of truth) — `pipeline-utils/` may not import `@kbn/*`. A unit test
+ * in `kbn-scout-info` fails CI if the two copies drift.
+ */
+
+const SCOUT_TESTS_ONLY_IGNORE_PATTERNS: readonly string[] = [
+  '**/README*',
+  '**/*.md',
+  '**/CHANGELOG*',
+];
+
+const SCOUT_TESTS_ONLY_SCOPE_GLOBS: readonly string[] = [
+  '**/test/scout{_*,}/{api,ui}/**',
+  '**/test/scout{_*,}/.meta/{api,ui}/**',
+];
+
+/**
+ * Returns `true` only when every changed file is either documentation noise
+ * (README, *.md, CHANGELOG*) or sits inside a Scout test scope. Falls back
+ * to `false` on an empty diff or anything unrecognised, so unrelated changes
+ * keep using the default test discovery.
+ */
+export function isScoutTestsOnlyDiff(changedFiles: readonly string[]): boolean {
+  return allChangedFilesInScope(
+    changedFiles,
+    SCOUT_TESTS_ONLY_SCOPE_GLOBS,
+    SCOUT_TESTS_ONLY_IGNORE_PATTERNS
+  );
+}

.buildkite/scout_ci_config.yml

@@ -62,6 +62,7 @@ plugins:
     - task_manager
     - transform
     - triggers_actions_ui
+    - upgrade_assistant
     - uptime
     - ux
     - workflows_extensions

.buildkite/scripts/steps/checks/capture_oas_snapshot.sh

@@ -21,6 +21,8 @@ cmd="node scripts/capture_oas_snapshot\
   --include-path /api/maintenance_window \
   --include-path /api/agent_builder \
   --include-path /api/workflows \
+  --include-path /api/dashboards \
+  --include-path /api/visualizations \
   --include-path /api/security/entity_store"
 
 run_check() {

.buildkite/scripts/steps/checks/notify_saved_objects_changes.ts

@@ -12,9 +12,14 @@ import parseArgs from 'minimist';
 import { upsertComment } from '#pipeline-utils';
 
 /**
- * Mirrors the report types in `@kbn/check-saved-objects-cli/src/findings`.
- * Inlined here so this Buildkite script keeps the same dependency surface as the
- * other notifiers (only `#pipeline-utils`).
+ * SOURCE OF TRUTH: packages/kbn-check-saved-objects-cli/src/findings/types.ts
+ *
+ * This interface is intentionally inlined rather than imported so that this
+ * Buildkite script keeps the same minimal dependency surface as the other
+ * notifiers (only `#pipeline-utils`, no Kibana package deps).
+ *
+ * When adding, removing, or changing fields in `SavedObjectsCheckFinding` or
+ * `SavedObjectsCheckReport` in the canonical file above, mirror the change here.
  */
 export interface SavedObjectsCheckFinding {
   ruleId: string;
@@ -28,6 +33,10 @@ export interface SavedObjectsCheckFinding {
    * A value without a leading `#` or `/` will produce a malformed URL.
    */
   docsAnchor?: string;
+  /** GCS URL of the regular (merge-base) baseline snapshot that triggered this finding. */
+  baselineUrl?: string;
+  /** GCS URL of the serverless baseline snapshot that triggered this finding. */
+  serverlessBaselineUrl?: string;
 }
 
 export interface SavedObjectsCheckReport {
@@ -100,7 +109,16 @@ See the [Saved Objects troubleshooting guide](${TROUBLESHOOTING_URL}) and the [m
     const bullets = findings
       .map((f) => {
         const fix = f.fixHint ? ` _Fix:_ ${f.fixHint}` : '';
-        return `- **[${f.ruleId}]** ${f.message}${fix} ([docs](${findingDocsLink(f)}))`;
+        const baselineLinks = [
+          f.baselineUrl ? `[baseline](${f.baselineUrl})` : null,
+          f.serverlessBaselineUrl ? `[serverless baseline](${f.serverlessBaselineUrl})` : null,
+        ]
+          .filter(Boolean)
+          .join(' ');
+        const links = `([docs](${findingDocsLink(f)}))${
+          baselineLinks ? ` (${baselineLinks})` : ''
+        }`;
+        return `- **[${f.ruleId}]** ${f.message}${fix} ${links}`;
       })
       .join('\n');
     sections.push(`${heading}\n${bullets}`);