From f9bbe2fe412783638bb66e0a15db56473e7388a4 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 21 Apr 2021 14:17:02 +0100 Subject: [PATCH] [v7.5.x] Loki: Pass Skip TLS Verify setting to alert queries (#33031) * WIP (#33025) (cherry picked from commit 4f7728738e80d68934ef166f9f37d50acd71cf3e) * Update pkg/tsdb/loki/loki.go Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> --- 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 bfa84759fae..2713f9ad02d 100644 --- a/pkg/tsdb/loki/loki.go +++ b/pkg/tsdb/loki/loki.go @@ -15,6 +15,7 @@ import ( "github.com/grafana/loki/pkg/loghttp" "github.com/grafana/loki/pkg/logproto" "github.com/opentracing/opentracing-go" + "github.com/prometheus/common/config" "github.com/prometheus/common/model" ) @@ -42,10 +43,18 @@ func (e *LokiExecutor) Query(ctx context.Context, dsInfo *models.DataSource, tsd Results: map[string]*tsdb.QueryResult{}, } + tlsConfig, err := dsInfo.GetTLSConfig() + if err != nil { + return nil, err + } + client := &client.DefaultClient{ Address: dsInfo.Url, Username: dsInfo.BasicAuthUser, Password: dsInfo.DecryptedBasicAuthPassword(), + TLSConfig: config.TLSConfig{ + InsecureSkipVerify: tlsConfig.InsecureSkipVerify, + }, } queries, err := parseQuery(dsInfo, tsdbQuery.Queries, tsdbQuery)