diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index b8cee10d3d..268d8aa3a0 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.48.1 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..de6df07ee2 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.48.1](https://img.shields.io/badge/Version-1.48.1-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 @@ -955,6 +955,8 @@ The memcached default args are removed and should be provided manually. The sett | storage.trace.blocklist_poll_fallback | string | `nil` | fallback to scanning the entire bucket. Set to false to disable this behavior. | | storage.trace.blocklist_poll_stale_tenant_index | string | `nil` | The oldest allowable tenant index. | | storage.trace.blocklist_poll_tenant_index_builders | string | `nil` | Maximum number of compactors that should build the tenant index. All other components will download the index. | +| storage.trace.empty_tenant_deletion_age | string | `nil` | How fast the poller will delete a tenant if it is empty. Will need to be enabled in 'empty_tenant_deletion_enabled'. | +| storage.trace.empty_tenant_deletion_enabled | string | `nil` | Delete empty tenants. | | storage.trace.pool.max_workers | int | `400` | Total number of workers pulling jobs from the queue | | storage.trace.pool.queue_depth | int | `20000` | Length of job queue. imporatant for querier as it queues a job for every block it has to search | | storage.trace.search.prefetch_trace_count | int | `1000` | Number of traces to prefetch while scanning blocks. Increasing this value can improve trace search performance at the cost of memory. | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 0b4964fc36..4ba60114ce 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1594,6 +1594,12 @@ config: | {{- if .Values.storage.trace.blocklist_poll_stale_tenant_index }} blocklist_poll_stale_tenant_index: {{ .Values.storage.trace.blocklist_poll_stale_tenant_index }} {{- end }} + {{- if .Values.storage.trace.empty_tenant_deletion_age }} + empty_tenant_deletion_age: {{ .Values.storage.trace.empty_tenant_deletion_age }} + {{- end }} + {{- if .Values.storage.trace.empty_tenant_deletion_enabled }} + empty_tenant_deletion_enabled: {{ .Values.storage.trace.empty_tenant_deletion_enabled }} + {{- end }} # Set Tempo server configuration # Refers to https://grafana.com/docs/tempo/latest/configuration/#server @@ -1667,7 +1673,12 @@ storage: blocklist_poll_tenant_index_builders: null # -- The oldest allowable tenant index. blocklist_poll_stale_tenant_index: null - # Settings for the Admin client storage backend and buckets. Only valid is enterprise.enabled is true. + # -- How fast the poller will delete a tenant if it is empty. Will need to be enabled in 'empty_tenant_deletion_enabled'. + empty_tenant_deletion_age: null + # -- Delete empty tenants. + empty_tenant_deletion_enabled: null + + # Settings for the Admin client storage backend and buckets. Only valid is enterprise.enabled is true admin: # -- The supported storage backends are gcs, s3 and azure, as specified in https://grafana.com/docs/enterprise-traces/latest/configure/reference/#admin_client_config backend: filesystem