From f884c8ef0e77ef53092a36b68aa62a408de44fe1 Mon Sep 17 00:00:00 2001
From: Chris Werner Rau <cwrau@cwrau.info>
Date: Mon, 9 Sep 2024 11:35:41 +0200
Subject: [PATCH 01/11] fix: don't automount default serviceAccount

Signed-off-by: Chris Werner Rau <cwrau@cwrau.info>
---
 charts/grafana/Chart.yaml                               | 2 +-
 charts/grafana/templates/image-renderer-deployment.yaml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index 87696c7225..bc39bc2123 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 8.5.1
+version: 8.5.2
 appVersion: 11.2.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
diff --git a/charts/grafana/templates/image-renderer-deployment.yaml b/charts/grafana/templates/image-renderer-deployment.yaml
index 4828aa38aa..75297cd27f 100644
--- a/charts/grafana/templates/image-renderer-deployment.yaml
+++ b/charts/grafana/templates/image-renderer-deployment.yaml
@@ -46,6 +46,7 @@ spec:
       {{- with .Values.imageRenderer.serviceAccountName }}
       serviceAccountName: "{{ . }}"
       {{- end }}
+      automountServiceAccountToken: {{ not (empty .Values.imageRenderer.serviceAccountName) }}
       {{- with .Values.imageRenderer.securityContext }}
       securityContext:
         {{- toYaml . | nindent 8 }}

From 6244db77e71bd0a15345aa0f27092cd4e0f60c0f Mon Sep 17 00:00:00 2001
From: Chris Werner Rau <cwrau@cwrau.info>
Date: Wed, 18 Sep 2024 10:23:24 +0200
Subject: [PATCH 02/11] chore: make automountServiceAccountToken configurable
 this doesn't make sense, but as per request by
 https://github.com/grafana/helm-charts/pull/3302#issuecomment-2353413283, it
 has to be done

Signed-off-by: Chris Werner Rau <cwrau@cwrau.info>
---
 charts/grafana/templates/image-renderer-deployment.yaml | 2 +-
 charts/grafana/values.yaml                              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/charts/grafana/templates/image-renderer-deployment.yaml b/charts/grafana/templates/image-renderer-deployment.yaml
index 75297cd27f..ead476e219 100644
--- a/charts/grafana/templates/image-renderer-deployment.yaml
+++ b/charts/grafana/templates/image-renderer-deployment.yaml
@@ -46,7 +46,7 @@ spec:
       {{- with .Values.imageRenderer.serviceAccountName }}
       serviceAccountName: "{{ . }}"
       {{- end }}
-      automountServiceAccountToken: {{ not (empty .Values.imageRenderer.serviceAccountName) }}
+      automountServiceAccountToken: {{ .Values.imageRenderer.automountServiceAccountToken }}
       {{- with .Values.imageRenderer.securityContext }}
       securityContext:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
index 51e94e01ff..f02c0077a3 100644
--- a/charts/grafana/values.yaml
+++ b/charts/grafana/values.yaml
@@ -1198,6 +1198,7 @@ imageRenderer:
 
   # image-renderer deployment serviceAccount
   serviceAccountName: ""
+  automountServiceAccountToken: false
   # image-renderer deployment securityContext
   securityContext: {}
   # image-renderer deployment container securityContext

From 16d47d18c05d3ea5695cacc08e36f8725f913bc7 Mon Sep 17 00:00:00 2001
From: Christian Simon <simon@swine.de>
Date: Tue, 10 Dec 2024 13:49:38 +0000
Subject: [PATCH 03/11] feat(grafana): Introduce profiling container port

In order to enable profiling using Grafana Alloy and Grafana Pyroscope
currently you would need to abuse another container port or insert a
dummy container to facitilitate profile collection.

This is because a containerPort is matched with the annotations to
enable profiling. As a workaround I am "abusing" the port :9094, as for
the example I am working on it is unused. This change will make it
possible to coexist with gossip-tcp and you would be able to enable
profiling like this:

```
helm upgrade -n pyroscope-test --install grafana grafana/grafana \
  --set env.GF_DIAGNOSTICS_PROFILING_ENABLED=true \
  --set env.GF_DIAGNOSTICS_PROFILING_ADDR=0.0.0.0 \
  --set env.GF_DIAGNOSTICS_PROFILING_PORT=6060 \
  --set-string 'podAnnotations.profiles\.grafana\.com/cpu\.scrape=true' \
  --set-string 'podAnnotations.profiles\.grafana\.com/cpu\.port=6060' \
  --set-string 'podAnnotations.profiles\.grafana\.com/memory\.scrape=true' \
  --set-string 'podAnnotations.profiles\.grafana\.com/memory\.port=6060' \
  --set-string 'podAnnotations.profiles\.grafana\.com/goroutine\.scrape=true' \
  --set-string 'podAnnotations.profiles\.grafana\.com/goroutine\.port=6060'
```

This is realted to https://github.com/grafana/pyroscope/pull/3753

Signed-off-by: Christian Simon <simon@swine.de>
---
 charts/grafana/Chart.yaml         | 2 +-
 charts/grafana/templates/_pod.tpl | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index f8ff539e08..c8e6e9d123 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 8.6.4
+version: 8.6.5
 appVersion: 11.3.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl
index bf55e43ba7..a0c32cf7aa 100644
--- a/charts/grafana/templates/_pod.tpl
+++ b/charts/grafana/templates/_pod.tpl
@@ -1088,6 +1088,9 @@ containers:
       - name: {{ .Values.gossipPortName }}-udp
         containerPort: 9094
         protocol: UDP
+      - name: profiling
+        containerPort: 6060
+        protocol: TCP
     env:
       - name: POD_IP
         valueFrom:

From 39aca61cbcf50243ddf893deb3368140162d5322 Mon Sep 17 00:00:00 2001
From: Sven Schliesing <s.schliesing@ndr.de>
Date: Fri, 13 Dec 2024 11:31:17 +0100
Subject: [PATCH 04/11] [grafana] Fix "Error: Failed to launch the browser
 process!\nchrome_crashpad_handler: --database is required"

See https://github.com/grafana/grafana-image-renderer/issues/565

Signed-off-by: Sven Schliesing <s.schliesing@ndr.de>
---
 charts/grafana/values.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
index 95696c1200..304f9361dd 100644
--- a/charts/grafana/values.yaml
+++ b/charts/grafana/values.yaml
@@ -1337,6 +1337,9 @@ imageRenderer:
   # extra environment variables
   env:
     HTTP_HOST: "0.0.0.0"
+    # Fixes "Error: Failed to launch the browser process!\nchrome_crashpad_handler: --database is required"
+    XDG_CONFIG_HOME: /tmp/.chromium
+    XDG_CACHE_HOME: /tmp/.chromium
     # RENDERING_ARGS: --no-sandbox,--disable-gpu,--window-size=1280x758
     # RENDERING_MODE: clustered
     # IGNORE_HTTPS_ERRORS: true

From 43fe9314bff11ce1af6a1e0f5ad70dd2904763d3 Mon Sep 17 00:00:00 2001
From: Sven Schliesing <s.schliesing@ndr.de>
Date: Fri, 13 Dec 2024 11:31:35 +0100
Subject: [PATCH 05/11] [grafana] Bump version

Signed-off-by: Sven Schliesing <s.schliesing@ndr.de>
---
 charts/grafana/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index fd4b26b726..cce3faa790 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 8.7.0
+version: 8.7.1
 appVersion: 11.4.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

