Merge branch 'feature/bump-loki' into q/128.0

Author: bert-e

CHANGELOG.md

@@ -24,6 +24,10 @@
 - Bump Calico version to [3.28.0](https://github.com/projectcalico/calico/releases/tag/v3.28.0)
   (PR[#4363](https://github.com/scality/metalk8s/pull/4363))
 
+- Bump Loki chart version to
+  [5.48.0](https://github.com/grafana/loki/releases/tag/helm-loki-5.48.0)
+  (PR[#4401](https://github.com/scality/metalk8s/pull/4401))
+
 - Bump kube-prometheus-stack chart version to
   [61.3.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-61.3.0)
   (PR[#4365](https://github.com/scality/metalk8s/pull/4365))

charts/loki/Chart.yaml

@@ -17,10 +17,11 @@ icon: https://grafana.com/docs/loki/latest/logo_and_name.png
 maintainers:
 - name: trevorwhitney
 - name: jeschkies
+- name: slim-bean
 name: loki
 sources:
 - https://github.com/grafana/loki
 - https://grafana.com/oss/loki/
 - https://grafana.com/docs/loki/latest/
 type: application
-version: 5.47.1
+version: 5.48.0

charts/loki/README.md

@@ -1,6 +1,6 @@
 # loki
 
-![Version: 5.47.1](https://img.shields.io/badge/Version-5.47.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square)
+![Version: 5.48.0](https://img.shields.io/badge/Version-5.48.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square)
 
 Helm chart for Grafana Loki in simple, scalable mode
 

charts/loki/templates/_helpers.tpl

@@ -201,7 +201,7 @@ Generated storage config for loki common config
 {{- if .Values.minio.enabled -}}
 s3:
   endpoint: {{ include "loki.minio" $ }}
-  bucketnames: {{ $.Values.loki.storage.bucketNames.chunks }}
+  bucketnames: chunks
   secret_access_key: {{ $.Values.minio.rootPassword }}
   access_key_id: {{ $.Values.minio.rootUser }}
   s3forcepathstyle: true
@@ -339,7 +339,7 @@ Storage config for ruler
 {{- if .Values.minio.enabled -}}
 type: "s3"
 s3:
-  bucketnames: {{ $.Values.loki.storage.bucketNames.ruler }}
+  bucketnames: ruler
 {{- else if eq .Values.loki.storage.type "s3" -}}
 {{- with .Values.loki.storage.s3 }}
 type: "s3"

charts/loki/templates/monitoring/pod-logs.yaml

@@ -18,6 +18,9 @@ metadata:
 spec:
   pipelineStages:
     - cri: { }
+    {{- with .additionalPipelineStages }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   relabelings:
     - action: replace
       sourceLabels:

charts/loki/values.yaml

@@ -691,6 +691,9 @@ monitoring:
       # -- PodLogs relabel configs to apply to samples before scraping
       # https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
       relabelings: []
+      # -- Additional pipeline stages to process logs after scraping
+      # https://grafana.com/docs/agent/latest/operator/api/#pipelinestagespec-a-namemonitoringgrafanacomv1alpha1pipelinestagespeca
+      additionalPipelineStages: []
     # LogsInstance configuration
     logsInstance:
       # -- LogsInstance annotations

salt/metalk8s/addons/logging/loki/deployed/chart.sls

@@ -17,7 +17,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: 2.9.6
-    helm.sh/chart: loki-5.47.1
+    helm.sh/chart: loki-5.48.0
     heritage: metalk8s
   name: loki
   namespace: metalk8s-logging
@@ -34,7 +34,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: 2.9.6
-    helm.sh/chart: loki-5.47.1
+    helm.sh/chart: loki-5.48.0
     heritage: metalk8s
   name: loki-runtime
   namespace: metalk8s-logging
@@ -48,7 +48,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: 2.9.6
-    helm.sh/chart: loki-5.47.1
+    helm.sh/chart: loki-5.48.0
     heritage: metalk8s
   name: loki-clusterrole
   namespace: metalk8s-logging
@@ -72,7 +72,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: 2.9.6
-    helm.sh/chart: loki-5.47.1
+    helm.sh/chart: loki-5.48.0
     heritage: metalk8s
   name: loki-clusterrolebinding
   namespace: metalk8s-logging
@@ -94,7 +94,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: 2.9.6
-    helm.sh/chart: loki-5.47.1
+    helm.sh/chart: loki-5.48.0
     heritage: metalk8s
   name: loki-memberlist
   namespace: metalk8s-logging
@@ -121,7 +121,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: 2.9.6
-    helm.sh/chart: loki-5.47.1
+    helm.sh/chart: loki-5.48.0
     heritage: metalk8s
     prometheus.io/service-monitor: 'false'
     variant: headless
@@ -148,7 +148,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: 2.9.6
-    helm.sh/chart: loki-5.47.1
+    helm.sh/chart: loki-5.48.0
     heritage: metalk8s
   name: loki
   namespace: metalk8s-logging
@@ -178,7 +178,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: 2.9.6
-    helm.sh/chart: loki-5.47.1
+    helm.sh/chart: loki-5.48.0
     heritage: metalk8s
   name: loki
   namespace: metalk8s-logging
@@ -304,7 +304,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: 2.9.6
-    helm.sh/chart: loki-5.47.1
+    helm.sh/chart: loki-5.48.0
     heritage: metalk8s
     metalk8s.scality.com/monitor: ''
   name: loki