Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[security_solution_cypress] Add support for options in EsArchiver.load #164988

Merged

Conversation

patrykkopycinski
Copy link
Contributor

@patrykkopycinski patrykkopycinski commented Aug 28, 2023

Summary

Needed for #160572 (comment)

@kibana-ci
Copy link
Collaborator

kibana-ci commented Aug 28, 2023

💔 Build Failed

Failed CI Steps

Test Failures

  • [job] [logs] Serverless Security Tests / serverless common API Alerting APIs Alerting rules should schedule task, run rule and schedule actions when appropriate

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@patrykkopycinski patrykkopycinski marked this pull request as ready for review August 28, 2023 17:19
@patrykkopycinski patrykkopycinski requested review from a team as code owners August 28, 2023 17:19
@patrykkopycinski patrykkopycinski added the release_note:skip Skip the PR/issue when compiling release notes label Aug 28, 2023
@patrykkopycinski
Copy link
Contributor Author

@elastic/kibana-operations can I ask you to force-merge this PR to unblock #160572 which will help us with #162673 ? 🙏

@mistic mistic merged commit f8ad13a into elastic:main Aug 28, 2023
@kibanamachine kibanamachine added v8.11.0 backport:skip This commit does not require backporting labels Aug 28, 2023
@mistic
Copy link
Member

mistic commented Aug 28, 2023

Just force merged this as required in the previous comment! 😃

@patrykkopycinski patrykkopycinski deleted the feat/security-esarchiver-load-options branch August 28, 2023 19:58
@patrykkopycinski patrykkopycinski added backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) and removed backport:skip This commit does not require backporting labels Aug 28, 2023
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
8.10 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 164988

Questions ?

Please refer to the Backport tool documentation

jloleysens added a commit to jloleysens/kibana that referenced this pull request Aug 29, 2023
* main: (40 commits)
  Adjust migrations and elasticsearch service settings for serverless. (elastic#165050)
  [Security Solution] expandable flyout - add investigate in timeline f… (elastic#165025)
  [SecuritySolution] Hide create dashboard button from listing (elastic#164476)
  Construct HTTP log message only if needed (elastic#165057)
  [Security Solution] expandable flyout - add no data message in entities details and entities overview components (elastic#164955)
  Add functional tests for serverless security management UIs (elastic#164886)
  [api-docs] 2023-08-29 Daily api_docs build (elastic#165056)
  [Cloud Security][CIS GCP]cis gcp now use updated gcp field name + small last minute changes (elastic#164792)
  [Security Solution] Expandable flyout - update risk classification ui in entities overview (elastic#165022)
  [Security Solution] Fixes Preconfigured Connectors not working with Assistant (elastic#164900)
  [Security Solution] Coverage Overview follow-up 2 (elastic#164986)
  [DOCS] Add cross-link for other encryption key settings (elastic#165014)
  chore(slo): general enhancement (elastic#164723)
  Revert "[SOR] Allow optionally downgrading documents with a higher version model in API READ methods" (elastic#164991)
  [OAS] Add more Elasticsearch query rule examples (elastic#164386)
  [security_solution_cypress] Add support for options in EsArchiver.load (elastic#164988)
  [Event Log] Skip setting assets to hidden in serverless (elastic#164767)
  remove unneeded usages of isErrorResponse (elastic#164609)
  [Enterprise Search] Make network drive connector platinum (elastic#165007)
  [RAM] update api key to become public (elastic#164883)
  ...
patrykkopycinski added a commit to patrykkopycinski/kibana that referenced this pull request Aug 30, 2023
elastic#164988)

## Summary

Needed for
elastic#160572 (comment)

(cherry picked from commit f8ad13a)

# Conflicts:
#	x-pack/test/security_solution_cypress/cypress/e2e/exceptions/rule_details_flow/add_edit_exception.cy.ts
patrykkopycinski added a commit that referenced this pull request Aug 31, 2023
…ver.load (#164988) (#165203)

# Backport

This will backport the following commits from `main` to `8.10`:
- [[security_solution_cypress] Add support for options in
EsArchiver.load
(#164988)](#164988)

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT [{"author":{"name":"Patryk
Kopyciński","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-08-28T18:21:43Z","message":"[security_solution_cypress]
Add support for options in EsArchiver.load (#164988)\n\n##
Summary\r\n\r\nNeeded
for\r\nhttps://github.com//pull/160572#issuecomment-1695775316","sha":"f8ad13ae1f078aa5f0cb6e1190e3c167dec168c8","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:prev-minor","v8.11.0"],"number":164988,"url":"https://github.com/elastic/kibana/pull/164988","mergeCommit":{"message":"[security_solution_cypress]
Add support for options in EsArchiver.load (#164988)\n\n##
Summary\r\n\r\nNeeded
for\r\nhttps://github.com//pull/160572#issuecomment-1695775316","sha":"f8ad13ae1f078aa5f0cb6e1190e3c167dec168c8"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/164988","number":164988,"mergeCommit":{"message":"[security_solution_cypress]
Add support for options in EsArchiver.load (#164988)\n\n##
Summary\r\n\r\nNeeded
for\r\nhttps://github.com//pull/160572#issuecomment-1695775316","sha":"f8ad13ae1f078aa5f0cb6e1190e3c167dec168c8"}}]}]
BACKPORT-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) release_note:skip Skip the PR/issue when compiling release notes v8.10.0 v8.11.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants