diff --git a/bitnami/grafana-loki/CHANGELOG.md b/bitnami/grafana-loki/CHANGELOG.md
index b0464ce3e3..acc4229961 100644
--- a/bitnami/grafana-loki/CHANGELOG.md
+++ b/bitnami/grafana-loki/CHANGELOG.md
@@ -1,8 +1,12 @@
# Changelog
-## 4.6.15 (2024-09-11)
+## 4.6.16 (2024-09-15)
-* [bitnami/grafana-loki] Allow rendering resources values ([#29343](https://github.com/bitnami/charts/pull/29343))
+* [bitnami/grafana-loki] bugfix: loki component not include `.Values.metrics.serviceMonitor.labels` ([#29434](https://github.com/bitnami/charts/pull/29434))
+
+## 4.6.15 (2024-09-13)
+
+* [bitnami/grafana-loki] Allow rendering resources values (#29343) ([b1a390b](https://github.com/bitnami/charts/commit/b1a390ba566cc74fa8b8a35138c79cc7c181a540)), closes [#29343](https://github.com/bitnami/charts/issues/29343)
## 4.6.14 (2024-09-09)
diff --git a/bitnami/grafana-loki/Chart.yaml b/bitnami/grafana-loki/Chart.yaml
index 9f271bafc4..b4be67f462 100644
--- a/bitnami/grafana-loki/Chart.yaml
+++ b/bitnami/grafana-loki/Chart.yaml
@@ -55,4 +55,4 @@ maintainers:
name: grafana-loki
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/grafana-loki
-version: 4.6.15
+version: 4.6.16
diff --git a/bitnami/grafana-loki/templates/compactor/servicemonitor.yaml b/bitnami/grafana-loki/templates/compactor/servicemonitor.yaml
index fea70d1a2a..7fb9cf9366 100644
--- a/bitnami/grafana-loki/templates/compactor/servicemonitor.yaml
+++ b/bitnami/grafana-loki/templates/compactor/servicemonitor.yaml
@@ -9,7 +9,9 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-loki.compactor.fullname" . }}
namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
- labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+ {{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.promtail.image "chart" .Chart ) ) }}
+ {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels $versionLabel ) "context" . ) }}
+ labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/part-of: grafana-loki
app.kubernetes.io/component: compactor
{{- if or .Values.commonAnnotations .Values.metrics.serviceMonitor.annotations }}
diff --git a/bitnami/grafana-loki/templates/distributor/servicemonitor.yaml b/bitnami/grafana-loki/templates/distributor/servicemonitor.yaml
index a759ec64d1..27be05a87a 100644
--- a/bitnami/grafana-loki/templates/distributor/servicemonitor.yaml
+++ b/bitnami/grafana-loki/templates/distributor/servicemonitor.yaml
@@ -9,7 +9,9 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-loki.distributor.fullname" . }}
namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
- labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+ {{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.promtail.image "chart" .Chart ) ) }}
+ {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels $versionLabel ) "context" . ) }}
+ labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/part-of: grafana-loki
app.kubernetes.io/component: distributor
{{- if or .Values.commonAnnotations .Values.metrics.serviceMonitor.annotations }}
diff --git a/bitnami/grafana-loki/templates/index-gateway/servicemonitor.yaml b/bitnami/grafana-loki/templates/index-gateway/servicemonitor.yaml
index 00e129bb49..80e31d5a45 100644
--- a/bitnami/grafana-loki/templates/index-gateway/servicemonitor.yaml
+++ b/bitnami/grafana-loki/templates/index-gateway/servicemonitor.yaml
@@ -9,7 +9,9 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-loki.index-gateway.fullname" . }}
namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
- labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+ {{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.promtail.image "chart" .Chart ) ) }}
+ {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels $versionLabel ) "context" . ) }}
+ labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/part-of: grafana-loki
app.kubernetes.io/component: index-gateway
{{- if or .Values.commonAnnotations .Values.metrics.serviceMonitor.annotations }}
diff --git a/bitnami/grafana-loki/templates/ingester/servicemonitor.yaml b/bitnami/grafana-loki/templates/ingester/servicemonitor.yaml
index 0ea7b2ce96..32cb461147 100644
--- a/bitnami/grafana-loki/templates/ingester/servicemonitor.yaml
+++ b/bitnami/grafana-loki/templates/ingester/servicemonitor.yaml
@@ -9,7 +9,9 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-loki.ingester.fullname" . }}
namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
- labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+ {{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.promtail.image "chart" .Chart ) ) }}
+ {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels $versionLabel ) "context" . ) }}
+ labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/part-of: grafana-loki
app.kubernetes.io/component: ingester
{{- if or .Values.commonAnnotations .Values.metrics.serviceMonitor.annotations }}
diff --git a/bitnami/grafana-loki/templates/querier/servicemonitor.yaml b/bitnami/grafana-loki/templates/querier/servicemonitor.yaml
index f981ef8cef..c85229b776 100644
--- a/bitnami/grafana-loki/templates/querier/servicemonitor.yaml
+++ b/bitnami/grafana-loki/templates/querier/servicemonitor.yaml
@@ -9,7 +9,9 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-loki.querier.fullname" . }}
namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
- labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+ {{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.promtail.image "chart" .Chart ) ) }}
+ {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels $versionLabel ) "context" . ) }}
+ labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/part-of: grafana-loki
app.kubernetes.io/component: querier
{{- if or .Values.commonAnnotations .Values.metrics.serviceMonitor.annotations }}
diff --git a/bitnami/grafana-loki/templates/query-frontend/servicemonitor.yaml b/bitnami/grafana-loki/templates/query-frontend/servicemonitor.yaml
index ee15e87af7..8c754a8b20 100644
--- a/bitnami/grafana-loki/templates/query-frontend/servicemonitor.yaml
+++ b/bitnami/grafana-loki/templates/query-frontend/servicemonitor.yaml
@@ -9,7 +9,9 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-loki.query-frontend.fullname" . }}
namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
- labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+ {{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.promtail.image "chart" .Chart ) ) }}
+ {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels $versionLabel ) "context" . ) }}
+ labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/part-of: grafana-loki
app.kubernetes.io/component: query-frontend
{{- if or .Values.commonAnnotations .Values.metrics.serviceMonitor.annotations }}
diff --git a/bitnami/grafana-loki/templates/ruler/servicemonitor.yaml b/bitnami/grafana-loki/templates/ruler/servicemonitor.yaml
index f4d7d383cd..cde8bd3ef3 100644
--- a/bitnami/grafana-loki/templates/ruler/servicemonitor.yaml
+++ b/bitnami/grafana-loki/templates/ruler/servicemonitor.yaml
@@ -9,7 +9,9 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-loki.ruler.fullname" . }}
namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
- labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+ {{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.promtail.image "chart" .Chart ) ) }}
+ {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels $versionLabel ) "context" . ) }}
+ labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/part-of: grafana-loki
app.kubernetes.io/component: ruler
{{- if or .Values.commonAnnotations .Values.metrics.serviceMonitor.annotations }}
diff --git a/bitnami/grafana-loki/templates/table-manager/servicemonitor.yaml b/bitnami/grafana-loki/templates/table-manager/servicemonitor.yaml
index 38efb6d184..35a3c8c3a2 100644
--- a/bitnami/grafana-loki/templates/table-manager/servicemonitor.yaml
+++ b/bitnami/grafana-loki/templates/table-manager/servicemonitor.yaml
@@ -9,7 +9,9 @@ kind: ServiceMonitor
metadata:
name: {{ template "grafana-loki.table-manager.fullname" . }}
namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
- labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+ {{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.promtail.image "chart" .Chart ) ) }}
+ {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels $versionLabel ) "context" . ) }}
+ labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/part-of: grafana-loki
app.kubernetes.io/component: table-manager
{{- if or .Values.commonAnnotations .Values.metrics.serviceMonitor.annotations }}