Skip to content

Commit

Permalink
Merge pull request #1377 from joe-elliott/tempo-distributed-1.4.1
Browse files Browse the repository at this point in the history 
[tempo-distributed] Upgrade to 1.4.1
  • Loading branch information
@joe-elliott
joe-elliott authored May 16, 2022
2 parents 19e6b71 + a2d33a7 commit 5b2675d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions charts/tempo-distributed/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: tempo-distributed
description: Grafana Tempo in MicroService mode
type: application
version: 0.17.3
appVersion: 1.4.0
version: 0.17.4
appVersion: 1.4.1
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png
Expand Down
6 changes: 3 additions & 3 deletions charts/tempo-distributed/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo-distributed

![Version: 0.17.0](https://img.shields.io/badge/Version-0.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square)
![Version: 0.17.4](https://img.shields.io/badge/Version-0.17.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.1](https://img.shields.io/badge/AppVersion-1.4.1-informational?style=flat-square)

Grafana Tempo in MicroService mode

Expand Down Expand Up @@ -84,7 +84,7 @@ The memcached default args are removed and should be provided manually. The sett
| compactor.service.annotations | object | `{}` | Annotations for compactor service |
| compactor.terminationGracePeriodSeconds | int | `30` | Grace period to allow the compactor to shutdown before it is killed |
| compactor.tolerations | list | `[]` | Tolerations for compactor pods |
| config | string | `"multitenancy_enabled: false\nsearch_enabled: {{ .Values.search.enabled }}\ncompactor:\n compaction:\n block_retention: {{ .Values.compactor.config.compaction.block_retention }}\n ring:\n kvstore:\n store: memberlist\ndistributor:\n ring:\n kvstore:\n store: memberlist\n receivers:\n {{- if or (.Values.traces.jaeger.thriftCompact) (.Values.traces.jaeger.thriftBinary) (.Values.traces.jaeger.thriftHttp) (.Values.traces.jaeger.grpc) }}\n jaeger:\n protocols:\n {{- if .Values.traces.jaeger.thriftCompact }}\n thrift_compact:\n endpoint: 0.0.0.0:6831\n {{- end }}\n {{- if .Values.traces.jaeger.thriftBinary }}\n thrift_binary:\n endpoint: 0.0.0.0:6832\n {{- end }}\n {{- if .Values.traces.jaeger.thriftHttp }}\n thrift_http:\n endpoint: 0.0.0.0:14268\n {{- end }}\n {{- if .Values.traces.jaeger.grpc }}\n grpc:\n endpoint: 0.0.0.0:14250\n {{- end }}\n {{- end }}\n {{- if .Values.traces.zipkin}}\n zipkin:\n endpoint: 0.0.0.0:9411\n {{- end }}\n {{- if or (.Values.traces.otlp.http) (.Values.traces.otlp.grpc) }}\n otlp:\n protocols:\n {{- if .Values.traces.otlp.http }}\n http:\n endpoint: 0.0.0.0:55681\n {{- end }}\n {{- if .Values.traces.otlp.grpc }}\n grpc:\n endpoint: 0.0.0.0:4317\n {{- end }}\n {{- end }}\n {{- if .Values.traces.opencensus }}\n opencensus:\n endpoint: 0.0.0.0:55678\n {{- end }}\n {{- if .Values.traces.kafka }}\n kafka:\n {{- toYaml .Values.traces.kafka | nindent 6 }}\n {{- end }}\nquerier:\n frontend_worker:\n frontend_address: {{ include \"tempo.queryFrontendFullname\" . }}-discovery:9095\n {{- if .Values.querier.config.frontend_worker.grpc_client_config }}\n grpc_client_config:\n {{- toYaml .Values.querier.config.frontend_worker.grpc_client_config | nindent 6 }}\n {{- end }}\ningester:\n lifecycler:\n ring:\n replication_factor: 1\n kvstore:\n store: memberlist\n tokens_file_path: /var/tempo/tokens.json\n {{- if .Values.ingester.config.maxBlockBytes }}\n max_block_bytes: {{ .Values.ingester.config.maxBlockBytes }}\n {{- end }}\n {{- if .Values.ingester.config.maxBlockDuration }}\n max_block_duration: {{ .Values.ingester.config.maxBlockDuration }}\n {{- end }}\n {{- if .Values.ingester.config.completeBlockTimeout }}\n complete_block_timeout: {{ .Values.ingester.config.completeBlockTimeout }}\n {{- end }}\nmemberlist:\n abort_if_cluster_join_fails: false\n join_members:\n - {{ include \"tempo.fullname\" . }}-gossip-ring\noverrides:\n {{- toYaml .Values.global_overrides | nindent 2 }}\nserver:\n http_listen_port: {{ .Values.server.httpListenPort }}\n log_level: {{ .Values.server.logLevel }}\n log_format: {{ .Values.server.logFormat }}\n grpc_server_max_recv_msg_size: {{ .Values.server.grpc_server_max_recv_msg_size }}\n grpc_server_max_send_msg_size: {{ .Values.server.grpc_server_max_send_msg_size }}\nstorage:\n trace:\n backend: {{.Values.storage.trace.backend}}\n {{- if eq .Values.storage.trace.backend \"gcs\"}}\n gcs:\n {{- toYaml .Values.storage.trace.gcs | nindent 6}}\n {{- end}}\n {{- if eq .Values.storage.trace.backend \"s3\"}}\n s3:\n {{- toYaml .Values.storage.trace.s3 | nindent 6}}\n {{- end}}\n {{- if eq .Values.storage.trace.backend \"azure\"}}\n azure:\n {{- toYaml .Values.storage.trace.azure | nindent 6}}\n {{- end}}\n blocklist_poll: 5m\n local:\n path: /var/tempo/traces\n wal:\n path: /var/tempo/wal\n cache: memcached\n memcached:\n consistent_hash: true\n host: {{ include \"tempo.fullname\" . }}-memcached\n service: memcached-client\n timeout: 500ms\n"` | |
| config | string | `"multitenancy_enabled: false\nsearch_enabled: {{ .Values.search.enabled }}\ncompactor:\n compaction:\n block_retention: {{ .Values.compactor.config.compaction.block_retention }}\n ring:\n kvstore:\n store: memberlist\ndistributor:\n ring:\n kvstore:\n store: memberlist\n receivers:\n {{- if or (.Values.traces.jaeger.thriftCompact) (.Values.traces.jaeger.thriftBinary) (.Values.traces.jaeger.thriftHttp) (.Values.traces.jaeger.grpc) }}\n jaeger:\n protocols:\n {{- if .Values.traces.jaeger.thriftCompact }}\n thrift_compact:\n endpoint: 0.0.0.0:6831\n {{- end }}\n {{- if .Values.traces.jaeger.thriftBinary }}\n thrift_binary:\n endpoint: 0.0.0.0:6832\n {{- end }}\n {{- if .Values.traces.jaeger.thriftHttp }}\n thrift_http:\n endpoint: 0.0.0.0:14268\n {{- end }}\n {{- if .Values.traces.jaeger.grpc }}\n grpc:\n endpoint: 0.0.0.0:14250\n {{- end }}\n {{- end }}\n {{- if .Values.traces.zipkin}}\n zipkin:\n endpoint: 0.0.0.0:9411\n {{- end }}\n {{- if or (.Values.traces.otlp.http) (.Values.traces.otlp.grpc) }}\n otlp:\n protocols:\n {{- if .Values.traces.otlp.http }}\n http:\n endpoint: 0.0.0.0:55681\n {{- end }}\n {{- if .Values.traces.otlp.grpc }}\n grpc:\n endpoint: 0.0.0.0:4317\n {{- end }}\n {{- end }}\n {{- if .Values.traces.opencensus }}\n opencensus:\n endpoint: 0.0.0.0:55678\n {{- end }}\n {{- if .Values.traces.kafka }}\n kafka:\n {{- toYaml .Values.traces.kafka | nindent 6 }}\n {{- end }}\nquerier:\n frontend_worker:\n frontend_address: {{ include \"tempo.queryFrontendFullname\" . }}-discovery:9095\n {{- if .Values.querier.config.frontend_worker.grpc_client_config }}\n grpc_client_config:\n {{- toYaml .Values.querier.config.frontend_worker.grpc_client_config | nindent 6 }}\n {{- end }}\ningester:\n lifecycler:\n ring:\n replication_factor: 1\n kvstore:\n store: memberlist\n tokens_file_path: /var/tempo/tokens.json\n {{- if .Values.ingester.config.max_block_bytes }}\n max_block_bytes: {{ .Values.ingester.config.max_block_bytes }}\n {{- end }}\n {{- if .Values.ingester.config.max_block_duration }}\n max_block_duration: {{ .Values.ingester.config.max_block_duration }}\n {{- end }}\n {{- if .Values.ingester.config.complete_block_timeout }}\n complete_block_timeout: {{ .Values.ingester.config.complete_block_timeout }}\n {{- end }}\nmemberlist:\n abort_if_cluster_join_fails: false\n join_members:\n - {{ include \"tempo.fullname\" . }}-gossip-ring\noverrides:\n {{- toYaml .Values.global_overrides | nindent 2 }}\nserver:\n http_listen_port: {{ .Values.server.httpListenPort }}\n log_level: {{ .Values.server.logLevel }}\n log_format: {{ .Values.server.logFormat }}\n grpc_server_max_recv_msg_size: {{ .Values.server.grpc_server_max_recv_msg_size }}\n grpc_server_max_send_msg_size: {{ .Values.server.grpc_server_max_send_msg_size }}\nstorage:\n trace:\n backend: {{.Values.storage.trace.backend}}\n {{- if eq .Values.storage.trace.backend \"gcs\"}}\n gcs:\n {{- toYaml .Values.storage.trace.gcs | nindent 6}}\n {{- end}}\n {{- if eq .Values.storage.trace.backend \"s3\"}}\n s3:\n {{- toYaml .Values.storage.trace.s3 | nindent 6}}\n {{- end}}\n {{- if eq .Values.storage.trace.backend \"azure\"}}\n azure:\n {{- toYaml .Values.storage.trace.azure | nindent 6}}\n {{- end}}\n blocklist_poll: 5m\n local:\n path: /var/tempo/traces\n wal:\n path: /var/tempo/wal\n cache: memcached\n memcached:\n consistent_hash: true\n host: {{ include \"tempo.fullname\" . }}-memcached\n service: memcached-client\n timeout: 500ms\n"` | |
| distributor.affinity | string | Hard node and soft zone anti-affinity | Affinity for distributor pods. Passed through `tpl` and, thus, to be configured as string |
| distributor.autoscaling.enabled | bool | `false` | Enable autoscaling for the distributor |
| distributor.autoscaling.maxReplicas | int | `3` | Maximum autoscaling replicas for the distributor |
Expand Down Expand Up @@ -167,7 +167,7 @@ The memcached default args are removed and should be provided manually. The sett
| global.priorityClassName | string | `nil` | Overrides the priorityClassName for all pods |
| global_overrides.per_tenant_override_config | string | `"/conf/overrides.yaml"` | |
| ingester.affinity | string | Hard node and soft zone anti-affinity | Affinity for ingester pods. Passed through `tpl` and, thus, to be configured as string |
| ingester.annotations | object | `{}` | Annotations for ingester StatefulSet |
| ingester.annotations | object | `{}` | Annotations for the ingester StatefulSet |
| ingester.autoscaling.enabled | bool | `false` | Enable autoscaling for the ingester |
| ingester.autoscaling.maxReplicas | int | `3` | Maximum autoscaling replicas for the ingester |
| ingester.autoscaling.minReplicas | int | `1` | Minimum autoscaling replicas for the ingester |
Expand Down

0 comments on commit 5b2675d

Please sign in to comment.