From c3b5acbe65b7439691dad5ed60c7e19c32ff1781 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Mon, 27 Apr 2020 15:11:49 -0600 Subject: [PATCH] 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 (cherry picked from commit c60ec03e47a596f9732f79e7c008f707f822cf4c) --- qa/workunits/cephadm/test_cephadm.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh index 42f195568dc..146e1ebfb27 100755 --- a/qa/workunits/cephadm/test_cephadm.sh +++ b/qa/workunits/cephadm/test_cephadm.sh @@ -330,21 +330,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 -- 2.47.3