From 72afe093aa0b45ecf5f7600bdb0b768967afda0d Mon Sep 17 00:00:00 2001
From: Cliff Parsons <cliff.parsons@att.com>
Date: Wed, 18 Mar 2020 16:54:36 +0000
Subject: [PATCH] Adjust RabbitMQ Exporter Probes

The currently defined RabbitMQ Exporter probes make a call to the
"/metrics" path of the exporter service, which downloads a huge file and
takes a very long time to download. An http probe should be based on a very
simple and short url response from the service. So this changes the
probes to just call the base path "/" of the url and set the timeout to
something reasonable like 5 seconds.

Change-Id: Ie106490b2fb8d61660663f39a992bf4dc1a61222
---
 .../templates/monitoring/prometheus/exporter-deployment.yaml  | 2 +-
 rabbitmq/values.yaml                                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
index f11655eab..ac3b7e9e8 100644
--- a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
+++ b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- define "exporterProbeTemplate" }}
 httpGet:
   scheme: HTTP
-  path: /metrics
+  path: /
   port: {{ tuple "prometheus_rabbitmq_exporter" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index 93a08d7c0..dd4830d10 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -56,13 +56,13 @@ pod:
           params:
             initialDelaySeconds: 30
             periodSeconds: 30
-            timeoutSeconds: 20
+            timeoutSeconds: 5
         liveness:
           enabled: true
           params:
             initialDelaySeconds: 120
             periodSeconds: 90
-            timeoutSeconds: 70
+            timeoutSeconds: 5
   security_context:
     exporter:
       pod: