Merge pull request #1606 from cortexproject/fix-ruler-alerts

bboreham · web-flow · commit 9b507187eb46 · 2019-08-24T10:14:20.000+01:00
Use v1 endpoint for Ruler to talk to Alertmanager, for compatibility
diff --git a/pkg/ruler/notifier.go b/pkg/ruler/notifier.go
@@ -117,7 +117,7 @@ func buildNotifierConfig(rulerConfig *Config) (*config.Config, error) {
 		}
 	}
 	amConfig := &config.AlertmanagerConfig{
-		APIVersion:             config.AlertmanagerAPIVersionV2,
+		APIVersion:             config.AlertmanagerAPIVersionV1,
 		Scheme:                 u.Scheme,
 		PathPrefix:             u.Path,
 		Timeout:                model.Duration(rulerConfig.NotificationTimeout),

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func buildNotifierConfig(rulerConfig Config) (config.Config, error) {`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`amConfig := &config.AlertmanagerConfig{`
`120`		`- APIVersion: config.AlertmanagerAPIVersionV2,`
	`120`	`+ APIVersion: config.AlertmanagerAPIVersionV1,`
`121`	`121`	`Scheme: u.Scheme,`
`122`	`122`	`PathPrefix: u.Path,`
`123`	`123`	`Timeout: model.Duration(rulerConfig.NotificationTimeout),`