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

[release-v1.77] Adjust the Prometheus service discovery for the etcd pods #8372

Conversation

gardener-ci-robot
Copy link
Contributor

This is an automated cherry-pick of #8371

/assign acumino

A bug is fixed that prevented scraping the metrics of etcd in the shoot control plane.

The labels on the etcd service changed with
gardener/etcd-druid#559 that was introduced in
gardener#8299.

The `app` and `role` labels are no longer present on the service, but they are
still available on the pods.

So by using the pod's labels for the service discovery, we can restore the
previous behavior.

https://prometheus.io/docs/prometheus/latest/configuration/configuration/#endpoints

Co-authored-by: Istvan Zoltan Ballok <istvan.zoltan.ballok@sap.com>
Co-authored-by: Jeremy Rickards <jeremy.rickards@sap.com>
@gardener-prow gardener-prow bot added cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Aug 18, 2023
@gardener-prow gardener-prow bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 18, 2023
Copy link
Member

@acumino acumino left a comment

Choose a reason for hiding this comment

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

/kind bug
/lgtm
/approve

@gardener-prow gardener-prow bot added lgtm Indicates that a PR is ready to be merged. kind/bug Bug labels Aug 18, 2023
@gardener-prow
Copy link
Contributor

gardener-prow bot commented Aug 18, 2023

LGTM label has been added.

Git tree hash: 12887b42aa15d1725bfb97e8f2b697582cda7cd1

@gardener-prow gardener-prow bot removed the do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. label Aug 18, 2023
@gardener-prow
Copy link
Contributor

gardener-prow bot commented Aug 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: acumino

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gardener-prow gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2023
@acumino
Copy link
Member

acumino commented Aug 18, 2023

/test pull-gardener-e2e-kind-ha-single-zone-release-v1-77

@gardener-prow gardener-prow bot merged commit bcdb19b into gardener:release-v1.77 Aug 18, 2023
1 check passed
@gardener-ci-robot gardener-ci-robot deleted the cherry-pick-8371-to-release-v1.77 branch August 18, 2023 22:00
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. cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/bug Bug lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants