From 4ea217b5a07ac52912c2c079f4d039c0032cc1f8 Mon Sep 17 00:00:00 2001 From: junya koyama Date: Thu, 30 Nov 2023 23:01:42 +0900 Subject: [PATCH 1/9] [lgtm-distributed] fix Chart.yaml - add license annotations and keywords Signed-off-by: junya koyama --- charts/lgtm-distributed/Chart.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml index 38f6458e6a..3cc119e172 100644 --- a/charts/lgtm-distributed/Chart.yaml +++ b/charts/lgtm-distributed/Chart.yaml @@ -16,7 +16,14 @@ sources: - https://github.com/grafana/mimir - https://github.com/grafana/tempo +keywords: + - monitoring + - traces + - metrics + - logs + annotations: + "artifacthub.io/license": AGPL-3.0-only "artifacthub.io/links": | - name: Chart Source url: https://github.com/grafana/helm-charts From 2662e62c193f9c46e2e19b77ea9cc7735a40ebb1 Mon Sep 17 00:00:00 2001 From: junya koyama Date: Thu, 30 Nov 2023 23:02:55 +0900 Subject: [PATCH 2/9] [lgtm-distributed] bump chart version Signed-off-by: junya koyama --- charts/lgtm-distributed/Chart.yaml | 2 +- charts/lgtm-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml index 3cc119e172..2869ffd7d6 100644 --- a/charts/lgtm-distributed/Chart.yaml +++ b/charts/lgtm-distributed/Chart.yaml @@ -3,7 +3,7 @@ apiVersion: v2 name: lgtm-distributed description: Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack type: application -version: 1.0.0 +version: 1.0.1 appVersion: "6.59.4" home: https://grafana.com/oss/ diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md index f8af897372..76c4bae8db 100644 --- a/charts/lgtm-distributed/README.md +++ b/charts/lgtm-distributed/README.md @@ -1,6 +1,6 @@ # lgtm-distributed -![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.59.4](https://img.shields.io/badge/AppVersion-6.59.4-informational?style=flat-square) +![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.59.4](https://img.shields.io/badge/AppVersion-6.59.4-informational?style=flat-square) Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack From c865e7390ab62463daf82ecd3b234a3dd93b2582 Mon Sep 17 00:00:00 2001 From: Javier Palacios Date: Mon, 15 Jan 2024 16:29:25 +0100 Subject: [PATCH 3/9] Allow for tempo dedicated attribute columns to be configured Signed-off-by: Javier Palacios --- charts/tempo-distributed/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 0e16fc70a8..5697955c94 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1251,6 +1251,10 @@ config: | {{- if .Values.storage.trace.block.version }} block: version: {{.Values.storage.trace.block.version}} + {{- if .Values.storage.trace.block.attribute_columns }} + parquet_dedicated_columns: + {{ .Values.storage.trace.block.attribute_columns }} + {{- end }} {{- end }} pool: max_workers: {{ .Values.storage.trace.pool.max_workers }} @@ -1314,6 +1318,8 @@ storage: block: # -- The supported block versions are specified here https://grafana.com/docs/tempo/latest/configuration/parquet/ version: null + # -- Rdedicated attribute columns (only for vParquet3 or later) + attribute_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. From 2dc6cbc69c28396f9bb3763effc7b3a284107091 Mon Sep 17 00:00:00 2001 From: Javier Palacios Date: Mon, 15 Jan 2024 17:54:22 +0100 Subject: [PATCH 4/9] Update documentation Signed-off-by: Javier Palacios --- charts/tempo-distributed/README.md | 1 + charts/tempo-distributed/values.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index e28f0acd3c..7135c5b8d4 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -728,6 +728,7 @@ The memcached default args are removed and should be provided manually. The sett | serviceAccount.name | string | `nil` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template | | storage.admin.backend | string | `"filesystem"` | The supported storage backends are gcs, s3 and azure, as specified in https://grafana.com/docs/enterprise-traces/latest/config/reference/#admin_client_config | | storage.trace.backend | string | `"local"` | The supported storage backends are gcs, s3 and azure, as specified in https://grafana.com/docs/tempo/latest/configuration/#storage | +| storage.trace.block.attribute_columns | list | `[]` | Lis with dedicated attribute columns (only for vParquet3 or later) | | storage.trace.block.version | string | `nil` | The supported block versions are specified here https://grafana.com/docs/tempo/latest/configuration/parquet/ | | 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 | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 5697955c94..0051689c46 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1318,7 +1318,7 @@ storage: block: # -- The supported block versions are specified here https://grafana.com/docs/tempo/latest/configuration/parquet/ version: null - # -- Rdedicated attribute columns (only for vParquet3 or later) + # -- Lis with dedicated attribute columns (only for vParquet3 or later) attribute_columns: [] # -- The supported storage backends are gcs, s3 and azure, as specified in https://grafana.com/docs/tempo/latest/configuration/#storage backend: local From 8826d46866a1f89323534f5a2eda5561bd3596de Mon Sep 17 00:00:00 2001 From: Javier Palacios Date: Mon, 15 Jan 2024 17:55:19 +0100 Subject: [PATCH 5/9] Version bump Signed-off-by: Javier Palacios --- charts/tempo-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 9b815d1696..a1cc09edd9 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.7.5 +version: 1.7.6 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From 690b82a9034d42f57fc585a9ad1f545930be3f6d Mon Sep 17 00:00:00 2001 From: Javier Palacios Date: Mon, 15 Jan 2024 17:58:15 +0100 Subject: [PATCH 6/9] Version bump (readme badge) Signed-off-by: Javier Palacios --- charts/tempo-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 7135c5b8d4..622db1c1bb 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.7.5](https://img.shields.io/badge/Version-1.7.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 8e90f76629d5ee68bebefffe8c11cac1f52358c2 Mon Sep 17 00:00:00 2001 From: Javier Palacios Date: Mon, 15 Jan 2024 18:28:42 +0100 Subject: [PATCH 7/9] Version bump (readme badge II) Signed-off-by: Javier Palacios --- charts/tempo-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 622db1c1bb..a1462b4030 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From da737f8039b70bd436a870d64dec0b60cadfc10c Mon Sep 17 00:00:00 2001 From: junya koyama Date: Tue, 16 Jan 2024 22:27:54 +0900 Subject: [PATCH 8/9] [lgtm-distributed] fix incorrect license annotations. Signed-off-by: junya koyama --- charts/lgtm-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml index 2869ffd7d6..04cf805e07 100644 --- a/charts/lgtm-distributed/Chart.yaml +++ b/charts/lgtm-distributed/Chart.yaml @@ -23,7 +23,7 @@ keywords: - logs annotations: - "artifacthub.io/license": AGPL-3.0-only + "artifacthub.io/license": Apache-2.0 "artifacthub.io/links": | - name: Chart Source url: https://github.com/grafana/helm-charts From 951628587b03de96c8478b418f2ade9dff973fca Mon Sep 17 00:00:00 2001 From: Javier Palacios Date: Tue, 16 Jan 2024 20:55:52 +0100 Subject: [PATCH 9/9] Change variable name Signed-off-by: Javier Palacios --- charts/tempo-distributed/README.md | 2 +- charts/tempo-distributed/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index a1462b4030..3cd8818412 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -728,7 +728,7 @@ The memcached default args are removed and should be provided manually. The sett | serviceAccount.name | string | `nil` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template | | storage.admin.backend | string | `"filesystem"` | The supported storage backends are gcs, s3 and azure, as specified in https://grafana.com/docs/enterprise-traces/latest/config/reference/#admin_client_config | | storage.trace.backend | string | `"local"` | The supported storage backends are gcs, s3 and azure, as specified in https://grafana.com/docs/tempo/latest/configuration/#storage | -| storage.trace.block.attribute_columns | list | `[]` | Lis with dedicated attribute columns (only for vParquet3 or later) | +| storage.trace.block.dedicated_columns | list | `[]` | Lis with dedicated attribute columns (only for vParquet3 or later) | | storage.trace.block.version | string | `nil` | The supported block versions are specified here https://grafana.com/docs/tempo/latest/configuration/parquet/ | | 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 | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 0051689c46..ae082dc148 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1251,9 +1251,9 @@ config: | {{- if .Values.storage.trace.block.version }} block: version: {{.Values.storage.trace.block.version}} - {{- if .Values.storage.trace.block.attribute_columns }} + {{- if .Values.storage.trace.block.dedicated_columns}} parquet_dedicated_columns: - {{ .Values.storage.trace.block.attribute_columns }} + {{ .Values.storage.trace.block.dedicated_columns}} {{- end }} {{- end }} pool: @@ -1319,7 +1319,7 @@ storage: # -- The supported block versions are specified here https://grafana.com/docs/tempo/latest/configuration/parquet/ version: null # -- Lis with dedicated attribute columns (only for vParquet3 or later) - attribute_columns: [] + 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.