public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alerting: Update alerting module to 20230418161049-5f374e58cb32 + refactoring (#66622)

Browse Source 
* update to alerting 20230418161049-5f374e58cb32
* rename renamed structs in https://github.com/grafana/alerting/pull/73
* update ValidateContactPoint to use BuildReceiverConfiguration
* update logger factory according to changes
* rewrite integration builder
Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
This commit is contained in:
Yuri Tseretyan
2023-04-25 13:39:46 -04:00
committed by GitHub
parent 12e5101b91
commit a8b4a4bb45
22 changed files with 179 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ngalert/api/api_alertmanager.go
+2 -2
View File
@@ -406,8 +406,8 @@ func statusForTestReceivers(v []notifier.TestReceiverResult) int {
for _, next := range receiver.Configs {
if next.Error != nil {
var (
invalidReceiverErr alertingNotify.InvalidReceiverError
receiverTimeoutErr alertingNotify.ReceiverTimeoutError
invalidReceiverErr alertingNotify.IntegrationValidationError
receiverTimeoutErr alertingNotify.IntegrationTimeoutError
)
if errors.As(next.Error, &invalidReceiverErr) {
numBadRequests += 1
pkg/services/ngalert/api/api_alertmanager_test.go
+6 -6
View File
@@ -108,7 +108,7 @@ func TestStatusForTestReceivers(t *testing.T) {
Name: "test1",
UID: "uid1",
Status: "failed",
Error: alertingNotify.InvalidReceiverError{},
Error: alertingNotify.IntegrationValidationError{},
}},
}, {
Name: "test2",
@@ -116,7 +116,7 @@ func TestStatusForTestReceivers(t *testing.T) {
Name: "test2",
UID: "uid2",
Status: "failed",
Error: alertingNotify.InvalidReceiverError{},
Error: alertingNotify.IntegrationValidationError{},
}},
}}))
})
@@ -128,7 +128,7 @@ func TestStatusForTestReceivers(t *testing.T) {
Name: "test1",
UID: "uid1",
Status: "failed",
Error: alertingNotify.ReceiverTimeoutError{},
Error: alertingNotify.IntegrationTimeoutError{},
}},
}, {
Name: "test2",
@@ -136,7 +136,7 @@ func TestStatusForTestReceivers(t *testing.T) {
Name: "test2",
UID: "uid2",
Status: "failed",
Error: alertingNotify.ReceiverTimeoutError{},
Error: alertingNotify.IntegrationTimeoutError{},
}},
}}))
})
@@ -148,7 +148,7 @@ func TestStatusForTestReceivers(t *testing.T) {
Name: "test1",
UID: "uid1",
Status: "failed",
Error: alertingNotify.InvalidReceiverError{},
Error: alertingNotify.IntegrationValidationError{},
}},
}, {
Name: "test2",
@@ -156,7 +156,7 @@ func TestStatusForTestReceivers(t *testing.T) {
Name: "test2",
UID: "uid2",
Status: "failed",
Error: alertingNotify.ReceiverTimeoutError{},
Error: alertingNotify.IntegrationTimeoutError{},
}},
}}))
})