]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/cephadm/test_cephadm.sh: wait longer for monitoring stack 34893/head
authorMichael Fritch <mfritch@suse.com>
Mon, 27 Apr 2020 21:11:49 +0000 (15:11 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Mon, 4 May 2020 16:04:43 +0000 (18:04 +0200)
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>
(cherry picked from commit c60ec03e47a596f9732f79e7c008f707f822cf4c)

qa/workunits/cephadm/test_cephadm.sh

index 42f195568dc76bcded498e123d6538ab0f66942f..146e1ebfb27f54adc8e1880ea3ef88c182385dcd 100755 (executable)
@@ -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