From ff9a031fabcaa9dfc6167fe39c1c4f5a1a4cd2bc Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Wed, 11 Dec 2024 16:32:42 +0330 Subject: [PATCH 1/5] Declare after installation Signed-off-by: xogoodnow --- charts/tempo-distributed/templates/NOTES.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/NOTES.txt b/charts/tempo-distributed/templates/NOTES.txt index 22b5fbc08f..139d7c1ba8 100644 --- a/charts/tempo-distributed/templates/NOTES.txt +++ b/charts/tempo-distributed/templates/NOTES.txt @@ -13,9 +13,19 @@ Installed components: * federation-frontend {{- end }} * compactor +{{- if .Values.metricsGenerator.enabled }} +* metrics-generator +{{- end }} {{- if .Values.memcached.enabled }} * memcached {{- end }} {{- if .Values.gateway.enabled }} * gateway -{{- end }} \ No newline at end of file +{{- end }} +{{- if .Values.minio.enabled }} +* minio +{{- end }} +{{- if .Values.rollout_operator.enabled }} +* rollout_operator +{{- end }} + From 85b8aa2f0daba6cba3b86f7eec6c811b11aca337 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Fri, 13 Dec 2024 12:47:23 +0330 Subject: [PATCH 2/5] Added all components Signed-off-by: xogoodnow --- charts/tempo-distributed/templates/NOTES.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/templates/NOTES.txt b/charts/tempo-distributed/templates/NOTES.txt index 139d7c1ba8..cadf0d5ffb 100644 --- a/charts/tempo-distributed/templates/NOTES.txt +++ b/charts/tempo-distributed/templates/NOTES.txt @@ -19,6 +19,9 @@ Installed components: {{- if .Values.memcached.enabled }} * memcached {{- end }} +{{- if .Values.memcachedExporter.enabled }} +* memcached-exporter +{{- end }} {{- if .Values.gateway.enabled }} * gateway {{- end }} @@ -26,6 +29,9 @@ Installed components: * minio {{- end }} {{- if .Values.rollout_operator.enabled }} -* rollout_operator +* rollout-operator +{{- end }} +{{- if .Values.enterprise.enabled }} +* admin_api +* enterprise-gateway {{- end }} - From fcc98f7c452a60494ce90ee8a577cad19ecdcbd4 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Fri, 13 Dec 2024 12:48:08 +0330 Subject: [PATCH 3/5] Gateway enterprise traces not metrics Signed-off-by: xogoodnow --- charts/tempo-distributed/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 4397b533ea..981b3c588e 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -2331,16 +2331,16 @@ enterpriseGateway: annotations: {} # -- Hosts configuration for the gateway ingress hosts: - - host: gateway.gem.example.com + - host: gateway.get.example.com paths: - path: / # -- pathType (e.g. ImplementationSpecific, Prefix, .. etc.) might also be required by some Ingress Controllers # pathType: Prefix # -- TLS configuration for the gateway ingress tls: - - secretName: gem-gateway-tls + - secretName: get-gateway-tls hosts: - - gateway.gem.example.com + - gateway.get.example.com # -- Create extra manifests via values. extraObjects: [] From 0f0a7e0484df11c1bba3d2c008b0f0ac553b7fb1 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Fri, 13 Dec 2024 12:55:58 +0330 Subject: [PATCH 4/5] bumped version Signed-off-by: xogoodnow --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 8eedcb4b6c..848f3a26f0 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.26.0 +version: 1.26.1 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index b0084f4350..6babd926cf 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.26.0](https://img.shields.io/badge/Version-1.26.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.26.1](https://img.shields.io/badge/Version-1.26.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -412,8 +412,8 @@ The memcached default args are removed and should be provided manually. The sett | enterpriseGateway.image.tag | string | `nil` | Docker image tag for the enterpriseGateway image. Overrides `tempo.image.tag` | | enterpriseGateway.ingress.annotations | object | `{}` | Annotations for the gateway ingress | | enterpriseGateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the gateway should be created | -| enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.gem.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the gateway ingress | -| enterpriseGateway.ingress.tls | list | `[{"hosts":["gateway.gem.example.com"],"secretName":"gem-gateway-tls"}]` | TLS configuration for the gateway ingress | +| enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.get.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the gateway ingress | +| enterpriseGateway.ingress.tls | list | `[{"hosts":["gateway.get.example.com"],"secretName":"get-gateway-tls"}]` | TLS configuration for the gateway ingress | | enterpriseGateway.initContainers | list | `[]` | | | enterpriseGateway.nodeSelector | object | `{}` | | | enterpriseGateway.persistence.subPath | string | `nil` | | From 8cbb046eb76a83605cce1be39a1345c2a4fb5b99 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Mon, 16 Dec 2024 18:12:06 +0330 Subject: [PATCH 5/5] Bumbped chart version Signed-off-by: xogoodnow --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index a0dd8f0187..bc14f9b5db 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.26.2 +version: 1.26.3 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index a584f620e0..98e0af3542 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.26.2](https://img.shields.io/badge/Version-1.26.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.26.3](https://img.shields.io/badge/Version-1.26.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -412,8 +412,8 @@ The memcached default args are removed and should be provided manually. The sett | enterpriseGateway.image.tag | string | `nil` | Docker image tag for the enterpriseGateway image. Overrides `tempo.image.tag` | | enterpriseGateway.ingress.annotations | object | `{}` | Annotations for the enterprise-gateway ingress | | enterpriseGateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the enterprise-gateway should be created | -| enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.gem.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the enterprise-gateway ingress | -| enterpriseGateway.ingress.tls | list | `[{"hosts":["gateway.gem.example.com"],"secretName":"gem-gateway-tls"}]` | TLS configuration for the enterprise-gateway ingress | +| enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.get.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the enterprise-gateway ingress | +| enterpriseGateway.ingress.tls | list | `[{"hosts":["gateway.get.example.com"],"secretName":"get-gateway-tls"}]` | TLS configuration for the enterprise-gateway ingress | | enterpriseGateway.initContainers | list | `[]` | | | enterpriseGateway.nodeSelector | object | `{}` | | | enterpriseGateway.persistence.subPath | string | `nil` | |