Skip to content

Commit

Permalink
add log_discarded_spans config for Tempo distributor to tempo-distrib…
Browse files Browse the repository at this point in the history
…uted chart.

The new value enabled configuring `log_discarded_spans` like for `log_received_spans` as shown below:

```
distributor:
  config:
    log_discarded_spans:
      enabled: true
    log_received_spans:
      # ...
```

The feature was introduced in [tempo/#3964](grafana/tempo#3964).

Signed-off-by: Daniel Strobusch <1847260+dastrobu@users.noreply.github.com>
  • Loading branch information
dastrobu committed Aug 30, 2024
1 parent 44e86c5 commit 05dc6e4
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 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: 1.17.0
version: 1.18.0
appVersion: 2.5.0
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
5 changes: 4 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.17.0](https://img.shields.io/badge/Version-1.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
![Version: 1.18.0](https://img.shields.io/badge/Version-1.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)

Grafana Tempo in MicroService mode

Expand Down Expand Up @@ -317,6 +317,9 @@ The memcached default args are removed and should be provided manually. The sett
| distributor.autoscaling.targetCPUUtilizationPercentage | int | `60` | Target CPU utilisation percentage for the distributor |
| distributor.autoscaling.targetMemoryUtilizationPercentage | string | `nil` | Target memory utilisation percentage for the distributor |
| distributor.config.extend_writes | string | `nil` | Disables write extension with inactive ingesters |
| distributor.config.log_discarded_spans.enabled | bool | `false` | |
| distributor.config.log_discarded_spans.filter_by_status_error | bool | `false` | |
| distributor.config.log_discarded_spans.include_all_attributes | bool | `false` | |
| distributor.config.log_received_spans | object | `{"enabled":false,"filter_by_status_error":false,"include_all_attributes":false}` | Enable to log every received span to help debug ingestion or calculate span error distributions using the logs |
| distributor.config.log_received_traces | string | `nil` | WARNING: Deprecated. Use log_received_spans instead. |
| distributor.extraArgs | list | `[]` | Additional CLI args for the distributor |
Expand Down
10 changes: 10 additions & 0 deletions charts/tempo-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,10 @@ distributor:
enabled: false
include_all_attributes: false
filter_by_status_error: false
log_discarded_spans:
enabled: false
include_all_attributes: false
filter_by_status_error: false
# -- Disables write extension with inactive ingesters
extend_writes: null
# -- Adds the appProtocol field to the distributor service. This allows distributor to work with istio protocol selection.
Expand Down Expand Up @@ -1302,6 +1306,12 @@ config: |
kafka:
{{- toYaml .Values.traces.kafka | nindent 6 }}
{{- end }}
{{- if .Values.distributor.config.log_discarded_spans.enabled }}
log_discarded_spans:
enabled: {{ .Values.distributor.config.log_discarded_spans.enabled }}
include_all_attributes: {{ .Values.distributor.config.log_discarded_spans.include_all_attributes }}
filter_by_status_error: {{ .Values.distributor.config.log_discarded_spans.filter_by_status_error }}
{{- end }}
{{- if or .Values.distributor.config.log_received_traces .Values.distributor.config.log_received_spans.enabled }}
log_received_spans:
enabled: {{ or .Values.distributor.config.log_received_traces .Values.distributor.config.log_received_spans.enabled }}
Expand Down

0 comments on commit 05dc6e4

Please # to comment.