]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: stripping out / from the end of the url 46306/head
authorRedouane Kachach <rkachach@redhat.com>
Tue, 17 May 2022 15:26:39 +0000 (17:26 +0200)
committerRedouane Kachach <rkachach@redhat.com>
Tue, 17 May 2022 15:27:06 +0000 (17:27 +0200)
Fixes: https://tracker.ceph.com/issues/55638
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
src/pybind/mgr/cephadm/services/monitoring.py

index 6bde0cc3e8c18773d4fa665707c4f1bbc40d9d4c..0bd388f461fc2b174adbc9aeb766a37ec41718d4 100644 (file)
@@ -148,7 +148,7 @@ class AlertmanagerService(CephadmService):
         proto = None  # http: or https:
         url = mgr_map.get('services', {}).get('dashboard', None)
         if url:
-            dashboard_urls.append(url)
+            dashboard_urls.append(url.rstrip('/'))
             p_result = urlparse(url)
             proto = p_result.scheme
             port = p_result.port
@@ -164,7 +164,7 @@ class AlertmanagerService(CephadmService):
                 continue
             assert dd.hostname is not None
             addr = self._inventory_get_fqdn(dd.hostname)
-            dashboard_urls.append(build_url(scheme=proto, host=addr, port=port))
+            dashboard_urls.append(build_url(scheme=proto, host=addr, port=port).rstrip('/'))
 
         for dd in self.mgr.cache.get_daemons_by_service('snmp-gateway'):
             assert dd.hostname is not None