Merge branch 'main' into patch-1

Author: chivunito

charts/tempo-distributed/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.41.1
-appVersion: 2.7.2
+version: 1.42.0
+appVersion: 2.8.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
 icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png

charts/tempo-distributed/README.md

@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.41.1](https://img.shields.io/badge/Version-1.41.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.2](https://img.shields.io/badge/AppVersion-2.7.2-informational?style=flat-square)
+![Version: 1.42.0](https://img.shields.io/badge/Version-1.42.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
@@ -48,13 +48,17 @@ The command removes all the Kubernetes components associated with the chart and
 
 A major chart version change indicates that there is an incompatible breaking change needing manual actions.
 
+### From Chart versions < 1.41.2
+Please be aware that we've updated the Tempo version to 2.8, which includes some breaking changes
+We recommend reviewing the [release notes](https://github.com/grafana/tempo/releases/tag/v2.8.0) before upgrading.
+
 ### From Chart versions < 1.41.0
 * Breaking Change *
 In order to be consistent with other projects and documentations, the default port has been changed from 3100 to 3200.
 
 ### From Chart versions < 1.33.0
 * Breaking Change *
-In order to reduce confusion, the overrides configurations have been renamed as below. 
+In order to reduce confusion, the overrides configurations have been renamed as below.
 
 `global_overrides` =>  `overrides` (this is where the defaults for every tenant is set)
 `overrides` => `per_tenant_overrides` (this is where configurations for specific tenants can be set)
@@ -653,9 +657,11 @@ The memcached default args are removed and should be provided manually. The sett
 | memcached.image.repository | string | `"memcached"` | Memcached Docker image repository |
 | memcached.image.tag | string | `"1.6.33-alpine"` | Memcached Docker image tag |
 | memcached.initContainers | list | `[]` | Init containers for the memcached pod |
+| memcached.livenessProbe | object | `{"failureThreshold":6,"initialDelaySeconds":30,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":5}` | configuration for liveness probe for memcached statefulset |
 | memcached.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
 | memcached.podAnnotations | object | `{}` | Annotations for memcached pods |
 | memcached.podLabels | object | `{}` | Labels for memcached pods |
+| memcached.readinessProbe | object | `{"failureThreshold":6,"initialDelaySeconds":5,"periodSeconds":5,"successThreshold":1,"tcpSocket":{"port":"client"},"timeoutSeconds":3}` | configuration for readiness probe for memcached statefulset |
 | memcached.replicas | int | `1` |  |
 | memcached.resources | object | `{}` | Resource requests and limits for memcached |
 | memcached.service.annotations | object | `{}` | Annotations for memcached service |

charts/tempo-distributed/README.md.gotmpl

@@ -41,13 +41,17 @@ The command removes all the Kubernetes components associated with the chart and
 
 A major chart version change indicates that there is an incompatible breaking change needing manual actions.
 
+### From Chart versions < 1.41.2
+Please be aware that we've updated the Tempo version to 2.8, which includes some breaking changes
+We recommend reviewing the [release notes](https://github.com/grafana/tempo/releases/tag/v2.8.0) before upgrading.
+
 ### From Chart versions < 1.41.0
 * Breaking Change *
 In order to be consistent with other projects and documentations, the default port has been changed from 3100 to 3200.
 
 ### From Chart versions < 1.33.0
 * Breaking Change *
-In order to reduce confusion, the overrides configurations have been renamed as below.  
+In order to reduce confusion, the overrides configurations have been renamed as below.
 
 `global_overrides` =>  `overrides` (this is where the defaults for every tenant is set)
 `overrides` => `per_tenant_overrides` (this is where configurations for specific tenants can be set)

charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml

@@ -77,6 +77,18 @@ spec:
           envFrom:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with .Values.memcached.readinessProbe }}
+          readinessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.memcached.livenessProbe }}
+          livenessProbe:
+            exec:
+              command:
+                - pgrep
+                - memcached
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.memcached.resources | nindent 12 }}
           {{- with .Values.tempo.securityContext }}

