Skip to content

Commit ce53bc5

Browse files
juliaElasticjuliaElastic
authored
Merge branch 'main' into add-collector-ui
2 parents 6657e4f + 5c84703 commit ce53bc5

2,061 files changed

Lines changed: 40386 additions & 10919 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.agents/skills/scout-api-testing/SKILL.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,11 @@ Tests then import `apiTest` from the local fixtures: `import { apiTest } from '.
9191
## Run / debug quickly
9292

9393
- Use either `--config` or `--testFiles` (they are mutually exclusive).
94-
- Run by config: `node scripts/scout.js run-tests --stateful --config <module-root>/test/scout*/api/playwright.config.ts` (or `.../api/parallel.playwright.config.ts` for parallel API runs)
95-
- Run by file/dir (Scout derives the right `playwright.config.ts` vs `parallel.playwright.config.ts`): `node scripts/scout.js run-tests --stateful --testFiles <module-root>/test/scout*/api/tests/my.spec.ts`
96-
- For faster iteration, start servers once in another terminal: `node scripts/scout.js start-server --stateful [--config-dir <configSet>]`, then run Playwright directly: `npx playwright test --config <...> --project local --grep <tag>`.
97-
- `--config-dir` notes:
98-
- `run-tests` auto-detects the custom config dir from `.../test/scout_<name>/...` paths (override with `--config-dir <name>` if needed).
99-
- `start-server` has no Playwright config to inspect, so pass `--config-dir <name>` when your tests require a custom server config.
94+
- Run by config: `node scripts/scout.js run-tests --arch stateful --domain classic --config <module-root>/test/scout*/api/playwright.config.ts` (or `.../api/parallel.playwright.config.ts` for parallel API runs)
95+
- Run by file/dir (Scout derives the right `playwright.config.ts` vs `parallel.playwright.config.ts`): `node scripts/scout.js run-tests --arch stateful --domain classic --testFiles <module-root>/test/scout*/api/tests/my.spec.ts`
96+
- For faster iteration, start servers once in another terminal: `node scripts/scout.js start-server --arch stateful --domain classic [--serverConfigSet <configSet>]`, then run Playwright directly: `npx playwright test --config <...> --project local --grep <tag>`.
97+
- `run-tests` auto-detects custom config sets from `.../test/scout_<name>/...` paths.
98+
- `start-server` has no Playwright config to inspect, so pass `--serverConfigSet <name>` when your tests require a custom config set.
10099
- Debug: `SCOUT_LOG_LEVEL=debug`
101100

102101
## CI enablement

‎.agents/skills/scout-api-testing/references/scout-api-auth.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const COMMON_HEADERS = {
2525
'elastic-api-version': '2023-10-31', // include for versioned public APIs
2626
};
2727

28-
apiTest.describe('GET /api/my_plugin/foo', { tag: tags.DEPLOYMENT_AGNOSTIC }, () => {
28+
apiTest.describe('GET /api/my_plugin/foo', { tag: tags.deploymentAgnostic }, () => {
2929
let viewer: RoleApiCredentials;
3030

3131
apiTest.beforeAll(async ({ requestAuth }) => {
@@ -55,7 +55,7 @@ const INTERNAL_HEADERS = {
5555
'x-elastic-internal-origin': 'kibana',
5656
};
5757

58-
apiTest.describe('GET /internal/my_plugin/foo', { tag: tags.DEPLOYMENT_AGNOSTIC }, () => {
58+
apiTest.describe('GET /internal/my_plugin/foo', { tag: tags.deploymentAgnostic }, () => {
5959
apiTest('calls internal endpoint', async ({ apiClient, samlAuth }) => {
6060
const { cookieHeader } = await samlAuth.asInteractiveUser('viewer');
6161

‎.agents/skills/scout-create-scaffold/SKILL.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ Notes:
6464
- Update `.meta` manifests when adding/moving configs or tests:
6565
- `node scripts/scout.js update-test-config-manifests`
6666
- Custom server config sets:
67-
- If you create/use `test/scout_<configSet>`, you typically also need a matching server config under `src/platform/packages/shared/kbn-scout/src/servers/configs/custom/<configSet>`.
68-
- `start-server` requires `--config-dir <configSet>` when using a custom server config set.
67+
- If you create/use `test/scout_<configSet>`, you typically also need a matching server config under `src/platform/packages/shared/kbn-scout/src/servers/configs/config_sets/<configSet>`.
68+
- `start-server` requires `--serverConfigSet <configSet>` when using a custom server config set.
6969

7070
## Path Conventions (Specs)
7171

‎.agents/skills/scout-migrate-from-ftr/SKILL.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ Migrate FTR tests to Scout by deciding whether a test should be UI or API, mappi
4848
9. Update Scout manifests (discovery/CI).
4949
- Run `node scripts/scout.js update-test-config-manifests` so `.meta` manifests reflect the new/changed tests and configs.
5050
10. Verify in both stateful and serverless when applicable.
51-
- Use `node scripts/scout.js run-tests --stateful --testFiles <path>` and
52-
`node scripts/scout.js run-tests --serverless=oblt --testFiles <path>` (adjust serverless target).
53-
- If the tests are under `test/scout_<configSet>/...`, `run-tests` auto-detects the server config dir from the Playwright config path (use `--config-dir <configSet>` only to override, or when using `start-server`).
51+
- Use `node scripts/scout.js run-tests --arch stateful --domain classic --testFiles <path>` and
52+
`node scripts/scout.js run-tests --arch serverless --domain observability_complete --testFiles <path>` (adjust the serverless domain).
53+
- If tests are under `test/scout_<configSet>/...`, `run-tests` auto-detects the config set from the Playwright config path.
54+
- If you start servers separately, pass `--serverConfigSet <configSet>` to `node scripts/scout.js start-server ...`.
5455

5556
## Common patterns
5657

‎.agents/skills/scout-ui-testing/SKILL.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,11 @@ test('creates and verifies a dashboard', async ({ pageObjects, page }) => {
104104
## Run / debug quickly
105105

106106
- Use either `--config` or `--testFiles` (they are mutually exclusive).
107-
- Run by config: `node scripts/scout.js run-tests --stateful --config <module-root>/test/scout*/ui/playwright.config.ts` (or `.../ui/parallel.playwright.config.ts` for parallel UI)
108-
- Run by file/dir (Scout derives the right `playwright.config.ts` vs `parallel.playwright.config.ts`): `node scripts/scout.js run-tests --stateful --testFiles <module-root>/test/scout*/ui/tests/my.spec.ts`
109-
- For faster iteration, start servers once in another terminal: `node scripts/scout.js start-server --stateful [--config-dir <configSet>]`, then run Playwright directly: `npx playwright test --config <...> --project local --grep <tag> --headed`.
110-
- `--config-dir` notes:
111-
- `run-tests` auto-detects the custom config dir from `.../test/scout_<name>/...` paths (override with `--config-dir <name>` if needed).
112-
- `start-server` has no Playwright config to inspect, so pass `--config-dir <name>` when your tests require a custom server config.
107+
- Run by config: `node scripts/scout.js run-tests --arch stateful --domain classic --config <module-root>/test/scout*/ui/playwright.config.ts` (or `.../ui/parallel.playwright.config.ts` for parallel UI)
108+
- Run by file/dir (Scout derives the right `playwright.config.ts` vs `parallel.playwright.config.ts`): `node scripts/scout.js run-tests --arch stateful --domain classic --testFiles <module-root>/test/scout*/ui/tests/my.spec.ts`
109+
- For faster iteration, start servers once in another terminal: `node scripts/scout.js start-server --arch stateful --domain classic [--serverConfigSet <configSet>]`, then run Playwright directly: `npx playwright test --config <...> --project local --grep <tag> --headed`.
110+
- `run-tests` auto-detects custom config sets from `.../test/scout_<name>/...` paths.
111+
- `start-server` has no Playwright config to inspect, so pass `--serverConfigSet <name>` when your tests require a custom config set.
113112
- Debug: `SCOUT_LOG_LEVEL=debug`, or `npx playwright test --config <...> --project local --ui`
114113

115114
## CI enablement

‎.agents/skills/scout-ui-testing/references/scout-browser-auth.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { tags } from '@kbn/scout'; // or the module's Scout package (e.g. @kbn/s
1919
import { expect } from '@kbn/scout/ui'; // or '@kbn/scout-search/ui', etc.
2020
import { test } from '../fixtures';
2121

22-
test.describe('my suite', { tag: tags.DEPLOYMENT_AGNOSTIC }, () => {
22+
test.describe('my suite', { tag: tags.deploymentAgnostic }, () => {
2323
test.beforeEach(async ({ browserAuth }) => {
2424
await browserAuth.loginAsViewer();
2525
});

‎.agents/skills/scout-ui-testing/references/scout-ui-parallelism.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Use this when working under `.../test/scout*/ui/parallel_tests/` or a `parallel.
2121
import { spaceTest, tags } from '@kbn/scout'; // or the module's Scout package
2222
import { expect } from '@kbn/scout/ui'; // or '@kbn/scout-oblt/ui', etc.
2323

