-
Notifications
You must be signed in to change notification settings - Fork 16.8k
[stable/kong] Kong prometheus servicemonitor label #17497
[stable/kong] Kong prometheus servicemonitor label #17497
Conversation
Signed-off-by: garland <[email protected]>
…rometheus-servicemonitor-label
Signed-off-by: garland <[email protected]>
Hi @sekka1. 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 Once the patch is verified, the new status will be reflected by the 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. |
@sekka1 |
Signed-off-by: garland <[email protected]>
@zanhsieh fixed the conflict. |
Signed-off-by: garland <[email protected]>
Signed-off-by: garland <[email protected]>
/ok-to-test |
stable/kong/values.yaml
Outdated
prometheusOperatorServiceMonitorSelector: | ||
enabled: false | ||
matchLabels: | ||
prometheus: somelabel |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks very weird.
Why is this additional level of prometheusOperatorServiceMonitorSelector
required?
I'd propose that we do something simpler like:
serviceMonitor:
enabled: false
labels:
foo: bar
Also, enabled for the labels should not be necessary for labels.
You can simply check if any labels are set and inject them:
https://github.com/helm/charts/blob/master/stable/kong/templates/deployment.yaml#L31
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point =)....updating...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hbagdi updated. This looks way better than my long variable name =)
Signed-off-by: garland <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hbagdi, sekka1 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 |
* Kong - prometheus-operator service monitor selector addition Signed-off-by: garland <[email protected]> * Kong - bumping chart version for the prometheus-operator selector update Signed-off-by: garland <[email protected]> * bumping chart version number Signed-off-by: garland <[email protected]> * Kong - simplifying variable name Signed-off-by: garland <[email protected]> Signed-off-by: Ali Sattari <[email protected]>
* Kong - prometheus-operator service monitor selector addition Signed-off-by: garland <[email protected]> * Kong - bumping chart version for the prometheus-operator selector update Signed-off-by: garland <[email protected]> * bumping chart version number Signed-off-by: garland <[email protected]> * Kong - simplifying variable name Signed-off-by: garland <[email protected]>
Prometheus operator uses a label selector on the
ServiceMonitor
to determine whichServiceMonitor
to pick up (prometheus-operator/kube-prometheus#16 (comment)). The label can be custom to each prometheus-operators usage. This PR adds the ability to add in a custom label on theServiceMonitor
.Checklist
[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]
[stable/chart]
)