Address review comments

Signed-off-by: gotjosh <[email protected]>

Author: gotjosh

pkg/alertmanager/multitenant.go

@@ -489,8 +489,7 @@ func (am *MultitenantAlertmanager) ServeHTTP(w http.ResponseWriter, req *http.Re
 
 func (am *MultitenantAlertmanager) alertmanagerFromFallbackConfig(userID string) (*Alertmanager, error) {
 	// Upload an empty config so that the Alertmanager is no de-activated in the next poll
-	cfg := &UserConfig{AlertmanagerConfig: ""}
-	cfgDesc := alerts.ToProto(cfg.AlertmanagerConfig, cfg.TemplateFiles, userID)
+	cfgDesc := alerts.ToProto("", nil, userID)
 	err := am.store.SetAlertConfig(context.Background(), cfgDesc)
 	if err != nil {
 		return nil, err

pkg/alertmanager/multitenant_test.go

@@ -270,11 +270,10 @@ receivers:
 `
 
 	// Create the Multitenant Alertmanager.
-	reg := prometheus.NewPedanticRegistry()
 	am := createMultitenantAlertmanager(&MultitenantAlertmanagerConfig{
 		ExternalURL: externalURL,
 		DataDir:     tempDir,
-	}, nil, nil, mockStore, log.NewNopLogger(), reg)
+	}, nil, nil, mockStore, log.NewNopLogger(), nil)
 	am.fallbackConfig = fallbackCfg
 
 	// Request when no user configuration is present.