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

Revert "refactor fleet mode detection and storage" #41151

Merged
merged 2 commits into from
Oct 7, 2024

Conversation

leehinman
Copy link
Contributor

Reverts #40667

Due to:

elastic/apm-server#14280
and
elastic/apm-server#14214

basically APM server is relying exactly on how Beats does argument parsing today and when the arguments are set in their final form.

@leehinman leehinman requested a review from a team as a code owner October 7, 2024 15:30
@leehinman leehinman requested review from faec and VihasMakwana October 7, 2024 15:30
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 7, 2024
Copy link
Contributor

mergify bot commented Oct 7, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @leehinman? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Oct 7, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Oct 7, 2024
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Oct 7, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 7, 2024
@jlind23 jlind23 enabled auto-merge (squash) October 7, 2024 16:43
@jlind23 jlind23 merged commit 60bdc6a into main Oct 7, 2024
141 checks passed
@jlind23 jlind23 deleted the revert-40667-refactor_fleet_mode_detection branch October 7, 2024 17:55
mergify bot pushed a commit that referenced this pull request Oct 7, 2024
* Revert "refactor fleet mode detection and storage (#40667)"

This reverts commit 3309620.

* fix import

(cherry picked from commit 60bdc6a)
leehinman added a commit that referenced this pull request Oct 7, 2024
* Revert "refactor fleet mode detection and storage (#40667)"

This reverts commit 3309620.

* fix import

(cherry picked from commit 60bdc6a)

Co-authored-by: Lee E Hinman <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants