Merge branch 'main' into main

grafana · Feb 1, 2024 · 4f5d111 · 4f5d111
2 parents 5988b47 + e0df642
commit 4f5d111
Show file tree

Hide file tree

Showing 23 changed files with 42 additions and 27 deletions.
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: grafana
-version: 7.2.4
-appVersion: 10.2.3
+version: 7.3.0
+appVersion: 10.3.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.com

diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl
@@ -1084,11 +1084,17 @@ containers:
       - secretRef:
           name: {{ tpl .name $ }}
           optional: {{ .optional | default false }}
+        {{- if .prefix }}
+        prefix: {{ tpl .prefix $ }}
+        {{- end }}
       {{- end }}
       {{- range .Values.envFromConfigMaps }}
       - configMapRef:
           name: {{ tpl .name $ }}
           optional: {{ .optional | default false }}
+        {{- if .prefix }}
+        prefix: {{ tpl .prefix $ }}
+        {{- end }}
       {{- end }}
     {{- end }}
     {{- with .Values.livenessProbe }}

diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
@@ -490,6 +490,7 @@ envRenderSecret: {}
 ## Name is templated.
 envFromSecrets: []
 ## - name: secret-name
+##   prefix: prefix
 ##   optional: true
 
 ## The names of conifgmaps in the same kubernetes namespace which contain values to be added to the environment
@@ -498,6 +499,7 @@ envFromSecrets: []
 ## ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapenvsource-v1-core
 envFromConfigMaps: []
 ## - name: configmap-name
+##   prefix: prefix
 ##   optional: true
 
 # Inject Kubernetes services as environment variables.

diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml
@@ -3,7 +3,7 @@ name: loki-distributed
 description: Helm chart for Grafana Loki in microservices mode
 type: application
 appVersion: 2.9.2
-version: 0.78.1
+version: 0.78.2
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki

diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md
@@ -1,6 +1,6 @@
 # loki-distributed
 
