RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code review fixes 

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
This commit is contained in:
Tyler Reid 2021-06-17 08:51:20 -05:00
parent d4ff90b555
commit b9b53f172d
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/configuration.md
View File

@ -727,6 +727,7 @@ attributes:
# The HTTP client's configuration. # The HTTP client's configuration.
[ http_config: <http_config> | default = global.http_config ] [ http_config: <http_config> | default = global.http_config ]
``` ```
###`<sigv4_config>` ###`<sigv4_config>`
```yaml ```yaml

35
notify/sns/sns.go
View File

@ -72,16 +72,13 @@ func (n *Notifier) Notify(ctx context.Context, alert ...*types.Alert) (bool, err
} }
attributes := make(map[string]*sns.MessageAttributeValue, len(n.conf.Attributes)) attributes := make(map[string]*sns.MessageAttributeValue, len(n.conf.Attributes))
if len(n.conf.Attributes) > 0 { for k, v := range n.conf.Attributes {
for k, v := range n.conf.Attributes { attributes[tmpl(k)] = &sns.MessageAttributeValue{DataType: aws.String("String"), StringValue: aws.String(tmpl(v))}
attributes[tmpl(k)] = &sns.MessageAttributeValue{DataType: aws.String("String"), StringValue: aws.String(tmpl(v))}
}
} }
sess, err := session.NewSessionWithOptions(session.Options{ sess, err := session.NewSessionWithOptions(session.Options{
Config: aws.Config{ Config: aws.Config{
Region: aws.String(tmpl(n.conf.Sigv4.Region)), Region: aws.String(n.conf.Sigv4.Region),
Credentials: creds, Credentials: creds,
Endpoint: aws.String(tmpl(n.conf.APIUrl)), Endpoint: aws.String(tmpl(n.conf.APIUrl)),
}, },
@ -97,15 +94,16 @@ func (n *Notifier) Notify(ctx context.Context, alert ...*types.Alert) (bool, err
} }
// Max message size for a message in a SNS publish request is 256KB, except for SMS messages where the limit is 1600 characters/runes. // Max message size for a message in a SNS publish request is 256KB, except for SMS messages where the limit is 1600 characters/runes.
messageSize := 256 * 1024 messageSizeLimit := 256 * 1024
client := sns.New(sess, &aws.Config{Credentials: creds}) client := sns.New(sess, &aws.Config{Credentials: creds})
publishInput := &sns.PublishInput{} publishInput := &sns.PublishInput{}
if n.conf.TopicARN != "" { if n.conf.TopicARN != "" {
publishInput.SetTopicArn(tmpl(n.conf.TopicARN)) topicTmpl := tmpl(n.conf.TopicARN)
publishInput.SetTopicArn(topicTmpl)
if n.isFifo == nil { if n.isFifo == nil {
checkFifo, err := checkTopicFifoAttribute(client, n.conf.TopicARN) checkFifo, err := checkTopicFifoAttribute(client, topicTmpl)
if err != nil { if err != nil {
if e, ok := err.(awserr.RequestFailure); ok { if e, ok := err.(awserr.RequestFailure); ok {
return n.retrier.Check(e.StatusCode(), strings.NewReader(e.Message())) return n.retrier.Check(e.StatusCode(), strings.NewReader(e.Message()))
@ -128,19 +126,19 @@ func (n *Notifier) Notify(ctx context.Context, alert ...*types.Alert) (bool, err
if n.conf.PhoneNumber != "" { if n.conf.PhoneNumber != "" {
publishInput.SetPhoneNumber(tmpl(n.conf.PhoneNumber)) publishInput.SetPhoneNumber(tmpl(n.conf.PhoneNumber))
// If we have an SMS message, we need to truncate to 1600 characters/runes. // If we have an SMS message, we need to truncate to 1600 characters/runes.
messageSize = 1600 messageSizeLimit = 1600
} }
if n.conf.TargetARN != "" { if n.conf.TargetARN != "" {
publishInput.SetTargetArn(tmpl(n.conf.TargetARN)) publishInput.SetTargetArn(tmpl(n.conf.TargetARN))
} }
messageToSend, isTrunc, err := validateAndTruncateMessage(tmpl(n.conf.Message), messageSize) messageToSend, isTrunc, err := validateAndTruncateMessage(tmpl(n.conf.Message), messageSizeLimit)
if err != nil { if err != nil {
return false, err return false, err
} }
if isTrunc { if isTrunc {
attributes[tmpl("truncated")] = &sns.MessageAttributeValue{DataType: aws.String("String"), StringValue: aws.String(tmpl("true"))} attributes["truncated"] = &sns.MessageAttributeValue{DataType: aws.String("String"), StringValue: aws.String("true")}
} }
publishInput.SetMessage(messageToSend) publishInput.SetMessage(messageToSend)
@ -159,7 +157,7 @@ func (n *Notifier) Notify(ctx context.Context, alert ...*types.Alert) (bool, err
} }
} }
level.Debug(n.logger).Log("msg", "SNS publish successfully sent", "message_id", publishOutput.MessageId, "sequence number", publishOutput.SequenceNumber) level.Debug(n.logger).Log("msg", "SNS message successfully published", "message_id", publishOutput.MessageId, "sequence number", publishOutput.SequenceNumber)
return false, nil return false, nil
} }
@ -170,21 +168,18 @@ func checkTopicFifoAttribute(client *sns.SNS, topicARN string) (bool, error) {
return false, err return false, err
} }
ta := topicAttributes.Attributes["FifoTopic"] ta := topicAttributes.Attributes["FifoTopic"]
if aws.StringValue(ta) == "true" { return aws.StringValue(ta) == "true", nil
return true, nil
}
return false, nil
} }
func validateAndTruncateMessage(message string, sizeInBytes int) (string, bool, error) { func validateAndTruncateMessage(message string, maxMessageSizeInBytes int) (string, bool, error) {
if !utf8.ValidString(message) { if !utf8.ValidString(message) {
return "", false, fmt.Errorf("non utf8 encoded message string") return "", false, fmt.Errorf("non utf8 encoded message string")
} }
if len(message) <= sizeInBytes { if len(message) <= maxMessageSizeInBytes {
return message, false, nil return message, false, nil
} }
// if the message is larger than our specified size we have to truncate. // if the message is larger than our specified size we have to truncate.
truncated := make([]byte, sizeInBytes) truncated := make([]byte, maxMessageSizeInBytes)
copy(truncated, message) copy(truncated, message)
return string(truncated), true, nil return string(truncated), true, nil
} }