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.

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 minReadySeconds for metrics generator #3491

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
8 changes: 7 additions & 1 deletion charts/tempo-distributed/README.md
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 @@ -308,6 +308,7 @@ The memcached default args are removed and should be provided manually. The sett
| compactor.image.repository | string | `nil` | Docker image repository for the compactor image. Overrides `tempo.image.repository` |
| compactor.image.tag | string | `nil` | Docker image tag for the compactor image. Overrides `tempo.image.tag` |
| compactor.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| compactor.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating |
| compactor.nodeSelector | object | `{}` | Node selector for compactor pods |
| compactor.podAnnotations | object | `{}` | Annotations for compactor pods |
| compactor.podLabels | object | `{}` | Labels for compactor pods |
Expand Down Expand Up @@ -342,6 +343,7 @@ The memcached default args are removed and should be provided manually. The sett
| distributor.image.repository | string | `nil` | Docker image repository for the distributor image. Overrides `tempo.image.repository` |
| distributor.image.tag | string | `nil` | Docker image tag for the distributor image. Overrides `tempo.image.tag` |
| distributor.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| distributor.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating |
| distributor.nodeSelector | object | `{}` | Node selector for distributor pods |
| distributor.podAnnotations | object | `{}` | Annotations for distributor pods |
| distributor.podLabels | object | `{}` | Labels for distributor pods |
Expand Down Expand Up @@ -476,6 +478,7 @@ The memcached default args are removed and should be provided manually. The sett
| gateway.ingress.labels | object | `{}` | Labels for the gateway ingress |
| gateway.ingress.tls | list | `[{"hosts":["gateway.tempo.example.com"],"secretName":"tempo-gateway-tls"}]` | TLS configuration for the gateway ingress |
| gateway.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| gateway.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating |
| gateway.nginxConfig.file | string | See values.yaml | Config file contents for Nginx. Passed through the `tpl` function to allow templating |
| gateway.nginxConfig.httpSnippet | string | `""` | Allows appending custom configuration to the http block |
| gateway.nginxConfig.logFormat | string | `"main '$remote_addr - $remote_user [$time_local] $status '\n '\"$request\" $body_bytes_sent \"$http_referer\" '\n '\"$http_user_agent\" \"$http_x_forwarded_for\"';"` | NGINX log format |
Expand Down Expand Up @@ -666,6 +669,7 @@ The memcached default args are removed and should be provided manually. The sett
| metricsGenerator.initContainers | list | `[]` | |
| metricsGenerator.kind | string | `"Deployment"` | Kind of deployment [StatefulSet/Deployment] |
| metricsGenerator.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| metricsGenerator.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating |
| metricsGenerator.nodeSelector | object | `{}` | Node selector for metrics-generator pods |
| metricsGenerator.persistence | object | `{"annotations":{},"enabled":false,"size":"10Gi","storageClass":null}` | Persistence configuration for metrics-generator |
| metricsGenerator.persistence.annotations | object | `{}` | Annotations for metrics generator PVCs |
Expand Down Expand Up @@ -736,6 +740,7 @@ The memcached default args are removed and should be provided manually. The sett
| querier.image.repository | string | `nil` | Docker image repository for the querier image. Overrides `tempo.image.repository` |
| querier.image.tag | string | `nil` | Docker image tag for the querier image. Overrides `tempo.image.tag` |
| querier.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| querier.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating |
| querier.nodeSelector | object | `{}` | Node selector for querier pods |
| querier.podAnnotations | object | `{}` | Annotations for querier pods |
| querier.podLabels | object | `{}` | Labels for querier pods |
Expand Down Expand Up @@ -783,6 +788,7 @@ The memcached default args are removed and should be provided manually. The sett
| queryFrontend.ingress.hosts | list | `[{"host":"query.tempo.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the Jaeger ingress |
| queryFrontend.ingress.tls | list | `[{"hosts":["query.tempo.example.com"],"secretName":"tempo-query-tls"}]` | TLS configuration for the Jaeger ingress |
| queryFrontend.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| queryFrontend.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating |
| queryFrontend.nodeSelector | object | `{}` | Node selector for query-frontend pods |
| queryFrontend.podAnnotations | object | `{}` | Annotations for query-frontend pods |
| queryFrontend.podLabels | object | `{}` | Labels for queryFrontend pods |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
minReadySeconds: 10
minReadySeconds: {{ .Values.compactor.minReadySeconds }}
replicas: {{ .Values.compactor.replicas }}
revisionHistoryLimit: 10
selector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
minReadySeconds: 10
minReadySeconds: {{ .Values.distributor.minReadySeconds }}
{{- if not .Values.distributor.autoscaling.enabled }}
replicas: {{ .Values.distributor.replicas }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
{{- include "tempo.labels" $dict | nindent 4 }}
spec:
minReadySeconds: 10
minReadySeconds: {{ .Values.gateway.minReadySeconds }}
{{- if not .Values.gateway.autoscaling.enabled }}
replicas: {{ .Values.gateway.replicas }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
minReadySeconds: 10
minReadySeconds: {{ .Values.metricsGenerator.minReadySeconds }}
replicas: {{ .Values.metricsGenerator.replicas }}
revisionHistoryLimit: 10
selector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
minReadySeconds: 10
minReadySeconds: {{ .Values.metricsGenerator.minReadySeconds }}
replicas: {{ .Values.metricsGenerator.replicas }}
revisionHistoryLimit: 10
podManagementPolicy: Parallel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
minReadySeconds: 10
minReadySeconds: {{ .Values.querier.minReadySeconds }}
{{- if not .Values.querier.autoscaling.enabled }}
replicas: {{ .Values.querier.replicas }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
minReadySeconds: 10
minReadySeconds: {{ .Values.queryFrontend.minReadySeconds }}
{{- if not .Values.queryFrontend.autoscaling.enabled }}
replicas: {{ .Values.queryFrontend.replicas }}
{{- end }}
Expand Down
12 changes: 12 additions & 0 deletions charts/tempo-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,8 @@ metricsGenerator:
topologyKey: topology.kubernetes.io/zone
# -- Pod Disruption Budget maxUnavailable
maxUnavailable: 1
# -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating
minReadySeconds: 10
# -- Node selector for metrics-generator pods
nodeSelector: {}
# -- Tolerations for metrics-generator pods
Expand Down Expand Up @@ -546,6 +548,8 @@ distributor:
topologyKey: topology.kubernetes.io/zone
# -- Pod Disruption Budget maxUnavailable
maxUnavailable: 1
# -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating
minReadySeconds: 10
# -- Node selector for distributor pods
nodeSelector: {}
# -- Tolerations for distributor pods
Expand Down Expand Up @@ -642,6 +646,8 @@ compactor:
terminationGracePeriodSeconds: 30
# -- Pod Disruption Budget maxUnavailable
maxUnavailable: 1
# -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating
minReadySeconds: 10
# -- Node selector for compactor pods
nodeSelector: {}
# -- Tolerations for compactor pods
Expand Down Expand Up @@ -758,6 +764,8 @@ querier:
topologyKey: topology.kubernetes.io/zone
# -- Pod Disruption Budget maxUnavailable
maxUnavailable: 1
# -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating
minReadySeconds: 10
# -- Node selector for querier pods
nodeSelector: {}
# -- Tolerations for querier pods
Expand Down Expand Up @@ -973,6 +981,8 @@ queryFrontend:
topologyKey: topology.kubernetes.io/zone
# -- Pod Disruption Budget maxUnavailable
maxUnavailable: 1
# -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating
minReadySeconds: 10
# -- Node selector for query-frontend pods
nodeSelector: {}
# -- Tolerations for query-frontend pods
Expand Down Expand Up @@ -1873,6 +1883,8 @@ gateway:
topologyKey: topology.kubernetes.io/zone
# -- Pod Disruption Budget maxUnavailable
maxUnavailable: 1
# -- Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating
minReadySeconds: 10
# -- Node selector for gateway pods
nodeSelector: {}
# -- Tolerations for gateway pods
Expand Down
Loading