From be2584fd7c06a194b7fc0876d36e2062c41b38a0 Mon Sep 17 00:00:00 2001
From: "DeJaeger, Darren (dd118r)" <dd118r@att.com>
Date: Fri, 9 Apr 2021 11:38:50 -0400
Subject: [PATCH] Adjust Prometheus http readiness probe path from /status to
 /-/ready

Prometheus documentation shows that /-/ready can be used to check that
it is ready to service traffic (i.e. respond to queries) [0]. I've
witnessed cases where Prometheus's readiness probe is passing during
initial deployment using /status, which in turn triggers its helm test
to start. Said helm test then fails because /status is not a good a
reliable indicator that Prometheus is actually ready to serve traffic
and the helm test is performing actions that require it to be proprely
up and ready.

[0]: https://prometheus.io/docs/prometheus/latest/management_api/

Change-Id: Iab22d0c986d680663fbe8e84d6c0d89b03dc6428
---
 prometheus/Chart.yaml                 | 2 +-
 prometheus/templates/statefulset.yaml | 2 +-
 releasenotes/notes/prometheus.yaml    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/prometheus/Chart.yaml b/prometheus/Chart.yaml
index 7814af1d7..9651a63fa 100644
--- a/prometheus/Chart.yaml
+++ b/prometheus/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v2.25.0
 description: OpenStack-Helm Prometheus
 name: prometheus
-version: 0.1.7
+version: 0.1.8
 home: https://prometheus.io/
 sources:
   - https://github.com/prometheus/prometheus
diff --git a/prometheus/templates/statefulset.yaml b/prometheus/templates/statefulset.yaml
index 4ba7f382f..d624dd457 100644
--- a/prometheus/templates/statefulset.yaml
+++ b/prometheus/templates/statefulset.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 {{- $probePass := .Values.endpoints.monitoring.auth.admin.password }}
 {{- $authHeader := printf "%s:%s" $probeUser $probePass | b64enc }}
 httpGet:
-  path: /status
+  path: /-/ready
   scheme: {{ tuple "monitoring" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
   port: {{ $probePort }}
   httpHeaders:
diff --git a/releasenotes/notes/prometheus.yaml b/releasenotes/notes/prometheus.yaml
index a4644860b..8d6f4ab17 100644
--- a/releasenotes/notes/prometheus.yaml
+++ b/releasenotes/notes/prometheus.yaml
@@ -8,4 +8,5 @@ prometheus:
   - 0.1.5 Fix spacing inconsistencies with flags
   - 0.1.6 Upgrade version to v2.25 fix/remove deprecated flags
   - 0.1.7 Enable TLS for Prometheus
+  - 0.1.8 Change readiness probe from /status to /-/ready
 ...