RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-03-31 15:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make API URL optional, clear up credential logic

Browse Source 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
This commit is contained in:
Tyler Reid 2021-06-21 12:29:03 -05:00
parent 4ebcaf9c23
commit 8911051770
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/notifiers.go
View File

@ -606,7 +606,7 @@ type SNSConfig struct {
HTTPConfig *commoncfg.HTTPClientConfig `yaml:"http_config,omitempty" json:"http_config,omitempty"` HTTPConfig *commoncfg.HTTPClientConfig `yaml:"http_config,omitempty" json:"http_config,omitempty"`
APIUrl string `yaml:"api_url" json:"api_url"` APIUrl string `yaml:"api_url,omitempty" json:"api_url,omitempty"`
Sigv4 SigV4Config `yaml:"sigv4" json:"sigv4"` Sigv4 SigV4Config `yaml:"sigv4" json:"sigv4"`
TopicARN string `yaml:"topic_arn,omitempty" json:"topic_arn,omitempty"` TopicARN string `yaml:"topic_arn,omitempty" json:"topic_arn,omitempty"`
PhoneNumber string `yaml:"phone_number,omitempty" json:"phone_number,omitempty"` PhoneNumber string `yaml:"phone_number,omitempty" json:"phone_number,omitempty"`

3
docs/configuration.md
View File

@ -698,7 +698,8 @@ value: <tmpl_string>
# Whether or not to notify about resolved alerts. # Whether or not to notify about resolved alerts.
[ send_resolved: <boolean> | default = false ] [ send_resolved: <boolean> | default = false ]
# The SNS API URL i.e. https://sns.us-east-2.amazonaws.com # The SNS API URL i.e. https://sns.us-east-2.amazonaws.com.
# If not specified, the SNS API URL from the SNS SDK will be used.
[api_url: <tmpl_string>] [api_url: <tmpl_string>]
# Configures AWS's Signature Verification 4 signing process to sign requests. # Configures AWS's Signature Verification 4 signing process to sign requests.

5
notify/sns/sns.go
View File

@ -79,16 +79,11 @@ func (n *Notifier) Notify(ctx context.Context, alert ...*types.Alert) (bool, err
sess, err := session.NewSessionWithOptions(session.Options{ sess, err := session.NewSessionWithOptions(session.Options{
Config: aws.Config{ Config: aws.Config{
Region: aws.String(n.conf.Sigv4.Region), Region: aws.String(n.conf.Sigv4.Region),
Credentials: creds,
Endpoint: aws.String(tmpl(n.conf.APIUrl)), Endpoint: aws.String(tmpl(n.conf.APIUrl)),
}, },
Profile: n.conf.Sigv4.Profile, Profile: n.conf.Sigv4.Profile,
}) })
if _, err := sess.Config.Credentials.Get(); err != nil {
return false, fmt.Errorf("could not get SigV4 credentials: %w", err)
}
if n.conf.Sigv4.RoleARN != "" { if n.conf.Sigv4.RoleARN != "" {
sess.Config.Credentials = stscreds.NewCredentials(sess, n.conf.Sigv4.RoleARN) sess.Config.Credentials = stscreds.NewCredentials(sess, n.conf.Sigv4.RoleARN)
} }