fixing prometheus rules integration for operator and additionalLabels #962
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi there,
this PR addresses multiple problems I was facing during evaluation deployment:
PrometheusRule
custom resource was not recognized and automatically loaded from the Prometheus Operator (kube-prometheus-stack
), because therelease
label is missingadditionalLabels
on that custom resource, because it was only implemented for theServiceMonitor
custom resourceadditionalLabels
on theServiceMonitor
custom resource did not work - there seems to be some type mixtures and implementation issues in the helm templateThe fixes include:
prometheus.enableAlerting
toprometheus.prometheusRule
to more accurately represent the custom resource we deploy (filetemplates/prometheusrule.yml
withkind: PrometheusRule
).Values.prometheus.enableAlerting
for backwards compatibilityprometheus.prometheusRule
(more or less same as used inprometheus.serviceMonitor
)prometheus.serviceMonitor.additionalLabels
I am unsure about the versioning you use for
Chart.yaml
(and if maybe you generate it from some CI pipeline?), so I did not yet bump the chart version. Give me a hint if I should do this manually.