IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Loki: Use data source settings for alerting queries (#33942)

Browse Source 
* Add Tripperware

* Return TLSConfig

* Create transport outside of client
This commit is contained in:
Ivana Huckova 2021-05-12 11:20:16 +02:00 committed by GitHub
parent 8c03b80490
commit 6c532c3f1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/tsdb/loki/loki.go
View File

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