From 749e2be9f5245ff0ad634a593820c353061b6544 Mon Sep 17 00:00:00 2001
From: Evgeny L <eli@mirantis.com>
Date: Fri, 1 Nov 2019 15:46:15 +0000
Subject: [PATCH] Add liveness and readiness probes for RabbitMQ exporter

Allow to configure liveness and readiness probes for
RabbitMQ exporter.

Change-Id: I80748276d20f688659c4ea2752c1941f9cfcaac4
---
 .../prometheus/exporter-deployment.yaml           |  9 +++++++++
 rabbitmq/values.yaml                              | 15 +++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
index e32a2f0f1..1665ab4f8 100644
--- a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
+++ b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
@@ -14,6 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
+{{- define "exporterProbeTemplate" }}
+httpGet:
+  scheme: HTTP
+  path: /metrics
+  port: {{ tuple "prometheus_rabbitmq_exporter" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+{{- end }}
+
 {{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }}
 {{- $envAll := . }}
 
@@ -50,6 +57,8 @@ spec:
 {{ tuple $envAll "prometheus_rabbitmq_exporter" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.prometheus_rabbitmq_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
 {{ dict "envAll" $envAll "application" "exporter" "container" "rabbitmq_exporter" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+{{ dict "envAll" $envAll "component" "prometheus_rabbitmq_exporter" "container" "rabbitmq_exporter" "type" "readiness" "probeTemplate" (include "exporterProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
+{{ dict "envAll" $envAll "component" "prometheus_rabbitmq_exporter" "container" "rabbitmq_exporter" "type" "liveness" "probeTemplate" (include "exporterProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
           ports:
             - name: metrics
               containerPort: {{ tuple "prometheus_rabbitmq_exporter" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index 22cff02d4..93a08d7c0 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -48,6 +48,21 @@ images:
       - image_repo_sync
 
 pod:
+  probes:
+    prometheus_rabbitmq_exporter:
+      rabbitmq_exporter:
+        readiness:
+          enabled: true
+          params:
+            initialDelaySeconds: 30
+            periodSeconds: 30
+            timeoutSeconds: 20
+        liveness:
+          enabled: true
+          params:
+            initialDelaySeconds: 120
+            periodSeconds: 90
+            timeoutSeconds: 70
   security_context:
     exporter:
       pod: