Skip to content

feat: Add TLS config to the analytics client #15227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 10, 2024
Merged

feat: Add TLS config to the analytics client #15227

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1693c4b
add new TLS config
DylanGuedes Dec 3, 2024
194468d
Only execute block when encessary
DylanGuedes Dec 3, 2024
b612933
Update docs
DylanGuedes Dec 3, 2024
46f5b8a
remove proxy_url
DylanGuedes Dec 3, 2024
f7bbe8c
Add unitary test
DylanGuedes Dec 9, 2024
e045b8a
Update docs
DylanGuedes Dec 9, 2024
3aeaaba
Merge branch 'main' into add-tls-config-to-analytics
DylanGuedes Dec 9, 2024
1ec4cde
Improve test
DylanGuedes Dec 9, 2024
74a542c
Merge branch 'add-tls-config-to-analytics' of github.com:grafana/loki…
DylanGuedes Dec 9, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Only execute block when encessary
  • Loading branch information
@DylanGuedes
DylanGuedes committed Dec 3, 2024
commit 194468d29a1e89919d0cef5f1718d9b04807014c
10 changes: 6 additions & 4 deletions pkg/analytics/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,12 @@ func NewReporter(config Config, kvConfig kv.Config, objectClient client.ObjectCl

originalDefaultTransport := http.DefaultTransport.(*http.Transport)
tr := originalDefaultTransport.Clone()
var err error
tr.TLSClientConfig, err = config.TLSConfig.GetTLSConfig()
if err != nil {
return nil, err
if config.TLSConfig.CertPath != "" || config.TLSConfig.KeyPath != "" {
var err error
tr.TLSClientConfig, err = config.TLSConfig.GetTLSConfig()
if err != nil {
return nil, err
}
}
r := &Reporter{
logger: logger,
Expand Down
Loading