-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
[Fleet] set typeMigrationVersion instead of migrationVersion #164712
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
juliaElastic
added
release_note:skip
Skip the PR/issue when compiling release notes
v8.10.0
v8.11.0
v8.9.2
labels
Aug 24, 2023
botelastic
bot
added
the
Team:Fleet
Team label for Observability Data Collection Fleet team
label
Aug 24, 2023
Pinging @elastic/fleet (Team:Fleet) |
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
juliaElastic
force-pushed
the
fix-migration-version
branch
from
August 24, 2023 13:14
b82e3ee
to
692a6cb
Compare
nchaulet
approved these changes
Aug 24, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code LGTM 🚀
💛 Build succeeded, but was flaky
Failed CI StepsMetrics [docs]To update your PR or re-run it, just comment with: |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Aug 24, 2023
…#164712) ## Summary Fix elastic#164690 `migrationVersion` was removed from es mapping in 8.8: elastic#154246 Replacing it with `typeMigrationVersion` using the same logic as in kibana core: https://github.com/elastic/kibana/blob/ba843882a7bb35aa3062efd6562ed85d5db157f4/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/document_migrator/migrations/transform_migration_version.ts#L17 To verify: - add Kubernetes integration to a new policy - verify that it is added successfully ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios (cherry picked from commit 0146dc8)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Aug 24, 2023
…#164712) ## Summary Fix elastic#164690 `migrationVersion` was removed from es mapping in 8.8: elastic#154246 Replacing it with `typeMigrationVersion` using the same logic as in kibana core: https://github.com/elastic/kibana/blob/ba843882a7bb35aa3062efd6562ed85d5db157f4/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/document_migrator/migrations/transform_migration_version.ts#L17 To verify: - add Kubernetes integration to a new policy - verify that it is added successfully ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios (cherry picked from commit 0146dc8)
kibanamachine
added a commit
that referenced
this pull request
Aug 24, 2023
…164712) (#164727) # Backport This will backport the following commits from `main` to `8.10`: - [[Fleet] set typeMigrationVersion instead of migrationVersion (#164712)](#164712) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Julia Bardi","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-08-24T14:37:58Z","message":"[Fleet] set typeMigrationVersion instead of migrationVersion (#164712)\n\n## Summary\r\n\r\nFix https://github.com/elastic/kibana/issues/164690\r\n\r\n`migrationVersion` was removed from es mapping in 8.8:\r\nhttps://github.com//issues/154246\r\nReplacing it with `typeMigrationVersion` using the same logic as in\r\nkibana core:\r\n\r\nhttps://github.com/elastic/kibana/blob/ba843882a7bb35aa3062efd6562ed85d5db157f4/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/document_migrator/migrations/transform_migration_version.ts#L17\r\n\r\n\r\nTo verify:\r\n- add Kubernetes integration to a new policy\r\n- verify that it is added successfully\r\n\r\n### Checklist\r\n\r\n- [x] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios","sha":"0146dc87e8db9ed085295ad63d5863f2964d4eb6","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v8.10.0","v8.11.0","v8.9.2"],"number":164712,"url":"https://github.com/elastic/kibana/pull/164712","mergeCommit":{"message":"[Fleet] set typeMigrationVersion instead of migrationVersion (#164712)\n\n## Summary\r\n\r\nFix https://github.com/elastic/kibana/issues/164690\r\n\r\n`migrationVersion` was removed from es mapping in 8.8:\r\nhttps://github.com//issues/154246\r\nReplacing it with `typeMigrationVersion` using the same logic as in\r\nkibana core:\r\n\r\nhttps://github.com/elastic/kibana/blob/ba843882a7bb35aa3062efd6562ed85d5db157f4/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/document_migrator/migrations/transform_migration_version.ts#L17\r\n\r\n\r\nTo verify:\r\n- add Kubernetes integration to a new policy\r\n- verify that it is added successfully\r\n\r\n### Checklist\r\n\r\n- [x] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios","sha":"0146dc87e8db9ed085295ad63d5863f2964d4eb6"}},"sourceBranch":"main","suggestedTargetBranches":["8.10","8.9"],"targetPullRequestStates":[{"branch":"8.10","label":"v8.10.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/164712","number":164712,"mergeCommit":{"message":"[Fleet] set typeMigrationVersion instead of migrationVersion (#164712)\n\n## Summary\r\n\r\nFix https://github.com/elastic/kibana/issues/164690\r\n\r\n`migrationVersion` was removed from es mapping in 8.8:\r\nhttps://github.com//issues/154246\r\nReplacing it with `typeMigrationVersion` using the same logic as in\r\nkibana core:\r\n\r\nhttps://github.com/elastic/kibana/blob/ba843882a7bb35aa3062efd6562ed85d5db157f4/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/document_migrator/migrations/transform_migration_version.ts#L17\r\n\r\n\r\nTo verify:\r\n- add Kubernetes integration to a new policy\r\n- verify that it is added successfully\r\n\r\n### Checklist\r\n\r\n- [x] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios","sha":"0146dc87e8db9ed085295ad63d5863f2964d4eb6"}},{"branch":"8.9","label":"v8.9.2","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Julia Bardi <[email protected]>
kibanamachine
added a commit
that referenced
this pull request
Aug 24, 2023
…164712) (#164728) # Backport This will backport the following commits from `main` to `8.9`: - [[Fleet] set typeMigrationVersion instead of migrationVersion (#164712)](#164712) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Julia Bardi","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-08-24T14:37:58Z","message":"[Fleet] set typeMigrationVersion instead of migrationVersion (#164712)\n\n## Summary\r\n\r\nFix https://github.com/elastic/kibana/issues/164690\r\n\r\n`migrationVersion` was removed from es mapping in 8.8:\r\nhttps://github.com//issues/154246\r\nReplacing it with `typeMigrationVersion` using the same logic as in\r\nkibana core:\r\n\r\nhttps://github.com/elastic/kibana/blob/ba843882a7bb35aa3062efd6562ed85d5db157f4/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/document_migrator/migrations/transform_migration_version.ts#L17\r\n\r\n\r\nTo verify:\r\n- add Kubernetes integration to a new policy\r\n- verify that it is added successfully\r\n\r\n### Checklist\r\n\r\n- [x] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios","sha":"0146dc87e8db9ed085295ad63d5863f2964d4eb6","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v8.10.0","v8.11.0","v8.9.2"],"number":164712,"url":"https://github.com/elastic/kibana/pull/164712","mergeCommit":{"message":"[Fleet] set typeMigrationVersion instead of migrationVersion (#164712)\n\n## Summary\r\n\r\nFix https://github.com/elastic/kibana/issues/164690\r\n\r\n`migrationVersion` was removed from es mapping in 8.8:\r\nhttps://github.com//issues/154246\r\nReplacing it with `typeMigrationVersion` using the same logic as in\r\nkibana core:\r\n\r\nhttps://github.com/elastic/kibana/blob/ba843882a7bb35aa3062efd6562ed85d5db157f4/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/document_migrator/migrations/transform_migration_version.ts#L17\r\n\r\n\r\nTo verify:\r\n- add Kubernetes integration to a new policy\r\n- verify that it is added successfully\r\n\r\n### Checklist\r\n\r\n- [x] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios","sha":"0146dc87e8db9ed085295ad63d5863f2964d4eb6"}},"sourceBranch":"main","suggestedTargetBranches":["8.10","8.9"],"targetPullRequestStates":[{"branch":"8.10","label":"v8.10.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/164712","number":164712,"mergeCommit":{"message":"[Fleet] set typeMigrationVersion instead of migrationVersion (#164712)\n\n## Summary\r\n\r\nFix https://github.com/elastic/kibana/issues/164690\r\n\r\n`migrationVersion` was removed from es mapping in 8.8:\r\nhttps://github.com//issues/154246\r\nReplacing it with `typeMigrationVersion` using the same logic as in\r\nkibana core:\r\n\r\nhttps://github.com/elastic/kibana/blob/ba843882a7bb35aa3062efd6562ed85d5db157f4/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/document_migrator/migrations/transform_migration_version.ts#L17\r\n\r\n\r\nTo verify:\r\n- add Kubernetes integration to a new policy\r\n- verify that it is added successfully\r\n\r\n### Checklist\r\n\r\n- [x] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios","sha":"0146dc87e8db9ed085295ad63d5863f2964d4eb6"}},{"branch":"8.9","label":"v8.9.2","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Julia Bardi <[email protected]>
This was referenced Oct 1, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
release_note:skip
Skip the PR/issue when compiling release notes
Team:Fleet
Team label for Observability Data Collection Fleet team
v8.9.2
v8.10.0
v8.11.0
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fix #164690
migrationVersion
was removed from es mapping in 8.8: #154246Replacing it with
typeMigrationVersion
using the same logic as in kibana core:kibana/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/document_migrator/migrations/transform_migration_version.ts
Line 17 in ba84388
To verify:
Checklist