From 6461fc7036e19b60f093b2c558a462c468e616e4 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 3 Aug 2020 16:34:57 +0100
Subject: [PATCH] Config fixes, svc name fix

---
 charts/kubezero-metrics/templates/istio-service.yaml |  2 +-
 deploy/templates/values.yaml                         | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/charts/kubezero-metrics/templates/istio-service.yaml b/charts/kubezero-metrics/templates/istio-service.yaml
index 2a3490b9..b2437a59 100644
--- a/charts/kubezero-metrics/templates/istio-service.yaml
+++ b/charts/kubezero-metrics/templates/istio-service.yaml
@@ -12,5 +12,5 @@ spec:
   http:
   - route:
     - destination:
-        host: grafana
+        host: metrics-grafana
 {{- end }}
diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml
index 2a358244..bdadb2c4 100644
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@@ -94,12 +94,14 @@ kubezero:
 
   metrics:
     enabled: {{ .Values.metrics.enabled }}
-    {{- if and .Values.metrics.istio.enabled .Values.istio.enabled }}
-    istio:
-      {{- with .Values.metrics.istio }}
-      {{- toYaml . | nindent 6 }}
+    values:
+      {{- if and .Values.metrics.istio.enabled .Values.istio.enabled }}
+      grafana:
+        istio:
+          {{- with .Values.metrics.istio }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
       {{- end }}
-    {{- end }}
 
 argo-cd:
   {{- with index .Values "argo-cd" "server" }}