[release/4][BACKPORT] Upgrade prometheus addon chart (#1132)

* Upgrade prometheus addon chart This upgrades to the renamed chart, kube-prometheus-stack. * Update prometheus test with new pod names * Update prometheus URL in prometheusadapter config Co-authored-by: Branden Rolston <[email protected]>
d2iq-archive · May 15, 2021 · 75142a9 · 75142a9
1 parent 6b6b4b7
commit 75142a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/addons/prometheus/prometheus.yaml b/addons/prometheus/prometheus.yaml
@@ -9,11 +9,11 @@ metadata:
     # on the cluster, this hack will trigger re-queue on Addons until one exists.
     kubeaddons.mesosphere.io/hack-requires-defaultstorageclass: "true"
   annotations:
-    catalog.kubeaddons.mesosphere.io/addon-revision: "0.44.0-9"
-    appversion.kubeaddons.mesosphere.io/prometheus-operator: "0.44.0"
-    appversion.kubeaddons.mesosphere.io/prometheus: "2.22.1"
+    catalog.kubeaddons.mesosphere.io/addon-revision: "0.47.0-1"
+    appversion.kubeaddons.mesosphere.io/prometheus-operator: "0.47.0"
+    appversion.kubeaddons.mesosphere.io/prometheus: "2.26.0"
     appversion.kubeaddons.mesosphere.io/alertmanager: "0.21.0"
-    appversion.kubeaddons.mesosphere.io/grafana: "6.1.17"
+    appversion.kubeaddons.mesosphere.io/grafana: "7.5.3"
     endpoint.kubeaddons.mesosphere.io/prometheus: "/ops/portal/prometheus"
     endpoint.kubeaddons.mesosphere.io/alertmanager: "/ops/portal/alertmanager"
     endpoint.kubeaddons.mesosphere.io/grafana: "/ops/portal/grafana"
@@ -43,9 +43,9 @@ spec:
     - name: none
       enabled: true
   chartReference:
-    chart: prometheus-operator
+    chart: kube-prometheus-stack
     repo: https://mesosphere.github.io/charts/staging
-    version: 12.11.10
+    version: 15.4.5
     valuesRemap:
       "prometheus.ingress.annotations.traefik\\.ingress\\.kubernetes\\.io/auth-url": "ingress.auth.auth-url"
       "alertmanager.ingress.annotations.traefik\\.ingress\\.kubernetes\\.io/auth-url": "ingress.auth.auth-url"
@@ -70,6 +70,7 @@ spec:
             traefik.ingress.kubernetes.io/priority: "2"
           paths:
             - /ops/portal/prometheus
+          pathType: ImplementationSpecific
         service:
           additionalPorts:
             # Service port for Thanos gRPC.
@@ -367,6 +368,7 @@ spec:
             traefik.ingress.kubernetes.io/priority: "2"
           paths:
             - /ops/portal/alertmanager
+          pathType: ImplementationSpecific
         alertmanagerSpec:
           resources:
             limits:
@@ -388,6 +390,7 @@ spec:
             traefik.ingress.kubernetes.io/priority: "2"
           hosts: [""]
           path: /ops/portal/grafana
+          pathType: ImplementationSpecific
         sidecar:
           dashboards:
             searchNamespace: ALL
@@ -396,6 +399,7 @@ spec:
             protocol: http
             enable_gzip: true
             root_url: "%(protocol)s://%(domain)s:%(http_port)s/ops/portal/grafana"
+            serve_from_sub_path: true
           auth.proxy:
             enabled: true
             header_name: X-Forwarded-User

diff --git a/addons/prometheusadapter/prometheusadapter.yaml b/addons/prometheusadapter/prometheusadapter.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     kubeaddons.mesosphere.io/name: prometheusadapter
   annotations:
-    catalog.kubeaddons.mesosphere.io/addon-revision: "v0.8.3-2"
+    catalog.kubeaddons.mesosphere.io/addon-revision: "v0.8.3-3"
     appversion.kubeaddons.mesosphere.io/prometheusadapter: "v0.8.3"
     values.chart.helm.kubeaddons.mesosphere.io/prometheusadapter: "https://raw.githubusercontent.com/prometheus-community/helm-charts/61fb05e4f4ba9b6e4255a07338715414a3f493a0/charts/prometheus-adapter/values.yaml"
 spec:
@@ -35,7 +35,7 @@ spec:
     values: |
       ---
       prometheus:
-        url: http://prometheus-kubeaddons-prom-prometheus
+        url: http://prometheus-kubeaddons-kube-prometheus
       resources:
         limits:
            cpu: 2000m

diff --git a/test/prometheus_test.go b/test/prometheus_test.go
@@ -13,10 +13,10 @@ import (
 )
 
 const (
-	promPodPrefix = "prometheus-prometheus-kubeaddons-prom-prometheus-"
+	promPodPrefix = "prometheus-prometheus-kubeaddons-kube-prometheus-"
 	promPort      = "9090"
 
-	alertmanagerPodPrefix = "alertmanager-prometheus-kubeaddons-prom-alertmanager-"
+	alertmanagerPodPrefix = "alertmanager-prometheus-kubeaddons-kube-alertmanager-"
 	alertmanagerPort      = "9093"
 
 	grafanaPodPrefix = "prometheus-kubeaddons-grafana"