24-
spaceTest.describe('my feature', { tag: tags.DEPLOYMENT_AGNOSTIC }, () => {
24+
spaceTest.describe('my feature', { tag: tags.deploymentAgnostic }, () => {
2525
spaceTest.beforeAll(async ({ scoutSpace }) => {
2626
// Worker-scoped setup in the isolated space.
2727
await scoutSpace.savedObjects.cleanStandardList();

‎.buildkite/pipelines/pull_request/base.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,6 @@ steps:
168168
spotZones: us-central1-f,us-central1-c,us-central1-a
169169
diskSizeGb: 105
170170
key: build_api_docs
171-
depends_on:
172-
- build
173171
timeout_in_minutes: 60
174172
retry:
175173
automatic:

‎.buildkite/scripts/lifecycle/pre_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if [[ "${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-}" != "" ]]; then # if we're in a P
3232
# GITHUB_PR_DRAFT is set by our pr build trigger bot
3333
buildkite-agent meta-data set "ingest:is_draft_pr" "${GITHUB_PR_DRAFT:-false}"
3434
# GITHUB_PR_LABELS is set by our pr build trigger bot, and is a comma-separated list of labels on the PR
35-
if [[ -n "${GITHUB_PR_LABELS:-}" ]]; then
35+
if [[ "${GITHUB_PR_LABELS:-}" =~ [^[:space:]] ]]; then
3636
buildkite-agent meta-data set "ingest:pr_labels" "$GITHUB_PR_LABELS"
3737
fi
3838
fi

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,7 @@ x-pack/platform/packages/shared/kbn-elastic-assistant-shared-state @elastic/secu
978978
x-pack/platform/packages/shared/kbn-entities-schema @elastic/obs-entities
979979
x-pack/platform/packages/shared/kbn-es-snapshot-loader @elastic/obs-ai-team
980980
x-pack/platform/packages/shared/kbn-evals @elastic/obs-ai-team
981+
x-pack/platform/packages/shared/kbn-evals-common @elastic/obs-ai-team @elastic/security-generative-ai
981982
x-pack/platform/packages/shared/kbn-evals-phoenix-executor @elastic/obs-ai-team
982983
x-pack/platform/packages/shared/kbn-evals-suite-streams @elastic/obs-onboarding-team @elastic/obs-sig-events-team
983984
x-pack/platform/packages/shared/kbn-event-stacktrace @elastic/obs-presentation-team @elastic/obs-exploration-team
@@ -1096,6 +1097,7 @@ x-pack/platform/plugins/shared/dataset_quality @elastic/obs-onboarding-team
10961097
x-pack/platform/plugins/shared/embeddable_alerts_table @elastic/response-ops
10971098
x-pack/platform/plugins/shared/encrypted_saved_objects @elastic/kibana-security
10981099
x-pack/platform/plugins/shared/entity_manager @elastic/obs-entities
1100+
x-pack/platform/plugins/shared/evals @elastic/obs-ai-team @elastic/security-generative-ai
10991101
x-pack/platform/plugins/shared/event_log @elastic/response-ops
11001102
x-pack/platform/plugins/shared/features @elastic/kibana-core
11011103
x-pack/platform/plugins/shared/fields_metadata @elastic/obs-onboarding-team
@@ -2787,9 +2789,11 @@ x-pack/solutions/security/test/serverless/functional/configs/config.context_awar
27872789
/x-pack/solutions/security/plugins/security_solution/public/detections/pages @elastic/security-threat-hunting-investigations
27882790
/x-pack/solutions/security/plugins/security_solution/public/detections/utils @elastic/security-threat-hunting-investigations
27892791
/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details @elastic/security-threat-hunting-investigations
2792+
/x-pack/solutions/security/plugins/security_solution/public/flyout_v2/document_details @elastic/security-threat-hunting-investigations
27902793
/x-pack/solutions/security/plugins/security_solution/public/flyout/network_details @elastic/security-threat-hunting-investigations
27912794
/x-pack/solutions/security/plugins/security_solution/public/flyout/attack_details @elastic/security-threat-hunting-investigations
27922795
/x-pack/solutions/security/plugins/security_solution/public/flyout/shared @elastic/security-threat-hunting-investigations
2796+
/x-pack/solutions/security/plugins/security_solution/public/flyout_v2/shared @elastic/security-threat-hunting-investigations
27932797
/x-pack/solutions/security/plugins/security_solution/public/flyout/rule_details @elastic/security-threat-hunting-investigations
27942798
/x-pack/solutions/security/plugins/security_solution/public/investigations @elastic/security-threat-hunting-investigations
27952799
/x-pack/solutions/security/plugins/security_solution/public/notes @elastic/security-threat-hunting-investigations

0 commit comments

Comments
 (0)