From: Michael Fritch <mfritch@suse.com>
Date: Mon, 27 Apr 2020 21:11:49 +0000 (-0600)
Subject: qa/workunits/cephadm/test_cephadm.sh: wait longer for monitoring stack
X-Git-Tag: v16.1.0~2436^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c60ec03e47a596f9732f79e7c008f707f822cf4c;p=ceph.git

qa/workunits/cephadm/test_cephadm.sh: wait longer for monitoring stack

Give the monitoring stack (node-exporter, prom, grafana) a few more
retries to become available before giving up

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index cf9e2cb17ca8..dd6a77f3ca8b 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -334,21 +334,21 @@ done
 ${CEPHADM//--image $IMAGE_MASTER/} deploy \
     --name node-exporter.a --fsid $FSID
 cond="curl 'http://localhost:9100' | grep -q 'Node Exporter'"
-is_available "node-exporter" "$cond" 5
+is_available "node-exporter" "$cond" 10
 
 # add prometheus
 cat ${CEPHADM_SAMPLES_DIR}/prometheus.json | \
         ${CEPHADM//--image $IMAGE_MASTER/} deploy \
 	    --name prometheus.a --fsid $FSID --config-json -
 cond="curl 'localhost:9095/api/v1/query?query=up'"
-is_available "prometheus" "$cond" 5
+is_available "prometheus" "$cond" 10
 
 # add grafana
 cat ${CEPHADM_SAMPLES_DIR}/grafana.json | \
         ${CEPHADM//--image $IMAGE_MASTER/} deploy \
             --name grafana.a --fsid $FSID --config-json -
 cond="curl --insecure 'https://localhost:3000' | grep -q 'grafana'"
-is_available "grafana" "$cond" 30
+is_available "grafana" "$cond" 50
 
 # add nfs-ganesha
 nfs_stop