Merge pull request #16 from AndreZiviani/fix-tempo-strategies

fix tempo strategies typo
AndreZiviani · May 27, 2021 · fa7d08b · fa7d08b
2 parents 650fda5 + f4259a9
commit fa7d08b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/charts/grafana-agent/Chart.yaml b/charts/grafana-agent/Chart.yaml
@@ -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.13
+version: 1.0.14
 home: https://github.com/grafana/agent/
 sources:
   - https://grafana.com/docs/grafana-cloud/agent/

diff --git a/charts/grafana-agent/README.md b/charts/grafana-agent/README.md
@@ -1,6 +1,6 @@
 # grafana-agent
 
-![Version: 1.0.13](https://img.shields.io/badge/Version-1.0.13-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.14](https://img.shields.io/badge/Version-1.0.14-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.
@@ -78,7 +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.strategies | string | `"{\"default_strategy\": {\"param\": 0.001, \"type\": \"probabilistic\"}}\n"` | 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 |

diff --git a/charts/grafana-agent/templates/secret.yaml b/charts/grafana-agent/templates/secret.yaml
@@ -32,5 +32,6 @@ stringData:
       {{- tpl .Values.prometheusDeployment.config . | nindent 6 }}
     {{- end }}
   {{- if .Values.tempo.enabled }}
-  strategies.json: {{ .Values.tempo.strategies | quote }}
+  strategies.json: |
+    {{ .Values.tempo.strategies }}
   {{- end }}
diff --git a/charts/grafana-agent/values.yaml b/charts/grafana-agent/values.yaml
@@ -615,7 +615,8 @@ tempo:
   # -- 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"}}'
+  strategies: |
+    {"default_strategy": {"param": 0.001, "type": "probabilistic"}}
   # -- Section for configuring the tempo daemonset part of the agent
   # @default -- See `values.yaml`
   config: |