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

[helm] Support for Servicemonitor #1402

Merged
merged 6 commits into from
Feb 10, 2024

Conversation

nlamirault
Copy link
Contributor

No description provided.

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
@HVBE
Copy link
Collaborator

HVBE commented Feb 7, 2024

@nlamirault Thanks for the PR! I'll let one of the maintainers that are more familiar with helm handle this one

Copy link
Collaborator

@NissesSenap NissesSenap left a comment

Choose a reason for hiding this comment

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

First of all thanks for the PR.

We have metricsService https://github.com/grafana/grafana-operator/blob/master/deploy/helm/grafana-operator/values.yaml#L53-L57 since earlier. In retrospect I probably picked a rather bad name for that value. So it could potentially be good to use that.

At the same time we have metrics name hard coded

so it's actually not needed. I guess easiest is to leave it as is.

So lets skip that, but take a look at the comment and add namespace.

{{- end }}
{{- with .Values.serviceMonitor.additionalLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Due to earlier PR we set namespace in all templates, so please add that to this one as well.

NissesSenap and others added 2 commits February 7, 2024 21:50
Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
@NissesSenap NissesSenap enabled auto-merge (squash) February 10, 2024 16:35
@NissesSenap NissesSenap merged commit 383045b into grafana:master Feb 10, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants