-
Notifications
You must be signed in to change notification settings - Fork 147
remove redundant minimal etcd ServiceMonitor #1499
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
Conversation
WalkthroughRemoved the etcd minimal ServiceMonitor manifest, dropped a label from the full ServiceMonitor, and updated the operator starter to stop bundling the deleted minimal manifest. No other logic or fields changed. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Pre-merge checks and finishing touches❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✨ Finishing touches
🧪 Generate unit tests (beta)
📜 Recent review detailsConfiguration used: CodeRabbit UI Review profile: CHILL Plan: Pro Cache: Disabled due to data retention organization setting Knowledge base: Disabled due to 📒 Files selected for processing (3)
💤 Files with no reviewable changes (3)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: lance5890 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 |
|
Hi @lance5890. Thanks for your PR. I'm waiting for a github.com 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-sigs/prow repository. |
| labels: | ||
| app.kubernetes.io/name: etcd | ||
| k8s-app: etcd | ||
| monitoring.openshift.io/collection-profile: full |
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.
ceo does not recognize this annotation
|
@simonpasquier / @machine424 is it safe to delete? or did we make the mistake to not honor some global configuration? I assume this was used to reduce the amount of metrics going to Prometheus in CMO at some point in time. |
|
Although both service monitors are present, only one should be considered (labels are used to select the appropriate one based on the profile. The selection is handled by the monitoring stack (prometheus-operator), CEO doesn't have to know about that.) |
|
I defer this to @lance5890 - I assume he just cleaned it up based on being unused here |
|
the config/customization happens on the monitoring side maybe a comment can be added on the etcd service monitors about that. |
|
yes, The prometheuse select the smon as:
|

When we run
kubectl get ServiceMonitor -n openshift-etcd-operator, we can see bothetcdandetcd-minimalexist.[root@provisioning ~]# kubectl get ServiceMonitor -n openshift-etcd-operator
NAME AGE
etcd 99d
etcd-minimal 99d
etcd-operator 99d
The
monitoring.openshift.io/collection-profileannotation is used by the Cluster Monitoring Operator (CMO), as shown in the source code: https://github.com/openshift/cluster-monitoring-operator/blob/289e250e6b7f70c546caf0be8a9fb507a2becc06/pkg/manifests/manifests.go#L1381However, the Cluster Etcd Operator (CEO) does not recognize the
monitoring.openshift.io/collection-profileannotation to determine which ServiceMonitor to apply (minimal or full).Therefore, I propose removing the
etcd-minimalServiceMonitor and keeping only the fulletcdServiceMonitor.related PR:
#1070
openshift/cluster-monitoring-operator#2039