From 932b03cdafc057541dd961a14da01778dc9b4bea Mon Sep 17 00:00:00 2001 From: Naing Naing Htun Date: Thu, 1 Feb 2024 16:07:25 +0700 Subject: [PATCH 01/20] Update metrics generator storage remote_write url Signed-off-by: Naing Naing Htun --- charts/tempo-distributed/README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 57ef9ab8f9..e28ca10245 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -826,9 +826,10 @@ Metrics-generator is disabled by default and can be activated by configuring the metricsGenerator: enabled: true config: - storage_remote_write: - - url: http://cortex/api/v1/push - send_exemplars: true + storage: + remote_write: + - url: http://cortex/api/v1/push + send_exemplars: true # headers: # x-scope-orgid: operations # Global overrides From a6d296214e7dae53f037b3591868213082cffe11 Mon Sep 17 00:00:00 2001 From: Blocka Date: Wed, 13 Mar 2024 09:59:46 +0800 Subject: [PATCH 02/20] fix type in url Signed-off-by: Blocka --- charts/tempo-distributed/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 3955e5c1bd..286fb6cc31 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1347,7 +1347,7 @@ storage: queue_depth: 20000 # 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/config/reference/#admin_client_config + # -- 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 # Global overrides From 414a13f539307af32ccb196d639990b613661ad8 Mon Sep 17 00:00:00 2001 From: Matt Clegg Date: Thu, 16 Nov 2023 14:00:36 +0000 Subject: [PATCH 03/20] DOCS fix typo ingester Signed-off-by: Matt Clegg --- charts/loki-distributed/Chart.yaml | 2 +- charts/loki-distributed/README.md | 4 ++-- charts/loki-distributed/values.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index 62b62a61cd..a5d437af85 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -3,7 +3,7 @@ name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application appVersion: 2.9.8 -version: 0.79.1 +version: 0.79.2 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index 5fb930a22d..ad6ddcb53b 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -315,8 +315,8 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingester.readinessProbe | object | `{}` | readiness probe settings for ingester pods. If empty, use `loki.readinessProbe` | | ingester.replicas | int | `1` | Number of replicas for the ingester | | ingester.resources | object | `{}` | Resource requests and limits for the ingester | -| ingester.serviceLabels | object | `{}` | Labels for ingestor service | -| ingester.terminationGracePeriodSeconds | int | `300` | Grace period to allow the ingester to shutdown before it is killed. Especially for the ingestor, this must be increased. It must be long enough so ingesters can be gracefully shutdown flushing/transferring all data and to successfully leave the member ring on shutdown. | +| ingester.serviceLabels | object | `{}` | Labels for ingester service | +| ingester.terminationGracePeriodSeconds | int | `300` | Grace period to allow the ingester to shutdown before it is killed. Especially for the ingester, this must be increased. It must be long enough so ingesters can be gracefully shutdown flushing/transferring all data and to successfully leave the member ring on shutdown. | | ingester.tolerations | list | `[]` | Tolerations for ingester pods | | ingester.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for ingester pods. Passed through `tpl` and, thus, to be configured as string | | ingress.annotations | object | `{}` | | diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml index 15e9343e84..4b20c29312 100644 --- a/charts/loki-distributed/values.yaml +++ b/charts/loki-distributed/values.yaml @@ -434,7 +434,7 @@ ingester: podLabels: {} # -- Annotations for ingester pods podAnnotations: {} - # -- Labels for ingestor service + # -- Labels for ingester service serviceLabels: {} # -- Additional CLI args for the ingester extraArgs: [] @@ -452,7 +452,7 @@ ingester: extraContainers: [] # -- Init containers to add to the ingester pods initContainers: [] - # -- Grace period to allow the ingester to shutdown before it is killed. Especially for the ingestor, + # -- Grace period to allow the ingester to shutdown before it is killed. Especially for the ingester, # this must be increased. It must be long enough so ingesters can be gracefully shutdown flushing/transferring # all data and to successfully leave the member ring on shutdown. terminationGracePeriodSeconds: 300 From be19eca29a90f777b3fb9f238cb11e17c3bb3750 Mon Sep 17 00:00:00 2001 From: fengxsong Date: Fri, 26 Jul 2024 09:48:07 +0800 Subject: [PATCH 04/20] fix: do not create pvc manually when useStatefulSet Signed-off-by: fengxsong --- charts/grafana/templates/pvc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/templates/pvc.yaml b/charts/grafana/templates/pvc.yaml index 0a4613edc7..d1c4b2de27 100644 --- a/charts/grafana/templates/pvc.yaml +++ b/charts/grafana/templates/pvc.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) (eq .Values.persistence.type "pvc")}} +{{- if and (not .Values.useStatefulSet) .Values.persistence.enabled (not .Values.persistence.existingClaim) (eq .Values.persistence.type "pvc")}} apiVersion: v1 kind: PersistentVolumeClaim metadata: From 5127f0b5e39041ca45060c75c12d8cbd80f07933 Mon Sep 17 00:00:00 2001 From: fengxsong Date: Mon, 29 Jul 2024 09:00:28 +0800 Subject: [PATCH 05/20] [grafana] bump chart version Signed-off-by: fengxsong --- 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 3b3bbdbf9d..df0c978549 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.3.6 +version: 8.3.7 appVersion: 11.1.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 3f62649982173b962da31625575cf87db868644e Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 30 Jul 2024 08:38:20 +0800 Subject: [PATCH 06/20] Update README.md Signed-off-by: MH --- charts/loki-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index ad6ddcb53b..bc86067d62 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.79.1](https://img.shields.io/badge/Version-0.79.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.8](https://img.shields.io/badge/AppVersion-2.9.8-informational?style=flat-square) +![Version: 0.79.2](https://img.shields.io/badge/Version-0.79.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.8](https://img.shields.io/badge/AppVersion-2.9.8-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode From 31aab04d01f8a75970741dced845cf53b9caa34d Mon Sep 17 00:00:00 2001 From: Timo Hankamer Date: Tue, 30 Jul 2024 07:57:41 +0200 Subject: [PATCH 07/20] feat: add value to make extraConfigmapMounts and extraSecretMounts optional Signed-off-by: Timo Hankamer --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/_pod.tpl | 6 ++++++ charts/grafana/values.yaml | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index df0c978549..6dad6e875d 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.3.7 +version: 8.4.0 appVersion: 11.1.0 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 93f8da3003..c74e9ddcac 100644 --- a/charts/grafana/templates/_pod.tpl +++ b/charts/grafana/templates/_pod.tpl @@ -1156,6 +1156,9 @@ volumes: - name: {{ tpl .name $root }} configMap: name: {{ tpl .configMap $root }} + {{- with .optional }} + optional: {{ . }} + {{- end }} {{- with .items }} items: {{- toYaml . | nindent 8 }} @@ -1261,6 +1264,9 @@ volumes: secret: secretName: {{ .secretName }} defaultMode: {{ .defaultMode }} + {{- with .optional }} + optional: {{ . }} + {{- end }} {{- with .items }} items: {{- toYaml . | nindent 8 }} diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 0390f78fdd..55acff0b66 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -164,6 +164,7 @@ extraConfigmapMounts: [] # subPath: certificates.crt # (optional) # configMap: certs-configmap # readOnly: true + # optional: false extraEmptyDirMounts: [] @@ -539,6 +540,7 @@ extraSecretMounts: [] # mountPath: /etc/secrets # secretName: grafana-secret-files # readOnly: true + # optional: false # subPath: "" # # for AWS EKS (cloudwatch) use the following (see also instruction in env: above) From 0b0c2ab2e2d70ef7a0de6250326a261a2d262f54 Mon Sep 17 00:00:00 2001 From: fengxsong Date: Fri, 26 Jul 2024 09:48:07 +0800 Subject: [PATCH 08/20] fix: do not create pvc manually when useStatefulSet Signed-off-by: fengxsong Signed-off-by: IB Akshay --- charts/grafana/templates/pvc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/templates/pvc.yaml b/charts/grafana/templates/pvc.yaml index 0a4613edc7..d1c4b2de27 100644 --- a/charts/grafana/templates/pvc.yaml +++ b/charts/grafana/templates/pvc.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) (eq .Values.persistence.type "pvc")}} +{{- if and (not .Values.useStatefulSet) .Values.persistence.enabled (not .Values.persistence.existingClaim) (eq .Values.persistence.type "pvc")}} apiVersion: v1 kind: PersistentVolumeClaim metadata: From d9c144344366324de6e6528e470a6d24cd893208 Mon Sep 17 00:00:00 2001 From: fengxsong Date: Mon, 29 Jul 2024 09:00:28 +0800 Subject: [PATCH 09/20] [grafana] bump chart version Signed-off-by: fengxsong Signed-off-by: IB Akshay --- 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 3b3bbdbf9d..df0c978549 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.3.6 +version: 8.3.7 appVersion: 11.1.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From f9edac28977f8217daedc353c7e3b49a91537f3c Mon Sep 17 00:00:00 2001 From: Akshay Iyyadurai Balasundaram Date: Tue, 30 Jul 2024 11:49:57 +0200 Subject: [PATCH 10/20] chore: update helm test annotations Signed-off-by: IB Akshay --- charts/grafana/templates/tests/test-configmap.yaml | 2 +- charts/grafana/templates/tests/test-podsecuritypolicy.yaml | 2 +- charts/grafana/templates/tests/test-role.yaml | 2 +- charts/grafana/templates/tests/test-rolebinding.yaml | 2 +- charts/grafana/templates/tests/test-serviceaccount.yaml | 2 +- charts/grafana/templates/tests/test.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/grafana/templates/tests/test-configmap.yaml b/charts/grafana/templates/tests/test-configmap.yaml index 01c96c9243..1e81bee90b 100644 --- a/charts/grafana/templates/tests/test-configmap.yaml +++ b/charts/grafana/templates/tests/test-configmap.yaml @@ -5,7 +5,7 @@ metadata: name: {{ include "grafana.fullname" . }}-test namespace: {{ include "grafana.namespace" . }} annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: {{- include "grafana.labels" . | nindent 4 }} diff --git a/charts/grafana/templates/tests/test-podsecuritypolicy.yaml b/charts/grafana/templates/tests/test-podsecuritypolicy.yaml index 1821772a45..c13a3bf668 100644 --- a/charts/grafana/templates/tests/test-podsecuritypolicy.yaml +++ b/charts/grafana/templates/tests/test-podsecuritypolicy.yaml @@ -4,7 +4,7 @@ kind: PodSecurityPolicy metadata: name: {{ include "grafana.fullname" . }}-test annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: {{- include "grafana.labels" . | nindent 4 }} diff --git a/charts/grafana/templates/tests/test-role.yaml b/charts/grafana/templates/tests/test-role.yaml index cb4c782040..75dddfdd3d 100644 --- a/charts/grafana/templates/tests/test-role.yaml +++ b/charts/grafana/templates/tests/test-role.yaml @@ -5,7 +5,7 @@ metadata: name: {{ include "grafana.fullname" . }}-test namespace: {{ include "grafana.namespace" . }} annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: {{- include "grafana.labels" . | nindent 4 }} diff --git a/charts/grafana/templates/tests/test-rolebinding.yaml b/charts/grafana/templates/tests/test-rolebinding.yaml index f40d791f6c..c0d2d39efa 100644 --- a/charts/grafana/templates/tests/test-rolebinding.yaml +++ b/charts/grafana/templates/tests/test-rolebinding.yaml @@ -5,7 +5,7 @@ metadata: name: {{ include "grafana.fullname" . }}-test namespace: {{ include "grafana.namespace" . }} annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: {{- include "grafana.labels" . | nindent 4 }} diff --git a/charts/grafana/templates/tests/test-serviceaccount.yaml b/charts/grafana/templates/tests/test-serviceaccount.yaml index 38fba3596a..7af8982723 100644 --- a/charts/grafana/templates/tests/test-serviceaccount.yaml +++ b/charts/grafana/templates/tests/test-serviceaccount.yaml @@ -7,6 +7,6 @@ metadata: name: {{ include "grafana.serviceAccountNameTest" . }} namespace: {{ include "grafana.namespace" . }} annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" {{- end }} diff --git a/charts/grafana/templates/tests/test.yaml b/charts/grafana/templates/tests/test.yaml index 9e88afcfa0..2484a96da0 100644 --- a/charts/grafana/templates/tests/test.yaml +++ b/charts/grafana/templates/tests/test.yaml @@ -7,7 +7,7 @@ metadata: labels: {{- include "grafana.labels" . | nindent 4 }} annotations: - "helm.sh/hook": test-success + "helm.sh/hook": test "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" namespace: {{ include "grafana.namespace" . }} spec: From 01820f67995295a82f7bd5d3a1e2326271e55d46 Mon Sep 17 00:00:00 2001 From: IB Akshay Date: Tue, 30 Jul 2024 13:20:56 +0200 Subject: [PATCH 11/20] chore: bump chart version Signed-off-by: IB Akshay --- 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 df0c978549..e4b88d1e78 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.3.7 +version: 8.3.8 appVersion: 11.1.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 6a2bbc36c61a67b999b920f821c78c31b94dbd28 Mon Sep 17 00:00:00 2001 From: IB Akshay Date: Tue, 30 Jul 2024 13:22:52 +0200 Subject: [PATCH 12/20] chore: bump to correct version Signed-off-by: IB Akshay --- 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 e4b88d1e78..df0c978549 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.3.8 +version: 8.3.7 appVersion: 11.1.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From da65a8c78127e99bbdf133778d30aa0962c8e7f7 Mon Sep 17 00:00:00 2001 From: IB Akshay Date: Tue, 30 Jul 2024 13:30:13 +0200 Subject: [PATCH 13/20] chore: bump version Signed-off-by: IB Akshay --- 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 df0c978549..e4b88d1e78 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.3.7 +version: 8.3.8 appVersion: 11.1.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 4004f966f171163ee81b52fe90d51ce1a2c344d0 Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 30 Jul 2024 22:13:51 +0800 Subject: [PATCH 14/20] Update README.md Signed-off-by: MH --- 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 421da1095c..3e7e4c0754 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.15.2](https://img.shields.io/badge/Version-1.15.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.15.3](https://img.shields.io/badge/Version-1.15.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode From 5cf6f95254f029c1c0d14bb6748560e46a11e1f3 Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 30 Jul 2024 22:14:14 +0800 Subject: [PATCH 15/20] Update Chart.yaml Signed-off-by: MH --- 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 d3420ba9f9..fa9dea822e 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.15.2 +version: 1.15.3 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From 948925b8ba78604aa7ee694425820029956f639f Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 30 Jul 2024 22:24:30 +0800 Subject: [PATCH 16/20] Update README.md Signed-off-by: MH --- charts/tempo-distributed/README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 3e7e4c0754..6905d483cf 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -892,10 +892,9 @@ Metrics-generator is disabled by default and can be activated by configuring the metricsGenerator: enabled: true config: - storage: - remote_write: - - url: http://cortex/api/v1/push - send_exemplars: true + storage_remote_write: + - url: http://cortex/api/v1/push + send_exemplars: true # headers: # x-scope-orgid: operations # Global overrides From b5d5a2448d88c3ece048fac708db82c8e33a88f8 Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 30 Jul 2024 22:27:59 +0800 Subject: [PATCH 17/20] revert Signed-off-by: MH --- charts/tempo-distributed/README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 6905d483cf..3e7e4c0754 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -892,9 +892,10 @@ Metrics-generator is disabled by default and can be activated by configuring the metricsGenerator: enabled: true config: - storage_remote_write: - - url: http://cortex/api/v1/push - send_exemplars: true + storage: + remote_write: + - url: http://cortex/api/v1/push + send_exemplars: true # headers: # x-scope-orgid: operations # Global overrides From 62acbdbd5726a2de3d2b7aaa3368b4a1e5ffffa9 Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 30 Jul 2024 22:34:02 +0800 Subject: [PATCH 18/20] Update README.md.gotmpl Signed-off-by: MH --- charts/tempo-distributed/README.md.gotmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index 6bb2718e0d..5cdb777ad3 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -263,9 +263,10 @@ Metrics-generator is disabled by default and can be activated by configuring the metricsGenerator: enabled: true config: - storage_remote_write: - - url: http://cortex/api/v1/push - send_exemplars: true + storage: + remote_write: + - url: http://cortex/api/v1/push + send_exemplars: true # headers: # x-scope-orgid: operations # Global overrides From b01353e65c70af05e085022d2cc880af117160ad Mon Sep 17 00:00:00 2001 From: MH Date: Wed, 31 Jul 2024 23:09:58 +0800 Subject: [PATCH 19/20] Update README.md Signed-off-by: MH --- charts/tempo-distributed/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 3e7e4c0754..972eeeb092 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.15.3](https://img.shields.io/badge/Version-1.15.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.15.4](https://img.shields.io/badge/Version-1.15.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -788,7 +788,7 @@ The memcached default args are removed and should be provided manually. The sett | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created | | serviceAccount.imagePullSecrets | list | `[]` | Image pull secrets for the service account | | 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.admin.backend | string | `"filesystem"` | The supported storage backends are gcs, s3 and azure, as specified in https://grafana.com/docs/enterprise-traces/latest/configure/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.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/ | From 956757092f4dd879f246850a81092fae2c5f16e2 Mon Sep 17 00:00:00 2001 From: MH Date: Wed, 31 Jul 2024 23:10:14 +0800 Subject: [PATCH 20/20] Update Chart.yaml Signed-off-by: MH --- 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 fa9dea822e..868897b1db 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.15.3 +version: 1.15.4 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/