Skip to content

Commit

Permalink
Merge pull request #14 from AndreZiviani/fix-tempo-strategies
Browse files Browse the repository at this point in the history
fix tempo strategies typo
  • Loading branch information
AndreZiviani authored May 27, 2021
2 parents 128656e + a54df50 commit d2873fb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 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.11
version: 1.0.12
home: https://github.com/grafana/agent/
sources:
- https://grafana.com/docs/grafana-cloud/agent/
Expand Down
2 changes: 1 addition & 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.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)
![Version: 1.0.12](https://img.shields.io/badge/Version-1.0.12-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
7 changes: 3 additions & 4 deletions charts/grafana-agent/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ stringData:
prometheus:
{{- tpl .Values.prometheusDeployment.config . | nindent 6 }}
{{- end }}
strategies.json: |
{{- if .Values.tempo.enabled }}
'{{- .Values.tempo.strategies }}'
{{- end }}
{{- if .Values.tempo.enabled }}
strategies.json: {{ .Values.tempo.strategies }}
{{- end }}

0 comments on commit d2873fb

Please sign in to comment.