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

[cherry-pick openshift-4.0] *: Change gRPC proxy to expose etcd server endpoint /metrics #6

Merged
merged 1 commit into from
Apr 12, 2019

Conversation

hexfusion
Copy link

Cherry pick of etcd-io#10618 to openshift-4.0

etcd-io#10618: *: Change gRPC proxy to expose endpoint /metrics

This was originally merged into upstream master and then backported to upstream release-3.3 via etcd-io#10630

This PR is a fix to https://bugzilla.redhat.com/show_bug.cgi?id=1699045 blocking https://bugzilla.redhat.com/show_bug.cgi?id=1670700

/cc @brancz @s-urbaniak

This PR resolves an issue where the `/metrics` endpoints exposed by the proxy were not returning metrics of the etcd members servers but of the proxy itself.

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 12, 2019
@hexfusion hexfusion requested a review from deads2k April 12, 2019 02:24
@s-urbaniak
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 12, 2019
@hexfusion
Copy link
Author

/cc @smarterclayton

@hexfusion
Copy link
Author

This change affects etcd gRPC-proxy only.

@smarterclayton
Copy link

Wait, cherrypicking to 4.0? From 4.1? You don't need to cherry-pick to release branches from master branches - is this just a code change from elsewhere?

@smarterclayton
Copy link

Oh, cherry-pick from upstream. Duh.

@smarterclayton
Copy link

lgtm too

@smarterclayton smarterclayton added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 12, 2019
@smarterclayton
Copy link

Why is tide not on for this repo?

@openshift-merge-robot openshift-merge-robot merged commit 46fe287 into openshift-4.0 Apr 12, 2019
@smarterclayton
Copy link

openshift/release#3454 turns on tide and approvals

@hexfusion hexfusion deleted the bp_fx_proxy branch May 4, 2019 17:28
@hexfusion hexfusion mentioned this pull request May 5, 2019
dusk125 pushed a commit to dusk125/etcd that referenced this pull request Jun 7, 2023
Signed-off-by: Chao Chen <chaochn@amazon.com>
dusk125 pushed a commit to dusk125/etcd that referenced this pull request Jun 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants