Support tls config for webhook receiver #9341
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Sep 20, 2024
titolins
changed the title
titolins
commented
Sep 20, 2024
titolins
force-pushed
the
titolins/support_tls_config_for_webhook_receiver
branch
5 times, most recently
from
7b521f1
to
21aa6ea
Compare
titolins
requested review from
grafanabot,
a team and
stevesg
as code owners
fayzal-g
reviewed
Sep 20, 2024
go.sum
Outdated
Comment on lines
1262
to
1263
| github.com/grafana/dskit v0.0.0-20240826073544-47b1b6311db3 h1:fc4ORkqFiLzuCRD2wGmMXsyDTOLkcl3QUqQwjtAlKcE= | ||
| github.com/grafana/dskit v0.0.0-20240826073544-47b1b6311db3/go.mod h1:wJbJeQ2ygiGuBKsur7BPPNe+3pSyHEDPtKa7IU3I8ZA= |
There was a problem hiding this comment.
Need to re-run go mod tidy
There was a problem hiding this comment.
should be good now 👍
pkg/alertmanager/sender.go
Outdated
Comment on lines
105
to
125
| func tlsClient(tlsConfig *tls.Config) *http.Client { | ||
| nc := func(tlsConfig *tls.Config) *http.Client { | ||
| return &http.Client{ | ||
| Timeout: time.Second * 30, | ||
| Transport: &http.Transport{ | ||
| TLSClientConfig: tlsConfig, | ||
| Proxy: http.ProxyFromEnvironment, | ||
| Dial: (&net.Dialer{ | ||
| Timeout: 30 * time.Second, | ||
| }).Dial, | ||
| TLSHandshakeTimeout: 5 * time.Second, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| if tlsConfig == nil { | ||
| return nc(&tls.Config{Renegotiation: tls.RenegotiateFreelyAsClient}) | ||
| } | ||
|
|
||
| return nc(tlsConfig) | ||
| } |
There was a problem hiding this comment.
This code is identical across grafana and mimir - can we extract it out into grafana/alerting?
There was a problem hiding this comment.
Good point - done now 👍
titolins
force-pushed
the
titolins/support_tls_config_for_webhook_receiver
branch
from
21aa6ea
to
7aaec9b
Compare
titolins
force-pushed
the
titolins/support_tls_config_for_webhook_receiver
branch
from
a5e125a
to
3ef6519
Compare
titolins
force-pushed
the
titolins/support_tls_config_for_webhook_receiver
branch
from
3ef6519
to
98b2a8f
Compare
fayzal-g
approved these changes
Oct 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add TLS configuration support for webhook receivers
Related PR's