Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-04-01 06:47:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/grafana-loki] bugfix: loki component not include .Values.metrics.serviceMonitor.labels (#29434)

Browse Source
This commit is contained in:
Eric_Ren
2024-09-16 14:11:53 +08:00
committed by GitHub
parent b9f4a563c1
commit 9dc17d8ec9
10 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bitnami/grafana-loki/CHANGELOG.md
View File

@@ -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))
## <small>4.6.15 (2024-09-13)</small>
* [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)
## <small>4.6.14 (2024-09-09)</small>

2
bitnami/grafana-loki/Chart.yaml
View File

@@ -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

4
bitnami/grafana-loki/templates/compactor/servicemonitor.yaml
View File

@@ -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 }}

4
bitnami/grafana-loki/templates/distributor/servicemonitor.yaml
View File

@@ -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 }}

4
bitnami/grafana-loki/templates/index-gateway/servicemonitor.yaml
View File

@@ -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 }}

4
bitnami/grafana-loki/templates/ingester/servicemonitor.yaml
View File

@@ -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 }}

4
bitnami/grafana-loki/templates/querier/servicemonitor.yaml
View File

@@ -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 }}

4
bitnami/grafana-loki/templates/query-frontend/servicemonitor.yaml
View File

@@ -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 }}

4
bitnami/grafana-loki/templates/ruler/servicemonitor.yaml
View File

@@ -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 }}

4
bitnami/grafana-loki/templates/table-manager/servicemonitor.yaml
View File

@@ -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 }}