]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart.sh: set prometheus port for each mgr. 33698/head
authorAlfonso Martínez <almartin@redhat.com>
Tue, 3 Mar 2020 15:32:28 +0000 (16:32 +0100)
committerAlfonso Martínez <almartin@redhat.com>
Wed, 4 Mar 2020 13:04:11 +0000 (14:04 +0100)
Fixes: https://tracker.ceph.com/issues/44417
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
src/vstart.sh

index 926b8a162211756480d05ccf0d735be542585eaa..2327e923a56b8bd08d54af6a8b0a0553acbd8b11 100755 (executable)
@@ -911,6 +911,7 @@ start_mgr() {
     local ssl=${DASHBOARD_SSL:-1}
     # avoid monitors on nearby ports (which test/*.sh use extensively)
     MGR_PORT=$(($CEPH_PORT + 1000))
+    PROMETHEUS_PORT=9283
     for name in x y z a b c d e f g h i j k l m n o p
     do
         [ $mgr -eq $CEPH_NUM_MGR ] && break
@@ -942,6 +943,8 @@ EOF
                 fi
             fi
            MGR_PORT=$(($MGR_PORT + 1000))
+           ceph_adm config set mgr mgr/prometheus/$name/server_port $PROMETHEUS_PORT --force
+           PROMETHEUS_PORT=$(($PROMETHEUS_PORT + 1000))
 
            ceph_adm config set mgr mgr/restful/$name/server_port $MGR_PORT --force
             if [ $mgr -eq 1 ]; then