diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index b8cee10d3d..26e76b22ce 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.48.0 +version: 1.49.0 appVersion: 2.8.2 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index f052043eae..846ed4127d 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.48.0](https://img.shields.io/badge/Version-1.48.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square) +![Version: 1.49.0](https://img.shields.io/badge/Version-1.49.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -528,6 +528,10 @@ The memcached default args are removed and should be provided manually. The sett | gateway.ingress.hosts | list | `[{"host":"gateway.tempo.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the gateway ingress | | gateway.ingress.labels | object | `{}` | Labels for the gateway ingress | | gateway.ingress.tls | list | `[{"hosts":["gateway.tempo.example.com"],"secretName":"tempo-gateway-tls"}]` | TLS configuration for the gateway ingress | +| gateway.livenessProbe.httpGet.path | string | `"/"` | | +| gateway.livenessProbe.httpGet.port | string | `"http-metrics"` | | +| gateway.livenessProbe.initialDelaySeconds | int | `30` | | +| gateway.livenessProbe.timeoutSeconds | int | `5` | | | gateway.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable | | gateway.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating | | gateway.nginxConfig.file | string | See values.yaml | Config file contents for Nginx. Passed through the `tpl` function to allow templating | @@ -963,6 +967,10 @@ The memcached default args are removed and should be provided manually. The sett | tempo.image.registry | string | `"docker.io"` | The Docker registry | | tempo.image.repository | string | `"grafana/tempo"` | Docker image repository | | tempo.image.tag | string | `nil` | Overrides the image tag whose default is the chart's appVersion | +| tempo.livenessProbe.httpGet.path | string | `"/ready"` | | +| tempo.livenessProbe.httpGet.port | string | `"http-metrics"` | | +| tempo.livenessProbe.initialDelaySeconds | int | `60` | | +| tempo.livenessProbe.timeoutSeconds | int | `5` | | | tempo.memberlist | object | `{"appProtocol":null,"service":{"annotations":{}}}` | Memberlist service configuration. | | tempo.memberlist.appProtocol | string | `nil` | Adds the appProtocol field to the memberlist service. This allows memberlist to work with istio protocol selection. Set the optional service protocol. Ex: "tcp", "http" or "https". | | tempo.memberlist.service | object | `{"annotations":{}}` | Adds the service field to the memberlist service | diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml index f49def948f..cfb896a899 100644 --- a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml @@ -95,6 +95,10 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} {{- end }} + livenessProbe: + {{- toYaml .Values.tempo.livenessProbe | nindent 12 }} + readinessProbe: + {{- toYaml .Values.tempo.readinessProbe | nindent 12 }} resources: {{- toYaml .Values.compactor.resources | nindent 12 }} {{- with .Values.tempo.securityContext }} diff --git a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml index fdee669659..3d0c71c590 100644 --- a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml @@ -138,6 +138,8 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} {{- end }} + livenessProbe: + {{- toYaml .Values.tempo.livenessProbe | nindent 12 }} readinessProbe: {{- toYaml .Values.tempo.readinessProbe | nindent 12 }} resources: diff --git a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml index 4adc541c18..cb03818e69 100644 --- a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml +++ b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml @@ -85,6 +85,8 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} {{- end }} + livenessProbe: + {{- toYaml .Values.gateway.livenessProbe | nindent 12 }} readinessProbe: {{- toYaml .Values.gateway.readinessProbe | nindent 12 }} volumeMounts: diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index d89950e8e2..609cd9f522 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -110,6 +110,8 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} {{- end }} + livenessProbe: + {{- toYaml .Values.tempo.livenessProbe | nindent 12 }} readinessProbe: {{- toYaml .Values.tempo.readinessProbe | nindent 12 }} resources: diff --git a/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml index 94b70f0220..a68d07236c 100644 --- a/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml @@ -82,6 +82,8 @@ spec: envFrom: {{- toYaml . | nindent 12 }} {{- end }} + livenessProbe: + {{- toYaml .Values.tempo.livenessProbe | nindent 12 }} readinessProbe: {{- toYaml .Values.tempo.readinessProbe | nindent 12 }} resources: diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml index e804402397..a445f3e9f4 100644 --- a/charts/tempo-distributed/templates/querier/deployment-querier.yaml +++ b/charts/tempo-distributed/templates/querier/deployment-querier.yaml @@ -102,6 +102,10 @@ spec: securityContext: {{- toYaml . | nindent 12 }} {{- end }} + {{- with .Values.tempo.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} {{- with .Values.tempo.readinessProbe }} readinessProbe: {{- toYaml . | nindent 12 }} diff --git a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml index 1b92d6560b..2233aa237d 100644 --- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml @@ -92,6 +92,11 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} {{- end }} + livenessProbe: + {{- toYaml .Values.tempo.livenessProbe | nindent 12 }} + readinessProbe: + {{- toYaml .Values.tempo.readinessProbe | nindent 12 }} + resources: resources: {{- toYaml .Values.queryFrontend.resources | nindent 12 }} {{- with .Values.tempo.securityContext }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 0b4964fc36..5b7b2c1c84 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -64,6 +64,12 @@ tempo: # -- Overrides the image tag whose default is the chart's appVersion tag: null pullPolicy: IfNotPresent + livenessProbe: + httpGet: + path: /ready + port: http-metrics + initialDelaySeconds: 60 + timeoutSeconds: 5 readinessProbe: httpGet: path: /ready @@ -2102,6 +2108,13 @@ gateway: {{ htpasswd (required "'gateway.basicAuth.username' is required" .Values.gateway.basicAuth.username) (required "'gateway.basicAuth.password' is required" .Values.gateway.basicAuth.password) }} # -- Existing basic auth secret to use. Must contain '.htpasswd' existingSecret: null + # Configures the liveness probe for the gateway + livenessProbe: + httpGet: + path: / + port: http-metrics + initialDelaySeconds: 30 + timeoutSeconds: 5 # Configures the readiness probe for the gateway readinessProbe: httpGet: