RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-16 10:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "slack: retry 429 errors (#2112)" (#2128)

Browse Source 
This reverts commit 26cc96a787.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
This commit is contained in:
Simon Pasquier 2019-12-06 10:16:51 +01:00 committed by GitHub
parent 89db909017
commit 052707f6d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,7 +11,6 @@
* [BUGFIX] Don't garbage-collect alerts from the store. #2040
* [BUGFIX] [ui] Disable the grammarly plugin on all textareas. #2061
* [BUGFIX] [config] Forbid nil regexp matchers. #2083
* [BUGFIX] [slack] Retry 429 errors. #2112
* [BUGFIX] [ui] Fix Silences UI when several filters are applied. #2075
Contributors:

2
notify/slack/slack.go
View File

@ -49,7 +49,7 @@ func New(c *config.SlackConfig, t *template.Template, l log.Logger) (*Notifier,
tmpl: t,
logger: l,
client: client,
retrier: &notify.Retrier{RetryCodes: []int{http.StatusTooManyRequests}},
retrier: &notify.Retrier{},
}, nil
}

4
notify/slack/slack_test.go
View File

@ -15,7 +15,6 @@ package slack
import (
"fmt"
"net/http"
"testing"
"github.com/go-kit/kit/log"
@ -36,8 +35,7 @@ func TestSlackRetry(t *testing.T) {
)
require.NoError(t, err)
retryCodes := append(test.DefaultRetryCodes(), http.StatusTooManyRequests)
for statusCode, expected := range test.RetryTests(retryCodes) {
for statusCode, expected := range test.RetryTests(test.DefaultRetryCodes()) {
actual, _ := notifier.retrier.Check(statusCode, nil)
require.Equal(t, expected, actual, fmt.Sprintf("error on status %d", statusCode))
}