diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index b12a1c9757..f0f4118f5a 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -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 diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 51460b7de4..8a0eab843a 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -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 @@ -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 | diff --git a/charts/tempo/templates/servicemonitor.yaml b/charts/tempo/templates/servicemonitor.yaml index 395eedf2d7..0a08eab4ba 100644 --- a/charts/tempo/templates/servicemonitor.yaml +++ b/charts/tempo/templates/servicemonitor.yaml @@ -30,6 +30,13 @@ 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 }} @@ -37,4 +44,11 @@ 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 }} {{- end }} diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index 2b9ce226ef..bdb0b773d8 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -272,6 +272,8 @@ serviceMonitor: interval: "" additionalLabels: {} annotations: {} + scheme: "" + tlsConfig: {} # scrapeTimeout: 10s persistence: