Skip to content

fix(fluent-bit): support additionalLabels in ServiceMonitor #691

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

Open
kalavt wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(fluent-bit): support additionalLabels in ServiceMonitor #691

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44e3698
fix(fluent-bit): support additionalLabels in ServiceMonitor
kalavt Jan 28, 2026
05ee74b
Breaking: Rename serviceMonitor.selector to additionalLabels
kalavt Jan 29, 2026
6a82a78
Merge branch 'main' into fix/servicemonitor-additionallabels
kalavt Feb 27, 2026
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
4 changes: 4 additions & 0 deletions charts/fluent-bit/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ metadata:
namespace: {{ default .Release.Namespace .Values.serviceMonitor.namespace }}
labels:
{{- include "fluent-bit.labels" . | nindent 4 }}
{{- with .Values.serviceMonitor.additionalLabels }}
{{- toYaml . | nindent 4 }}
{{- else }}
{{- with .Values.serviceMonitor.selector }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
spec:
jobLabel: app.kubernetes.io/instance
endpoints:
Expand Down
9 changes: 7 additions & 2 deletions charts/fluent-bit/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,13 @@ serviceMonitor:
# namespace: monitoring
# interval: 10s
# scrapeTimeout: 10s
# selector:
# prometheus: my-prometheus
# ## additionalLabels: Additional labels to add to the ServiceMonitor metadata
# ## This is the recommended way to add labels for Prometheus Operator selection
# additionalLabels: {}
# # prometheus: my-prometheus
# ## selector: (DEPRECATED) Use additionalLabels instead
# ## This field is maintained for backward compatibility but additionalLabels is preferred
# selector: {}
# ## metric relabel configs to apply to samples before ingestion.
# ##
# metricRelabelings:
Expand Down