From: Alfonso Martínez <almartin@redhat.com>
Date: Tue, 3 Mar 2020 15:32:28 +0000 (+0100)
Subject: vstart.sh: set prometheus port for each mgr.
X-Git-Tag: v15.1.1~121^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b591cfba5c18f6bcd31fc33ba71fcbf4d169e76e;p=ceph.git

vstart.sh: set prometheus port for each mgr.

Fixes: https://tracker.ceph.com/issues/44417

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 926b8a162211..2327e923a56b 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -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