charts/tempo-distributed/values.yaml

@@ -1712,6 +1712,25 @@ memcached:
   service:
     # -- Annotations for memcached service
     annotations: {}
+
+  # -- configuration for readiness probe for memcached statefulset
+  readinessProbe:
+    tcpSocket:
+      port: client
+    initialDelaySeconds: 5
+    periodSeconds: 5
+    timeoutSeconds: 3
+    failureThreshold: 6
+    successThreshold: 1
+
+  # -- configuration for liveness probe for memcached statefulset
+  livenessProbe:
+    initialDelaySeconds: 30
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
+
 memcachedExporter:
   # -- Specifies whether the Memcached Exporter should be enabled
   enabled: false

charts/tempo/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: tempo
 description: Grafana Tempo Single Binary Mode
 type: application
-version: 1.21.1
-appVersion: 2.7.1
+version: 1.23.1
+appVersion: 2.8.0
 engine: gotpl
 home: https://grafana.net
 icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png

charts/tempo/README.md

@@ -1,6 +1,6 @@
 # tempo
 
-![Version: 1.21.1](https://img.shields.io/badge/Version-1.21.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.1](https://img.shields.io/badge/AppVersion-2.7.1-informational?style=flat-square)
+![Version: 1.23.1](https://img.shields.io/badge/Version-1.23.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square)
 
 Grafana Tempo Single Binary Mode
 
@@ -64,7 +64,7 @@ Grafana Tempo Single Binary Mode
 | tempo.ingester | object | `{}` | Configuration options for the ingester. Refers to: https://grafana.com/docs/tempo/latest/configuration/#ingester |
 | tempo.livenessProbe.failureThreshold | int | `3` |  |
 | tempo.livenessProbe.httpGet.path | string | `"/ready"` |  |
-| tempo.livenessProbe.httpGet.port | int | `3100` |  |
+| tempo.livenessProbe.httpGet.port | int | `3200` |  |
 | tempo.livenessProbe.initialDelaySeconds | int | `30` |  |
 | tempo.livenessProbe.periodSeconds | int | `10` |  |
 | tempo.livenessProbe.successThreshold | int | `1` |  |
@@ -82,7 +82,7 @@ Grafana Tempo Single Binary Mode
 | tempo.queryFrontend | object | `{}` | Configuration options for the query-fronted. Refers to: https://grafana.com/docs/tempo/latest/configuration/#query-frontend |
 | tempo.readinessProbe.failureThreshold | int | `3` |  |
 | tempo.readinessProbe.httpGet.path | string | `"/ready"` |  |
-| tempo.readinessProbe.httpGet.port | int | `3100` |  |
+| tempo.readinessProbe.httpGet.port | int | `3200` |  |
 | tempo.readinessProbe.initialDelaySeconds | int | `20` |  |
 | tempo.readinessProbe.periodSeconds | int | `10` |  |
 | tempo.readinessProbe.successThreshold | int | `1` |  |
@@ -99,7 +99,7 @@ Grafana Tempo Single Binary Mode
 | tempo.resources | object | `{}` |  |
 | tempo.retention | string | `"24h"` |  |
 | tempo.securityContext | object | `{}` |  |
-| tempo.server.http_listen_port | int | `3100` | HTTP server listen port |
+| tempo.server.http_listen_port | int | `3200` | HTTP server listen port |
 | tempo.storage.trace.backend | string | `"local"` |  |
 | tempo.storage.trace.local.path | string | `"/var/tempo/traces"` |  |
 | tempo.storage.trace.wal.path | string | `"/var/tempo/wal"` |  |
@@ -155,9 +155,18 @@ The command removes all the Kubernetes components associated with the chart and
 
 A major chart version change indicates that there is an incompatible breaking change needing manual actions.
 
+### From Chart versions < 1.22.0
+* Breaking Change *
+Please be aware that we've updated the Tempo version to 2.8, which includes some breaking changes
+We recommend reviewing the [release notes](https://grafana.com/docs/tempo/latest/release-notes/v2-8/) before upgrading.
+
+### From Chart versions < 1.21.1
+* Breaking Change *
+In order to be consistent with other projects and documentations, the default port has been changed from 3100 to 3200.
+
 ### From Chart versions < 1.19.0
 * Breaking Change *
-In order to reduce confusion, the overrides configurations have been renamed as below. 
+In order to reduce confusion, the overrides configurations have been renamed as below.
 
 `global_overrides` =>  `overrides` (this is where the defaults for every tenant is set)
 `overrides` => `per_tenant_overrides` (this is where configurations for specific tenants can be set)
@@ -187,4 +196,4 @@ and [1.5 -> 2.0 upgrade guide](https://grafana.com/docs/tempo/latest/setup/upgra
 
 Upgrading from pre 0.7.0 will, by default, move your trace storage from `/tmp/tempo/traces` to `/var/tempo/traces`.
 This will cause Tempo to lose trace history. If you would like to retain history just copy the contents from the
-old folder to the new.
+old folder to the new.

charts/tempo/README.md.gotmpl

@@ -40,9 +40,18 @@ The command removes all the Kubernetes components associated with the chart and
 
 A major chart version change indicates that there is an incompatible breaking change needing manual actions.
 
+### From Chart versions < 1.22.0
+* Breaking Change *
+Please be aware that we've updated the Tempo version to 2.8, which includes some breaking changes
+We recommend reviewing the [release notes](https://grafana.com/docs/tempo/latest/release-notes/v2-8/) before upgrading.
+
+### From Chart versions < 1.21.1
+* Breaking Change *
+In order to be consistent with other projects and documentations, the default port has been changed from 3100 to 3200.
+
 ### From Chart versions < 1.19.0
 * Breaking Change *
-In order to reduce confusion, the overrides configurations have been renamed as below.  
+In order to reduce confusion, the overrides configurations have been renamed as below.
 
 `global_overrides` =>  `overrides` (this is where the defaults for every tenant is set)
 `overrides` => `per_tenant_overrides` (this is where configurations for specific tenants can be set)
@@ -65,11 +74,11 @@ We recommend reviewing the [release notes](https://github.com/grafana/tempo/rele
 ### From Chart versions < 1.0.0
 
 Please note that we've incremented the major version when upgrading to Tempo 2.0. There were a large number of
-changes in this release (breaking and otherwise). It is encouraged to review the [release notes](https://grafana.com/docs/tempo/latest/release-notes/v2-0/) 
+changes in this release (breaking and otherwise). It is encouraged to review the [release notes](https://grafana.com/docs/tempo/latest/release-notes/v2-0/)
 and [1.5 -> 2.0 upgrade guide](https://grafana.com/docs/tempo/latest/setup/upgrade/) before upgrading.
 
 ### From Chart versions < 0.7.0
 
 Upgrading from pre 0.7.0 will, by default, move your trace storage from `/tmp/tempo/traces` to `/var/tempo/traces`.
-This will cause Tempo to lose trace history. If you would like to retain history just copy the contents from the 
-old folder to the new.
+This will cause Tempo to lose trace history. If you would like to retain history just copy the contents from the
+old folder to the new.

charts/tempo/templates/_ports.tpl

@@ -24,9 +24,9 @@
 {{/* TCP sockets */}}
 {{- define "tempo.tcp"}}
 - name: tempo-prom-metrics
-  port: 3100
+  port: 3200
   protocol: TCP
-  targetPort: 3100
+  targetPort: 3200
 {{- if .Values.tempoQuery.enabled }}
 - name: jaeger-metrics
   port: 16687
@@ -85,4 +85,4 @@
   protocol: TCP
   targetPort: 55678
 {{- /* end of define */}}
-{{- end  }}
+{{- end  }}

charts/tempo/templates/statefulset.yaml

@@ -67,7 +67,7 @@ spec:
         imagePullPolicy: {{ .Values.tempo.pullPolicy }}
         name: tempo
         ports:
-        - containerPort: 3100
+        - containerPort: 3200
           name: prom-metrics
         - containerPort: 6831
           name: jaeger-thrift-c