Skip to content

Allow fleet-setup retries for all environments#240342

Merged
MichelLosier merged 3 commits intoelastic:mainfrom
MichelLosier:adjust-fleet-setup-retries
Oct 24, 2025
Merged

Allow fleet-setup retries for all environments#240342
MichelLosier merged 3 commits intoelastic:mainfrom
MichelLosier:adjust-fleet-setup-retries

Conversation

@MichelLosier
Copy link
Contributor

@MichelLosier MichelLosier commented Oct 23, 2025

Summary

  • non-serverless environments relied on integrations-server triggering fleet setup retries externally. This change allows fleet setup retries in all environments

Release notes

  • Allows fleet setup retries on start in all environments

Checklist

Check the PR satisfies following conditions.

Reviewers should verify this PR satisfies this list as well.

  • Any text added follows EUI's writing guidelines, uses sentence case text and includes i18n support
  • Documentation was added for features that require explanation or tutorials
  • Unit or functional tests were updated or added to match the most common scenarios
  • If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the docker list
  • This was checked for breaking HTTP API changes, and any breaking changes have been approved by the breaking-change committee. The release_note:breaking label should be applied in these situations.
  • Flaky Test Runner was used on any tests changed
  • The PR description includes the appropriate Release Notes section, and the correct release_note:* label is applied per the guidelines
  • Review the backport guidelines and apply applicable backport:* labels.

Identify risks

Does this PR introduce any risks? For example, consider risks like hard to test bugs, performance regression, potential of data loss.

Describe the risk, its severity, and mitigation for each identified risk. Invite stakeholders and evaluate how to proceed before merging.

@MichelLosier MichelLosier requested a review from a team as a code owner October 23, 2025 18:03
@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Oct 23, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@MichelLosier MichelLosier self-assigned this Oct 23, 2025
@MichelLosier MichelLosier added release_note:skip Skip the PR/issue when compiling release notes release_note:fix backport:version Backport to applied version labels v9.3.0 v9.2.0 v9.1.6 v8.19.6 and removed release_note:skip Skip the PR/issue when compiling release notes v9.2.0 v9.3.0 labels Oct 23, 2025
@nchaulet
Copy link
Member

Do you think it will make sense to keep the config but with a default value to true? This way we still have a way to disable it if things go wrong

@elasticmachine
Copy link
Contributor

elasticmachine commented Oct 23, 2025

💔 Build Failed

Failed CI Steps

History

cc @MichelLosier

Copy link
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@MichelLosier MichelLosier merged commit a82601e into elastic:main Oct 24, 2025
14 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.19, 9.1, 9.2

https://github.com/elastic/kibana/actions/runs/18786638262

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 24, 2025
non-serverless environments relied on integrations-server triggering
fleet setup retries externally. This change allows fleet setup retries
in all environments

(cherry picked from commit a82601e)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 24, 2025
non-serverless environments relied on integrations-server triggering
fleet setup retries externally. This change allows fleet setup retries
in all environments

(cherry picked from commit a82601e)
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
8.19 Backport failed because of merge conflicts
9.1
9.2

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 240342

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Oct 24, 2025
# Backport

