From 70e47723cc6ba400d0771653d5e546481efbd1ab Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Tue, 26 Nov 2024 14:28:44 +0330 Subject: [PATCH 1/9] Added resource limit and request samples for all components Signed-off-by: xogoodnow --- charts/tempo-distributed/values.yaml | 66 ++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index aaed57b276..6f9d0cc292 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -156,6 +156,12 @@ ingester: extraEnvFrom: [] # -- Resource requests and limits for the ingester resources: {} + # limits: + # cpu: 500m + # memory: 512Mi + # requests: + # cpu: 500m + # memory: 512Mi # -- 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. @@ -327,6 +333,12 @@ metricsGenerator: extraEnvFrom: [] # -- Resource requests and limits for the metrics-generator resources: {} + # limits: + # cpu: 500m + # memory: 512Mi + # requests: + # cpu: 500m + # memory: 512Mi # -- Grace period to allow the metrics-generator to shutdown before it is killed. Especially for the ingestor, # this must be increased. It must be long enough so metrics-generators can be gracefully shutdown flushing/transferring # all data and to successfully leave the member ring on shutdown. @@ -503,6 +515,12 @@ distributor: extraEnvFrom: [] # -- Resource requests and limits for the distributor resources: {} + # limits: + # cpu: 500m + # memory: 512Mi + # requests: + # cpu: 500m + # memory: 512Mi # -- Grace period to allow the distributor to shutdown before it is killed terminationGracePeriodSeconds: 30 # -- topologySpread for distributor pods. Passed through `tpl` and, thus, to be configured as string @@ -624,6 +642,12 @@ compactor: extraEnvFrom: [] # -- Resource requests and limits for the compactor resources: {} + # limits: + # cpu: 500m + # memory: 512Mi + # requests: + # cpu: 500m + # memory: 512Mi # -- Grace period to allow the compactor to shutdown before it is killed terminationGracePeriodSeconds: 30 # -- Pod Disruption Budget maxUnavailable @@ -715,6 +739,12 @@ querier: extraEnvFrom: [] # -- Resource requests and limits for the querier resources: {} + # limits: + # cpu: 500m + # memory: 512Mi + # requests: + # cpu: 500m + # memory: 512Mi # -- Grace period to allow the querier to shutdown before it is killed terminationGracePeriodSeconds: 30 # -- topologySpread for querier pods. Passed through `tpl` and, thus, to be configured as string @@ -803,6 +833,12 @@ queryFrontend: tag: null # -- Resource requests and limits for the query resources: {} + # limits: + # cpu: 500m + # memory: 512Mi + # requests: + # cpu: 500m + # memory: 512Mi # -- Additional CLI args for tempo-query pods extraArgs: [] # -- Environment variables to add to the tempo-query pods @@ -913,6 +949,12 @@ queryFrontend: extraEnvFrom: [] # -- Resource requests and limits for the query-frontend resources: {} + # limits: + # cpu: 500m + # memory: 512Mi + # requests: + # cpu: 500m + # memory: 512Mi # -- Grace period to allow the query-frontend to shutdown before it is killed terminationGracePeriodSeconds: 30 # -- topologySpread for query-frontend pods. Passed through `tpl` and, thus, to be configured as string @@ -1021,6 +1063,12 @@ enterpriseFederationFrontend: extraEnvFrom: [] # -- Resource requests and limits for the federation-frontend resources: {} + # limits: + # cpu: 500m + # memory: 512Mi + # requests: + # cpu: 500m + # memory: 512Mi # -- Grace period to allow the federation-frontend to shutdown before it is killed terminationGracePeriodSeconds: 30 # -- topologySpread for federation-frontend pods. Passed through `tpl` and, thus, to be configured as string @@ -1541,6 +1589,12 @@ memcached: podAnnotations: {} # -- Resource requests and limits for memcached resources: {} + # limits: + # cpu: 500m + # memory: 512Mi + # requests: + # cpu: 500m + # memory: 512Mi # -- topologySpread for memcached pods. Passed through `tpl` and, thus, to be configured as string # @default -- Defaults to allow skew no more then 1 node per AZ topologySpreadConstraints: | @@ -1596,6 +1650,12 @@ memcachedExporter: pullPolicy: IfNotPresent # -- Memcached Exporter resource requests and limits resources: {} + # limits: + # cpu: 500m + # memory: 512Mi + # requests: + # cpu: 500m + # memory: 512Mi # -- Additional CLI args for the memcached exporter extraArgs: [] metaMonitoring: @@ -1808,6 +1868,12 @@ gateway: extraVolumeMounts: [] # -- Resource requests and limits for the gateway resources: {} + # limits: + # cpu: 500m + # memory: 512Mi + # requests: + # cpu: 500m + # memory: 512Mi # -- Grace period to allow the gateway to shutdown before it is killed terminationGracePeriodSeconds: 30 # -- topologySpread for gateway pods. Passed through `tpl` and, thus, to be configured as string From a33f534899a0bbce7e934a747c082635e7065959 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Tue, 26 Nov 2024 14:50:45 +0330 Subject: [PATCH 2/9] Added limits to Minio,admin-api and enterprise gateway Signed-off-by: xogoodnow --- charts/tempo-distributed/values.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 6f9d0cc292..1377b9ee7b 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1807,6 +1807,9 @@ minio: persistence: size: 5Gi resources: + limits: + cpu: 100m + memory: 128Mi requests: cpu: 100m memory: 128Mi @@ -2232,6 +2235,9 @@ adminApi: initialDelaySeconds: 45 resources: + limits: + cpu: 10m + memory: 32Mi requests: cpu: 10m memory: 32Mi @@ -2345,6 +2351,9 @@ enterpriseGateway: initialDelaySeconds: 45 resources: + limits: + cpu: 10m + memory: 32Mi requests: cpu: 10m memory: 32Mi From f29c8d6dce2f4b1827ed29bba06ae3c004d775c1 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Thu, 28 Nov 2024 14:19:36 +0330 Subject: [PATCH 3/9] bumped chart version Signed-off-by: xogoodnow --- 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 33f58d970c..74f2da80ba 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.22.2 +version: 1.22.3 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From b54655ee4e454f1b1aa2695328d4e05a9176fe9f Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Tue, 10 Dec 2024 22:44:30 +0330 Subject: [PATCH 4/9] Commented the resource section for enterprise gateway Signed-off-by: xogoodnow --- charts/tempo-distributed/values.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 1377b9ee7b..90f72a3694 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -2350,13 +2350,13 @@ enterpriseGateway: port: http-metrics initialDelaySeconds: 45 - resources: - limits: - cpu: 10m - memory: 32Mi - requests: - cpu: 10m - memory: 32Mi + resources: {} +# limits: +# cpu: 10m +# memory: 32Mi +# requests: +# cpu: 10m +# memory: 32Mi terminationGracePeriodSeconds: 60 From 1cafb498d1283ea15f4c711b158e8bf7f6a70375 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Tue, 10 Dec 2024 22:49:43 +0330 Subject: [PATCH 5/9] bumped the chart number Signed-off-by: xogoodnow --- 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 74f2da80ba..05fc452b85 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.22.3 +version: 1.25.1 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From 311f3c14c2eb566ea2f3f3f607cf886f79198fc3 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Wed, 11 Dec 2024 15:14:37 +0330 Subject: [PATCH 6/9] Ran helm-docs Signed-off-by: xogoodnow --- charts/tempo-distributed/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index d500749d7b..f60c09d897 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.22.2](https://img.shields.io/badge/Version-1.22.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.25.1](https://img.shields.io/badge/Version-1.25.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 @@ -253,6 +253,8 @@ The memcached default args are removed and should be provided manually. The sett | adminApi.readinessProbe.httpGet.port | string | `"http-metrics"` | | | adminApi.readinessProbe.initialDelaySeconds | int | `45` | | | adminApi.replicas | int | `1` | | +| adminApi.resources.limits.cpu | string | `"10m"` | | +| adminApi.resources.limits.memory | string | `"32Mi"` | | | adminApi.resources.requests.cpu | string | `"10m"` | | | adminApi.resources.requests.memory | string | `"32Mi"` | | | adminApi.securityContext | object | `{}` | | @@ -423,8 +425,7 @@ The memcached default args are removed and should be provided manually. The sett | enterpriseGateway.readinessProbe.httpGet.port | string | `"http-metrics"` | | | enterpriseGateway.readinessProbe.initialDelaySeconds | int | `45` | | | enterpriseGateway.replicas | int | `1` | | -| enterpriseGateway.resources.requests.cpu | string | `"10m"` | | -| enterpriseGateway.resources.requests.memory | string | `"32Mi"` | | +| enterpriseGateway.resources | object | `{}` | | | enterpriseGateway.securityContext | object | `{}` | | | enterpriseGateway.service.annotations | object | `{}` | Annotations for the enterprise gateway service | | enterpriseGateway.service.clusterIP | string | `nil` | ClusterIP of the enterprise gateway service | @@ -690,6 +691,8 @@ The memcached default args are removed and should be provided manually. The sett | minio.enabled | bool | `false` | | | minio.mode | string | `"standalone"` | | | minio.persistence.size | string | `"5Gi"` | | +| minio.resources.limits.cpu | string | `"100m"` | | +| minio.resources.limits.memory | string | `"128Mi"` | | | minio.resources.requests.cpu | string | `"100m"` | | | minio.resources.requests.memory | string | `"128Mi"` | | | minio.rootPassword | string | `"supersecret"` | | From b18b4d68f4e12a22f668943a4124b86166e89812 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Wed, 11 Dec 2024 15:15:55 +0330 Subject: [PATCH 7/9] Ran helm-docs Signed-off-by: xogoodnow --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 05fc452b85..27b368baab 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.25.1 +version: 1.25.2 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 f60c09d897..17c306f018 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.25.1](https://img.shields.io/badge/Version-1.25.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) +![Version: 1.25.2](https://img.shields.io/badge/Version-1.25.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) Grafana Tempo in MicroService mode From b17137ab28f96ad3caf53196aee2693f42d8ca49 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Sun, 15 Dec 2024 11:16:43 +0330 Subject: [PATCH 8/9] Bumbped version Signed-off-by: xogoodnow --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 848f3a26f0..a0dd8f0187 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.1 +version: 1.26.2 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 b0f0c03017..904bf257d8 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![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) +![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) Grafana Tempo in MicroService mode From 06b5fe9ee8beeaf244617be3caf67f3a854068ab Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Mon, 16 Dec 2024 18:09:42 +0330 Subject: [PATCH 9/9] Bumbped chart version Signed-off-by: xogoodnow --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 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 bd81e7d9be..773df31bd1 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