feat: add TLS support for communication from the Ruler-->AM #3752
Conversation
This file contains hidden or 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
jtlisi
force-pushed
the
20210127_ruler_am_TLS
branch
from
bf30ece to
b7b29fb
Compare
jtlisi
force-pushed
the
20210127_ruler_am_TLS
branch
from
2aa0016 to
eea9780
Compare
jtlisi
force-pushed
the
20210127_ruler_am_TLS
branch
from
e77a0e1 to
c5d9203
Compare
3 tasks
jtlisi
force-pushed
the
20210127_ruler_am_TLS
branch
from
c5d9203 to
b310997
Compare
pracucci
reviewed
Jan 29, 2021
| @@ -350,6 +350,26 @@ func NewAlertmanager(name string, flags map[string]string, image string) *Cortex | |||
| ) | |||
| } | |||
|
|
|||
| func NewAlertmanagerWithTLS(name string, flags map[string]string, image string) *CortexService { | |||
There was a problem hiding this comment.
To my understanding the only difference between this and NewAlertmanager is the readiness probe. What's the problem making the readiness probe working with HTTPS too?
There was a problem hiding this comment.
The only reason I didn't do this was because it required a change to the function parameters in the e2e package that were rather far reaching. Would it be acceptable to do this in a separate PR?
There was a problem hiding this comment.
Sure. I haven't checked the complexity and it's not a big deal.
jtlisi
force-pushed
the
20210127_ruler_am_TLS
branch
from
b0f0d50 to
3db66b5
Compare
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com> add simple integration test generate documentation update changelog Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
…ext, update changelog Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
jtlisi
force-pushed
the
20210127_ruler_am_TLS
branch
from
9a2e685 to
1d07701
Compare
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
pstibrany
approved these changes
Feb 2, 2021
pkg/ruler/ruler.go
Outdated
| @@ -86,6 +86,8 @@ type Config struct { | |||
| NotificationQueueCapacity int `yaml:"notification_queue_capacity"` | |||
| // HTTP timeout duration when sending notifications to the Alertmanager. | |||
| NotificationTimeout time.Duration `yaml:"notification_timeout"` | |||
| // Client configs for interacting with the Alertmanager | |||
| NotifierConfig `yaml:"alertmanager_client"` | |||
There was a problem hiding this comment.
Why is this embedded field instead of named field? Nothing else in this struct is using embedding.
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
pracucci
approved these changes
Feb 2, 2021
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.
What this PR does:
Which issue(s) this PR fixes:
Fixes #3751
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]