Skip to content

[kube-prometheus-stack] add additionalLabels for alertmanager and prometheus #5632

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

Merged
jkroepke merged 3 commits into from
Jun 14, 2025
Merged

[kube-prometheus-stack] add additionalLabels for alertmanager and prometheus #5632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd31c86
feat: add additionalLabels for alertmanager and prometheus
timonegk May 9, 2025
62761bc
Merge branch 'main' into kps-add-sts-label
jkroepke Jun 4, 2025
07885e9
Merge branch 'main' into kps-add-sts-label
jkroepke Jun 14, 2025
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/kube-prometheus-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ name: kube-prometheus-stack
sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
version: 74.0.0
version: 74.1.0

# Please do not add a renovate hint here, since appVersion updates involves manual tasks
appVersion: v0.83.0
Expand Down
11 changes: 7 additions & 4 deletions charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ metadata:
namespace: {{ template "kube-prometheus-stack-alertmanager.namespace" . }}
labels:
app: {{ template "kube-prometheus-stack.name" . }}-alertmanager
{{ include "kube-prometheus-stack.labels" . | indent 4 }}
{{- if .Values.alertmanager.annotations }}
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
{{- with .Values.alertmanager.additionalLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.alertmanager.annotations }}
annotations:
{{ toYaml .Values.alertmanager.annotations | indent 4 }}
{{- end }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.alertmanager.alertmanagerSpec.image }}
{{- $registry := .Values.global.imageRegistry | default .Values.alertmanager.alertmanagerSpec.image.registry -}}
Expand Down
11 changes: 7 additions & 4 deletions charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ metadata:
namespace: {{ template "kube-prometheus-stack.namespace" . }}
labels:
app: {{ template "kube-prometheus-stack.name" . }}-prometheus
{{ include "kube-prometheus-stack.labels" . | indent 4 }}
{{- if .Values.prometheus.annotations }}
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
{{- with .Values.prometheus.additionalLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.prometheus.annotations }}
annotations:
{{ toYaml .Values.prometheus.annotations | indent 4 }}
{{- end }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if not (kindIs "invalid" .Values.prometheus.prometheusSpec.automountServiceAccountToken) }}
automountServiceAccountToken: {{ .Values.prometheus.prometheusSpec.automountServiceAccountToken }}
Expand Down
8 changes: 8 additions & 0 deletions charts/kube-prometheus-stack/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ alertmanager:
##
annotations: {}

## Additional labels for Alertmanager
##
additionalLabels: {}

## Api that prometheus will use to communicate with alertmanager. Possible values are v1, v2
##
apiVersion: v2
Expand Down Expand Up @@ -3381,6 +3385,10 @@ prometheus:
##
annotations: {}

## Additional labels for Prometheus
##
additionalLabels: {}

## Configure network policy for the prometheus
networkPolicy:
enabled: false
Expand Down