RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-26 00:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove error return value from NotifyFunc() (#4459)

Browse Source 
It's always nil and we also forgot to check it.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
This commit is contained in:
Julius Volz 2018-08-04 21:31:12 +02:00 committed by GitHub
parent 0c54cf489b
commit 90521a65f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/prometheus/main.go
View File

@ -682,7 +682,7 @@ func computeExternalURL(u, listenAddr string) (*url.URL, error) {
// sendAlerts implements the rules.NotifyFunc for a Notifier. // sendAlerts implements the rules.NotifyFunc for a Notifier.
// It filters any non-firing alerts from the input. // It filters any non-firing alerts from the input.
func sendAlerts(n *notifier.Manager, externalURL string) rules.NotifyFunc { func sendAlerts(n *notifier.Manager, externalURL string) rules.NotifyFunc {
return func(ctx context.Context, expr string, alerts ...*rules.Alert) error { return func(ctx context.Context, expr string, alerts ...*rules.Alert) {
var res []*notifier.Alert var res []*notifier.Alert
for _, alert := range alerts { for _, alert := range alerts {
@ -705,6 +705,5 @@ func sendAlerts(n *notifier.Manager, externalURL string) rules.NotifyFunc {
if len(alerts) > 0 { if len(alerts) > 0 {
n.Send(res...) n.Send(res...)
} }
return nil
} }
} }

2
rules/manager.go
View File

@ -573,7 +573,7 @@ type Appendable interface {
} }
// NotifyFunc sends notifications about a set of alerts generated by the given expression. // NotifyFunc sends notifications about a set of alerts generated by the given expression.
type NotifyFunc func(ctx context.Context, expr string, alerts ...*Alert) error type NotifyFunc func(ctx context.Context, expr string, alerts ...*Alert)
// ManagerOptions bundles options for the Manager. // ManagerOptions bundles options for the Manager.
type ManagerOptions struct { type ManagerOptions struct {

14
rules/manager_test.go
View File

@ -343,14 +343,12 @@ func TestForStateRestore(t *testing.T) {
testutil.Ok(t, err) testutil.Ok(t, err)
opts := &ManagerOptions{ opts := &ManagerOptions{
QueryFunc: EngineQueryFunc(suite.QueryEngine(), suite.Storage()), QueryFunc: EngineQueryFunc(suite.QueryEngine(), suite.Storage()),
Appendable: suite.Storage(), Appendable: suite.Storage(),
TSDB: suite.Storage(), TSDB: suite.Storage(),
Context: context.Background(), Context: context.Background(),
Logger: log.NewNopLogger(), Logger: log.NewNopLogger(),
NotifyFunc: func(ctx context.Context, expr string, alerts ...*Alert) error { NotifyFunc: func(ctx context.Context, expr string, alerts ...*Alert) {},
return nil
},
OutageTolerance: 30 * time.Minute, OutageTolerance: 30 * time.Minute,
ForGracePeriod: 10 * time.Minute, ForGracePeriod: 10 * time.Minute,
} }