-![Version: 0.78.1](https://img.shields.io/badge/Version-0.78.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square)
+![Version: 0.78.2](https://img.shields.io/badge/Version-0.78.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square)
 
 Helm chart for Grafana Loki in microservices mode
 

diff --git a/charts/loki-distributed/templates/distributor/poddisruptionbudget-distributor.yaml b/charts/loki-distributed/templates/distributor/poddisruptionbudget-distributor.yaml
@@ -1,5 +1,5 @@
 {{- if gt (int .Values.distributor.replicas) 1 }}
-{{- if not .Values.distributor.maxUnavailable }}
+{{- if kindIs "invalid" .Values.distributor.maxUnavailable }}
 {{- fail "`.Values.distributor.maxUnavailable` must be set when `.Values.distributor.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/charts/loki-distributed/templates/gateway/poddisruptionbudget-gateway.yaml b/charts/loki-distributed/templates/gateway/poddisruptionbudget-gateway.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.gateway.enabled (gt (int .Values.gateway.replicas) 1) }}
-{{- if not .Values.gateway.maxUnavailable }}
+{{- if kindIs "invalid" .Values.gateway.maxUnavailable }}
 {{- fail "`.Values.gateway.maxUnavailable` must be set when `.Values.gateway.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/charts/loki-distributed/templates/index-gateway/poddisruptionbudget-index-gateway.yaml b/charts/loki-distributed/templates/index-gateway/poddisruptionbudget-index-gateway.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.indexGateway.enabled (gt (int .Values.indexGateway.replicas) 1) }}
-{{- if not .Values.indexGateway.maxUnavailable }}
+{{- if kindIs "invalid" .Values.indexGateway.maxUnavailable }}
 {{- fail "`.Values.indexGateway.maxUnavailable` must be set when `.Values.indexGateway.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/charts/loki-distributed/templates/ingester/poddisruptionbudget-ingester.yaml b/charts/loki-distributed/templates/ingester/poddisruptionbudget-ingester.yaml
@@ -1,5 +1,5 @@
 {{- if gt (int .Values.ingester.replicas) 1 }}
-{{- if not .Values.ingester.maxUnavailable }}
+{{- if kindIs "invalid" .Values.ingester.maxUnavailable }}
 {{- fail "`.Values.ingester.maxUnavailable` must be set when `.Values.ingester.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/charts/loki-distributed/templates/memcached-chunks/poddisruptionbudget-memcached-chunks.yaml b/charts/loki-distributed/templates/memcached-chunks/poddisruptionbudget-memcached-chunks.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.memcachedChunks.enabled (gt (int .Values.memcachedChunks.replicas) 1) }}
-{{- if not .Values.memcachedChunks.maxUnavailable }}
+{{- if kindIs "invalid" .Values.memcachedChunks.maxUnavailable }}
 {{- fail "`.Values.memcachedChunks.maxUnavailable` must be set when `.Values.memcachedChunks.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/...loki-distributed/templates/memcached-frontend/poddisruptionbudget-memcached-frontend.yaml b/...loki-distributed/templates/memcached-frontend/poddisruptionbudget-memcached-frontend.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.memcachedFrontend.enabled (gt (int .Values.memcachedFrontend.replicas) 1) }}
-{{- if not .Values.memcachedFrontend.maxUnavailable }}
+{{- if kindIs "invalid" .Values.memcachedFrontend.maxUnavailable }}
 {{- fail "`.Values.memcachedFrontend.maxUnavailable` must be set when `.Values.memcachedFrontend.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/...ibuted/templates/memcached-index-queries/poddisruptionbudget-memcached-index-queries.yaml b/...ibuted/templates/memcached-index-queries/poddisruptionbudget-memcached-index-queries.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.memcachedIndexQueries.enabled (gt (int .Values.memcachedIndexQueries.replicas) 1) }}
-{{- if not .Values.memcachedIndexQueries.maxUnavailable }}
+{{- if kindIs "invalid" .Values.memcachedIndexQueries.maxUnavailable }}
 {{- fail "`.Values.memcachedIndexQueries.maxUnavailable` must be set when `.Values.memcachedIndexQueries.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/...tributed/templates/memcached-index-writes/poddisruptionbudget-memcached-index-writes.yaml b/...tributed/templates/memcached-index-writes/poddisruptionbudget-memcached-index-writes.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.memcachedIndexWrites.enabled (gt (int .Values.memcachedIndexWrites.replicas) 1) }}
-{{- if not .Values.memcachedIndexWrites.maxUnavailable }}
+{{- if kindIs "invalid" .Values.memcachedIndexWrites.maxUnavailable }}
 {{- fail "`.Values.memcachedIndexWrites.maxUnavailable` must be set when `.Values.memcachedIndexWrites.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/charts/loki-distributed/templates/querier/poddisruptionbudget-querier.yaml b/charts/loki-distributed/templates/querier/poddisruptionbudget-querier.yaml
@@ -1,5 +1,5 @@
 {{- if gt (int .Values.querier.replicas) 1 }}
-{{- if not .Values.querier.maxUnavailable }}
+{{- if kindIs "invalid" .Values.querier.maxUnavailable }}
 {{- fail "`.Values.querier.maxUnavailable` must be set when `.Values.querier.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/charts/loki-distributed/templates/query-frontend/poddisruptionbudget-query-frontent.yaml b/charts/loki-distributed/templates/query-frontend/poddisruptionbudget-query-frontent.yaml
@@ -1,5 +1,5 @@
 {{- if gt (int .Values.queryFrontend.replicas) 1 }}
-{{- if not .Values.queryFrontend.maxUnavailable }}
+{{- if kindIs "invalid" .Values.queryFrontend.maxUnavailable }}
 {{- fail "`.Values.queryFrontend.maxUnavailable` must be set when `.Values.queryFrontend.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/charts/loki-distributed/templates/query-scheduler/poddisruptionbudget-query-scheduler.yaml b/charts/loki-distributed/templates/query-scheduler/poddisruptionbudget-query-scheduler.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.queryScheduler.enabled (gt (int .Values.queryScheduler.replicas) 1) }}
-{{- if not .Values.queryScheduler.maxUnavailable }}
+{{- if kindIs "invalid" .Values.queryScheduler.maxUnavailable }}
 {{- fail "`.Values.queryScheduler.maxUnavailable` must be set when `.Values.queryScheduler.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/charts/loki-distributed/templates/ruler/poddisruptionbudget-ruler.yaml b/charts/loki-distributed/templates/ruler/poddisruptionbudget-ruler.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.ruler.enabled (gt (int .Values.ruler.replicas) 1) }}
-{{- if not .Values.ruler.maxUnavailable }}
+{{- if kindIs "invalid" .Values.ruler.maxUnavailable }}
 {{- fail "`.Values.ruler.maxUnavailable` must be set when `.Values.ruler.replicas` is greater than 1." }}
 {{- else }}
 apiVersion: {{ include "loki.pdb.apiVersion" . }}

diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: promtail
 description: Promtail is an agent which ships the contents of local logs to a Loki instance
 type: application
-appVersion: 2.9.2
-version: 6.15.3
+appVersion: 2.9.3
+version: 6.15.5
 home: https://grafana.com/loki
 sources:
   - https://github.com/grafana/loki

diff --git a/charts/promtail/README.md b/charts/promtail/README.md
@@ -1,6 +1,6 @@
 # promtail
 
-![Version: 6.15.3](https://img.shields.io/badge/Version-6.15.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square)
+![Version: 6.15.5](https://img.shields.io/badge/Version-6.15.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square)
 
 Promtail is an agent which ships the contents of local logs to a Loki instance
 

diff --git a/charts/promtail/templates/_pod.tpl b/charts/promtail/templates/_pod.tpl
@@ -10,11 +10,7 @@ metadata:
     {{- end }}
   annotations:
     {{- if not .Values.sidecar.configReloader.enabled }}
-    {{- if not .Values.configmap.enabled }}
-    checksum/config: {{ include (print .Template.BasePath "/secret.yaml") . | sha256sum }}
-    {{- else }}
-    checksum/config: {{ include (print .Template.BasePath "/configmap.yaml") . | sha256sum }}
-    {{- end }}
+    checksum/config: {{ tpl .Values.config.file . | sha256sum }}
     {{- end }}
     {{- with .Values.podAnnotations }}
     {{- toYaml . | nindent 4 }}

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
@@ -315,7 +315,7 @@ The memcached default args are removed and should be provided manually. The sett
 | distributor.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for distributor pods. Passed through `tpl` and, thus, to be configured as string |
 | enterprise.enabled | bool | `false` |  |
 | enterprise.image.repository | string | `"grafana/enterprise-traces"` | Grafana Enterprise Metrics container image repository. Note: for Grafana Tempo use the value 'image.repository' |
-| enterprise.image.tag | string | `"v2.3.1"` | Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag' |
+| enterprise.image.tag | string | `"v2.3.2"` | Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag' |
 | enterpriseFederationFrontend.affinity | string | Hard node and soft zone anti-affinity | Affinity for federation-frontend pods. Passed through `tpl` and, thus, to be configured as string |
 | enterpriseFederationFrontend.autoscaling.enabled | bool | `false` | Enable autoscaling for the federation-frontend |
 | enterpriseFederationFrontend.autoscaling.maxReplicas | int | `3` | Maximum autoscaling replicas for the federation-frontend |

diff --git a/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml b/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml
@@ -0,0 +1,11 @@
+storage:
+  trace:
+    block:
+      version: vParquet3
+      dedicated_columns:
+        - name: cluster
+          type: string
+          scope: resource
+        - name: service.name
+          type: string
+          scope: resource
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
@@ -1256,7 +1256,7 @@ config: |
         version: {{.Values.storage.trace.block.version}}
         {{- if .Values.storage.trace.block.dedicated_columns}}
         parquet_dedicated_columns:
-          {{ .Values.storage.trace.block.dedicated_columns}}
+          {{ .Values.storage.trace.block.dedicated_columns | toYaml | nindent 8}}
         {{- end }}
       {{- end }}
       pool:
@@ -1854,7 +1854,7 @@ enterprise:
     # -- Grafana Enterprise Metrics container image repository. Note: for Grafana Tempo use the value 'image.repository'
     repository: grafana/enterprise-traces
     # -- Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag'
-    tag: v2.3.1
+    tag: v2.3.2
     # Note: pullPolicy and optional pullSecrets are set in toplevel 'image' section, not here
 
 # In order to use Grafana Enterprise Traces features, you will need to provide the contents of your Grafana Enterprise Traces