This will backport the following commits from `main` to `9.2`:
- [Allow fleet-setup retries for all environments
(#240342)](#240342)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Michel
Losier","email":"michel.losier@elastic.co"},"sourceCommit":{"committedDate":"2025-10-24T17:00:34Z","message":"Allow
fleet-setup retries for all environments (#240342)\n\nnon-serverless
environments relied on integrations-server triggering\nfleet setup
retries externally. This change allows fleet setup retries\nin all
environments","sha":"a82601e16417e028a9c4534a51a5a8473171846f","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:version","v9.3.0","v9.1.6","v8.19.6","v9.2.1"],"title":"Allow
fleet-setup retries for all
environments","number":240342,"url":"https://github.com/elastic/kibana/pull/240342","mergeCommit":{"message":"Allow
fleet-setup retries for all environments (#240342)\n\nnon-serverless
environments relied on integrations-server triggering\nfleet setup
retries externally. This change allows fleet setup retries\nin all
environments","sha":"a82601e16417e028a9c4534a51a5a8473171846f"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19","9.2"],"targetPullRequestStates":[{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/240342","number":240342,"mergeCommit":{"message":"Allow
fleet-setup retries for all environments (#240342)\n\nnon-serverless
environments relied on integrations-server triggering\nfleet setup
retries externally. This change allows fleet setup retries\nin all
environments","sha":"a82601e16417e028a9c4534a51a5a8473171846f"}},{"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"},{"branch":"9.2","label":"v9.2.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Michel Losier <michel.losier@elastic.co>
kibanamachine added a commit that referenced this pull request Oct 24, 2025
# Backport

This will backport the following commits from `main` to `9.1`:
- [Allow fleet-setup retries for all environments
(#240342)](#240342)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Michel
Losier","email":"michel.losier@elastic.co"},"sourceCommit":{"committedDate":"2025-10-24T17:00:34Z","message":"Allow
fleet-setup retries for all environments (#240342)\n\nnon-serverless
environments relied on integrations-server triggering\nfleet setup
retries externally. This change allows fleet setup retries\nin all
environments","sha":"a82601e16417e028a9c4534a51a5a8473171846f","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:version","v9.3.0","v9.1.6","v8.19.6","v9.2.1"],"title":"Allow
fleet-setup retries for all
environments","number":240342,"url":"https://github.com/elastic/kibana/pull/240342","mergeCommit":{"message":"Allow
fleet-setup retries for all environments (#240342)\n\nnon-serverless
environments relied on integrations-server triggering\nfleet setup
retries externally. This change allows fleet setup retries\nin all
environments","sha":"a82601e16417e028a9c4534a51a5a8473171846f"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19","9.2"],"targetPullRequestStates":[{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/240342","number":240342,"mergeCommit":{"message":"Allow
fleet-setup retries for all environments (#240342)\n\nnon-serverless
environments relied on integrations-server triggering\nfleet setup
retries externally. This change allows fleet setup retries\nin all
environments","sha":"a82601e16417e028a9c4534a51a5a8473171846f"}},{"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"},{"branch":"9.2","label":"v9.2.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Michel Losier <michel.losier@elastic.co>
@MichelLosier
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
8.19

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

MichelLosier added a commit to MichelLosier/kibana that referenced this pull request Oct 24, 2025
non-serverless environments relied on integrations-server triggering
fleet setup retries externally. This change allows fleet setup retries
in all environments

(cherry picked from commit a82601e)

# Conflicts:
#	x-pack/platform/plugins/shared/fleet/server/config.ts
MichelLosier added a commit that referenced this pull request Oct 24, 2025
)

# Backport

This will backport the following commits from `main` to `8.19`:
- [Allow fleet-setup retries for all environments
(#240342)](#240342)

<!--- Backport version: 10.1.0 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Michel
Losier","email":"michel.losier@elastic.co"},"sourceCommit":{"committedDate":"2025-10-24T17:00:34Z","message":"Allow
fleet-setup retries for all environments (#240342)\n\nnon-serverless
environments relied on integrations-server triggering\nfleet setup
retries externally. This change allows fleet setup retries\nin all
environments","sha":"a82601e16417e028a9c4534a51a5a8473171846f","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:version","v9.3.0","v9.1.6","v8.19.6","v9.1.7","v9.2.1"],"title":"Allow
fleet-setup retries for all
environments","number":240342,"url":"https://github.com/elastic/kibana/pull/240342","mergeCommit":{"message":"Allow
fleet-setup retries for all environments (#240342)\n\nnon-serverless
environments relied on integrations-server triggering\nfleet setup
retries externally. This change allows fleet setup retries\nin all
environments","sha":"a82601e16417e028a9c4534a51a5a8473171846f"}},"sourceBranch":"main","suggestedTargetBranches":["8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/240342","number":240342,"mergeCommit":{"message":"Allow
fleet-setup retries for all environments (#240342)\n\nnon-serverless
environments relied on integrations-server triggering\nfleet setup
retries externally. This change allows fleet setup retries\nin all
environments","sha":"a82601e16417e028a9c4534a51a5a8473171846f"}},{"branch":"9.1","label":"v9.1.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/240486","number":240486,"state":"MERGED","mergeCommit":{"sha":"196623300e67308011d8bffa5c0dfa7782d48401","message":"[9.1]
Allow fleet-setup retries for all environments (#240342) (#240486)\n\n#
Backport\n\nThis will backport the following commits from `main` to
`9.1`:\n- [Allow fleet-setup retries for all
environments\n(#240342)](https://github.com/elastic/kibana/pull/240342)\n\n\n\n###
Questions ?\nPlease refer to the [Backport
tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by:
Michel Losier
<michel.losier@elastic.co>"}},{"branch":"8.19","label":"v8.19.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.2","label":"v9.2.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/240487","number":240487,"state":"MERGED","mergeCommit":{"sha":"0d770422df00dc37c4175de20b386517575245bd","message":"[9.2]
Allow fleet-setup retries for all environments (#240342) (#240487)\n\n#
Backport\n\nThis will backport the following commits from `main` to
`9.2`:\n- [Allow fleet-setup retries for all
environments\n(#240342)](https://github.com/elastic/kibana/pull/240342)\n\n\n\n###
Questions ?\nPlease refer to the [Backport
tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by:
Michel Losier <michel.losier@elastic.co>"}}]}] BACKPORT-->
Supplementing pushed a commit to Supplementing/kibana that referenced this pull request Oct 29, 2025
non-serverless environments relied on integrations-server triggering
fleet setup retries externally. This change allows fleet setup retries
in all environments
Supplementing pushed a commit to Supplementing/kibana that referenced this pull request Oct 29, 2025
non-serverless environments relied on integrations-server triggering
fleet setup retries externally. This change allows fleet setup retries
in all environments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:version Backport to applied version labels release_note:fix Team:Fleet Team label for Observability Data Collection Fleet team v8.19.7 v9.1.6 v9.1.7 v9.2.1 v9.3.0

6 participants