From 7c707c3899b265db1666968f674f323b434082bd Mon Sep 17 00:00:00 2001 From: Gireesh Naidu Date: Thu, 14 Dec 2023 14:06:42 +0530 Subject: [PATCH 1/2] bad url fix --- client/grafana/GrafanaClient.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/grafana/GrafanaClient.go b/client/grafana/GrafanaClient.go index 1ef9cabc720..4c74a4dd0b8 100644 --- a/client/grafana/GrafanaClient.go +++ b/client/grafana/GrafanaClient.go @@ -364,7 +364,7 @@ func (impl *GrafanaClientImpl) CreateDatasource(createDatasourceRequest CreateDa return nil, err } if hostUrl != nil { - impl.config.DestinationURL = strings.ReplaceAll(hostUrl.Value, "//", "//%s:%s") + impl.config.DestinationURL = strings.ReplaceAll(hostUrl.Value, "//", "//%s:%s@") } } @@ -377,11 +377,12 @@ func (impl *GrafanaClientImpl) CreateDatasource(createDatasourceRequest CreateDa url := impl.config.DestinationURL + AddPromDatasource url = fmt.Sprintf(url, impl.config.GrafanaUsername, impl.config.GrafanaPassword) req, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(reqBody)) - req.Header.Set("X-Grafana-Org-Id", strconv.Itoa(impl.config.GrafanaOrgId)) if err != nil { - impl.logger.Errorw("error while adding datasource", "err", err) + // do not log url or req body as they contains sensitive data + impl.logger.Errorw("error while creating http request", "destinationURL", impl.config.DestinationURL, "err", err) return nil, err } + req.Header.Set("X-Grafana-Org-Id", strconv.Itoa(impl.config.GrafanaOrgId)) req.Header.Set("Content-Type", "application/json") resp, err := impl.client.Do(req) if err != nil { From 1dac247db158bcaf655dc33cfc53aeda786b1d62 Mon Sep 17 00:00:00 2001 From: Gireesh Naidu Date: Thu, 14 Dec 2023 14:46:00 +0530 Subject: [PATCH 2/2] bad url fix --- client/grafana/GrafanaClient.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/grafana/GrafanaClient.go b/client/grafana/GrafanaClient.go index 4c74a4dd0b8..652aa1cfaa4 100644 --- a/client/grafana/GrafanaClient.go +++ b/client/grafana/GrafanaClient.go @@ -45,6 +45,7 @@ const AddPromDatasource = "/api/datasources" const DeletePromDatasource = "/api/datasources/%d" const UpdatePromDatasource = "/api/datasources/%d" const GetPromDatasource = "/api/datasources/%d" +const GrafanaPath = "/grafana" func GetGrafanaClientConfig() (*GrafanaClientConfig, error) { cfg := &GrafanaClientConfig{} @@ -365,6 +366,7 @@ func (impl *GrafanaClientImpl) CreateDatasource(createDatasourceRequest CreateDa } if hostUrl != nil { impl.config.DestinationURL = strings.ReplaceAll(hostUrl.Value, "//", "//%s:%s@") + impl.config.DestinationURL += GrafanaPath } }