]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart.sh: set prometheus port for each mgr. 33738/head
authorAlfonso Martínez <almartin@redhat.com>
Tue, 3 Mar 2020 15:32:28 +0000 (16:32 +0100)
committerAlfonso Martínez <almartin@redhat.com>
Thu, 5 Mar 2020 08:36:02 +0000 (09:36 +0100)
Fixes: https://tracker.ceph.com/issues/44417
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit b591cfba5c18f6bcd31fc33ba71fcbf4d169e76e)

src/vstart.sh

index 37aa28b7375329c29e530b98df05e6c3ad61f11b..2df8b3b73d8a3edda20f03eb0fbb1ea068d15645 100755 (executable)
@@ -775,6 +775,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
@@ -806,6 +807,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