fix(receivers): use v2 of the alertmanager api (grafana#159)

DGuhr · Feb 13, 2024 · 92f64f0 · 92f64f0
1 parent b1d7d5f
commit 92f64f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/receivers/alertmanager/config.go b/receivers/alertmanager/config.go
@@ -33,7 +33,7 @@ func NewConfig(jsonData json.RawMessage, decryptFn receivers.DecryptFunc) (Confi
 		if uS == "" {
 			continue
 		}
-		uS = strings.TrimSuffix(uS, "/") + "/api/v1/alerts"
+		uS = strings.TrimSuffix(uS, "/") + "/api/v2/alerts"
 		u, err := url.Parse(uS)
 		if err != nil {
 			return Config{}, fmt.Errorf("invalid url property in settings: %w", err)

diff --git a/receivers/alertmanager/config_test.go b/receivers/alertmanager/config_test.go
@@ -27,7 +27,7 @@ func TestNewConfig(t *testing.T) {
 			settings: `{
 				"url": "://alertmanager.com"
 			}`,
-			expectedInitError: `invalid url property in settings: parse "://alertmanager.com/api/v1/alerts": missing protocol scheme`,
+			expectedInitError: `invalid url property in settings: parse "://alertmanager.com/api/v2/alerts": missing protocol scheme`,
 		},
 		{
 			name: "Error in initing: empty URL",
@@ -48,15 +48,15 @@ func TestNewConfig(t *testing.T) {
 			settings: `{
 				"url": "https://alertmanager-01.com,://url"
 			}`,
-			expectedInitError: "invalid url property in settings: parse \"://url/api/v1/alerts\": missing protocol scheme",
+			expectedInitError: "invalid url property in settings: parse \"://url/api/v2/alerts\": missing protocol scheme",
 		}, {
 			name: "Single URL",
 			settings: `{
 				"url": "https://alertmanager-01.com"
 			}`,
 			expectedConfig: Config{
 				URLs: []*url.URL{
-					receiversTesting.ParseURLUnsafe("https://alertmanager-01.com/api/v1/alerts"),
+					receiversTesting.ParseURLUnsafe("https://alertmanager-01.com/api/v2/alerts"),
 				},
 				User:     "",
 				Password: "",
@@ -69,9 +69,9 @@ func TestNewConfig(t *testing.T) {
 			}`,
 			expectedConfig: Config{
 				URLs: []*url.URL{
-					receiversTesting.ParseURLUnsafe("https://alertmanager-01.com/api/v1/alerts"),
-					receiversTesting.ParseURLUnsafe("https://alertmanager-02.com/api/v1/alerts"),
-					receiversTesting.ParseURLUnsafe("https://alertmanager-03.com/api/v1/alerts"),
+					receiversTesting.ParseURLUnsafe("https://alertmanager-01.com/api/v2/alerts"),
+					receiversTesting.ParseURLUnsafe("https://alertmanager-02.com/api/v2/alerts"),
+					receiversTesting.ParseURLUnsafe("https://alertmanager-03.com/api/v2/alerts"),
 				},
 				User:     "",
 				Password: "",
@@ -86,7 +86,7 @@ func TestNewConfig(t *testing.T) {
 			}`,
 			expectedConfig: Config{
 				URLs: []*url.URL{
-					receiversTesting.ParseURLUnsafe("https://alertmanager-01.com/api/v1/alerts"),
+					receiversTesting.ParseURLUnsafe("https://alertmanager-01.com/api/v2/alerts"),
 				},
 				User:     "grafana",
 				Password: "admin",
@@ -98,7 +98,7 @@ func TestNewConfig(t *testing.T) {
 			secrets:  receiversTesting.ReadSecretsJSONForTesting(FullValidSecretsForTesting),
 			expectedConfig: Config{
 				URLs: []*url.URL{
-					receiversTesting.ParseURLUnsafe("https://alertmanager-01.com/api/v1/alerts"),
+					receiversTesting.ParseURLUnsafe("https://alertmanager-01.com/api/v2/alerts"),
 				},
 				User:     "grafana",
 				Password: "grafana-admin",