Skip to content
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

[8.x](backport #6498) Add ability to enroll with defined ID and replace_token #6806

Merged
merged 3 commits into from
Feb 13, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 11, 2025

What does this PR do?

Adds new --id (ELASTIC_AGENT_ID env for container) and --replace-token (FLEET_REPLACE_TOKEN env for container) to enrollment.

Why is it important?

Allows an Elastic Agent to enroll with a defined ID and replacement token to allow it to replace an existing Elastic Agent. The original Elastic Agent must have also been enrolled with the same --replace-token or it will not be allow to enroll if the --id collides with an existing Elastic Agent.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files (no config changes)
  • [ ] I have added tests that prove my fix is effective or that my feature works (cannot unit test)
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

None

How to test this PR locally

You need this PR (elastic/fleet-server#4290) from Fleet Server and have that Fleet Server running to enroll. Then you can build this PR and run enroll with --id and --replace-token.

Related issues


This is an automatic backport of pull request #6498 done by [Mergify](https://mergify.com).

Allows an Elastic Agent to enroll with a defined ID and replacement token to allow it to replace an existing Elastic Agent. The original Elastic Agent must have also been enrolled with the same --replace-token or it will not be allow to enroll if the --id collides with an existing Elastic Agent.

(cherry picked from commit 8a878fc)
@mergify mergify bot requested a review from a team as a code owner February 11, 2025 13:05
@mergify mergify bot added the backport label Feb 11, 2025
@mergify mergify bot requested review from swiatekm and pchila and removed request for a team February 11, 2025 13:05
@github-actions github-actions bot added enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Feb 11, 2025
@elasticmachine
Copy link
Contributor

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

@blakerouse blakerouse enabled auto-merge (squash) February 11, 2025 14:33
@blakerouse
Copy link
Contributor

buildkite test this

@blakerouse blakerouse merged commit 36a8f34 into 8.x Feb 13, 2025
14 checks passed
@blakerouse blakerouse deleted the mergify/bp/8.x/pr-6498 branch February 13, 2025 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants