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.

Sign up for GitHub

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

Jump to bottom

[7.12] Migrations v2 ignore fleet agent events (#96690) and non-persisted sessions (#96938) #96892

Merged
merged 9 commits into from
Apr 13, 2021
Merged

[7.12] Migrations v2 ignore fleet agent events (#96690) and non-persisted sessions (#96938) #96892

merged 9 commits into from
Apr 13, 2021

Conversation

rudolf
Copy link
Contributor

@rudolf rudolf commented Apr 12, 2021 •
edited by pgayvallet
Loading

Backports the following commits to 7.12:

@rudolf
Migrations v2 ignore fleet agent events (elastic#96690)
7400699 
* migrationsv2: ignore fleet agent events and tsvb telemetry

* migrationsv1: ignore tsvb-validation-telemetry

* Skip fleet test that depends on fleet-agent-events

* Fix typescript errors

Co-authored-by: Kibana Machine <[email protected]>
# Conflicts:
#	src/core/server/saved_objects/migrationsv2/integration_tests/actions.test.ts
@rudolf rudolf enabled auto-merge (squash) April 12, 2021 20:45
@rudolf rudolf force-pushed the backport/7.12/pr-96690 branch from 817c335 to 3b4922a Compare April 12, 2021 23:07
@rudolf
Copy link
Contributor Author

rudolf commented Apr 13, 2021

@elasticmachine merge upstream

@rudolf rudolf disabled auto-merge April 13, 2021 08:19
@rudolf rudolf added backport and removed backport labels Apr 13, 2021
@rudolf
Copy link
Contributor Author

rudolf commented Apr 13, 2021

@elasticmachine merge upstream

@rudolf
Copy link
Contributor Author

rudolf commented Apr 13, 2021

Test failures seems to be caused by #96946

@pgayvallet pgayvallet changed the title [7.12] Migrations v2 ignore fleet agent events (#96690) [7.12] Migrations v2 ignore fleet agent events (#96690) and non-persisted sessions (#96938) Apr 13, 2021
@pgayvallet pgayvallet force-pushed the backport/7.12/pr-96690 branch from 410513a to db7a7f8 Compare April 13, 2021 13:14
nchaulet
nchaulet approved these changes Apr 13, 2021
View reviewed changes
Copy link
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

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

🚀

@pgayvallet
Copy link
Contributor

retest

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

@pgayvallet pgayvallet merged commit e3369df into elastic:7.12 Apr 13, 2021
@rudolf rudolf deleted the backport/7.12/pr-96690 branch April 13, 2021 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nchaulet nchaulet nchaulet approved these changes

Assignees
No one assigned
Labels
backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rudolf @pgayvallet @kibanamachine @nchaulet