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 39974f02d7..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 @@ -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 | `{}` | | @@ -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 | @@ -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"` | | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 68e2157433..0fd645c9c5 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -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. @@ -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. @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 then 1 node per AZ topologySpreadConstraints: | @@ -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: @@ -1783,6 +1843,9 @@ minio: persistence: size: 5Gi resources: + limits: + cpu: 100m + memory: 128Mi requests: cpu: 100m memory: 128Mi @@ -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 @@ -2202,6 +2271,9 @@ adminApi: initialDelaySeconds: 45 resources: + limits: + cpu: 10m + memory: 32Mi requests: cpu: 10m memory: 32Mi @@ -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