RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-17 19:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check error type before unpacking awserr.requestFailure

Browse Source 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
This commit is contained in:
Tyler Reid 2021-06-15 09:09:01 -05:00
parent 6519c399b1
commit af8406a920
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
notify/sns/sns.go
View File

@ -60,10 +60,10 @@ func New(c *config.SNSConfig, t *template.Template, l log.Logger, httpOpts ...co
} }
func (n Notifier) Notify(ctx context.Context, alert ...*types.Alert) (bool, error) { func (n Notifier) Notify(ctx context.Context, alert ...*types.Alert) (bool, error) {
var( var (
err error err error
data = notify.GetTemplateData(ctx, n.tmpl, alert, n.logger) data = notify.GetTemplateData(ctx, n.tmpl, alert, n.logger)
tmpl = notify.TmplText(n.tmpl, data, &err) tmpl = notify.TmplText(n.tmpl, data, &err)
creds *credentials.Credentials = nil creds *credentials.Credentials = nil
) )
if n.conf.Sigv4.AccessKey != "" && n.conf.Sigv4.SecretKey != "" { if n.conf.Sigv4.AccessKey != "" && n.conf.Sigv4.SecretKey != "" {
@ -148,7 +148,11 @@ func (n Notifier) Notify(ctx context.Context, alert ...*types.Alert) (bool, erro
publishOutput, err := client.Publish(publishInput) publishOutput, err := client.Publish(publishInput)
if err != nil { if err != nil {
return n.retrier.Check(err.(awserr.RequestFailure).StatusCode(), strings.NewReader(err.(awserr.RequestFailure).Message())) if e, ok := err.(awserr.RequestFailure); ok {
return n.retrier.Check(e.StatusCode(), strings.NewReader(e.Message()))
} else {
return true, err
}
} }
err = n.logger.Log(publishOutput.String()) err = n.logger.Log(publishOutput.String())