Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tempo-distributed] Added resource limit and request samples for all components #3452

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

[tempo-distributed] Added resource limit and request samples for all components #3452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
70e4772
Added resource limit and request samples for all components
xogoodnow Nov 26, 2024
a33f534
Added limits to Minio,admin-api and enterprise gateway
xogoodnow Nov 26, 2024
f29c8d6
bumped chart version
xogoodnow Nov 28, 2024
b54655e
Commented the resource section for enterprise gateway
xogoodnow Dec 10, 2024
1cafb49
bumped the chart number
xogoodnow Dec 10, 2024
311f3c1
Ran helm-docs
xogoodnow Dec 11, 2024
b18b4d6
Ran helm-docs
xogoodnow Dec 11, 2024
cdbb0a1
Merge branch 'main' into resource-sample
xogoodnow Dec 13, 2024
6c80bc5
Merge branch 'main' into resource-sample
xogoodnow Dec 15, 2024
b17137a
Bumbped version
xogoodnow Dec 15, 2024
47856dc
Merge branch 'main' into resource-sample
xogoodnow Dec 16, 2024
06b5fe9
Bumbped chart version
xogoodnow Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/tempo-distributed/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
9 changes: 6 additions & 3 deletions charts/tempo-distributed/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -255,6 +255,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 | `{}` | |
Expand Down Expand Up @@ -425,8 +427,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 |
Expand Down Expand Up @@ -695,6 +696,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"` | |
Expand Down
83 changes: 79 additions & 4 deletions charts/tempo-distributed/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,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.
Expand Down Expand Up @@ -341,6 +347,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.
Expand Down Expand Up @@ -517,6 +529,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
Expand Down Expand Up @@ -638,6 +656,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
Expand Down Expand Up @@ -729,6 +753,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
Expand Down Expand Up @@ -817,6 +847,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
Expand Down Expand Up @@ -944,6 +980,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
Expand Down Expand Up @@ -1052,6 +1094,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
Expand Down Expand Up @@ -1577,6 +1625,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 than 1 node per AZ
topologySpreadConstraints: |
Expand Down Expand Up @@ -1632,6 +1686,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:
Expand Down Expand Up @@ -1783,6 +1843,9 @@ minio:
persistence:
size: 5Gi
resources:
limits:
cpu: 100m
memory: 128Mi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I expect this to be too small to be useful, but I don't have an example to check at the moment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems more reasonable

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about commenting out the resource section for Minio as well?!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I agree. I think folks can place their own limits here. Scale will matter, so choosing sane defaults is a bit difficult.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exactly.

requests:
cpu: 100m
memory: 128Mi
Expand Down Expand Up @@ -1844,6 +1907,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
Expand Down Expand Up @@ -2202,6 +2271,9 @@ adminApi:
initialDelaySeconds: 45

resources:
limits:
cpu: 10m
memory: 32Mi
xogoodnow marked this conversation as resolved.
Show resolved Hide resolved
requests:
cpu: 10m
memory: 32Mi
Expand Down Expand Up @@ -2314,10 +2386,13 @@ enterpriseGateway:
port: http-metrics
initialDelaySeconds: 45

resources:
requests:
cpu: 10m
memory: 32Mi
resources: {}
# limits:
# cpu: 10m
# memory: 32Mi
# requests:
# cpu: 10m
# memory: 32Mi

terminationGracePeriodSeconds: 60

Expand Down
Loading