diff --git a/chart/templates/authservice/values.yaml b/chart/templates/authservice/values.yaml index f7de2c0ba86ab53b7df4a7949176a6a2c210e5ad..8746e7ece74f933f92870b5875d55d0466605079 100644 --- a/chart/templates/authservice/values.yaml +++ b/chart/templates/authservice/values.yaml @@ -187,7 +187,8 @@ chains: {{- end }} {{- end }} - {{- if and .Values.tempo.enabled .Values.tempo.sso.enabled }} + {{- $tempoQueryEnabled := (dig "tempoQuery" "enabled" false .Values.tempo.values) }} + {{- if and $tempoQueryEnabled .Values.tempo.enabled .Values.tempo.sso.enabled }} tempo: match: header: ":authority" diff --git a/chart/templates/kiali/values.yaml b/chart/templates/kiali/values.yaml index b2c45ec5b0d50fd583e389b952979c1b631884ca..2a91f5b7528b47f8dbe3ab650053f93ebfdfac33 100644 --- a/chart/templates/kiali/values.yaml +++ b/chart/templates/kiali/values.yaml @@ -88,8 +88,9 @@ cr: password: "secret:grafana-auth:password" {{- end }} tracing: - enabled: {{ or .Values.tempo.enabled .Values.jaeger.enabled }} - {{- if and .Values.tempo.enabled (not .Values.jaeger.enabled)}} + {{- $tempoQueryEnabled := (dig "tempoQuery" "enabled" false .Values.tempo.values) }} + enabled: {{ or (and .Values.tempo.enabled $tempoQueryEnabled) .Values.jaeger.enabled }} + {{- if and $tempoQueryEnabled (not .Values.jaeger.enabled) }} in_cluster_url: "http://tempo-tempo.tempo.svc.cluster.local:16686" {{- $tracingUrl := first (dig "istio" "tempoQuery" "hosts" list .Values.tempo.values) }} url: https://{{ tpl ($tracingUrl | default (printf "%s.%s" "tracing" $domainName )) . }} diff --git a/chart/templates/monitoring/values.yaml b/chart/templates/monitoring/values.yaml index ef5113ae44eddbd85dbb481e37ca33b768ab4988..c9f23fef51bd98989c4cfa22243287172b7ca111 100644 --- a/chart/templates/monitoring/values.yaml +++ b/chart/templates/monitoring/values.yaml @@ -220,8 +220,7 @@ prometheus: - name: "config-reloader" imagePullPolicy: {{ .Values.imagePullPolicy }} {{- if .Values.tempo.enabled }} - enableFeatures: - - remote-write-receiver + enableRemoteWriteReceiver: true {{- end }} podMetadata: labels: diff --git a/chart/values.yaml b/chart/values.yaml index c2067429a184819ad465ae54a8376483a62c2ffc..af8397f8cafda605c587482120d346e92aceac84 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -810,11 +810,11 @@ tempo: git: repo: https://repo1.dso.mil/big-bang/product/packages/tempo.git path: "./chart" - tag: "1.11.0-bb.1" + tag: "1.16.0-bb.0" helmRepo: repoName: "registry1" chartName: "tempo" - tag: "1.11.0-bb.1" + tag: "1.16.0-bb.0" # -- Redirect the package ingress to a specific Istio Gateway (listed in `istio.gateways`). The default is "public". ingress: