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 ec444c5fca02ebc04ad26df584560e278b540d64..d165d45259d1eeda803ad9b8bc976e3385accdce 100644 (file)
--- 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