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

x-pack/plugin/apm-data: fix @custom component templates #104182

Merged
merged 3 commits into from
Jan 17, 2024
Merged

x-pack/plugin/apm-data: fix @custom component templates #104182

merged 3 commits into from
Jan 17, 2024

Conversation

axw
Copy link
Member

@axw axw commented Jan 10, 2024

Use <data_stream.type>@custom instead of apm@custom. This is an enhancement over what Fleet sets up; it is an additive improvement in the direction of #97664.

The rollup data streams' @custom component templates now include the duration, like what Fleet sets up.

Add a YAML REST test, and a unit test ensuring consistency across the index templates.

@axw
apm-data: fix @custom component templates
8c8b0b9 
Use `<data_stream.type>@custom` instead of `apm@custom`.
This is an enhancement over what Fleet sets up; it is
an additive improvement in the direction of
elastic#97664.

The rollup data streams' `@custom` component templates
now include the duration, like what Fleet sets up.

Add a YAML REST test, and a unit test ensuring consistency
across the index templates.
@axw axw added >bug :Data Management/Data streams Data streams and their lifecycles labels Jan 10, 2024
@elasticsearchmachine elasticsearchmachine added external-contributor Pull request authored by a developer outside the Elasticsearch team v8.13.0 labels Jan 10, 2024
@elasticsearchmachine
Copy link
Collaborator

Hi @axw, I've created a changelog YAML for you.

@axw axw mentioned this pull request Jan 10, 2024
Closed
@axw axw changed the title apm-data: fix @custom component templates x-pack/plugin/apm-data: fix @custom component templates Jan 10, 2024
@axw axw marked this pull request as ready for review January 10, 2024 06:39
@axw axw requested a review from a team as a code owner January 10, 2024 06:39
@elasticsearchmachine elasticsearchmachine added the Team:Data Management Meta label for data/management team label Jan 10, 2024
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-data-management (Team:Data Management)

@felixbarny
Copy link
Member

I'm wondering if we should keep the apm@custom component templates in addition to the ones you've added for backwards compatibility reasons. Users may have already added an apm@custom component template. If we stop importing them, that could be considered a breaking change.

@axw
Copy link
Member Author

axw commented Jan 16, 2024

I'm wondering if we should keep the apm@custom component templates in addition to the ones you've added for backwards compatibility reasons. Users may have already added an apm@custom component template. If we stop importing them, that could be considered a breaking change.

@felixbarny apm@custom isn't something that gets added by Fleet, it was something I made up for the plugin to support cross-cutting mappings or settings customisations. Since the plugin is tech preview, I don't think we need to worry about backwards compatibility yet.

@felixbarny
Copy link
Member

Ah, I wasn't aware of that. Makes sense then.

felixbarny
felixbarny approved these changes Jan 16, 2024
View reviewed changes
Copy link
Member

@felixbarny felixbarny left a comment

Choose a reason for hiding this comment

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

Love the test chat checks for compliance to the naming conventions

@axw
Copy link
Member Author

axw commented Jan 17, 2024

@elasticmachine update branch

@axw axw added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Jan 17, 2024
@elasticsearchmachine elasticsearchmachine merged commit 32ace95 into elastic:main Jan 17, 2024
14 checks passed
@axw axw deleted the apmdata-custom-component-templates branch January 17, 2024 01:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixbarny felixbarny felixbarny approved these changes

Assignees
No one assigned
Labels
auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) >bug :Data Management/Data streams Data streams and their lifecycles external-contributor Pull request authored by a developer outside the Elasticsearch team Team:Data Management Meta label for data/management team v8.13.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@axw @elasticsearchmachine @felixbarny @elasticmachine