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

NGAlert: Remove unwanted fields from notification channel config (#34036)

Browse Source 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
This commit is contained in:
Ganesh Vernekar
2021-05-18 13:34:47 +05:30
committed by GitHub
parent bfcf82f861
commit 89c2b5e863
22 changed files with 138 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tests/api/alerting/api_alertmanager_configuration_test.go
-9
View File
@@ -49,7 +49,6 @@ func TestAlertmanagerConfigurationIsTransactional(t *testing.T) {
},
"secureSettings": {},
"type": "slack",
"sendReminder": true,
"name": "slack.receiver",
"disableResolveMessage": false,
"uid": ""
@@ -96,7 +95,6 @@ func TestAlertmanagerConfigurationPersistSecrets(t *testing.T) {
"url": "http://averysecureurl.com/webhook"
},
"type": "slack",
"sendReminder": true,
"name": "slack.receiver",
"disableResolveMessage": false
}]
@@ -127,7 +125,6 @@ func TestAlertmanagerConfigurationPersistSecrets(t *testing.T) {
"url": true
},
"type": "slack",
"sendReminder": true,
"name": "slack.receiver",
"disableResolveMessage": false
}]
@@ -153,16 +150,10 @@ func TestAlertmanagerConfigurationPersistSecrets(t *testing.T) {
"receivers": [{
"name": "slack.receiver",
"grafana_managed_receiver_configs": [{
"id": 0,
"uid": "",
"name": "slack.receiver",
"type": "slack",
"isDefault": false,
"sendReminder": true,
"disableResolveMessage": false,
"frequency": "",
"created": "0001-01-01T00:00:00Z",
"updated": "0001-01-01T00:00:00Z",
"settings": {
"recipient": "#unified-alerting-test-but-updated"
},
pkg/tests/api/alerting/api_notification_channel_test.go
+2 -49
View File
@@ -67,7 +67,8 @@ func TestNotificationChannels(t *testing.T) {
alertsURL := fmt.Sprintf("http://grafana:password@%s/api/alertmanager/grafana/config/api/v1/alerts", grafanaListedAddr)
resp := getRequest(t, alertsURL, http.StatusOK) // nolint
b := getBody(t, resp.Body)
require.JSONEq(t, getExpAlertmanagerConfigFromAPI(mockChannel.server.Addr), b)
e := getExpAlertmanagerConfigFromAPI(mockChannel.server.Addr)
require.JSONEq(t, e, b)
}
{
@@ -584,16 +585,10 @@ var expAlertmanagerConfigFromAPI = `
"name": "email_recv",
"grafana_managed_receiver_configs": [
{
"id": 0,
"uid": "",
"name": "email_test",
"type": "email",
"isDefault": false,
"sendReminder": false,
"disableResolveMessage": false,
"frequency": "",
"created": "0001-01-01T00:00:00Z",
"updated": "0001-01-01T00:00:00Z",
"settings": {
"addresses": "test@email.com",
"singleEmail": true
@@ -606,16 +601,10 @@ var expAlertmanagerConfigFromAPI = `
"name": "dingding_recv",
"grafana_managed_receiver_configs": [
{
"id": 0,
"uid": "",
"name": "dingding_test",
"type": "dingding",
"isDefault": false,
"sendReminder": false,
"disableResolveMessage": false,
"frequency": "",
"created": "0001-01-01T00:00:00Z",
"updated": "0001-01-01T00:00:00Z",
"settings": {
"url": "http://CHANNEL_ADDR/dingding_recv/dingding_test"
},
@@ -627,16 +616,10 @@ var expAlertmanagerConfigFromAPI = `
"name": "teams_recv",
"grafana_managed_receiver_configs": [
{
"id": 0,
"uid": "",
"name": "teams_test",
"type": "teams",
"isDefault": false,
"sendReminder": false,
"disableResolveMessage": false,
"frequency": "",
"created": "0001-01-01T00:00:00Z",
"updated": "0001-01-01T00:00:00Z",
"settings": {
"url": "http://CHANNEL_ADDR/teams_recv/teams_test"
},
@@ -648,16 +631,10 @@ var expAlertmanagerConfigFromAPI = `
"name": "webhook_recv",
"grafana_managed_receiver_configs": [
{
"id": 0,
"uid": "",
"name": "webhook_test",
"type": "webhook",
"isDefault": false,
"sendReminder": false,
"disableResolveMessage": false,
"frequency": "",
"created": "0001-01-01T00:00:00Z",
"updated": "0001-01-01T00:00:00Z",
"settings": {
"url": "http://CHANNEL_ADDR/webhook_recv/webhook_test",
"username": "my_username",
@@ -674,16 +651,10 @@ var expAlertmanagerConfigFromAPI = `
"name": "telegram_recv",
"grafana_managed_receiver_configs": [
{
"id": 0,
"uid": "",
"name": "telegram_test",
"type": "telegram",
"isDefault": false,
"sendReminder": false,
"disableResolveMessage": false,
"frequency": "",
"created": "0001-01-01T00:00:00Z",
"updated": "0001-01-01T00:00:00Z",
"settings": {
"chatid": "telegram_chat_id"
},
@@ -697,16 +668,10 @@ var expAlertmanagerConfigFromAPI = `
"name": "slack_recv1",
"grafana_managed_receiver_configs": [
{
"id": 0,
"uid": "",
"name": "slack_test_without_token",
"type": "slack",
"isDefault": false,
"sendReminder": false,
"disableResolveMessage": false,
"frequency": "",
"created": "0001-01-01T00:00:00Z",
"updated": "0001-01-01T00:00:00Z",
"settings": {
"fallback": "Integration Test {{ template \"slack.default.title\" . }}",
"icon_emoji": "🚀",
@@ -729,16 +694,10 @@ var expAlertmanagerConfigFromAPI = `
"name": "slack_recv2",
"grafana_managed_receiver_configs": [
{
"id": 0,
"uid": "",
"name": "slack_test_with_token",
"type": "slack",
"isDefault": false,
"sendReminder": false,
"disableResolveMessage": false,
"frequency": "",
"created": "0001-01-01T00:00:00Z",
"updated": "0001-01-01T00:00:00Z",
"settings": {
"mentionUsers": "user1, user2",
"recipient": "#test-channel",
@@ -754,16 +713,10 @@ var expAlertmanagerConfigFromAPI = `
"name": "pagerduty_recv",
"grafana_managed_receiver_configs": [
{
"id": 0,
"uid": "",
"name": "pagerduty_test",
"type": "pagerduty",
"isDefault": false,
"sendReminder": false,
"disableResolveMessage": false,
"frequency": "",
"created": "0001-01-01T00:00:00Z",
"updated": "0001-01-01T00:00:00Z",
"settings": {
"class": "testclass",
"component": "Integration Test",
pkg/tests/api/alerting/testing.go
-6
View File
@@ -21,16 +21,10 @@ const defaultAlertmanagerConfigJSON = `
"receivers": [{
"name": "grafana-default-email",
"grafana_managed_receiver_configs": [{
"id": 0,
"uid": "",
"name": "email receiver",
"type": "email",
"isDefault": true,
"sendReminder": false,
"disableResolveMessage": false,
"frequency": "",
"created": "0001-01-01T00:00:00Z",
"updated": "0001-01-01T00:00:00Z",
"settings": {
"addresses": "\u003cexample@email.com\u003e"
},