[UA] Remove 7->8 multitype check #203995
Merged
[UA] Remove 7->8 multitype check #203995
+20
−194
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
jloleysens
added
Team:Core
|
Pinging @elastic/kibana-core (Team:Core) |
1 task
jloleysens
commented
Dec 12, 2024
There was a problem hiding this comment.
Looks like a sustainable re-architecture PR that merged recently reset some these to management 🙈
alisonelizabeth
approved these changes
Dec 12, 2024
|
Starting backport for target branches: 8.17, 8.x |
💔 All backports failed
Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Dec 12, 2024
## Summary
Removes the 7->8.x logic for detecting and warning users about custom
types. Specifically, we had a `GET index` call with `include_type_name`
that is no longer supported and would return mappings in the following,
deprecated, multitype form:
```jsonc
{
"mappings": {
"<type_name>": { "properties": { /* properties */ } }
}
}
```
Now you can only get:
```jsonc
{
"mappings": {
"properties": { /* properties */ }
}
```
...including `include_type_name` is causing a 400 response from ES,
blocking UA's ability to reindex. Existing code already handles both of
these forms bc it had to for 7.last, this PR just removes logic
targeting the former (and removes our outdated user-facing warning).
## Resources
* 7->8 removal notice
https://www.elastic.co/guide/en/elasticsearch/reference/7.17/removal-of-types.html
* old docs
https://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-get-index.html
---------
Co-authored-by: kibanamachine <[email protected]>
(cherry picked from commit b525d00)
# Conflicts:
# .github/CODEOWNERS
# x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts
# x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Dec 12, 2024
## Summary
Removes the 7->8.x logic for detecting and warning users about custom
types. Specifically, we had a `GET index` call with `include_type_name`
that is no longer supported and would return mappings in the following,
deprecated, multitype form:
```jsonc
{
"mappings": {
"<type_name>": { "properties": { /* properties */ } }
}
}
```
Now you can only get:
```jsonc
{
"mappings": {
"properties": { /* properties */ }
}
```
...including `include_type_name` is causing a 400 response from ES,
blocking UA's ability to reindex. Existing code already handles both of
these forms bc it had to for 7.last, this PR just removes logic
targeting the former (and removes our outdated user-facing warning).
## Resources
* 7->8 removal notice
https://www.elastic.co/guide/en/elasticsearch/reference/7.17/removal-of-types.html
* old docs
https://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-get-index.html
---------
Co-authored-by: kibanamachine <[email protected]>
(cherry picked from commit b525d00)
# Conflicts:
# .github/CODEOWNERS
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
This was referenced Dec 12, 2024
jloleysens
added a commit
that referenced
this pull request
Dec 12, 2024
# Backport This will backport the following commits from `main` to `8.x`: - [[UA] Remove 7->8 multitype check (#203995)](#203995) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Jean-Louis Leysens","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-12-12T14:13:49Z","message":"[UA] Remove 7->8 multitype check (#203995)\n\n## Summary\r\n\r\nRemoves the 7->8.x logic for detecting and warning users about custom\r\ntypes. Specifically, we had a `GET index` call with `include_type_name`\r\nthat is no longer supported and would return mappings in the following,\r\ndeprecated, multitype form:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"<type_name>\": { \"properties\": { /* properties */ } }\r\n }\r\n}\r\n```\r\n\r\nNow you can only get:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"properties\": { /* properties */ }\r\n}\r\n```\r\n\r\n...including `include_type_name` is causing a 400 response from ES,\r\nblocking UA's ability to reindex. Existing code already handles both of\r\nthese forms bc it had to for 7.last, this PR just removes logic\r\ntargeting the former (and removes our outdated user-facing warning).\r\n\r\n## Resources\r\n* 7->8 removal notice\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/7.17/removal-of-types.html\r\n* old docs\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-get-index.html\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"b525d00fde535645d7d60d3d98cd1f5f8cb0d4ad","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","release_note:skip","Feature:Upgrade Assistant","v9.0.0","backport:version","v8.18.0","v8.17.1"],"number":203995,"url":"https://github.com/elastic/kibana/pull/203995","mergeCommit":{"message":"[UA] Remove 7->8 multitype check (#203995)\n\n## Summary\r\n\r\nRemoves the 7->8.x logic for detecting and warning users about custom\r\ntypes. Specifically, we had a `GET index` call with `include_type_name`\r\nthat is no longer supported and would return mappings in the following,\r\ndeprecated, multitype form:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"<type_name>\": { \"properties\": { /* properties */ } }\r\n }\r\n}\r\n```\r\n\r\nNow you can only get:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"properties\": { /* properties */ }\r\n}\r\n```\r\n\r\n...including `include_type_name` is causing a 400 response from ES,\r\nblocking UA's ability to reindex. Existing code already handles both of\r\nthese forms bc it had to for 7.last, this PR just removes logic\r\ntargeting the former (and removes our outdated user-facing warning).\r\n\r\n## Resources\r\n* 7->8 removal notice\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/7.17/removal-of-types.html\r\n* old docs\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-get-index.html\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"b525d00fde535645d7d60d3d98cd1f5f8cb0d4ad"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.17"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/203995","number":203995,"mergeCommit":{"message":"[UA] Remove 7->8 multitype check (#203995)\n\n## Summary\r\n\r\nRemoves the 7->8.x logic for detecting and warning users about custom\r\ntypes. Specifically, we had a `GET index` call with `include_type_name`\r\nthat is no longer supported and would return mappings in the following,\r\ndeprecated, multitype form:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"<type_name>\": { \"properties\": { /* properties */ } }\r\n }\r\n}\r\n```\r\n\r\nNow you can only get:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"properties\": { /* properties */ }\r\n}\r\n```\r\n\r\n...including `include_type_name` is causing a 400 response from ES,\r\nblocking UA's ability to reindex. Existing code already handles both of\r\nthese forms bc it had to for 7.last, this PR just removes logic\r\ntargeting the former (and removes our outdated user-facing warning).\r\n\r\n## Resources\r\n* 7->8 removal notice\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/7.17/removal-of-types.html\r\n* old docs\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-get-index.html\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"b525d00fde535645d7d60d3d98cd1f5f8cb0d4ad"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.17","label":"v8.17.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
jloleysens
added a commit
that referenced
this pull request
Dec 12, 2024
# Backport This will backport the following commits from `main` to `8.17`: - [[UA] Remove 7->8 multitype check (#203995)](#203995) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Jean-Louis Leysens","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-12-12T14:13:49Z","message":"[UA] Remove 7->8 multitype check (#203995)\n\n## Summary\r\n\r\nRemoves the 7->8.x logic for detecting and warning users about custom\r\ntypes. Specifically, we had a `GET index` call with `include_type_name`\r\nthat is no longer supported and would return mappings in the following,\r\ndeprecated, multitype form:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"<type_name>\": { \"properties\": { /* properties */ } }\r\n }\r\n}\r\n```\r\n\r\nNow you can only get:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"properties\": { /* properties */ }\r\n}\r\n```\r\n\r\n...including `include_type_name` is causing a 400 response from ES,\r\nblocking UA's ability to reindex. Existing code already handles both of\r\nthese forms bc it had to for 7.last, this PR just removes logic\r\ntargeting the former (and removes our outdated user-facing warning).\r\n\r\n## Resources\r\n* 7->8 removal notice\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/7.17/removal-of-types.html\r\n* old docs\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-get-index.html\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"b525d00fde535645d7d60d3d98cd1f5f8cb0d4ad","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","release_note:skip","Feature:Upgrade Assistant","v9.0.0","backport:version","v8.18.0","v8.17.1"],"number":203995,"url":"https://github.com/elastic/kibana/pull/203995","mergeCommit":{"message":"[UA] Remove 7->8 multitype check (#203995)\n\n## Summary\r\n\r\nRemoves the 7->8.x logic for detecting and warning users about custom\r\ntypes. Specifically, we had a `GET index` call with `include_type_name`\r\nthat is no longer supported and would return mappings in the following,\r\ndeprecated, multitype form:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"<type_name>\": { \"properties\": { /* properties */ } }\r\n }\r\n}\r\n```\r\n\r\nNow you can only get:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"properties\": { /* properties */ }\r\n}\r\n```\r\n\r\n...including `include_type_name` is causing a 400 response from ES,\r\nblocking UA's ability to reindex. Existing code already handles both of\r\nthese forms bc it had to for 7.last, this PR just removes logic\r\ntargeting the former (and removes our outdated user-facing warning).\r\n\r\n## Resources\r\n* 7->8 removal notice\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/7.17/removal-of-types.html\r\n* old docs\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-get-index.html\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"b525d00fde535645d7d60d3d98cd1f5f8cb0d4ad"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.17"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/203995","number":203995,"mergeCommit":{"message":"[UA] Remove 7->8 multitype check (#203995)\n\n## Summary\r\n\r\nRemoves the 7->8.x logic for detecting and warning users about custom\r\ntypes. Specifically, we had a `GET index` call with `include_type_name`\r\nthat is no longer supported and would return mappings in the following,\r\ndeprecated, multitype form:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"<type_name>\": { \"properties\": { /* properties */ } }\r\n }\r\n}\r\n```\r\n\r\nNow you can only get:\r\n\r\n```jsonc\r\n{\r\n \"mappings\": {\r\n \"properties\": { /* properties */ }\r\n}\r\n```\r\n\r\n...including `include_type_name` is causing a 400 response from ES,\r\nblocking UA's ability to reindex. Existing code already handles both of\r\nthese forms bc it had to for 7.last, this PR just removes logic\r\ntargeting the former (and removes our outdated user-facing warning).\r\n\r\n## Resources\r\n* 7->8 removal notice\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/7.17/removal-of-types.html\r\n* old docs\r\nhttps://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-get-index.html\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"b525d00fde535645d7d60d3d98cd1f5f8cb0d4ad"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.17","label":"v8.17.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] 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
Removes the 7->8.x logic for detecting and warning users about custom types. Specifically, we had a
GET indexcall withinclude_type_namethat is no longer supported and would return mappings in the following, deprecated, multitype form:Now you can only get:
...including
include_type_nameis causing a 400 response from ES, blocking UA's ability to reindex. Existing code already handles both of these forms bc it had to for 7.last, this PR just removes logic targeting the former (and removes our outdated user-facing warning).Resources