Skip to content

Commit d110ef0

Browse files
committed
feat(tempo): add grafana sidecar datasource to tempo
Signed-off-by: Yordis Prieto <[email protected]>
1 parent 472ce8d commit d110ef0

File tree

3 files changed

+55
-0
lines changed

3 files changed

+55
-0
lines changed

charts/tempo/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ Grafana Tempo Single Binary Mode
105105
| tempo.storage.trace.wal.path | string | `"/var/tempo/wal"` | |
106106
| tempo.tag | string | `""` | |
107107
| tempo.updateStrategy | string | `"RollingUpdate"` | |
108+
| tempo.datasource.isDefault | bool | `false` | Whether to set this datasource as the default in Grafana |
109+
| tempo.datasource.jsonData | string | `"{}"` | Additional JSON data to configure the datasource |
110+
| tempo.datasource.uid | string | `""` | Unique identifier for the datasource |
108111
| tempoQuery.enabled | bool | `false` | if False the tempo-query container is not deployed |
109112
| tempoQuery.extraArgs | object | `{}` | |
110113
| tempoQuery.extraEnv | list | `[]` | Environment variables to add |
@@ -124,6 +127,11 @@ Grafana Tempo Single Binary Mode
124127
| tempoQuery.service.port | int | `16686` | |
125128
| tempoQuery.tag | string | `nil` | |
126129
| tolerations | list | `[]` | Tolerations for pod assignment. See: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ |
130+
| grafana.sidecar.datasources.enabled | bool | `true` | Enable the Grafana datasource sidecar |
131+
| grafana.sidecar.datasources.label | string | `""` | Label to use for the Grafana datasource sidecar |
132+
| grafana.sidecar.datasources.labelValue | string | `""` | Label value to use for the Grafana datasource sidecar |
133+
| grafana.sidecar.datasources.maxLines | int | `1000` | Maximum number of lines to read from the datasource config file |
134+
127135

128136
## Chart Repo
129137

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{{- if .Values.grafana.sidecar.datasources.enabled }}
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: {{ include "tempo.fullname" . }}
6+
namespace: {{ .Release.Namespace }}
7+
labels:
8+
app: {{ include "tempo.name" . }}
9+
chart: {{ include "tempo.chart" . }}
10+
release: {{ .Release.Name }}
11+
heritage: {{ .Release.Service }}
12+
{{- if .Values.grafana.sidecar.datasources.label }}
13+
{{ .Values.grafana.sidecar.datasources.label }}: {{ .Values.grafana.sidecar.datasources.labelValue | quote }}
14+
{{- else }}
15+
grafana_datasource: "1"
16+
{{- end }}
17+
data:
18+
tempo-datasource.yaml: |-
19+
apiVersion: 1
20+
datasources:
21+
- name: Tempo
22+
type: tempo
23+
access: proxy
24+
url: {{ tpl .Values.tempo.datasource.url . | quote }}
25+
version: 1
26+
isDefault: {{ default false .Values.tempo.datasource.isDefault }}
27+
{{- with .Values.tempo.datasource.uid }}
28+
uid: {{ . | quote }}
29+
{{- end }}
30+
{{- with .Values.tempo.datasource.jsonData }}
31+
jsonData:
32+
{{- tpl . $ | nindent 8 }}
33+
{{- end }}
34+
{{- end }}

charts/tempo/values.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ tempo:
165165
# mountPath: /mnt/volume
166166
# readOnly: true
167167
# existingClaim: volume-claim
168+
datasource:
169+
isDefault: false
170+
jsonData: "{}"
171+
uid: ""
172+
url: "http://{{ include "tempo.fullname" . }}:{{ .Values.tempo.server.http_listen_port }}"
168173

169174
# -- Tempo configuration file contents
170175
# @default -- Dynamically generated tempo configmap
@@ -413,3 +418,11 @@ networkPolicy:
413418
## - namespaceSelector:
414419
## matchExpressions:
415420
## - {key: role, operator: In, values: [tempo]}
421+
422+
grafana:
423+
sidecar:
424+
datasources:
425+
enabled: true
426+
label: ""
427+
labelValue: ""
428+
maxLines: 1000

0 commit comments

Comments
 (0)