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.

Sign up for GitHub

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

Jump to bottom

Fix labels used by Prometheus Operator to load #80

Merged
merged 3 commits into from
May 6, 2024
Merged

Fix labels used by Prometheus Operator to load #80

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
407fdb6
fix: Prometheus Operator resources
nlamirault May 2, 2024
eaef85c
bump chart version
nlamirault May 2, 2024
7ca3922
Add default additionalLabels for PrometheusRule
nlamirault May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/quickwit/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: quickwit
description: Sub-second search & analytics engine on cloud storage.
type: application
version: 0.5.14
version: 0.5.15
appVersion: "v0.8.1"
keywords:
- quickwit
Expand Down
5 changes: 4 additions & 1 deletion charts/quickwit/templates/prometheusrule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ metadata:
name: {{ include "quickwit.fullname" . }}
labels:
{{- include "quickwit.labels" . | nindent 4 }}
{{- with .Values.prometheusRule.additionalLabels }}
rdettai marked this conversation as resolved.
Show resolved Hide resolved
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
groups:
- name: {{ include "quickwit.fullname" . }}
rules:
{{- toYaml .Values.prometheusRules.rules | nindent 8 }}
{{- toYaml .Values.prometheusRule.rules | nindent 8 }}
{{- end }}
3 changes: 3 additions & 0 deletions charts/quickwit/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
name: {{ include "quickwit.fullname" . }}
labels:
{{- include "quickwit.labels" . | nindent 4 }}
{{- with .Values.serviceMonitor.additionalLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
Comment on lines +8 to +10
Copy link
Contributor

Choose a reason for hiding this comment

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

do we really need an extra set of additionalLabels? Can't the Prometheus operator be configured to use the quickwit.labels which are already configurable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's a common pattern in the Prometheus Operator community to have these labels for ServiceMonitor, PodMonitor, PrometheusRule, ...
Ex:

spec:
endpoints:
- path: /metrics
Expand Down
Loading