Skip to content

Commit

Permalink
Merge pull request #1323 from ben-natan/fix-ingester-values
Browse files Browse the repository at this point in the history
[tempo-distributed] Fix ingester values
  • Loading branch information
joe-elliott authored Apr 29, 2022
2 parents d9b74db + 105d5bd commit dbd1951
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
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: 0.17.0
version: 0.17.1
appVersion: 1.4.0
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
12 changes: 6 additions & 6 deletions charts/tempo-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -469,14 +469,14 @@ config: |
kvstore:
store: memberlist
tokens_file_path: /var/tempo/tokens.json
{{- if .Values.ingester.config.maxBlockBytes }}
max_block_bytes: {{ .Values.ingester.config.maxBlockBytes }}
{{- if .Values.ingester.config.max_block_bytes }}
max_block_bytes: {{ .Values.ingester.config.max_block_bytes }}
{{- end }}
{{- if .Values.ingester.config.maxBlockDuration }}
max_block_duration: {{ .Values.ingester.config.maxBlockDuration }}
{{- if .Values.ingester.config.max_block_duration }}
max_block_duration: {{ .Values.ingester.config.max_block_duration }}
{{- end }}
{{- if .Values.ingester.config.completeBlockTimeout }}
complete_block_timeout: {{ .Values.ingester.config.completeBlockTimeout }}
{{- if .Values.ingester.config.complete_block_timeout }}
complete_block_timeout: {{ .Values.ingester.config.complete_block_timeout }}
{{- end }}
memberlist:
abort_if_cluster_join_fails: false
Expand Down

0 comments on commit dbd1951

Please sign in to comment.