From 89780039fcbaf0cf97dc2243c6000a6413fb69ab Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 2 Dec 2020 04:30:17 -0800
Subject: [PATCH] Fix service names in metrics

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

diff --git a/charts/kubezero-metrics/templates/istio-service.yaml b/charts/kubezero-metrics/templates/istio-service.yaml
index 1aa937d5..a6cea887 100644
--- a/charts/kubezero-metrics/templates/istio-service.yaml
+++ b/charts/kubezero-metrics/templates/istio-service.yaml
@@ -10,13 +10,13 @@ metadata:
 {{ include "kubezero-lib.labels" $ | indent 4 }}
 spec:
   hosts:
-  - {{ index $service.url }}
+  - {{ $service.url }}
   gateways:
-  - {{ index $service.gateway }}
+  - {{ $service.gateway }}
   http:
   - route:
     - destination:
-        host: metrics-{{- $name }}
+        host: {{ $service.destination }}
 ---
 {{- end }}
 
diff --git a/charts/kubezero-metrics/values.yaml b/charts/kubezero-metrics/values.yaml
index 320462da..0d618093 100644
--- a/charts/kubezero-metrics/values.yaml
+++ b/charts/kubezero-metrics/values.yaml
@@ -181,15 +181,18 @@ istio:
     ipBlocks: []
     url: ""
     gateway: istio-ingress/ingressgateway
+    destination: metrics-grafana
 
   prometheus:
     enabled: false
     ipBlocks: []
     url: ""
     gateway: istio-ingress/ingressgateway
+    destination: metrics-kube-prometheus-st-prometheus
 
   alertmanager:
     enabled: false
     ipBlocks: []
     url: ""
     gateway: istio-ingress/ingressgateway
+    destination: metrics-kube-prometheus-st-alertmanager