Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/nginx-ingress] Add configurable serviceMonitor metricRelabelling and targetLabels #23527

Closed
wants to merge 1 commit into from
Closed

[stable/nginx-ingress] Add configurable serviceMonitor metricRelabelling and targetLabels #23527

wants to merge 1 commit into from

Conversation

calvinbui
Copy link
Contributor

Signed-off-by: Calvin Bui 3604363+calvinbui@users.noreply.github.com

What this PR does / why we need it:

Target Labels: Adds the serviceMonitor targetLabels key as documented in the Prometheus Operator API

Metric Relabelings: Adds the ServiceMonitor metricRelabelings key as documented in the Prometheus Operator API. Used for adding, dropping or renaming labels at ingestion time, or to drop entire metrics that are not useful.

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • DCO signed
  • Chart Version bumped
  • Variables are documented in the README.md
  • Title of the PR starts with chart name (e.g. [stable/mychartname])

Signed-off-by: Calvin Bui <3604363+calvinbui@users.noreply.github.com>
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: calvinbui
To complete the pull request process, please assign taharah
You can assign the PR to them by writing /assign @taharah in a comment when ready.

The full list of commands accepted by this bot can be found 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

@helm-bot helm-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). labels Aug 13, 2020
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 13, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @calvinbui. Thanks for your PR.

I'm waiting for a helm 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.

@calvinbui
Copy link
Contributor Author

/assign @taharah

@ChiefAlexander
Copy link
Collaborator

This chart is being deprecated via #22823
The new location of the chart for changes is https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx

@calvinbui
Copy link
Contributor Author

There's still no migration path so it's not really deprecated yet according to https://github.com/helm/charts/issues/21103

@calvinbui
Copy link
Contributor Author

@ChiefAlexander should I re-open this over in ingress-nginx?

@scottrigby
Copy link
Member

/hold

I'm working on a PR to add migration steps to the chart readme for the ingress-nginx/ingress-nginx chart and docs at https://kubernetes.github.io/ingress-nginx/deploy/upgrade/#with-helm.

@calvinbui Yes please open a PR over there. Thanks!

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 18, 2020
@calvinbui
Copy link
Contributor Author

recreated at kubernetes/ingress-nginx#6039

@calvinbui calvinbui closed this Aug 19, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-ok-to-test Indicates a PR that requires an org member to verify it 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.

6 participants