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

Backport of Revert: Add exporting of Envoy metrics to HCP for linked clusters into release/1.4.x #455

Merged

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #454 to be assessed for backporting due to the inclusion of the label backport/1.4.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@loshz
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-dataplane/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Manual revert of #370


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Feb 26, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@loshz loshz force-pushed the backport/revert/feat/hcp-metrics/exactly-obliging-boxer branch from 13ad0c0 to 804b8fd Compare February 26, 2024 19:33
@loshz loshz marked this pull request as ready for review February 26, 2024 19:33
@loshz loshz requested a review from a team as a code owner February 26, 2024 19:33
@loshz loshz enabled auto-merge (squash) February 26, 2024 19:33
@loshz loshz merged commit 28dc081 into release/1.4.x Feb 26, 2024
22 checks passed
@loshz loshz deleted the backport/revert/feat/hcp-metrics/exactly-obliging-boxer branch February 26, 2024 19:35
loshz pushed a commit that referenced this pull request Feb 26, 2024
…clusters into release/1.4.x (#455)

Revert: Add exporting of Envoy metrics to HCP for linked clusters (#454)

(cherry picked from commit 5930c7c)

Co-authored-by: Dan <[email protected]>
(cherry picked from commit 28dc081)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants