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.

Sign up for GitHub

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

Jump to bottom

Revert "feat: bump beats to latest main commit (#14146)" #14310

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Revert "feat: bump beats to latest main commit (#14146)" #14310

merged 2 commits into from
Oct 9, 2024

Conversation

carsonip
Copy link
Member

@carsonip carsonip commented Oct 9, 2024 •
edited
Loading

Motivation/summary

Alternative to #14307.

This reverts commit e258527.

Unblock #14292 to fix #14280. Reverting beats instead of
bumping beats to avoid #14297.

Backport PR to 8.x is #14309

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues

@carsonip carsonip requested a review from a team as a code owner October 9, 2024 11:09
@mergify Mergify
Copy link
Contributor

mergify bot commented Oct 9, 2024

This pull request does not have a backport label. Could you fix it @carsonip? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

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

@mergify Mergify
Copy link
Contributor

mergify bot commented Oct 9, 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.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Oct 9, 2024
@carsonip carsonip added backport-skip Skip notification from the automated backport with mergify and removed backport-8.x Automated backport to the 8.x branch with mergify labels Oct 9, 2024
@carsonip carsonip requested a review from kruskall October 9, 2024 11:12
@carsonip carsonip enabled auto-merge (squash) October 9, 2024 13:01
@carsonip carsonip mentioned this pull request Oct 9, 2024
Merged
2 tasks
@carsonip carsonip merged commit c015652 into elastic:main Oct 9, 2024
11 checks passed
carsonip added a commit that referenced this pull request Oct 9, 2024
@carsonip
Revert "add flag.Parse so HandlFlags works correctly (#14214)" (#14292)
01237c4 
This reverts commit 7efa6d5.

Require beats bump / revert #14310 (8.x: #14309 )
Part of #14280
@carsonip carsonip mentioned this pull request Oct 9, 2024
Closed
2 tasks
mergify bot pushed a commit that referenced this pull request Oct 9, 2024
@carsonip @mergify
Revert "add flag.Parse so HandlFlags works correctly (#14214)" (#14292)
8247106 
This reverts commit 7efa6d5.

Require beats bump / revert #14310 (8.x: #14309 )
Part of #14280

(cherry picked from commit 01237c4)
@mergify mergify bot mentioned this pull request Oct 9, 2024
Merged
2 tasks
mergify bot added a commit that referenced this pull request Oct 9, 2024
@mergify @carsonip
Revert "add flag.Parse so HandlFlags works correctly (#14214)" (#14292)…
1715a5d 
… (#14314)

This reverts commit 7efa6d5.

Require beats bump / revert #14310 (8.x: #14309 )
Part of #14280

(cherry picked from commit 01237c4)

Co-authored-by: Carson Ip <[email protected]>
kruskall added a commit to kruskall/apm-server that referenced this pull request Oct 29, 2024
@kruskall
Reapply "feat: bump beats to latest main commit (elastic#14146)" (ela…
2fe0fde 
…stic#14310)

This reverts commit c015652.
kruskall added a commit that referenced this pull request Oct 30, 2024
@kruskall
feat(main): bump beats to latest version (#14469)
2120b17 
* Reapply "feat: bump beats to latest main commit (#14146)" (#14310)

This reverts commit c015652.

* feat: pin ristretto using replace and bump beats

pin ristretto to a version before generics was added to not break binary
compatibility

* build: regenerate licence
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kruskall kruskall kruskall approved these changes

Assignees
No one assigned
Labels
backport-skip Skip notification from the automated backport with mergify
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

flag provided but not defined: -environment
2 participants
@carsonip @kruskall