Skip to content

*: support authentication and TLS for Alertmanager #1838

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
bwplotka merged 10 commits into from
Dec 18, 2019
Merged

*: support authentication and TLS for Alertmanager #1838

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5eca357
*: support authentication and TLS for Alertmanager
simonpasquier Dec 2, 2019
5673d74
Fail hard when --alertmanagers.url and --alertmanagers.config flags a…
simonpasquier Dec 9, 2019
a245cc2
Update CHANGELOG.md
simonpasquier Dec 9, 2019
282681e
Move tests from cmd/thanos to pkg/alert
simonpasquier Dec 9, 2019
16f1858
Add end-to-end for Alertmanager file SD
simonpasquier Dec 10, 2019
351841d
test/e2e: add test with different alerting HTTP clients
simonpasquier Dec 11, 2019
075283c
Fix panic in pkg/alert/client_test.go
simonpasquier Dec 11, 2019
65f00de
Address Bartek's comments
simonpasquier Dec 16, 2019
07f711b
Re-use dns.Provider for resolving Alertmanager addresses
simonpasquier Dec 17, 2019
f467acf
update documentation
simonpasquier Dec 17, 2019
File filter

Filter by extension

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
Fix panic in pkg/alert/client_test.go 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
  • Loading branch information
@simonpasquier
simonpasquier committed Dec 17, 2019
commit 075283cea73ca550044d754c6b167b041ea02fc5
4 changes: 4 additions & 0 deletions pkg/alert/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ type Alertmanager struct {

// NewAlertmanager returns a new Alertmanager client.
func NewAlertmanager(logger log.Logger, cfg AlertmanagerConfig) (*Alertmanager, error) {
if logger == nil {
logger = log.NewNopLogger()
}

httpClientConfig, err := cfg.HTTPClientConfig.convert()
if err != nil {
return nil, err
Expand Down