Merge branch 'update-tempo-tag-1.0.0-bb.3' into 'master'

Monitoring & tempo updates for Service and Node Graph Features

Closes #1438

See merge request !2546

chart/templates/monitoring/values.yaml

@@ -91,6 +91,10 @@ prometheus:
         imagePullPolicy: {{ .Values.imagePullPolicy }}
       - name: "config-reloader"
         imagePullPolicy: {{ .Values.imagePullPolicy }}
+    {{- if .Values.tempo.enabled }}
+    enableFeatures:
+      - remote-write-receiver
+    {{- end }}
     {{- if or $istioInjection .Values.monitoring.sso.enabled .Values.addons.vault.enabled }}
     podMetadata:
       {{- if or .Values.monitoring.sso.enabled (and .Values.networkPolicies.enabled .Values.addons.vault.enabled) }}
@@ -284,6 +288,10 @@ grafana:
     url: http://tempo-tempo.tempo.svc:3100
     isDefault: false
     editable: true
+    jsonData:
+      httpMethod: GET
+      serviceMap:
+        datasourceUid: 'prometheus'
   {{- if .Values.loki.enabled }}
     jsonData:
       httpMethod: GET

chart/templates/tempo/values.yaml

@@ -31,6 +31,12 @@ tempo:
 {{- end }}
 {{- end }}
 
+{{- if .Values.monitoring.enabled }}
+  metricsGenerator:
+    enabled: true
+    remoteWriteUrl: "http://monitoring-monitoring-kube-prometheus.monitoring.svc.cluster.local:9090/api/v1/write"
+{{- end }}
+
 # hostname is deprecated and replaced with domain. But if hostname exists then use it.
 {{- $domainName := default .Values.domain .Values.hostname }}
 hostname: {{ $domainName }}

chart/values.yaml

@@ -615,7 +615,7 @@ tempo:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/tempo.git
     path: "./chart"
-    tag: "1.0.0-bb.2"
+    tag: "1.0.0-bb.3"
 
   # -- Redirect the package ingress to a specific Istio Gateway (listed in `istio.gateways`).  The default is "public".
   ingress:
@@ -675,7 +675,7 @@ monitoring:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
     path: "./chart"
-    tag: "43.1.2-bb.2"
+    tag: "43.1.2-bb.3"
 
   # -- Flux reconciliation overrides specifically for the Monitoring Package
   flux: