From 36e31fc9fa28f482604fc449380c1c822c46dd15 Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Sat, 23 Mar 2019 17:54:16 -0700
Subject: [PATCH] Add liveness and readiness probes to Grafana

* https://github.com/grafana/grafana/issues/3302
---
 CHANGES.md                        |  1 +
 addons/grafana/deployment.yaml    | 10 ++++++++++
 addons/prometheus/deployment.yaml | 12 ++++++------
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 35cf369c..38fdecee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,6 +31,7 @@ Notable changes between versions.
 * Update Prometheus from v2.7.1 to [v2.8.0](https://github.com/prometheus/prometheus/releases/tag/v2.8.0)
   * Refresh rules based on upstreams ([#426](https://github.com/poseidon/typhoon/pull/426))
 * Update Grafana from v6.0.0 to v6.0.2
+  * Add liveness and readiness probes
   * Refresh dashboards and organize to stay below ConfigMap size limit ([#426](https://github.com/poseidon/typhoon/pull/426))
 * Remove heapster manifests from addons ([#427](https://github.com/poseidon/typhoon/pull/427))
   * Heapster addon powers `kubectl top` (in early Kubernetes, running the addon was expected). Today, there are better monitoring options.
diff --git a/addons/grafana/deployment.yaml b/addons/grafana/deployment.yaml
index 31dc662b..a72972b1 100644
--- a/addons/grafana/deployment.yaml
+++ b/addons/grafana/deployment.yaml
@@ -30,6 +30,16 @@ spec:
           ports:
             - name: http
               containerPort: 8080
+          livenessProbe:
+            httpGet:
+              path: /metrics
+              port: 8080
+            initialDelaySeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /api/health
+              port: 8080
+            initialDelaySeconds: 10
           resources:
             requests:
               cpu: 100m
diff --git a/addons/prometheus/deployment.yaml b/addons/prometheus/deployment.yaml
index 5088f235..ccb727bf 100644
--- a/addons/prometheus/deployment.yaml
+++ b/addons/prometheus/deployment.yaml
@@ -39,18 +39,18 @@ spec:
               mountPath: /etc/prometheus/rules
             - name: data
               mountPath: /var/lib/prometheus
-          readinessProbe:
-            httpGet:
-              path: /-/ready
-              port: 9090
-            initialDelaySeconds: 10
-            timeoutSeconds: 10
           livenessProbe:
             httpGet:
               path: /-/healthy
               port: 9090
             initialDelaySeconds: 10
             timeoutSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /-/ready
+              port: 9090
+            initialDelaySeconds: 10
+            timeoutSeconds: 10
       terminationGracePeriodSeconds: 30
       volumes:
         - name: config