From b00bb9092645f77558e5b8c132689730cdce4f2f Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 13 Oct 2022 21:33:40 +0200 Subject: [PATCH] Propagate all headers on main QueryData (#56896) (#56901) (cherry picked from commit 145b9705571d7e85f7b2bce04dd731604fb7c04c) Co-authored-by: Alexander Weaver --- pkg/tsdb/loki/loki.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pkg/tsdb/loki/loki.go b/pkg/tsdb/loki/loki.go index fb69e6cc11b..624cc88a796 100644 --- a/pkg/tsdb/loki/loki.go +++ b/pkg/tsdb/loki/loki.go @@ -173,24 +173,10 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) return queryData(ctx, req, dsInfo, s.plog, s.tracer) } -func getAuthHeadersForQueryData(headers map[string]string) map[string]string { - data := make(map[string]string) - - if auth := headers["Authorization"]; auth != "" { - data["Authorization"] = auth - } - - if cookie := headers["Cookie"]; cookie != "" { - data["Cookie"] = cookie - } - - return data -} - func queryData(ctx context.Context, req *backend.QueryDataRequest, dsInfo *datasourceInfo, plog log.Logger, tracer tracing.Tracer) (*backend.QueryDataResponse, error) { result := backend.NewQueryDataResponse() - api := newLokiAPI(dsInfo.HTTPClient, dsInfo.URL, plog, getAuthHeadersForQueryData(req.Headers)) + api := newLokiAPI(dsInfo.HTTPClient, dsInfo.URL, plog, req.Headers) queries, err := parseQuery(req) if err != nil {