Skip to content

Set manual rollback default window to 7 days#11955

Merged
ebeahan merged 6 commits intoelastic:mainfrom
ebeahan:feature/set-rollback-to-7d
Jan 16, 2026
Merged

Set manual rollback default window to 7 days#11955
ebeahan merged 6 commits intoelastic:mainfrom
ebeahan:feature/set-rollback-to-7d

Conversation

@ebeahan
Copy link
Member

@ebeahan ebeahan commented Dec 19, 2025

Sets the agent.upgrade.rollback_window in the agent's configuration to a default value of 7 days (168h) instead of zero (disabled).

Also including a changelog entry because this will enable the manual rollback feature for users.

Closes #6881

@ebeahan ebeahan self-assigned this Dec 19, 2025
@ebeahan ebeahan added enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team backport-9.3 Automated backport to the 9.3 branch labels Dec 19, 2025
@ebeahan
Copy link
Member Author

ebeahan commented Dec 19, 2025

Should not merge this PR enabling the manual rollback feature until following PRs are merged first:

@ebeahan ebeahan marked this pull request as ready for review January 15, 2026 15:36
@ebeahan ebeahan requested a review from a team as a code owner January 15, 2026 15:36
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@ebeahan ebeahan force-pushed the feature/set-rollback-to-7d branch from fae7a97 to 4b8a010 Compare January 16, 2026 02:00
@ebeahan ebeahan force-pushed the feature/set-rollback-to-7d branch from 4b8a010 to 32fca6d Compare January 16, 2026 02:46
@ebeahan
Copy link
Member Author

ebeahan commented Jan 16, 2026

Asked @pchila to take a look at the failing tests as soon as the 7d window is re-enabled: 29067b3.

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @ebeahan

Copy link
Contributor

@michel-laterman michel-laterman left a comment

Choose a reason for hiding this comment

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

lgtm; code looks good, but I have not been able to test

@ebeahan ebeahan merged commit 62cd3bc into elastic:main Jan 16, 2026
22 checks passed
mergify bot pushed a commit that referenced this pull request Jan 16, 2026
* set manual rollback windows default to 7 days

* add changelog

* add PR/issue links

* restore 7 day default for defaultRollbackWindowDuration

* Pass the upgrade target version to getAvailableRollbacks() to detect support for manual rollback feature

* fixup! Pass the upgrade target version to getAvailableRollbacks() to detect support for manual rollback feature

---------

Co-authored-by: Paolo Chila <paolo.chila@elastic.co>
(cherry picked from commit 62cd3bc)
@ebeahan ebeahan deleted the feature/set-rollback-to-7d branch January 16, 2026 21:20
ebeahan added a commit that referenced this pull request Jan 16, 2026
* set manual rollback windows default to 7 days

* add changelog

* add PR/issue links

* restore 7 day default for defaultRollbackWindowDuration

* Pass the upgrade target version to getAvailableRollbacks() to detect support for manual rollback feature

* fixup! Pass the upgrade target version to getAvailableRollbacks() to detect support for manual rollback feature

---------


(cherry picked from commit 62cd3bc)

Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
Co-authored-by: Paolo Chila <paolo.chila@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-9.3 Automated backport to the 9.3 branch enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

4 participants