Skip to content

Commit

Permalink
Merge pull request #13 from AndreZiviani/tempo-strategies
Browse files Browse the repository at this point in the history
add missing tempo strategy file
  • Loading branch information
AndreZiviani authored May 27, 2021
2 parents db0c36f + 975beb6 commit 128656e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion charts/grafana-agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: grafana-agent
description: Grafana Agent is a telemetry collector for sending metrics, logs, and trace data to the opinionated Grafana observability stack.
type: application
appVersion: v0.14.0
version: 1.0.10
version: 1.0.11
home: https://github.com/grafana/agent/
sources:
- https://grafana.com/docs/grafana-cloud/agent/
Expand Down
3 changes: 2 additions & 1 deletion charts/grafana-agent/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# grafana-agent

![Version: 1.0.10](https://img.shields.io/badge/Version-1.0.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.14.0](https://img.shields.io/badge/AppVersion-v0.14.0-informational?style=flat-square)
![Version: 1.0.11](https://img.shields.io/badge/Version-1.0.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.14.0](https://img.shields.io/badge/AppVersion-v0.14.0-informational?style=flat-square)

This chart is a temporary solution while the [Operator is not finished](https://github.com/grafana/agent/pull/549),
after that this chart will be discontinued.
Expand Down Expand Up @@ -78,6 +78,7 @@ A major chart version change indicates that there is an incompatible breaking ch
| tempo.config | string | See `values.yaml` | Section for configuring the tempo daemonset part of the agent |
| tempo.enabled | bool | `true` | Enable trace collection in daemonset mode |
| tempo.remoteWriteURL | string | `"http://localhost"` | |
| tempo.strategies | string | `"{\"default_strategy\": {\"param\": 0.001, \"type\": \"probabilistic\"}}"` | Jaeger strategy |
| tempo.tenant | string | `""` | Add the X-Scope-OrgID header to the requests, usefull when using multitenant tempo feature |
| tolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]` | Tolerations for pods. By default, pods will be scheduled on master nodes. |
| updateStrategy | object | `{"type":"RollingUpdate"}` | The update strategy for the DaemonSet |
Expand Down
4 changes: 4 additions & 0 deletions charts/grafana-agent/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,7 @@ stringData:
prometheus:
{{- tpl .Values.prometheusDeployment.config . | nindent 6 }}
{{- end }}
strategies.json: |
{{- if .Values.tempo.enabled }}
'{{- .Values.tempo.strategies }}'
{{- end }}
2 changes: 2 additions & 0 deletions charts/grafana-agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,8 @@ tempo:
remoteWriteURL: http://localhost
# -- Add the X-Scope-OrgID header to the requests, usefull when using multitenant tempo feature
tenant: ""
# -- Jaeger strategy
strategies: '{"default_strategy": {"param": 0.001, "type": "probabilistic"}}'
# -- Section for configuring the tempo daemonset part of the agent
# @default -- See `values.yaml`
config: |
Expand Down

0 comments on commit 128656e

Please sign in to comment.