monit_utils: Add support for more than 10 cc workers

- #267 identified a bug where the wait_unmonitor_job function assumed there would be less than 10 cloud controller workers - this fix removes the less than 10 worker assumption and looks for the job_name in the regex Authored-by: Kyle Ong <[email protected]>
cloudfoundry · Oct 18, 2022 · 52eb61d · 52eb61d
1 parent 282227c
commit 52eb61d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/capi_utils/monit_utils.sh b/src/capi_utils/monit_utils.sh
@@ -86,7 +86,7 @@ function wait_unmonitor_job() {
   local job_name="$1"
 
   while true; do
-    if [[ $(sudo /var/vcap/bosh/bin/monit summary | grep ${job_name} ) =~ not[[:space:]]monitored[[:space:]]*$ ]]; then
+    if [[ $(sudo /var/vcap/bosh/bin/monit summary | grep ${job_name} ) =~ .*${job_name}.*[[:space:]]not[[:space:]]monitored[[:space:]]; then
       echo "Unmonitored ${job_name}"
       return 0
     else