Skip to content

[ska] relocate solutions ES archives#229914

Merged
jbudz merged 6 commits intoelastic:mainfrom
dmlemeshko:ska/relocate-solutions-esArchives
Jul 30, 2025
Merged

[ska] relocate solutions ES archives#229914
jbudz merged 6 commits intoelastic:mainfrom
dmlemeshko:ska/relocate-solutions-esArchives

Conversation

@dmlemeshko
Copy link
Contributor

@dmlemeshko dmlemeshko commented Jul 30, 2025

Summary

Part of https://github.com/elastic/kibana-team/issues/1503

This PR is mostly about moving solutions esArchives from x-pack/test/functional dir

Before

x-pack/test/functional/es_archives/

After:

x-pack/solutions/observability/test/fixtures/es_archives/

x-pack/solutions/security/test/fixtures/es_archives/

some unused archives were deleted

@dmlemeshko dmlemeshko self-assigned this Jul 30, 2025
@dmlemeshko dmlemeshko added release_note:skip Skip the PR/issue when compiling release notes backport:version Backport to applied version labels v9.2.0 v9.1.1 v8.19.1 labels Jul 30, 2025
@dmlemeshko dmlemeshko marked this pull request as ready for review July 30, 2025 12:22
@dmlemeshko dmlemeshko requested review from a team as code owners July 30, 2025 12:22
@dmlemeshko dmlemeshko requested a review from a team July 30, 2025 12:22
@dmlemeshko dmlemeshko requested a review from a team as a code owner July 30, 2025 12:22
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

cc @dmlemeshko

Copy link
Contributor

@rylnd rylnd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Detection Engine changes LGTM

*/
private static readonly RELOCATED_ARCHIVES = ['auditbeat', 'filebeat'];
private static readonly PLATFORM_ARCHIVES = ['auditbeat', 'filebeat'];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 better description.

docsOnly: true,
});
await esArchiver.load(
'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All these changes are indicating (to me) that we need to abstract away the fully-qualified path, here, but I will address that in a subsequent PR. Thanks for making these changes in the meantime.

@jbudz jbudz merged commit 8e56732 into elastic:main Jul 30, 2025
13 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.19, 9.1

https://github.com/elastic/kibana/actions/runs/16633069127

@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
8.19 Backport failed because of merge conflicts
9.1 Backport failed because of merge conflicts

You might need to backport the following PRs to 9.1:
- [ska] relocate esArchives to platform/test/fixtures (#229750)
- [ska] relocate serverless platform api-integration tests (#229567)
- [ska] relocate security_solution_playwright (#229496)
- [ska] remove test-helper imports that lead to circular dependencies issue (#229587)

Manual backport

To create the backport manually run:

node scripts/backport --pr 229914

Questions ?

Please refer to the Backport tool documentation

@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.19, 9.1

https://github.com/elastic/kibana/actions/runs/16673651064

@kibanamachine
Copy link
Contributor

dmlemeshko added a commit to dmlemeshko/kibana that referenced this pull request Aug 1, 2025
## Summary

Part of elastic/kibana-team#1503

This PR is mostly about moving solutions esArchives from
`x-pack/test/functional` dir

Before
```
x-pack/test/functional/es_archives/
```

After:
```
x-pack/solutions/observability/test/fixtures/es_archives/

x-pack/solutions/security/test/fixtures/es_archives/

```

some unused archives were deleted

(cherry picked from commit 8e56732)

# Conflicts:
#	x-pack/platform/test/rule_registry/security_and_spaces/tests/basic/get_alert_fields_by_rule_type_ids.ts
#	x-pack/solutions/observability/test/observability_functional/apps/observability/pages/overview/alert_table.ts
#	x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/esql.ts
@dmlemeshko
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
9.1

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

dmlemeshko added a commit that referenced this pull request Aug 1, 2025
# Backport

This will backport the following commits from `main` to `9.1`:
- [[ska] relocate solutions ES archives
(#229914)](#229914)

<!--- Backport version: 10.0.1 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Dzmitry
Lemechko","email":"dzmitry.lemechko@elastic.co"},"sourceCommit":{"committedDate":"2025-07-30T20:29:29Z","message":"[ska]
relocate solutions ES archives (#229914)\n\n## Summary\n\nPart of
https://github.com/elastic/kibana-team/issues/1503\n\nThis PR is mostly
about moving solutions esArchives from\n`x-pack/test/functional`
dir\n\nBefore\n```\nx-pack/test/functional/es_archives/\n```\n\nAfter:
\n```\nx-pack/solutions/observability/test/fixtures/es_archives/\n\nx-pack/solutions/security/test/fixtures/es_archives/\n\n```\n\nsome
unused archives were
deleted","sha":"8e56732042e91d63c97b6164d110026da5e02f26","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:version","v9.2.0","v9.1.1","v8.19.1"],"title":"[ska]
relocate solutions ES
archives","number":229914,"url":"https://github.com/elastic/kibana/pull/229914","mergeCommit":{"message":"[ska]
relocate solutions ES archives (#229914)\n\n## Summary\n\nPart of
https://github.com/elastic/kibana-team/issues/1503\n\nThis PR is mostly
about moving solutions esArchives from\n`x-pack/test/functional`
dir\n\nBefore\n```\nx-pack/test/functional/es_archives/\n```\n\nAfter:
\n```\nx-pack/solutions/observability/test/fixtures/es_archives/\n\nx-pack/solutions/security/test/fixtures/es_archives/\n\n```\n\nsome
unused archives were
deleted","sha":"8e56732042e91d63c97b6164d110026da5e02f26"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/229914","number":229914,"mergeCommit":{"message":"[ska]
relocate solutions ES archives (#229914)\n\n## Summary\n\nPart of
https://github.com/elastic/kibana-team/issues/1503\n\nThis PR is mostly
about moving solutions esArchives from\n`x-pack/test/functional`
dir\n\nBefore\n```\nx-pack/test/functional/es_archives/\n```\n\nAfter:
\n```\nx-pack/solutions/observability/test/fixtures/es_archives/\n\nx-pack/solutions/security/test/fixtures/es_archives/\n\n```\n\nsome
unused archives were
deleted","sha":"8e56732042e91d63c97b6164d110026da5e02f26"}},{"branch":"9.1","label":"v9.1.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
delanni pushed a commit to delanni/kibana that referenced this pull request Aug 5, 2025
## Summary

Part of elastic/kibana-team#1503

This PR is mostly about moving solutions esArchives from
`x-pack/test/functional` dir

Before
```
x-pack/test/functional/es_archives/
```

After: 
```
x-pack/solutions/observability/test/fixtures/es_archives/

x-pack/solutions/security/test/fixtures/es_archives/

```

some unused archives were deleted
@wildemat wildemat mentioned this pull request Aug 7, 2025
10 tasks
@fake-haris
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.19

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:version Backport to applied version labels release_note:skip Skip the PR/issue when compiling release notes v8.19.1 v9.1.1 v9.2.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.