[Fleet] adding object_type for fields under a group #162041
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
botelastic
bot
added
the
Team:Fleet
|
Pinging @elastic/fleet (Team:Fleet) |
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
juliaElastic
added
v8.9.1
backport:prev-minor
💚 Build Succeeded
Metrics [docs]
To update your PR or re-run it, just comment with: |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jul 17, 2023
## Summary Relates elastic#155004 Fixes a limitation that wildcard fields under a group field were not changed to `type:object` with `object_type`. This was discovered during testing with prometheus package where a field was changed to `type:double` and it was not converted to object type: https://github.com/elastic/integrations/blob/c17d59c8875196a31184d98f773c2fbb939fd866/packages/prometheus/data_stream/collector/fields/fields.yml#L9 To verify, upload the package [prometheus-1.5.2.zip](https://github.com/elastic/kibana/files/12069089/prometheus-1.5.2.zip) and verify that the resulting `collector` and `remote_write` `@package` component template has `prometheus.metrics.*` in `dynamic_templates` ``` curl -XPOST -H 'content-type: application/zip' -H 'kbn-xsrf: true' http://localhost:5601/julia/api/fleet/epm/packages -u elastic:changeme --data-binary @prometheus-1.5.2.zip ``` <img width="499" alt="image" src="https://github.com/elastic/kibana/assets/90178898/337295d8-9e3c-40c8-8b13-bda6229e7272"> ### 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 13b8864)
💚 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
Jul 17, 2023
…162056) # Backport This will backport the following commits from `main` to `8.9`: - [[Fleet] adding object_type for fields under a group (#162041)](#162041) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Julia Bardi","email":"90178898+juliaElastic@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-07-17T14:18:32Z","message":"[Fleet] adding object_type for fields under a group (#162041)\n\n## Summary\r\n\r\nRelates https://github.com/elastic/kibana/issues/155004\r\n\r\nFixes a limitation that wildcard fields under a group field were not\r\nchanged to `type:object` with `object_type`.\r\n\r\nThis was discovered during testing with prometheus package where a field\r\nwas changed to `type:double` and it was not converted to object type:\r\nhttps://github.com/elastic/integrations/blob/c17d59c8875196a31184d98f773c2fbb939fd866/packages/prometheus/data_stream/collector/fields/fields.yml#L9\r\n\r\nTo verify, upload the package\r\n[prometheus-1.5.2.zip](https://github.com/elastic/kibana/files/12069089/prometheus-1.5.2.zip)\r\nand verify that the resulting `collector` and `remote_write` `@package`\r\ncomponent template has `prometheus.metrics.*` in `dynamic_templates`\r\n```\r\ncurl -XPOST -H 'content-type: application/zip' -H 'kbn-xsrf: true' http://localhost:5601/julia/api/fleet/epm/packages -u elastic:changeme --data-binary @prometheus-1.5.2.zip\r\n```\r\n<img width=\"499\" alt=\"image\"\r\nsrc=\"https://github.com/elastic/kibana/assets/90178898/337295d8-9e3c-40c8-8b13-bda6229e7272\">\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":"13b8864c481888060fd1aa01f567d0b10702ce14","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-minor","v8.10.0"],"number":162041,"url":"https://github.com/elastic/kibana/pull/162041","mergeCommit":{"message":"[Fleet] adding object_type for fields under a group (#162041)\n\n## Summary\r\n\r\nRelates https://github.com/elastic/kibana/issues/155004\r\n\r\nFixes a limitation that wildcard fields under a group field were not\r\nchanged to `type:object` with `object_type`.\r\n\r\nThis was discovered during testing with prometheus package where a field\r\nwas changed to `type:double` and it was not converted to object type:\r\nhttps://github.com/elastic/integrations/blob/c17d59c8875196a31184d98f773c2fbb939fd866/packages/prometheus/data_stream/collector/fields/fields.yml#L9\r\n\r\nTo verify, upload the package\r\n[prometheus-1.5.2.zip](https://github.com/elastic/kibana/files/12069089/prometheus-1.5.2.zip)\r\nand verify that the resulting `collector` and `remote_write` `@package`\r\ncomponent template has `prometheus.metrics.*` in `dynamic_templates`\r\n```\r\ncurl -XPOST -H 'content-type: application/zip' -H 'kbn-xsrf: true' http://localhost:5601/julia/api/fleet/epm/packages -u elastic:changeme --data-binary @prometheus-1.5.2.zip\r\n```\r\n<img width=\"499\" alt=\"image\"\r\nsrc=\"https://github.com/elastic/kibana/assets/90178898/337295d8-9e3c-40c8-8b13-bda6229e7272\">\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":"13b8864c481888060fd1aa01f567d0b10702ce14"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/162041","number":162041,"mergeCommit":{"message":"[Fleet] adding object_type for fields under a group (#162041)\n\n## Summary\r\n\r\nRelates https://github.com/elastic/kibana/issues/155004\r\n\r\nFixes a limitation that wildcard fields under a group field were not\r\nchanged to `type:object` with `object_type`.\r\n\r\nThis was discovered during testing with prometheus package where a field\r\nwas changed to `type:double` and it was not converted to object type:\r\nhttps://github.com/elastic/integrations/blob/c17d59c8875196a31184d98f773c2fbb939fd866/packages/prometheus/data_stream/collector/fields/fields.yml#L9\r\n\r\nTo verify, upload the package\r\n[prometheus-1.5.2.zip](https://github.com/elastic/kibana/files/12069089/prometheus-1.5.2.zip)\r\nand verify that the resulting `collector` and `remote_write` `@package`\r\ncomponent template has `prometheus.metrics.*` in `dynamic_templates`\r\n```\r\ncurl -XPOST -H 'content-type: application/zip' -H 'kbn-xsrf: true' http://localhost:5601/julia/api/fleet/epm/packages -u elastic:changeme --data-binary @prometheus-1.5.2.zip\r\n```\r\n<img width=\"499\" alt=\"image\"\r\nsrc=\"https://github.com/elastic/kibana/assets/90178898/337295d8-9e3c-40c8-8b13-bda6229e7272\">\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":"13b8864c481888060fd1aa01f567d0b10702ce14"}}]}] BACKPORT--> Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
4 tasks
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
Relates #155004
Fixes a limitation that wildcard fields under a group field were not changed to
type:objectwithobject_type.This was discovered during testing with prometheus package where a field was changed to
type:doubleand it was not converted to object type: https://github.com/elastic/integrations/blob/c17d59c8875196a31184d98f773c2fbb939fd866/packages/prometheus/data_stream/collector/fields/fields.yml#L9To verify, upload the package prometheus-1.5.2.zip and verify that the resulting
collectorandremote_write@packagecomponent template hasprometheus.metrics.*indynamic_templatesChecklist