From: Zack Cerza <zack@redhat.com>
Date: Wed, 16 Jan 2019 20:36:23 +0000 (-0700)
Subject: mgr/dashboard: Fix /api/grafana/validation
X-Git-Tag: v14.1.0~363^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=132eb8b798fe057afbffa784c17fb6dd8767c3aa;p=ceph.git

mgr/dashboard: Fix /api/grafana/validation

If the Grafana URL contains a trailing slash, this endpoint ends up
returning a 404, disabling the integration entirely. Fix that.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/controllers/grafana.py b/src/pybind/mgr/dashboard/controllers/grafana.py
index ec444c5fca02..d165d45259d1 100644
--- a/src/pybind/mgr/dashboard/controllers/grafana.py
+++ b/src/pybind/mgr/dashboard/controllers/grafana.py
@@ -32,6 +32,7 @@ class Grafana(BaseController):
     def validation(self, params):
         grafana = GrafanaRestClient()
         method = 'GET'
-        url = Settings.GRAFANA_API_URL + '/api/dashboards/uid/' + params
+        url = Settings.GRAFANA_API_URL.rstrip('/') + \
+            '/api/dashboards/uid/' + params
         response = grafana.url_validation(method, url)
         return response