From 4b48da5935ac054b9170d377ebfba684fe289053 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Sat, 28 Nov 2020 23:54:40 +0000
Subject: [PATCH] Metrics update

---
 charts/kubezero-metrics/Chart.yaml  | 2 +-
 charts/kubezero-metrics/values.yaml | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/charts/kubezero-metrics/Chart.yaml b/charts/kubezero-metrics/Chart.yaml
index a6e19e6d..d1203073 100644
--- a/charts/kubezero-metrics/Chart.yaml
+++ b/charts/kubezero-metrics/Chart.yaml
@@ -16,7 +16,7 @@ dependencies:
     version: ">= 0.1.3"
     repository: https://zero-down-time.github.io/kubezero/
   - name: kube-prometheus-stack
-    version: 11.1.1
+    version: 12.2.4
     repository: https://prometheus-community.github.io/helm-charts
   - name: prometheus-adapter
     version: 2.7.1
diff --git a/charts/kubezero-metrics/values.yaml b/charts/kubezero-metrics/values.yaml
index 40868fc4..a7e1a378 100644
--- a/charts/kubezero-metrics/values.yaml
+++ b/charts/kubezero-metrics/values.yaml
@@ -3,13 +3,13 @@ grafana:
     enabled: false
     ipBlocks: []
     url: ""
-    gateway: istio-system/ingressgateway
+    gateway: istio-ingress/ingressgateway
 
 prometheus:
   istio:
     enabled: false
     url: ""
-    gateway: istio-system/ingressgateway
+    gateway: istio-ingress/ingressgateway
 
 kube-prometheus-stack:
   defaultRules:
@@ -132,10 +132,6 @@ kube-prometheus-stack:
       enabled: false
     testFramework:
       enabled: false
-    # Missing default in prometheus-stack
-    sidecar:
-      notifiers:
-        enabled: false
 
   # Assign state metrics to control plane
   kube-state-metrics: