[Fleet] Fix cloudflare template error #182645
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
criamico
added
release_note:fix
Team:Fleet
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
|
Pinging @elastic/fleet (Team:Fleet) |
💛 Build succeeded, but was flaky
Failed CI StepsMetrics [docs]Async chunks
To update your PR or re-run it, just comment with: cc @criamico |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
May 6, 2024
## Summary Cloudflare 8.24 doesn't install properly and the config tab also fails with the same error. This PR fixes this error and also fixes a small UI issue with max width not sets in configs tab. The integration defines two possible options for auth (auth key or token) but only one should be used. When both are set the [compile template](https://github.com/elastic/kibana/blob/be3f66fd45db4001b9437281a2cb075e817fa25f/x-pack/plugins/fleet/server/services/epm/agent/agent.ts#L27) fails with an error ## Before   ## After  (cherry picked from commit 1a3ff70)
💚 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
May 6, 2024
# Backport This will backport the following commits from `main` to `8.14`: - [[Fleet] Fix cloudflare template error (#182645)](#182645) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Cristina Amico","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-05-06T10:19:13Z","message":"[Fleet] Fix cloudflare template error (#182645)\n\n## Summary\r\n\r\nCloudflare 8.24 doesn't install properly and the config tab also fails\r\nwith the same error. This PR fixes this error and also fixes a small UI\r\nissue with max width not sets in configs tab.\r\n\r\nThe integration defines two possible options for auth (auth key or\r\ntoken) but only one should be used. When both are set the [compile\r\ntemplate](https://github.com/elastic/kibana/blob/be3f66fd45db4001b9437281a2cb075e817fa25f/x-pack/plugins/fleet/server/services/epm/agent/agent.ts#L27)\r\nfails with an error\r\n\r\n## Before\r\n\r\n\r\n\r\n## After\r\n","sha":"1a3ff70c5e7ebdc308fe5022acee178a43302dc5","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-minor","v8.15.0"],"title":"[Fleet] Fix cloudflare template error","number":182645,"url":"https://github.com/elastic/kibana/pull/182645","mergeCommit":{"message":"[Fleet] Fix cloudflare template error (#182645)\n\n## Summary\r\n\r\nCloudflare 8.24 doesn't install properly and the config tab also fails\r\nwith the same error. This PR fixes this error and also fixes a small UI\r\nissue with max width not sets in configs tab.\r\n\r\nThe integration defines two possible options for auth (auth key or\r\ntoken) but only one should be used. When both are set the [compile\r\ntemplate](https://github.com/elastic/kibana/blob/be3f66fd45db4001b9437281a2cb075e817fa25f/x-pack/plugins/fleet/server/services/epm/agent/agent.ts#L27)\r\nfails with an error\r\n\r\n## Before\r\n\r\n\r\n\r\n## After\r\n","sha":"1a3ff70c5e7ebdc308fe5022acee178a43302dc5"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.15.0","branchLabelMappingKey":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/182645","number":182645,"mergeCommit":{"message":"[Fleet] Fix cloudflare template error (#182645)\n\n## Summary\r\n\r\nCloudflare 8.24 doesn't install properly and the config tab also fails\r\nwith the same error. This PR fixes this error and also fixes a small UI\r\nissue with max width not sets in configs tab.\r\n\r\nThe integration defines two possible options for auth (auth key or\r\ntoken) but only one should be used. When both are set the [compile\r\ntemplate](https://github.com/elastic/kibana/blob/be3f66fd45db4001b9437281a2cb075e817fa25f/x-pack/plugins/fleet/server/services/epm/agent/agent.ts#L27)\r\nfails with an error\r\n\r\n## Before\r\n\r\n\r\n\r\n## After\r\n","sha":"1a3ff70c5e7ebdc308fe5022acee178a43302dc5"}}]}] BACKPORT--> Co-authored-by: Cristina Amico <[email protected]>
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
Cloudflare 8.24 doesn't install properly and the config tab also fails with the same error. This PR fixes this error and also fixes a small UI issue with max width not sets in configs tab.
The integration defines two possible options for auth (auth key or token) but only one should be used. When both are set the compile template fails with an error
Before
After