Loki: Use data source settings for alerting queries (#33942)
* Add Tripperware * Return TLSConfig * Create transport outside of client
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user