From c4db1a7c0f35ded9f543a0c921a0974021d1bcc9 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Fri, 13 Dec 2024 14:34:09 +0330
Subject: [PATCH 06/11] Fixed comments

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 charts/tempo-distributed/Chart.yaml  |  2 +-
 charts/tempo-distributed/README.md   | 42 ++++++++++++++--------------
 charts/tempo-distributed/values.yaml | 42 ++++++++++++++--------------
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 8eedcb4b6c..848f3a26f0 100644
--- a/charts/tempo-distributed/Chart.yaml
+++ b/charts/tempo-distributed/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.26.0
+version: 1.26.1
 appVersion: 2.6.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index b0084f4350..850f6719e8 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.26.0](https://img.shields.io/badge/Version-1.26.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)
+![Version: 1.26.1](https://img.shields.io/badge/Version-1.26.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
@@ -265,7 +265,7 @@ The memcached default args are removed and should be provided manually. The sett
 | adminApi.strategy.type | string | `"RollingUpdate"` |  |
 | adminApi.terminationGracePeriodSeconds | int | `60` |  |
 | adminApi.tolerations | list | `[]` |  |
-| adminApi.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for admin-api pods. Passed through `tpl` and, thus, to be configured as string |
+| adminApi.topologySpreadConstraints | string | Defaults to allow skew no more than 1 node per AZ | topologySpread for admin-api pods. Passed through `tpl` and, thus, to be configured as string |
 | cache.caches[0].memcached.consistent_hash | bool | `true` |  |
 | cache.caches[0].memcached.host | string | `"{{ include \"tempo.fullname\" . }}-memcached"` |  |
 | cache.caches[0].memcached.service | string | `"memcached-client"` |  |
@@ -338,9 +338,9 @@ The memcached default args are removed and should be provided manually. The sett
 | distributor.extraVolumes | list | `[]` | Extra volumes for distributor deployment |
 | distributor.hostAliases | list | `[]` | hostAliases to add |
 | distributor.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` |
-| distributor.image.registry | string | `nil` | The Docker registry for the ingester image. Overrides `tempo.image.registry` |
-| distributor.image.repository | string | `nil` | Docker image repository for the ingester image. Overrides `tempo.image.repository` |
-| distributor.image.tag | string | `nil` | Docker image tag for the ingester image. Overrides `tempo.image.tag` |
+| distributor.image.registry | string | `nil` | The Docker registry for the distributor image. Overrides `tempo.image.registry` |
+| distributor.image.repository | string | `nil` | Docker image repository for the distributor image. Overrides `tempo.image.repository` |
+| distributor.image.tag | string | `nil` | Docker image tag for the distributor image. Overrides `tempo.image.tag` |
 | distributor.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
 | distributor.nodeSelector | object | `{}` | Node selector for distributor pods |
 | distributor.podAnnotations | object | `{}` | Annotations for distributor pods |
@@ -361,8 +361,8 @@ The memcached default args are removed and should be provided manually. The sett
 | distributor.tolerations | list | `[]` | Tolerations for distributor pods |
 | 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.6.1"` | Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag' |
+| enterprise.image.repository | string | `"grafana/enterprise-traces"` | Grafana Enterprise Tetrics container image repository. Note: for Grafana Tempo use the value 'image.repository' |
+| enterprise.image.tag | string | `"v2.6.1"` | Grafana Enterprise Tetrics 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 |
@@ -398,7 +398,7 @@ The memcached default args are removed and should be provided manually. The sett
 | enterpriseFederationFrontend.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for federation-frontend pods. Passed through `tpl` and, thus, to be configured as string |
 | enterpriseGateway.affinity | string | Soft node and soft zone anti-affinity | Affinity for enterprise-gateway pods. Passed through `tpl` and, thus, to be configured as string |
 | enterpriseGateway.annotations | object | `{}` |  |
-| enterpriseGateway.containerSecurityContext | object | `{"readOnlyRootFilesystem":true}` | The SecurityContext for gateway containers |
+| enterpriseGateway.containerSecurityContext | object | `{"readOnlyRootFilesystem":true}` | The SecurityContext for enterprise-gateway containers |
 | enterpriseGateway.env | list | `[]` |  |
 | enterpriseGateway.extraArgs | object | `{}` |  |
 | enterpriseGateway.extraContainers | list | `[]` |  |
@@ -410,10 +410,10 @@ The memcached default args are removed and should be provided manually. The sett
 | enterpriseGateway.image.registry | string | `nil` | The Docker registry for the enterpriseGateway image. Overrides `tempo.image.registry` |
 | enterpriseGateway.image.repository | string | `nil` | Docker image repository for the enterpriseGateway image. Overrides `tempo.image.repository` |
 | enterpriseGateway.image.tag | string | `nil` | Docker image tag for the enterpriseGateway image. Overrides `tempo.image.tag` |
-| enterpriseGateway.ingress.annotations | object | `{}` | Annotations for the gateway ingress |
-| enterpriseGateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the gateway should be created |
-| enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.gem.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the gateway ingress |
-| enterpriseGateway.ingress.tls | list | `[{"hosts":["gateway.gem.example.com"],"secretName":"gem-gateway-tls"}]` | TLS configuration for the gateway ingress |
+| enterpriseGateway.ingress.annotations | object | `{}` | Annotations for the enterprise-gateway ingress |
+| enterpriseGateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the enterprise-gateway should be created |
+| enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.gem.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the enterprise-gateway ingress |
+| enterpriseGateway.ingress.tls | list | `[{"hosts":["gateway.gem.example.com"],"secretName":"gem-gateway-tls"}]` | TLS configuration for the enterprise-gateway ingress |
 | enterpriseGateway.initContainers | list | `[]` |  |
 | enterpriseGateway.nodeSelector | object | `{}` |  |
 | enterpriseGateway.persistence.subPath | string | `nil` |  |
@@ -431,7 +431,7 @@ The memcached default args are removed and should be provided manually. The sett
 | enterpriseGateway.service.annotations | object | `{}` | Annotations for the enterprise gateway service |
 | enterpriseGateway.service.clusterIP | string | `nil` | ClusterIP of the enterprise gateway service |
 | enterpriseGateway.service.labels | object | `{}` | Labels for enterprise gateway service |
-| enterpriseGateway.service.loadBalancerIP | string | `nil` | Load balancer IPO address if service type is LoadBalancer for enterprise gateway service |
+| enterpriseGateway.service.loadBalancerIP | string | `nil` | Load balancer IP address if service type is LoadBalancer for enterprise gateway service |
 | enterpriseGateway.service.port | string | `nil` | Port of the enterprise gateway service; if left undefined, the service will listen on the same port as the pod |
 | enterpriseGateway.service.type | string | `"ClusterIP"` | Type of the enterprise gateway service |
 | enterpriseGateway.strategy.rollingUpdate.maxSurge | int | `0` |  |
@@ -439,7 +439,7 @@ The memcached default args are removed and should be provided manually. The sett
 | enterpriseGateway.strategy.type | string | `"RollingUpdate"` |  |
 | enterpriseGateway.terminationGracePeriodSeconds | int | `60` |  |
 | enterpriseGateway.tolerations | list | `[]` |  |
-| enterpriseGateway.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for enterprise-gateway pods. Passed through `tpl` and, thus, to be configured as string |
+| enterpriseGateway.topologySpreadConstraints | string | Defaults to allow skew no more than 1 node per AZ | topologySpread for enterprise-gateway pods. Passed through `tpl` and, thus, to be configured as string |
 | enterpriseGateway.useDefaultProxyURLs | bool | `true` | If you want to use your own proxy URLs, set this to false. |
 | externalConfigSecretName | string | `"{{ include \"tempo.resourceName\" (dict \"ctx\" . \"component\" \"config\") }}"` | Name of the Secret or ConfigMap that contains the configuration (used for naming even if config is internal). |
 | externalConfigVersion | string | `"0"` | When 'useExternalConfig' is true, then changing 'externalConfigVersion' triggers restart of services - otherwise changes to the configuration cause a restart. |
@@ -491,17 +491,17 @@ The memcached default args are removed and should be provided manually. The sett
 | gateway.readinessProbe.timeoutSeconds | int | `1` |  |
 | gateway.replicas | int | `1` | Number of replicas for the gateway |
 | gateway.resources | object | `{}` | Resource requests and limits for the gateway |
-| gateway.service.additionalPorts | list | `[]` | Additional ports to be opneed on gateway service (e.g. for RPC connections) |
+| gateway.service.additionalPorts | list | `[]` | Additional ports to be appended on gateway service (e.g. for RPC connections) |
 | gateway.service.annotations | object | `{}` | Annotations for the gateway service |
 | gateway.service.clusterIP | string | `nil` | ClusterIP of the gateway service |
 | gateway.service.labels | object | `{}` | Labels for gateway service |
-| gateway.service.loadBalancerIP | string | `nil` | Load balancer IPO address if service type is LoadBalancer |
+| gateway.service.loadBalancerIP | string | `nil` | Load balancer IP address if service type is LoadBalancer |
 | gateway.service.nodePort | string | `nil` | Node port if service type is NodePort |
 | gateway.service.port | int | `80` | Port of the gateway service |
 | gateway.service.type | string | `"ClusterIP"` | Type of the gateway service |
 | gateway.terminationGracePeriodSeconds | int | `30` | Grace period to allow the gateway to shutdown before it is killed |
 | gateway.tolerations | list | `[]` | Tolerations for gateway pods |
-| gateway.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for gateway pods. Passed through `tpl` and, thus, to be configured as string |
+| gateway.topologySpreadConstraints | string | Defaults to allow skew no more than 1 node per AZ | topologySpread for gateway pods. Passed through `tpl` and, thus, to be configured as string |
 | gateway.verboseLogging | bool | `true` | Enable logging of 2xx and 3xx HTTP requests |
 | global.clusterDomain | string | `"cluster.local"` | configures cluster domain ("cluster.local" by default) |
 | global.dnsNamespace | string | `"kube-system"` | configures DNS service namespace |
@@ -600,7 +600,7 @@ The memcached default args are removed and should be provided manually. The sett
 | memcached.resources | object | `{}` | Resource requests and limits for memcached |
 | memcached.service.annotations | object | `{}` | Annotations for memcached service |
 | memcached.tolerations | list | `[]` | Toleration for memcached pods |
-| memcached.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for memcached pods. Passed through `tpl` and, thus, to be configured as string |
+| memcached.topologySpreadConstraints | string | Defaults to allow skew no more than 1 node per AZ | topologySpread for memcached pods. Passed through `tpl` and, thus, to be configured as string |
 | memcachedExporter.enabled | bool | `false` | Specifies whether the Memcached Exporter should be enabled |
 | memcachedExporter.extraArgs | list | `[]` | Additional CLI args for the memcached exporter |
 | memcachedExporter.hostAliases | list | `[]` | hostAliases to add |
@@ -795,9 +795,9 @@ The memcached default args are removed and should be provided manually. The sett
 | queryFrontend.query.extraVolumeMounts | list | `[]` | Extra volumes for tempo-query pods |
 | queryFrontend.query.extraVolumes | list | `[]` | Extra volumes for tempo-query deployment |
 | queryFrontend.query.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` |
-| queryFrontend.query.image.registry | string | `nil` | The Docker registry for the query-frontend image. Overrides `tempo.image.registry` |
-| queryFrontend.query.image.repository | string | `"grafana/tempo-query"` | Docker image repository for the query-frontend image. Overrides `tempo.image.repository` |
-| queryFrontend.query.image.tag | string | `nil` | Docker image tag for the query-frontend image. Overrides `tempo.image.tag` |
+| queryFrontend.query.image.registry | string | `nil` | The Docker registry for the tempo-query image. Overrides `tempo.image.registry` |
+| queryFrontend.query.image.repository | string | `"grafana/tempo-query"` | Docker image repository for the tempo-queryimage. Overrides `tempo.image.repository` |
+| queryFrontend.query.image.tag | string | `nil` | Docker image tag for the tempo-query image. Overrides `tempo.image.tag` |
 | queryFrontend.query.resources | object | `{}` | Resource requests and limits for the query |
 | queryFrontend.replicas | int | `1` | Number of replicas for the query-frontend |
 | queryFrontend.resources | object | `{}` | Resource requests and limits for the query-frontend |
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 68e2157433..38defd5564 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -475,13 +475,13 @@ distributor:
     # -- Target memory utilisation percentage for the distributor
     targetMemoryUtilizationPercentage:
   image:
-    # -- The Docker registry for the ingester image. Overrides `tempo.image.registry`
+    # -- The Docker registry for the distributor image. Overrides `tempo.image.registry`
     registry: null
     # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets`
     pullSecrets: []
-    # -- Docker image repository for the ingester image. Overrides `tempo.image.repository`
+    # -- Docker image repository for the distributor image. Overrides `tempo.image.repository`
     repository: null
-    # -- Docker image tag for the ingester image. Overrides `tempo.image.tag`
+    # -- Docker image tag for the distributor image. Overrides `tempo.image.tag`
     tag: null
   service:
     # -- Annotations for distributor service
@@ -807,13 +807,13 @@ queryFrontend:
     # -- Required for grafana version <7.5 for compatibility with jaeger-ui. Doesn't work on ARM arch
     enabled: false
     image:
-      # -- The Docker registry for the query-frontend image. Overrides `tempo.image.registry`
+      # -- The Docker registry for the tempo-query image. Overrides `tempo.image.registry`
       registry: null
       # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets`
       pullSecrets: []
-      # -- Docker image repository for the query-frontend image. Overrides `tempo.image.repository`
+      # -- Docker image repository for the tempo-queryimage. Overrides `tempo.image.repository`
       repository: grafana/tempo-query
-      # -- Docker image tag for the query-frontend image. Overrides `tempo.image.tag`
+      # -- Docker image tag for the tempo-query image. Overrides `tempo.image.tag`
       tag: null
     # -- Resource requests and limits for the query
     resources: {}
@@ -1526,7 +1526,7 @@ storage:
       dedicated_columns: []
     # -- The supported storage backends are gcs, s3 and azure, as specified in https://grafana.com/docs/tempo/latest/configuration/#storage
     backend: local
-    # The worker pool is used primarily when finding traces by id, but is also used by other.
+    # The worker pool is used primarily when finding traces by id, but is also used by others.
     pool:
       # -- Total number of workers pulling jobs from the queue
       max_workers: 400
@@ -1578,7 +1578,7 @@ memcached:
   # -- Resource requests and limits for memcached
   resources: {}
   # -- topologySpread for memcached pods. Passed through `tpl` and, thus, to be configured as string
-  # @default -- Defaults to allow skew no more then 1 node per AZ
+  # @default -- Defaults to allow skew no more than 1 node per AZ
   topologySpreadConstraints: |
     - maxSkew: 1
       topologyKey: topology.kubernetes.io/zone
@@ -1847,7 +1847,7 @@ gateway:
   # -- Grace period to allow the gateway to shutdown before it is killed
   terminationGracePeriodSeconds: 30
   # -- topologySpread for gateway pods. Passed through `tpl` and, thus, to be configured as string
-  # @default -- Defaults to allow skew no more then 1 node per AZ
+  # @default -- Defaults to allow skew no more than 1 node per AZ
   topologySpreadConstraints: |
     - maxSkew: 1
       topologyKey: topology.kubernetes.io/zone
@@ -1887,13 +1887,13 @@ gateway:
     clusterIP: null
     # -- Node port if service type is NodePort
     nodePort: null
-    # -- Load balancer IPO address if service type is LoadBalancer
+    # -- Load balancer IP address if service type is LoadBalancer
     loadBalancerIP: null
     # -- Annotations for the gateway service
     annotations: {}
     # -- Labels for gateway service
     labels: {}
-    # -- Additional ports to be opneed on gateway service (e.g. for RPC connections)
+    # -- Additional ports to be appended on gateway service (e.g. for RPC connections)
     additionalPorts: []
   # Gateway ingress configuration
   ingress:
@@ -2075,9 +2075,9 @@ enterprise:
   enabled: false
 
   image:
-    # -- Grafana Enterprise Metrics container image repository. Note: for Grafana Tempo use the value 'image.repository'
+    # -- Grafana Enterprise Tetrics 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'
+    # -- Grafana Enterprise Tetrics container image tag. Note: for Grafana Tempo use the value 'image.tag'
     tag: v2.6.1
     # Note: pullPolicy and optional pullSecrets are set in toplevel 'image' section, not here
 
@@ -2155,7 +2155,7 @@ adminApi:
 
   nodeSelector: {}
   # -- topologySpread for admin-api pods. Passed through `tpl` and, thus, to be configured as string
-  # @default -- Defaults to allow skew no more then 1 node per AZ
+  # @default -- Defaults to allow skew no more than 1 node per AZ
   topologySpreadConstraints: |
     - maxSkew: 1
       topologyKey: topology.kubernetes.io/zone
@@ -2247,7 +2247,7 @@ enterpriseGateway:
     type: ClusterIP
     # -- ClusterIP of the enterprise gateway service
     clusterIP: null
-    # -- Load balancer IPO address if service type is LoadBalancer for enterprise gateway service
+    # -- Load balancer IP address if service type is LoadBalancer for enterprise gateway service
     loadBalancerIP: null
     # -- Annotations for the enterprise gateway service
     annotations: {}
@@ -2268,7 +2268,7 @@ enterpriseGateway:
 
   nodeSelector: {}
   # -- topologySpread for enterprise-gateway pods. Passed through `tpl` and, thus, to be configured as string
-  # @default -- Defaults to allow skew no more then 1 node per AZ
+  # @default -- Defaults to allow skew no more than 1 node per AZ
   topologySpreadConstraints: |
     - maxSkew: 1
       topologyKey: topology.kubernetes.io/zone
@@ -2297,7 +2297,7 @@ enterpriseGateway:
   securityContext:
     {}
 
-    # -- The SecurityContext for gateway containers
+    # -- The SecurityContext for enterprise-gateway containers
   containerSecurityContext:
     readOnlyRootFilesystem: true
 
@@ -2330,20 +2330,20 @@ enterpriseGateway:
 
   # Ingress configuration
   ingress:
-    # -- Specifies whether an ingress for the gateway should be created
+    # -- Specifies whether an ingress for the enterprise-gateway should be created
     enabled: false
     # -- Ingress Class Name. MAY be required for Kubernetes versions >= 1.18
     # ingressClassName: gateway
-    # -- Annotations for the gateway ingress
+    # -- Annotations for the enterprise-gateway ingress
     annotations: {}
-    # -- Hosts configuration for the gateway ingress
+    # -- Hosts configuration for the enterprise-gateway ingress
     hosts:
       - host: gateway.gem.example.com
         paths:
           - path: /
             # -- pathType (e.g. ImplementationSpecific, Prefix, .. etc.) might also be required by some Ingress Controllers
             # pathType: Prefix
-    # -- TLS configuration for the gateway ingress
+    # -- TLS configuration for the enterprise-gateway ingress
     tls:
       - secretName: gem-gateway-tls
         hosts:

From bcdc051cdef13a1205e2b8fe610e1bd0b9b85688 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Fri, 13 Dec 2024 18:45:23 +0330
Subject: [PATCH 07/11] Fixed a typo

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 charts/tempo-distributed/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 38defd5564..65e3a4f2ed 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -2075,9 +2075,9 @@ enterprise:
   enabled: false
 
   image:
-    # -- Grafana Enterprise Tetrics container image repository. Note: for Grafana Tempo use the value 'image.repository'
+    # -- Grafana Enterprise Traces container image repository. Note: for Grafana Tempo use the value 'image.repository'
     repository: grafana/enterprise-traces
-    # -- Grafana Enterprise Tetrics container image tag. Note: for Grafana Tempo use the value 'image.tag'
+    # -- Grafana Enterprise Traces container image tag. Note: for Grafana Tempo use the value 'image.tag'
     tag: v2.6.1
     # Note: pullPolicy and optional pullSecrets are set in toplevel 'image' section, not here
 

From 7ead812014f27e7d7fa7b136dba79f6ef242eae1 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Fri, 13 Dec 2024 18:49:28 +0330
Subject: [PATCH 08/11] Fixed a typo

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 charts/tempo-distributed/README.md   | 6 +++---
 charts/tempo-distributed/values.yaml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index 850f6719e8..c7075f65e5 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -361,8 +361,8 @@ The memcached default args are removed and should be provided manually. The sett
 | distributor.tolerations | list | `[]` | Tolerations for distributor pods |
 | 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 Tetrics container image repository. Note: for Grafana Tempo use the value 'image.repository' |
-| enterprise.image.tag | string | `"v2.6.1"` | Grafana Enterprise Tetrics container image tag. Note: for Grafana Tempo use the value 'image.tag' |
+| enterprise.image.repository | string | `"grafana/enterprise-traces"` | Grafana Enterprise Traces container image repository. Note: for Grafana Tempo use the value 'image.repository' |
+| enterprise.image.tag | string | `"v2.6.1"` | Grafana Enterprise Traces 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 |
@@ -491,7 +491,7 @@ The memcached default args are removed and should be provided manually. The sett
 | gateway.readinessProbe.timeoutSeconds | int | `1` |  |
 | gateway.replicas | int | `1` | Number of replicas for the gateway |
 | gateway.resources | object | `{}` | Resource requests and limits for the gateway |
-| gateway.service.additionalPorts | list | `[]` | Additional ports to be appended on gateway service (e.g. for RPC connections) |
+| gateway.service.additionalPorts | list | `[]` | Additional ports to be opened on gateway service (e.g. for RPC connections) |
 | gateway.service.annotations | object | `{}` | Annotations for the gateway service |
 | gateway.service.clusterIP | string | `nil` | ClusterIP of the gateway service |
 | gateway.service.labels | object | `{}` | Labels for gateway service |
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 65e3a4f2ed..ffde885e29 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -1893,7 +1893,7 @@ gateway:
     annotations: {}
     # -- Labels for gateway service
     labels: {}
-    # -- Additional ports to be appended on gateway service (e.g. for RPC connections)
+    # -- Additional ports to be opened on gateway service (e.g. for RPC connections)
     additionalPorts: []
   # Gateway ingress configuration
   ingress:

From 6cbc3b500355fcaa419924836dd04ad3dbad7e58 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Fri, 13 Dec 2024 18:52:08 +0330
Subject: [PATCH 09/11] Fixed a typo

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 charts/tempo-distributed/README.md   | 2 +-
 charts/tempo-distributed/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index c7075f65e5..2b7394b3e8 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -796,7 +796,7 @@ The memcached default args are removed and should be provided manually. The sett
 | queryFrontend.query.extraVolumes | list | `[]` | Extra volumes for tempo-query deployment |
 | queryFrontend.query.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` |
 | queryFrontend.query.image.registry | string | `nil` | The Docker registry for the tempo-query image. Overrides `tempo.image.registry` |
-| queryFrontend.query.image.repository | string | `"grafana/tempo-query"` | Docker image repository for the tempo-queryimage. Overrides `tempo.image.repository` |
+| queryFrontend.query.image.repository | string | `"grafana/tempo-query"` | Docker image repository for the tempo-query image. Overrides `tempo.image.repository` |
 | queryFrontend.query.image.tag | string | `nil` | Docker image tag for the tempo-query image. Overrides `tempo.image.tag` |
 | queryFrontend.query.resources | object | `{}` | Resource requests and limits for the query |
 | queryFrontend.replicas | int | `1` | Number of replicas for the query-frontend |
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index ffde885e29..0446057df3 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -811,7 +811,7 @@ queryFrontend:
       registry: null
       # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets`
       pullSecrets: []
-      # -- Docker image repository for the tempo-queryimage. Overrides `tempo.image.repository`
+      # -- Docker image repository for the tempo-query image. Overrides `tempo.image.repository`
       repository: grafana/tempo-query
       # -- Docker image tag for the tempo-query image. Overrides `tempo.image.tag`
       tag: null

From 3e3e13fe347e94e0d08917d449b4ff8c2a2b9255 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 15 Dec 2024 11:14:13 +0330
Subject: [PATCH 10/11] Bumbped version

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 charts/tempo-distributed/Chart.yaml | 2 +-
 charts/tempo-distributed/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 848f3a26f0..a0dd8f0187 100644
--- a/charts/tempo-distributed/Chart.yaml
+++ b/charts/tempo-distributed/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.26.1
+version: 1.26.2
 appVersion: 2.6.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index e7d2e54cf6..a584f620e0 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.26.1](https://img.shields.io/badge/Version-1.26.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)
+![Version: 1.26.2](https://img.shields.io/badge/Version-1.26.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

From d068f9c6ac7417d65454bdd67cfb153a47359e9d Mon Sep 17 00:00:00 2001
From: MH <zanhsieh@gmail.com>
Date: Sun, 15 Dec 2024 23:46:36 +0800
Subject: [PATCH 11/11] Update Chart.yaml

Signed-off-by: MH <zanhsieh@gmail.com>
---
 charts/grafana/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index cce3faa790..ea9033b72a 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 8.7.1
+version: 8.8.0
 appVersion: 11.4.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.