From 27baf921fe068d16bfe116ba33135c6263922094 Mon Sep 17 00:00:00 2001 From: Jennie Pham Date: Fri, 31 May 2024 12:51:19 -0500 Subject: [PATCH 1/3] [tempo-distributed] Update for v2.5.0 release Signed-off-by: Jennie Pham --- charts/tempo-distributed/Chart.yaml | 4 ++-- charts/tempo-distributed/README.md | 6 ++---- charts/tempo-distributed/values.yaml | 6 ------ 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 1c9d10771e..989b46ccf2 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.9.11 -appVersion: 2.4.2 +version: 1.10.0 +appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 9623d9faaf..6c7d4e590a 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.9.11](https://img.shields.io/badge/Version-1.9.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square) +![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-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 @@ -694,9 +694,7 @@ The memcached default args are removed and should be provided manually. The sett | queryFrontend.config.max_retries | int | `2` | Number of times to retry a request sent to a querier | | queryFrontend.config.search.concurrent_jobs | int | `1000` | The number of concurrent jobs to execute when searching the backend | | queryFrontend.config.search.target_bytes_per_job | int | `104857600` | The target number of bytes for each job to handle when performing a backend search | -| queryFrontend.config.trace_by_id | object | `{"hedge_requests_at":"2s","hedge_requests_up_to":2,"query_shards":50}` | Trace by ID lookup configuration | -| queryFrontend.config.trace_by_id.hedge_requests_at | string | `"2s"` | If set to a non-zero value, a second request will be issued at the provided duration. Recommended to be set to p99 of search requests to reduce long-tail latency. | -| queryFrontend.config.trace_by_id.hedge_requests_up_to | int | `2` | The maximum number of requests to execute when hedging. Requires hedge_requests_at to be set. Must be greater than 0. | +| queryFrontend.config.trace_by_id | object | `{"query_shards":50}` | Trace by ID lookup configuration | | queryFrontend.config.trace_by_id.query_shards | int | `50` | The number of shards to split a trace by id query into. | | queryFrontend.extraArgs | list | `[]` | Additional CLI args for the query-frontend | | queryFrontend.extraEnv | list | `[]` | Environment variables to add to the query-frontend pods | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index d47c76db75..b08122a96d 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -723,10 +723,6 @@ queryFrontend: trace_by_id: # -- The number of shards to split a trace by id query into. query_shards: 50 - # -- If set to a non-zero value, a second request will be issued at the provided duration. Recommended to be set to p99 of search requests to reduce long-tail latency. - hedge_requests_at: 2s - # -- The maximum number of requests to execute when hedging. Requires hedge_requests_at to be set. Must be greater than 0. - hedge_requests_up_to: 2 autoscaling: # -- Enable autoscaling for the query-frontend enabled: false @@ -1221,8 +1217,6 @@ config: | concurrent_jobs: {{ .Values.queryFrontend.config.search.concurrent_jobs }} trace_by_id: query_shards: {{ .Values.queryFrontend.config.trace_by_id.query_shards }} - hedge_requests_at: {{ .Values.queryFrontend.config.trace_by_id.hedge_requests_at }} - hedge_requests_up_to: {{ .Values.queryFrontend.config.trace_by_id.hedge_requests_up_to }} ingester: lifecycler: From 41be9d6d9b2644d2a6861da8850ab6dfc17d4dcd Mon Sep 17 00:00:00 2001 From: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> Date: Fri, 31 May 2024 15:02:31 -0400 Subject: [PATCH 2/3] update helm for agent v0.41.0 Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> --- charts/agent-operator/Chart.yaml | 10 +++++----- charts/agent-operator/README.md | 6 +++--- charts/agent-operator/values.yaml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index 60e55344da..958324697e 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.3.22 -appVersion: "0.40.5" -home: https://grafana.com/docs/agent/v0.40/ -icon: https://raw.githubusercontent.com/grafana/agent/v0.40.5/docs/sources/assets/logo_and_name.png +version: 0.3.23 +appVersion: "0.41.0" +home: https://grafana.com/docs/agent/v0.41/ +icon: https://raw.githubusercontent.com/grafana/agent/v0.41.0/docs/sources/assets/logo_and_name.png sources: - - https://github.com/grafana/agent/tree/v0.40.5/pkg/operator + - https://github.com/grafana/agent/tree/v0.41.0/pkg/operator maintainers: - name: Grafana Agent Team email: grafana-agent-team@googlegroups.com diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 8500500acd..4eba48bc33 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.3.22](https://img.shields.io/badge/Version-0.3.22-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.5](https://img.shields.io/badge/AppVersion-0.40.5-informational?style=flat-square) +![Version: 0.3.23](https://img.shields.io/badge/Version-0.3.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.0](https://img.shields.io/badge/AppVersion-0.41.0-informational?style=flat-square) A Helm chart for Grafana Agent Operator @@ -8,7 +8,7 @@ A Helm chart for Grafana Agent Operator ## Source Code -* +* Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources. @@ -63,7 +63,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an | image.pullSecrets | list | `[]` | Image pull secrets | | image.registry | string | `"docker.io"` | Image registry | | image.repository | string | `"grafana/agent-operator"` | Image repo | -| image.tag | string | `"v0.40.5"` | Image tag | +| image.tag | string | `"v0.41.0"` | Image tag | | kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets | | nameOverride | string | `""` | Overrides the chart's name | | nodeSelector | object | `{}` | nodeSelector configuration | diff --git a/charts/agent-operator/values.yaml b/charts/agent-operator/values.yaml index ed005a5492..6e7dea5059 100644 --- a/charts/agent-operator/values.yaml +++ b/charts/agent-operator/values.yaml @@ -37,7 +37,7 @@ image: # -- Image repo repository: grafana/agent-operator # -- Image tag - tag: v0.40.5 + tag: v0.41.0 # -- Image pull policy pullPolicy: IfNotPresent # -- Image pull secrets From 344749519e353c9798a1cf92503c49689f059867 Mon Sep 17 00:00:00 2001 From: Jennie Pham Date: Fri, 31 May 2024 13:05:18 -0500 Subject: [PATCH 3/3] [tempo] Update for v2.5.0 release Signed-off-by: Jennie Pham --- charts/tempo/Chart.yaml | 4 ++-- charts/tempo/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index ee09ebd7c8..0cda20a162 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.8.0 -appVersion: 2.4.2 +version: 1.9.0 +appVersion: 2.5.0 engine: gotpl home: https://grafana.net icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 4eec988285..980fd36c6b 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square) +![Version: 1.9.0](https://img.shields.io/badge/Version-1.9.0-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 Single Binary Mode