-
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] Improve input template API yaml comments #199168
[Fleet] Improve input template API yaml comments #199168
Conversation
Pinging @elastic/fleet (Team:Fleet) |
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
/oblt-deploy |
I don't think the original PR made it into 8.16 |
@flash1293 it seems it is in 8.16.0 the code is present in the 8.16 branch |
@nchaulet Then we should definitely backport to 8.16 The last BC will be cut tomorrow, let's make sure to get it in today |
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.
Checked the output and everything looks good to me, waiting for the test deployment to do a proper e2e test on serverless
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.
Makes sense to me. I think having the second comment character should make it relatively easy to uncomment via editor shortcuts while still maintaining the description.
@elasticmachine merge upstream |
⏳ Build in-progress
History
cc @nchaulet |
Starting backport for target branches: 8.16, 8.x |
(cherry picked from commit 8041372)
(cherry picked from commit 8041372)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
…99238) # Backport This will backport the following commits from `main` to `8.16`: - [[Fleet] Improve input template API yaml comments (#199168)](#199168) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Nicolas Chaulet","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-06T22:01:19Z","message":"[Fleet] Improve input template API yaml comments (#199168)","sha":"8041372868f732530d7fecf1c44fad1f61b631fc","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor","ci:project-deploy-observability","v8.16.0","v8.17.0"],"title":"[Fleet] Improve input template API yaml comments","number":199168,"url":"https://github.com/elastic/kibana/pull/199168","mergeCommit":{"message":"[Fleet] Improve input template API yaml comments (#199168)","sha":"8041372868f732530d7fecf1c44fad1f61b631fc"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199168","number":199168,"mergeCommit":{"message":"[Fleet] Improve input template API yaml comments (#199168)","sha":"8041372868f732530d7fecf1c44fad1f61b631fc"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> --------- Co-authored-by: Nicolas Chaulet <[email protected]> Co-authored-by: Joe Reuter <[email protected]>
…9239) # Backport This will backport the following commits from `main` to `8.x`: - [[Fleet] Improve input template API yaml comments (#199168)](#199168) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Nicolas Chaulet","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-06T22:01:19Z","message":"[Fleet] Improve input template API yaml comments (#199168)","sha":"8041372868f732530d7fecf1c44fad1f61b631fc","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor","ci:project-deploy-observability","v8.16.0","v8.17.0"],"title":"[Fleet] Improve input template API yaml comments","number":199168,"url":"https://github.com/elastic/kibana/pull/199168","mergeCommit":{"message":"[Fleet] Improve input template API yaml comments (#199168)","sha":"8041372868f732530d7fecf1c44fad1f61b631fc"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199168","number":199168,"mergeCommit":{"message":"[Fleet] Improve input template API yaml comments (#199168)","sha":"8041372868f732530d7fecf1c44fad1f61b631fc"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> --------- Co-authored-by: Nicolas Chaulet <[email protected]>
Summary
Related to https://github.com/elastic/observability-dev/issues/3200
Replace #199135
Improve the yaml we generate for input template, previously we introduced placeholder variables to include variables without default in the generated YAML. To make that yaml valid for agents we will now comment the lines where we introduced placeholder.
For example for system and redis integration the template looks like this now:
Do we want to backport this to 8.16.0 ?