Merge pull request #375 from SUSE/vladi/no-monit-summary

Don't use "monit summary" in container readiness probe
cloudfoundry-incubator · Jul 27, 2018 · d62c076 · d62c076
2 parents ec5724d + 02a7b97
commit d62c076
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/scripts/dockerfiles/readiness-probe.sh b/scripts/dockerfiles/readiness-probe.sh
@@ -16,12 +16,14 @@
 
 set -o errexit -o nounset
 
+# Grab monit port
+monit_port=$(awk '/httpd port/ { print $4 }' /etc/monitrc)
+
 # Check that monit thinks everything is ready
-/var/vcap/bosh/bin/monit summary | gawk '
-    BEGIN                                 { status = 0 }
-    $1 == "Process" && $3 != "running"    { print ; status = 1 }
-    $1 == "File"    && $3 != "accessible" { print ; status = 1 }
-    END                                   { exit status }
+curl -s -u admin:${MONIT_PASSWORD} http://127.0.0.1:${monit_port}/_status | gawk '
+    BEGIN                                                     { status = 0 }
+    $1 == "status" && $2 != "running" && $2 != "accessible"   { print ; status = 1 }
+    END                                                       { exit status }
     '
 
 # Check that any additional readiness checks are ready