Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[tempo] add servicemonitor tlsconfig and scheme #3409

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+20 −2
Open

[tempo] add servicemonitor tlsconfig and scheme #3409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ff7ef4
adding in ability to specify a scheme and tlsConfig
qqchachoo Nov 7, 2024
c070373
Bumped chart, Updated Readme, added Scheme and tlsConfig to values.yaml
qqchachoo Nov 7, 2024
a6e1c98
update chart and readme
qqchachoo Nov 18, 2024
1113f00
Merge branch 'main' into tempo-add-servicemonitor-tlsconfig-and-scheme
qqchachoo Nov 18, 2024
279e487
Merge branch 'main' into tempo-add-servicemonitor-tlsconfig-and-scheme
qqchachoo Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/tempo/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: tempo
description: Grafana Tempo Single Binary Mode
type: application
version: 1.14.0
version: 1.14.1
appVersion: 2.6.1
engine: gotpl
home: https://grafana.net
Expand Down
4 changes: 3 additions & 1 deletion charts/tempo/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo

![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
![Version: 1.14.1](https://img.shields.io/badge/Version-1.14.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)

Grafana Tempo Single Binary Mode

Expand Down Expand Up @@ -53,6 +53,8 @@ Grafana Tempo Single Binary Mode
| serviceMonitor.annotations | object | `{}` | |
| serviceMonitor.enabled | bool | `false` | |
| serviceMonitor.interval | string | `""` | |
| serviceMonitor.scheme | string | `""` | |
| serviceMonitor.tlsConfig | object | `{}` | |
| tempo.extraArgs | object | `{}` | |
| tempo.extraEnv | list | `[]` | Environment variables to add |
| tempo.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the ingester pods |
Expand Down
14 changes: 14 additions & 0 deletions charts/tempo/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,25 @@ spec:
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.serviceMonitor.scheme }}
scheme: {{ .Values.serviceMonitor.scheme }}
{{- end }}
{{- if .Values.serviceMonitor.tlsConfig }}
tlsConfig:
{{- toYaml .Values.serviceMonitor.tlsConfig | nindent 8 }}
{{- end }}
- port: jaeger-metrics
{{- if .Values.serviceMonitor.interval }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.serviceMonitor.scheme }}
scheme: {{ .Values.serviceMonitor.scheme }}
{{- end }}
{{- if .Values.serviceMonitor.tlsConfig }}
tlsConfig:
{{- toYaml .Values.serviceMonitor.tlsConfig | nindent 8 }}
{{- end }}
{{- end }}
2 changes: 2 additions & 0 deletions charts/tempo/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ serviceMonitor:
interval: ""
additionalLabels: {}
annotations: {}
scheme: ""
tlsConfig: {}
# scrapeTimeout: 10s

persistence:
Expand Down