[UII] Fix skipped test by add logs otel template to index template overlaps #194764
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
|
Pinging @elastic/fleet (Team:Fleet) |
juliaElastic
approved these changes
Oct 7, 2024
💚 Build Succeeded
Metrics [docs]
History
To update your PR or re-run it, just comment with: cc @jen-huang |
|
Starting backport for target branches: 8.x https://github.com/elastic/kibana/actions/runs/11213942514 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Oct 7, 2024
…erlaps (elastic#194764) ## Summary **Do not merge until ES has been promoted** Resolves elastic#194714. Test was skipped due to changes from latest ES build. This PR amends the test and unskips it. (cherry picked from commit 95d01cd)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Oct 7, 2024
…ate overlaps (#194764) (#195220) # Backport This will backport the following commits from `main` to `8.x`: - [[UII] Fix skipped test by add logs otel template to index template overlaps (#194764)](#194764) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Jen Huang","email":"its.jenetic@gmail.com"},"sourceCommit":{"committedDate":"2024-10-07T10:48:48Z","message":"[UII] Fix skipped test by add logs otel template to index template overlaps (#194764)\n\n## Summary\r\n\r\n**Do not merge until ES has been promoted**\r\n\r\nResolves #194714. Test was skipped due to changes from latest ES build.\r\nThis PR amends the test and unskips it.","sha":"95d01cdfa002cc8dd01e03f6a5eca1770f81cf08","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor"],"title":"[UII] Fix skipped test by add logs otel template to index template overlaps","number":194764,"url":"https://github.com/elastic/kibana/pull/194764","mergeCommit":{"message":"[UII] Fix skipped test by add logs otel template to index template overlaps (#194764)\n\n## Summary\r\n\r\n**Do not merge until ES has been promoted**\r\n\r\nResolves #194714. Test was skipped due to changes from latest ES build.\r\nThis PR amends the test and unskips it.","sha":"95d01cdfa002cc8dd01e03f6a5eca1770f81cf08"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/194764","number":194764,"mergeCommit":{"message":"[UII] Fix skipped test by add logs otel template to index template overlaps (#194764)\n\n## Summary\r\n\r\n**Do not merge until ES has been promoted**\r\n\r\nResolves #194714. Test was skipped due to changes from latest ES build.\r\nThis PR amends the test and unskips it.","sha":"95d01cdfa002cc8dd01e03f6a5eca1770f81cf08"}}]}] BACKPORT--> Co-authored-by: Jen Huang <its.jenetic@gmail.com>
jen-huang
added a commit
that referenced
this pull request
Oct 9, 2024
## Summary Follow up to #194764. This test was also failing on 7.17 branch when they 8.x ES compatibility tests were run, so this PR adjusts the test based on the ES version it runs against. This will be backported to 8.x and 7.17.
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Oct 9, 2024
## Summary Follow up to elastic#194764. This test was also failing on 7.17 branch when they 8.x ES compatibility tests were run, so this PR adjusts the test based on the ES version it runs against. This will be backported to 8.x and 7.17. (cherry picked from commit ab2d7aa)
kibanamachine
added a commit
that referenced
this pull request
Oct 9, 2024
…195535) # Backport This will backport the following commits from `main` to `8.x`: - [[UII] Adjust test based on ES version tested against (#195508)](#195508) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Jen Huang","email":"its.jenetic@gmail.com"},"sourceCommit":{"committedDate":"2024-10-09T07:05:56Z","message":"[UII] Adjust test based on ES version tested against (#195508)\n\n## Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17 branch when\r\nthey 8.x ES compatibility tests were run, so this PR adjusts the test\r\nbased on the ES version it runs against. This will be backported to 8.x\r\nand 7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:all-open"],"title":"[UII] Adjust test based on ES version tested against","number":195508,"url":"https://github.com/elastic/kibana/pull/195508","mergeCommit":{"message":"[UII] Adjust test based on ES version tested against (#195508)\n\n## Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17 branch when\r\nthey 8.x ES compatibility tests were run, so this PR adjusts the test\r\nbased on the ES version it runs against. This will be backported to 8.x\r\nand 7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/195508","number":195508,"mergeCommit":{"message":"[UII] Adjust test based on ES version tested against (#195508)\n\n## Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17 branch when\r\nthey 8.x ES compatibility tests were run, so this PR adjusts the test\r\nbased on the ES version it runs against. This will be backported to 8.x\r\nand 7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}}]}] BACKPORT--> Co-authored-by: Jen Huang <its.jenetic@gmail.com>
jen-huang
added a commit
to jen-huang/kibana
that referenced
this pull request
Oct 9, 2024
## Summary Follow up to elastic#194764. This test was also failing on 7.17 branch when they 8.x ES compatibility tests were run, so this PR adjusts the test based on the ES version it runs against. This will be backported to 8.x and 7.17. (cherry picked from commit ab2d7aa) # Conflicts: # x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts
jen-huang
added a commit
that referenced
this pull request
Oct 9, 2024
…#195664) # Backport This will backport the following commits from `main` to `8.15`: - [[UII] Adjust test based on ES version tested against (#195508)](#195508) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Jen Huang","email":"its.jenetic@gmail.com"},"sourceCommit":{"committedDate":"2024-10-09T07:05:56Z","message":"[UII] Adjust test based on ES version tested against (#195508)\n\n## Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17 branch when\r\nthey 8.x ES compatibility tests were run, so this PR adjusts the test\r\nbased on the ES version it runs against. This will be backported to 8.x\r\nand 7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:all-open","v8.16.0"],"number":195508,"url":"https://github.com/elastic/kibana/pull/195508","mergeCommit":{"message":"[UII] Adjust test based on ES version tested against (#195508)\n\n## Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17 branch when\r\nthey 8.x ES compatibility tests were run, so this PR adjusts the test\r\nbased on the ES version it runs against. This will be backported to 8.x\r\nand 7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/195508","number":195508,"mergeCommit":{"message":"[UII] Adjust test based on ES version tested against (#195508)\n\n## Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17 branch when\r\nthey 8.x ES compatibility tests were run, so this PR adjusts the test\r\nbased on the ES version it runs against. This will be backported to 8.x\r\nand 7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}},{"branch":"8.x","label":"v8.16.0","labelRegex":"^v8.16.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/195535","number":195535,"state":"MERGED","mergeCommit":{"sha":"327ce6a52181b2d6a7228a97f776a60a8909afd5","message":"[8.x] [UII] Adjust test based on ES version tested against (#195508) (#195535)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.x`:\n- [[UII] Adjust test based on ES version tested against\n(#195508)](https://github.com/elastic/kibana/pull/195508)\n\n<!--- Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT [{\"author\":{\"name\":\"Jen\nHuang\",\"email\":\"its.jenetic@gmail.com\"},\"sourceCommit\":{\"committedDate\":\"2024-10-09T07:05:56Z\",\"message\":\"[UII]\nAdjust test based on ES version tested against (#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility tests were run, so this PR\nadjusts the test\\r\\nbased on the ES version it runs against. This will\nbe backported to 8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.16.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"Team:Fleet\",\"v9.0.0\",\"backport:all-open\"],\"title\":\"[UII]\nAdjust test based on ES version tested\nagainst\",\"number\":195508,\"url\":\"https://github.com/elastic/kibana/pull/195508\",\"mergeCommit\":{\"message\":\"[UII]\nAdjust test based on ES version tested against (#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility tests were run, so this PR\nadjusts the test\\r\\nbased on the ES version it runs against. This will\nbe backported to 8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/195508\",\"number\":195508,\"mergeCommit\":{\"message\":\"[UII]\nAdjust test based on ES version tested against (#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility tests were run, so this PR\nadjusts the test\\r\\nbased on the ES version it runs against. This will\nbe backported to 8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\"}}]}] BACKPORT-->\n\nCo-authored-by: Jen Huang <its.jenetic@gmail.com>"}}]}] BACKPORT-->
jen-huang
added a commit
that referenced
this pull request
Oct 9, 2024
…#195665) # Backport This will backport the following commits from `main` to `7.17`: - [[UII] Adjust test based on ES version tested against (#195508)](#195508) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Jen Huang","email":"its.jenetic@gmail.com"},"sourceCommit":{"committedDate":"2024-10-09T07:05:56Z","message":"[UII] Adjust test based on ES version tested against (#195508)\n\n## Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17 branch when\r\nthey 8.x ES compatibility tests were run, so this PR adjusts the test\r\nbased on the ES version it runs against. This will be backported to 8.x\r\nand 7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:all-open","v8.16.0"],"number":195508,"url":"https://github.com/elastic/kibana/pull/195508","mergeCommit":{"message":"[UII] Adjust test based on ES version tested against (#195508)\n\n## Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17 branch when\r\nthey 8.x ES compatibility tests were run, so this PR adjusts the test\r\nbased on the ES version it runs against. This will be backported to 8.x\r\nand 7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/195508","number":195508,"mergeCommit":{"message":"[UII] Adjust test based on ES version tested against (#195508)\n\n## Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17 branch when\r\nthey 8.x ES compatibility tests were run, so this PR adjusts the test\r\nbased on the ES version it runs against. This will be backported to 8.x\r\nand 7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}},{"branch":"8.x","label":"v8.16.0","labelRegex":"^v8.16.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/195535","number":195535,"state":"MERGED","mergeCommit":{"sha":"327ce6a52181b2d6a7228a97f776a60a8909afd5","message":"[8.x] [UII] Adjust test based on ES version tested against (#195508) (#195535)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.x`:\n- [[UII] Adjust test based on ES version tested against\n(#195508)](https://github.com/elastic/kibana/pull/195508)\n\n<!--- Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT [{\"author\":{\"name\":\"Jen\nHuang\",\"email\":\"its.jenetic@gmail.com\"},\"sourceCommit\":{\"committedDate\":\"2024-10-09T07:05:56Z\",\"message\":\"[UII]\nAdjust test based on ES version tested against (#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility tests were run, so this PR\nadjusts the test\\r\\nbased on the ES version it runs against. This will\nbe backported to 8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.16.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"Team:Fleet\",\"v9.0.0\",\"backport:all-open\"],\"title\":\"[UII]\nAdjust test based on ES version tested\nagainst\",\"number\":195508,\"url\":\"https://github.com/elastic/kibana/pull/195508\",\"mergeCommit\":{\"message\":\"[UII]\nAdjust test based on ES version tested against (#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility tests were run, so this PR\nadjusts the test\\r\\nbased on the ES version it runs against. This will\nbe backported to 8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/195508\",\"number\":195508,\"mergeCommit\":{\"message\":\"[UII]\nAdjust test based on ES version tested against (#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility tests were run, so this PR\nadjusts the test\\r\\nbased on the ES version it runs against. This will\nbe backported to 8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\"}}]}] BACKPORT-->\n\nCo-authored-by: Jen Huang <its.jenetic@gmail.com>"}}]}] BACKPORT-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Resolves #194714. Test was skipped due to changes from latest ES build. This PR amends the test and unskips it.