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

feat: Add relabelings config to ServiceMonitor resource #6780

Merged
merged 1 commit into from
Sep 30, 2024

Conversation

thefirstofthe300
Copy link
Contributor

What type of PR is this?

/kind feature

What this PR does / why we need it:

Prometheus service discovery meta-labels __meta_kubernetes_* labels are not necessarily still attached to a metric when the metric_relabel_configs step is reached. Consequently, it is not possible to configure a label on pod as a metric tag using the chart solely. Adding the relabelings value to the ServiceMonitor will allow this use case.

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Added relabelings config for the ServiceMonitor to the Helm chart

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 29, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @thefirstofthe300!

It looks like this is your first PR to kubernetes/autoscaler 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/autoscaler has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @thefirstofthe300. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. area/helm-charts labels Apr 29, 2024
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 29, 2024
@Shubham82
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 1, 2024
@Shubham82
Copy link
Contributor

Shubham82 commented May 1, 2024

/lgtm

Thanks @thefirstofthe300

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 1, 2024
@thefirstofthe300
Copy link
Contributor Author

@gjtempleton @mwielgus Would you PTAL?

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 28, 2024
@Shubham82
Copy link
Contributor

Hi @thefirstofthe300, Please address the failed test, which is required to pass to merge the PR.
It failed because you didn't bump the Chart version, so you need to bump the version to pass the failed test.

@Shubham82
Copy link
Contributor

Here is the Lint and Test Charts / Helm chart (pull_request) test case failure error message:

The Lint and Test Charts / Helm chart (pull_request) test case failed due to not doing a bump version:
✖︎ cluster-autoscaler => (version: "9.34.1", path: "charts/cluster-autoscaler") > Chart version not ok. Needs a version bump! 

so you need to bump the chart version.

@Shubham82
Copy link
Contributor

Shubham82 commented Jul 1, 2024

To update the README.md file, you have to update the README.md.gotmpl file and values.yaml(for values section) and then the pre-commit hooks update the README.md file.

JFYI: you have to install Pre-commit hooks before working in the Charts.

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 3, 2024
@Shubham82
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 25, 2024
Copy link
Contributor

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 24, 2024
@Shubham82
Copy link
Contributor

@thefirstofthe300, please resolve the merge conflict.

@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 27, 2024
@thefirstofthe300
Copy link
Contributor Author

@gjtempleton @Shubham82 @jackfrancis Can I please get an approval here? It's very frustrating to have what I judge to be a very simple PR languish in approval purgatory for five months. I appreciate Jack and Shubham taking the time to LGTM my PR, but not being able to merge despite those reviews is very frustrating.

Copy link
Contributor

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 27, 2024
@jackfrancis
Copy link
Contributor

@thefirstofthe300 fair criticism, I'll work to start reinforcing the helm chart (tests, auditing of features) to enable additional approvers in the near future

/assign @gjtempleton

@Shubham82
Copy link
Contributor

It looks good to me.
/lgtm

@gjtempleton
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gjtempleton, jackfrancis, thefirstofthe300

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 30, 2024
@k8s-ci-robot k8s-ci-robot merged commit 51167b3 into kubernetes:master Sep 30, 2024
6 checks passed
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. area/helm-charts cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

5 participants