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

WIP (#33025)

Browse Source
This commit is contained in:
Ivana Huckova 2021-04-15 15:06:26 +02:00 committed by GitHub
parent 6bbb2fd4ba
commit 4f7728738e
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

@ -16,6 +16,7 @@ import (
"github.com/grafana/loki/pkg/loghttp" "github.com/grafana/loki/pkg/loghttp"
"github.com/grafana/loki/pkg/logproto" "github.com/grafana/loki/pkg/logproto"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
"github.com/prometheus/common/config"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
) )
@ -45,10 +46,18 @@ func (e *LokiExecutor) DataQuery(ctx context.Context, dsInfo *models.DataSource,
Results: map[string]plugins.DataQueryResult{}, Results: map[string]plugins.DataQueryResult{},
} }
tlsConfig, err := dsInfo.GetTLSConfig()
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,
Password: dsInfo.DecryptedBasicAuthPassword(), Password: dsInfo.DecryptedBasicAuthPassword(),
TLSConfig: config.TLSConfig{
InsecureSkipVerify: tlsConfig.InsecureSkipVerify,
},
} }
queries, err := e.parseQuery(dsInfo, queryContext) queries, err := e.parseQuery(dsInfo, queryContext)