Fixing pm_stack installer to remove Prometheus and Kafka Exporter

[osm/devops.git] / installers / osm_health.sh

diff --git a/installers/osm_health.sh b/installers/osm_health.sh
index 3a7eaf9..4625dc8 100755 (executable)
--- a/installers/osm_health.sh
+++ b/installers/osm_health.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
-WAIT_TIME=30
+WAIT_TIME=60
 NUM_SERVICES_WITH_HEALTH=3
+SERVICES_WITH_HEALTH="nbi ro kafka"
 
-while getopts "w:s:n:" o; do
+while getopts "w:s:n:c:" o; do
     case "${o}" in
         w)
             WAIT_TIME=${OPTARG}
@@ -14,6 +15,9 @@ while getopts "w:s:n:" o; do
         n)
             NUM_SERVICES_WITH_HEALTH=${OPTARG}
             ;;
+        c)
+            SERVICES_WITH_HEALTH="${OPTARG}"
+            ;;
     esac
 done
 
@@ -32,4 +36,14 @@ done
 echo "Not all Docker services are healthy"
 docker ps | grep " ${STACK_NAME}_"
 
+for S_WITH_HEALTH in $SERVICES_WITH_HEALTH ; do
+    docker ps | grep " ${STACK_NAME}_" | grep -i healthy | grep -q "_${S_WITH_HEALTH}."  && continue
+    echo
+    echo BEGIN LOGS of container ${S_WITH_HEALTH} not healthy
+    docker service logs ${STACK_NAME}_${S_WITH_HEALTH} 2>&1 | tail -n 100
+    echo END LOGS of container ${S_WITH_HEALTH} not healthy
+    echo
+done
+
 exit 1
+