diff --git a/Dispatchfile b/Dispatchfile
index 1ac4db84..471badb4 100644
--- a/Dispatchfile
+++ b/Dispatchfile
@@ -40,7 +40,7 @@ common_env = [
     k8s.corev1.EnvVar(name="GIT_TERMINAL_PROMPT", value="1"),
     k8s.corev1.EnvVar(name="GITHUB_TOKEN", valueFrom=secret_var("d2iq-dispatch-basic-auth", "password")),
     k8s.corev1.EnvVar(name="GOPRIVATE", value="github.com/mesosphere"),
-    k8s.corev1.EnvVar(name="KONVOY_VERSION", value="v1.6.1"),
+    k8s.corev1.EnvVar(name="KONVOY_VERSION", value="v1.8.0"),
     k8s.corev1.EnvVar(name="KUBEADDONS_ADDON_DELETE_DURATION", value="5m"),
     k8s.corev1.EnvVar(name="SSH_KEY_BASE64", valueFrom=secret_var( "d2iq-dispatch-git-ssh-base64", "ssh-privatekey-base64")),
 ]
diff --git a/Makefile b/Makefile
index 4da83baa..96a9e108 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ endif
 
 .PHONY: dispatch-test-install-upgrade
 .ONESHELL:
-dispatch-test-install-upgrade: $(GITHUB_CLI_BIN)
+dispatch-test-install-upgrade: test/konvoy $(GITHUB_CLI_BIN)
 	cd test
 	./dispatch_test_install_upgrade.sh
 
diff --git a/addons/flagger/flagger.yaml b/addons/flagger/flagger.yaml
index aed5a6cc..f68d6b28 100644
--- a/addons/flagger/flagger.yaml
+++ b/addons/flagger/flagger.yaml
@@ -8,7 +8,7 @@ metadata:
   annotations:
     sidecar.istio.io/inject: "false"
     appversion.kubeaddons.mesosphere.io/flagger: "0.19.0"
-    catalog.kubeaddons.mesosphere.io/addon-revision: "0.19.0-4"
+    catalog.kubeaddons.mesosphere.io/addon-revision: "0.19.0-5"
     docs.kubeaddons.mesosphere.io/flagger: "https://docs.flagger.app/"
     values.chart.helm.kubeaddons.mesosphere.io/flagger: "https://raw.githubusercontent.com/mesosphere/charts/f4105ebb01fc758a4af356069a8ceae043201057/staging/flagger/values.yaml"
 spec:
@@ -38,7 +38,7 @@ spec:
     values: |
       ---
       meshProvider: istio
-      metricsServer: http://prometheus-kubeaddons-prom-prometheus.kubeaddons:9090
+      metricsServer: http://prometheus-kubeaddons-kube-prometheus.kubeaddons:9090
       podLabels:
         podmonitor.kubeaddons.mesosphere.io/path: "metrics"
         kubeaddons.mesosphere.io/name: "flagger"
diff --git a/addons/kiali/kiali.yaml b/addons/kiali/kiali.yaml
index cb031e47..d6a0c975 100644
--- a/addons/kiali/kiali.yaml
+++ b/addons/kiali/kiali.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     kubeaddons.mesosphere.io/name: kiali
   annotations:
-    catalog.kubeaddons.mesosphere.io/addon-revision: "v1.29.1-2"
+    catalog.kubeaddons.mesosphere.io/addon-revision: "v1.29.1-3"
     appversion.kubeaddons.mesosphere.io/kiali-operator: "v1.29.1"
     appversion.kubeaddons.mesosphere.io/kiali: "1.29.0"
     stage.kubeaddons.mesosphere.io/kiali: Experimental
@@ -55,7 +55,7 @@ spec:
             grafana:
               in_cluster_url: http://prometheus-kubeaddons-grafana.kubeaddons:3000
             prometheus:
-              url: http://prometheus-kubeaddons-prom-prometheus.kubeaddons:9090
+              url: http://prometheus-kubeaddons-kube-prometheus.kubeaddons:9090
             tracing:
               in_cluster_url: http://jaeger-kubeaddons-jaeger-operator-jaeger-query:16686
           deployment:
diff --git a/test/dispatch_test_install_upgrade.sh b/test/dispatch_test_install_upgrade.sh
index b7fddf32..7445823b 100755
--- a/test/dispatch_test_install_upgrade.sh
+++ b/test/dispatch_test_install_upgrade.sh
@@ -18,7 +18,7 @@ fi
 
 
 echo "INFO: the following test groups will be run:"
-tests=$(go run -tags experimental scripts/test-wrapper.go origin ${branch} | (grep -E '^Test' || true) | grep -v 'TestAwsGroup\|TestElasticsearchGroup\|TestIstioGroup')
+tests=$(go run -tags experimental scripts/test-wrapper.go origin ${branch} | (grep -E '^Test' || true) | grep -Ev 'TestAwsGroup\|TestElasticsearchGroup\|TestIstioGroup')
 echo ${tests}
 
 for g in ${tests}
diff --git a/test/run-tests.sh b/test/run-tests.sh
index abfa5a1c..8dbd023a 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -8,7 +8,7 @@ set -euxo pipefail
 cd "$(dirname "$0")"
 
 echo "Setup Konvoy"
-source ./scripts/setup-konvoy.sh v1.6.1
+source ./scripts/setup-konvoy.sh v1.8.0
 
 echo "git fetch branches."
 git fetch
diff --git a/test/scripts/setup-konvoy.sh b/test/scripts/setup-konvoy.sh
index 7f5e11a5..206a3d20 100755
--- a/test/scripts/setup-konvoy.sh
+++ b/test/scripts/setup-konvoy.sh
@@ -2,7 +2,7 @@
 # NOTE: used by teamcity and dispatch
 
 UNAME=$(uname | tr '[:upper:]' '[:lower:]')
-KONVOY_VERSION="${1:-${KONVOY_VERSION:-v1.6.1}}"
+KONVOY_VERSION="${1:-${KONVOY_VERSION:-v1.8.0}}"
 
 set -euo pipefail
 
diff --git a/test/testdata/prometheus-metric-output.json b/test/testdata/prometheus-metric-output.json
index e842bbb8..9d21939d 100644
--- a/test/testdata/prometheus-metric-output.json
+++ b/test/testdata/prometheus-metric-output.json
@@ -18277,10 +18277,10 @@
           "__name__": "up",
           "endpoint": "http",
           "instance": "192.168.136.19:8080",
-          "job": "prometheus-kubeaddons-prom-operator",
+          "job": "prometheus-kubeaddons-kube-operator",
           "namespace": "kubeaddons",
