From 132eb8b798fe057afbffa784c17fb6dd8767c3aa Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Wed, 16 Jan 2019 13:36:23 -0700 Subject: [PATCH] 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 --- src/pybind/mgr/dashboard/controllers/grafana.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- 2.47.3