From 6c532c3f1e078751da73458da2e8d46eeaf475b5 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 12 May 2021 11:20:16 +0200
Subject: [PATCH] Loki: Use data source settings for alerting queries (#33942)

* Add Tripperware

* Return TLSConfig

* Create transport outside of client
---
 pkg/tsdb/loki/loki.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkg/tsdb/loki/loki.go b/pkg/tsdb/loki/loki.go
index 6e9cefd8641..946380f028d 100644
--- a/pkg/tsdb/loki/loki.go
+++ b/pkg/tsdb/loki/loki.go
@@ -3,6 +3,7 @@ package loki
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"regexp"
 	"strings"
 	"time"
@@ -53,6 +54,11 @@ func (e *LokiExecutor) DataQuery(ctx context.Context, dsInfo *models.DataSource,
 		return plugins.DataResponse{}, err
 	}
 
+	transport, err := dsInfo.GetHttpTransport()
+	if err != nil {
+		return plugins.DataResponse{}, err
+	}
+
 	client := &client.DefaultClient{
 		Address:  dsInfo.Url,
 		Username: dsInfo.BasicAuthUser,
@@ -60,6 +66,9 @@ func (e *LokiExecutor) DataQuery(ctx context.Context, dsInfo *models.DataSource,
 		TLSConfig: config.TLSConfig{
 			InsecureSkipVerify: tlsConfig.InsecureSkipVerify,
 		},
+		Tripperware: func(t http.RoundTripper) http.RoundTripper {
+			return transport
+		},
 	}
 
 	queries, err := e.parseQuery(dsInfo, queryContext)