[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless#225188
Merged
jen-huang merged 20 commits intoelastic:mainfrom Oct 15, 2025
Merged
[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless#225188jen-huang merged 20 commits intoelastic:mainfrom
jen-huang merged 20 commits intoelastic:mainfrom
Conversation
…rverless, use them in handling of agentless policies
jen-huang
added
release_note:skip
10 tasks
jen-huang
changed the title
jen-huang
added
ci:cloud-deploy
Contributor
|
Pinging @elastic/fleet (Team:Fleet) |
Member
|
I am not sure this will totally work as we delete/ non used preconfigured output/fleet server hosts during Fleet setup, we continuously will try to delete those, or mark them as non preconfigured if they are used by a policy You can see in log I think one way to prevent that will be to add the newly created fleet server host to the preconfigured list here and same for output here |
Contributor
MichelLosier
left a comment
MichelLosier
left a comment
There was a problem hiding this comment.
Looking good so far, good catch @nchaulet on the clean up part
Contributor
Author
kibanamachine
added
backport:skip
ersin-erdal
pushed a commit
to ersin-erdal/kibana
that referenced
this pull request
Oct 15, 2025
jen-huang
added
v9.0.0
backport:version
Contributor
|
Starting backport for target branches: 8.19, 9.0, 9.1, 9.2 https://github.com/elastic/kibana/actions/runs/18537454866 |
Contributor
|
Starting backport for target branches: 8.19, 9.0, 9.1, 9.2 https://github.com/elastic/kibana/actions/runs/18537455061 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Oct 15, 2025
… Serverless (elastic#225188) (cherry picked from commit 237a489)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Oct 15, 2025
… Serverless (elastic#225188) (cherry picked from commit 237a489)
Contributor
💔 Some backports could not be created
Note: Successful backport PRs will be merged automatically after passing CI. Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Oct 15, 2025
… Serverless (elastic#225188) (cherry picked from commit 237a489)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Oct 15, 2025
… Serverless (elastic#225188) (cherry picked from commit 237a489)
Contributor
💔 Some backports could not be created
Note: Successful backport PRs will be merged automatically after passing CI. Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Oct 15, 2025
…CH and Serverless (#225188) (#239212) # Backport This will backport the following commits from `main` to `9.2`: - [[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless (#225188)](#225188) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Jen Huang","email":"its.jenetic@gmail.com"},"sourceCommit":{"committedDate":"2025-10-15T02:59:59Z","message":"[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless (#225188)","sha":"237a489648c48ab43701b77a0af380f5a7360cee","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","ci:cloud-deploy","ci:project-deploy-security","backport:version","v9.2.0","v9.3.0","v9.1.6","v8.19.6"],"title":"[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless","number":225188,"url":"https://github.com/elastic/kibana/pull/225188","mergeCommit":{"message":"[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless (#225188)","sha":"237a489648c48ab43701b77a0af380f5a7360cee"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","9.2","9.1","8.19"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.2","label":"v9.2.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/225188","number":225188,"mergeCommit":{"message":"[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless (#225188)","sha":"237a489648c48ab43701b77a0af380f5a7360cee"}},{"branch":"9.1","label":"v9.1.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Jen Huang <its.jenetic@gmail.com>
jen-huang
added a commit
that referenced
this pull request
Oct 15, 2025
…CH and Serverless (#225188) (#239231) # Backport This will backport the following commits from `main` to `9.1`: - [[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless (#225188)](#225188) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Jen Huang","email":"its.jenetic@gmail.com"},"sourceCommit":{"committedDate":"2025-10-15T02:59:59Z","message":"[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless (#225188)","sha":"237a489648c48ab43701b77a0af380f5a7360cee","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","ci:cloud-deploy","ci:project-deploy-security","backport:version","v9.2.0","v9.3.0","v9.1.6","v8.19.6"],"title":"[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless","number":225188,"url":"https://github.com/elastic/kibana/pull/225188","mergeCommit":{"message":"[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless (#225188)","sha":"237a489648c48ab43701b77a0af380f5a7360cee"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","9.2","9.1","8.19"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.2","label":"v9.2.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/225188","number":225188,"mergeCommit":{"message":"[UII] Use explicit fleet server & output IDs for agentless on ECH and Serverless (#225188)","sha":"237a489648c48ab43701b77a0af380f5a7360cee"}},{"branch":"9.1","label":"v9.1.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
mgadewoll
pushed a commit
to tkajtoch/kibana
that referenced
this pull request
Oct 17, 2025
rylnd
pushed a commit
to rylnd/kibana
that referenced
this pull request
Oct 17, 2025
nickpeihl
pushed a commit
to nickpeihl/kibana
that referenced
this pull request
Oct 23, 2025
NicholasPeretti
pushed a commit
to NicholasPeretti/kibana
that referenced
this pull request
Oct 27, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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
Resolves https://github.com/elastic/ingest-dev/issues/5924.
This PR adjusts the fixed IDs for Fleet Server host and ES output used by agentless policies on ECH. This is done by programmatically creating new uneditable host objects during Fleet setup.
On serverless, the logic remains the same: serverless agent policies use preconfigured hosts IDs defined by project controller.
PR also:
Checklist
Check the PR satisfies following conditions.
Reviewers should verify this PR satisfies this list as well.
release_note:*label is applied per the guidelines