Alerting: Proxy RouteDeleteAlertingConfig through MultiOrgAlertmanager (#93549)

Proxy RouteDeleteAlertingConfig through MultiOrgAlertmanager

pkg/services/ngalert/api/api_alertmanager.go

@@ -65,14 +65,10 @@ func (srv AlertmanagerSrv) RouteGetAMStatus(c *contextmodel.ReqContext) response
 }
 
 func (srv AlertmanagerSrv) RouteDeleteAlertingConfig(c *contextmodel.ReqContext) response.Response {
-	am, errResp := srv.AlertmanagerFor(c.SignedInUser.GetOrgID())
-	if errResp != nil {
-		return errResp
-	}
-
-	if err := am.SaveAndApplyDefaultConfig(c.Req.Context()); err != nil {
+	err := srv.mam.SaveAndApplyDefaultConfig(c.Req.Context(), c.SignedInUser.GetOrgID())
+	if err != nil {
 		srv.log.Error("Unable to save and apply default alertmanager configuration", "error", err)
-		return ErrResp(http.StatusInternalServerError, err, "failed to save and apply default Alertmanager configuration")
+		return response.ErrOrFallback(http.StatusInternalServerError, "failed to save and apply default Alertmanager configuration", err)
 	}
 
 	return response.JSON(http.StatusAccepted, util.DynMap{"message": "configuration deleted; the default is applied"})

pkg/services/ngalert/notifier/alertmanager_config.go

@@ -49,6 +49,22 @@ type configurationStore interface {
 	GetLatestAlertmanagerConfiguration(ctx context.Context, orgID int64) (*models.AlertConfiguration, error)
 }
 
+func (moa *MultiOrgAlertmanager) SaveAndApplyDefaultConfig(ctx context.Context, orgId int64) error {
+	moa.alertmanagersMtx.RLock()
+	defer moa.alertmanagersMtx.RUnlock()
+
+	orgAM, err := moa.alertmanagerForOrg(orgId)
+	if err != nil {
+		return err
+	}
+
+	err = orgAM.SaveAndApplyDefaultConfig(ctx)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 // ApplyConfig will apply the given alertmanager configuration for a given org.
 // Can be used to force regeneration of autogenerated routes.
 func (moa *MultiOrgAlertmanager) ApplyConfig(ctx context.Context, orgId int64, dbConfig *models.AlertConfiguration) error {