-          "pod": "prometheus-kubeaddons-prom-operator-6db988ccc4-qwrk6",
-          "service": "prometheus-kubeaddons-prom-operator"
+          "pod": "prometheus-kubeaddons-kube-operator-6db988ccc4-qwrk6",
+          "service": "prometheus-kubeaddons-kube-operator"
         },
         "values": [
           [
@@ -29233,7 +29233,7 @@
           "job": "kube-proxy",
           "namespace": "kube-system",
           "pod": "kube-proxy-z2whp",
-          "service": "prometheus-kubeaddons-prom-kube-proxy"
+          "service": "prometheus-kubeaddons-kube-kube-proxy"
         },
         "values": [
           [
@@ -30450,7 +30450,7 @@
           "job": "kube-proxy",
           "namespace": "kube-system",
           "pod": "kube-proxy-7xm8c",
-          "service": "prometheus-kubeaddons-prom-kube-proxy"
+          "service": "prometheus-kubeaddons-kube-kube-proxy"
         },
         "values": [
           [
@@ -31667,7 +31667,7 @@
           "job": "kube-proxy",
           "namespace": "kube-system",
           "pod": "kube-proxy-xw8g4",
-          "service": "prometheus-kubeaddons-prom-kube-proxy"
+          "service": "prometheus-kubeaddons-kube-kube-proxy"
         },
         "values": [
           [
@@ -32884,7 +32884,7 @@
           "job": "kube-proxy",
           "namespace": "kube-system",
           "pod": "kube-proxy-njwtv",
-          "service": "prometheus-kubeaddons-prom-kube-proxy"
+          "service": "prometheus-kubeaddons-kube-kube-proxy"
         },
         "values": [
           [
@@ -34101,7 +34101,7 @@
           "job": "kube-proxy",
           "namespace": "kube-system",
           "pod": "kube-proxy-6ngmw",
-          "service": "prometheus-kubeaddons-prom-kube-proxy"
+          "service": "prometheus-kubeaddons-kube-kube-proxy"
         },
         "values": [
           [
@@ -35318,7 +35318,7 @@
           "job": "kube-proxy",
           "namespace": "kube-system",
           "pod": "kube-proxy-zg76x",
-          "service": "prometheus-kubeaddons-prom-kube-proxy"
+          "service": "prometheus-kubeaddons-kube-kube-proxy"
         },
         "values": [
           [
@@ -36535,7 +36535,7 @@
           "job": "kube-proxy",
           "namespace": "kube-system",
           "pod": "kube-proxy-nrpkv",
-          "service": "prometheus-kubeaddons-prom-kube-proxy"
+          "service": "prometheus-kubeaddons-kube-kube-proxy"
         },
         "values": [
           [
@@ -37752,7 +37752,7 @@
           "job": "coredns",
           "namespace": "kube-system",
           "pod": "coredns-6955765f44-rgsfc",
-          "service": "prometheus-kubeaddons-prom-coredns"
+          "service": "prometheus-kubeaddons-kube-coredns"
         },
         "values": [
           [
@@ -38969,7 +38969,7 @@
           "job": "coredns",
           "namespace": "kube-system",
           "pod": "coredns-6955765f44-gjjr9",
-          "service": "prometheus-kubeaddons-prom-coredns"
+          "service": "prometheus-kubeaddons-kube-coredns"
         },
         "values": [
           [
@@ -43835,7 +43835,7 @@
           "metrics_path": "/metrics",
           "namespace": "kube-system",
           "node": "ip-10-0-128-80.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -45053,7 +45053,7 @@
           "metrics_path": "/metrics/cadvisor",
           "namespace": "kube-system",
           "node": "ip-10-0-128-80.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -46271,7 +46271,7 @@
           "metrics_path": "/metrics/probes",
           "namespace": "kube-system",
           "node": "ip-10-0-128-80.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -47489,7 +47489,7 @@
           "metrics_path": "/metrics/resource/v1alpha1",
           "namespace": "kube-system",
           "node": "ip-10-0-128-80.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -48707,7 +48707,7 @@
           "metrics_path": "/metrics",
           "namespace": "kube-system",
           "node": "ip-10-0-129-168.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -49925,7 +49925,7 @@
           "metrics_path": "/metrics/cadvisor",
           "namespace": "kube-system",
           "node": "ip-10-0-129-168.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -51143,7 +51143,7 @@
           "metrics_path": "/metrics/probes",
           "namespace": "kube-system",
           "node": "ip-10-0-129-168.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -52361,7 +52361,7 @@
           "metrics_path": "/metrics/resource/v1alpha1",
           "namespace": "kube-system",
           "node": "ip-10-0-129-168.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -53579,7 +53579,7 @@
           "metrics_path": "/metrics",
           "namespace": "kube-system",
           "node": "ip-10-0-129-228.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -54797,7 +54797,7 @@
           "metrics_path": "/metrics/cadvisor",
           "namespace": "kube-system",
           "node": "ip-10-0-129-228.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -56015,7 +56015,7 @@
           "metrics_path": "/metrics/probes",
           "namespace": "kube-system",
           "node": "ip-10-0-129-228.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -57233,7 +57233,7 @@
           "metrics_path": "/metrics/resource/v1alpha1",
           "namespace": "kube-system",
           "node": "ip-10-0-129-228.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -58451,7 +58451,7 @@
           "metrics_path": "/metrics",
           "namespace": "kube-system",
           "node": "ip-10-0-129-244.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -59669,7 +59669,7 @@
           "metrics_path": "/metrics/cadvisor",
           "namespace": "kube-system",
           "node": "ip-10-0-129-244.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -60887,7 +60887,7 @@
           "metrics_path": "/metrics/probes",
           "namespace": "kube-system",
           "node": "ip-10-0-129-244.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -62105,7 +62105,7 @@
           "metrics_path": "/metrics/resource/v1alpha1",
           "namespace": "kube-system",
           "node": "ip-10-0-129-244.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -63323,7 +63323,7 @@
           "metrics_path": "/metrics",
           "namespace": "kube-system",
           "node": "ip-10-0-194-126.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -64541,7 +64541,7 @@
           "metrics_path": "/metrics/cadvisor",
           "namespace": "kube-system",
           "node": "ip-10-0-194-126.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -65759,7 +65759,7 @@
           "metrics_path": "/metrics/probes",
           "namespace": "kube-system",
           "node": "ip-10-0-194-126.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -66977,7 +66977,7 @@
           "metrics_path": "/metrics/resource/v1alpha1",
           "namespace": "kube-system",
           "node": "ip-10-0-194-126.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -68195,7 +68195,7 @@
           "metrics_path": "/metrics",
           "namespace": "kube-system",
           "node": "ip-10-0-194-47.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -69413,7 +69413,7 @@
           "metrics_path": "/metrics/cadvisor",
           "namespace": "kube-system",
           "node": "ip-10-0-194-47.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -70631,7 +70631,7 @@
           "metrics_path": "/metrics/probes",
           "namespace": "kube-system",
           "node": "ip-10-0-194-47.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -71849,7 +71849,7 @@
           "metrics_path": "/metrics/resource/v1alpha1",
           "namespace": "kube-system",
           "node": "ip-10-0-194-47.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -73067,7 +73067,7 @@
           "metrics_path": "/metrics",
           "namespace": "kube-system",
           "node": "ip-10-0-195-99.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -74285,7 +74285,7 @@
           "metrics_path": "/metrics/cadvisor",
           "namespace": "kube-system",
           "node": "ip-10-0-195-99.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -75503,7 +75503,7 @@
           "metrics_path": "/metrics/probes",
           "namespace": "kube-system",
           "node": "ip-10-0-195-99.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -76721,7 +76721,7 @@
           "metrics_path": "/metrics/resource/v1alpha1",
           "namespace": "kube-system",
           "node": "ip-10-0-195-99.us-west-2.compute.internal",
-          "service": "prometheus-kubeaddons-prom-kubelet"
+          "service": "prometheus-kubeaddons-kube-kubelet"
         },
         "values": [
           [
@@ -93756,10 +93756,10 @@
           "__name__": "up",
           "endpoint": "web",
           "instance": "192.168.174.73:9093",
-          "job": "prometheus-kubeaddons-prom-alertmanager",
+          "job": "prometheus-kubeaddons-kube-alertmanager",
           "namespace": "kubeaddons",
-          "pod": "alertmanager-prometheus-kubeaddons-prom-alertmanager-0",
-          "service": "prometheus-kubeaddons-prom-alertmanager"
+          "pod": "alertmanager-prometheus-kubeaddons-kube-alertmanager-0",
+          "service": "prometheus-kubeaddons-kube-alertmanager"
         },
         "values": [
           [
@@ -94973,10 +94973,10 @@
           "__name__": "up",
           "endpoint": "web",
           "instance": "192.168.174.74:9090",
-          "job": "prometheus-kubeaddons-prom-prometheus",
+          "job": "prometheus-kubeaddons-kube-prometheus",
           "namespace": "kubeaddons",
-          "pod": "prometheus-prometheus-kubeaddons-prom-prometheus-0",
-          "service": "prometheus-kubeaddons-prom-prometheus"
+          "pod": "prometheus-prometheus-kubeaddons-kube-prometheus-0",
+          "service": "prometheus-kubeaddons-kube-prometheus"
         },
         "values": [
           [
diff --git a/test/testdata/prometheus-metric-tests.yaml b/test/testdata/prometheus-metric-tests.yaml
index 2786a917..0f1aff59 100644
--- a/test/testdata/prometheus-metric-tests.yaml
+++ b/test/testdata/prometheus-metric-tests.yaml
@@ -17,17 +17,17 @@
 - name: up
   app: ""
   namespace: kube-system
-  service: prometheus-kubeaddons-prom-coredns
+  service: prometheus-kubeaddons-kube-coredns
   job: coredns
 - name: up
   app: ""
   namespace: kube-system
-  service: prometheus-kubeaddons-prom-kube-proxy
+  service: prometheus-kubeaddons-kube-kube-proxy
   job: kube-proxy
 - name: up
   app: ""
   namespace: kube-system
-  service: prometheus-kubeaddons-prom-kubelet
+  service: prometheus-kubeaddons-kube-kubelet
   job: kubelet
 - name: up
   app: ""
@@ -57,23 +57,23 @@
 - name: up
   app: ""
   namespace: kubeaddons
-  service: prometheus-kubeaddons-kube-state-metrics
-  job: kube-state-metrics
+  service: prometheus-kubeaddons-kube-alertmanager
+  job: prometheus-kubeaddons-kube-alertmanager
 - name: up
   app: ""
   namespace: kubeaddons
-  service: prometheus-kubeaddons-prom-alertmanager
-  job: prometheus-kubeaddons-prom-alertmanager
+  service: prometheus-kubeaddons-kube-operator
+  job: prometheus-kubeaddons-kube-operator
 - name: up
   app: ""
   namespace: kubeaddons
-  service: prometheus-kubeaddons-prom-operator
-  job: prometheus-kubeaddons-prom-operator
+  service: prometheus-kubeaddons-kube-prometheus
+  job: prometheus-kubeaddons-kube-prometheus
 - name: up
   app: ""
   namespace: kubeaddons
-  service: prometheus-kubeaddons-prom-prometheus
-  job: prometheus-kubeaddons-prom-prometheus
+  service: prometheus-kubeaddons-kube-state-metrics
+  job: kube-state-metrics
 - name: up
   app: ""
   namespace: kubeaddons
diff --git a/test/testdata/test-nightly-group-prom-metric-tests.yaml b/test/testdata/test-nightly-group-prom-metric-tests.yaml
index 4127ddbd..50cc31b1 100644
--- a/test/testdata/test-nightly-group-prom-metric-tests.yaml
+++ b/test/testdata/test-nightly-group-prom-metric-tests.yaml
@@ -17,17 +17,17 @@
 - name: up
   app: ""
   namespace: kube-system
-  service: prometheus-kubeaddons-prom-coredns
+  service: prometheus-kubeaddons-kube-coredns
   job: coredns
 - name: up
   app: ""
   namespace: kube-system
-  service: prometheus-kubeaddons-prom-kube-proxy
+  service: prometheus-kubeaddons-kube-kube-proxy
   job: kube-proxy
 - name: up
   app: ""
   namespace: kube-system
-  service: prometheus-kubeaddons-prom-kubelet
+  service: prometheus-kubeaddons-kube-kubelet
   job: kubelet
 - name: up
   app: ""
@@ -57,23 +57,23 @@
 - name: up
   app: ""
   namespace: kubeaddons
-  service: prometheus-kubeaddons-kube-state-metrics
-  job: kube-state-metrics
+  service: prometheus-kubeaddons-kube-alertmanager
+  job: prometheus-kubeaddons-kube-alertmanager
 - name: up
   app: ""
   namespace: kubeaddons
-  service: prometheus-kubeaddons-prom-alertmanager
-  job: prometheus-kubeaddons-prom-alertmanager
+  service: prometheus-kubeaddons-kube-operator
+  job: prometheus-kubeaddons-kube-operator
 - name: up
   app: ""
   namespace: kubeaddons
-  service: prometheus-kubeaddons-prom-operator
-  job: prometheus-kubeaddons-prom-operator
+  service: prometheus-kubeaddons-kube-prometheus
+  job: prometheus-kubeaddons-kube-prometheus
 - name: up
   app: ""
   namespace: kubeaddons
-  service: prometheus-kubeaddons-prom-prometheus
-  job: prometheus-kubeaddons-prom-prometheus
+  service: prometheus-kubeaddons-kube-state-metrics
+  job: kube-state-metrics
 - name: up
   app: ""
   namespace: kubeaddons