Move fields around for consistency with the original code

Author: bboreham

pkg/alertmanager/alertmanager.go

@@ -34,9 +34,9 @@ type Config struct {
 	UserID string
 	// Used to persist notification logs and silences on disk.
 	DataDir     string
+	Logger      log.Logger
 	Peer        *cluster.Peer
 	PeerTimeout time.Duration
-	Logger      log.Logger
 	Retention   time.Duration
 	ExternalURL *url.URL
 }

pkg/alertmanager/multitenant.go

@@ -175,8 +175,6 @@ func (cfg *MultitenantAlertmanagerConfig) RegisterFlags(f *flag.FlagSet) {
 type MultitenantAlertmanager struct {
 	cfg *MultitenantAlertmanagerConfig
 
-	peer *cluster.Peer
-
 	configsAPI configs_client.AlertManagerConfigsAPI
 
 	// The fallback config is stored as a string and parsed every time it's needed
@@ -193,6 +191,8 @@ type MultitenantAlertmanager struct {
 	latestConfig configs.ID
 	latestMutex  sync.RWMutex
 
+	peer *cluster.Peer
+
 	stop chan struct{}
 	done chan struct{}
 }
@@ -249,11 +249,11 @@ func NewMultitenantAlertmanager(cfg *MultitenantAlertmanagerConfig) (*Multitenan
 
 	am := &MultitenantAlertmanager{
 		cfg:            cfg,
-		peer:           peer,
 		configsAPI:     configsAPI,
 		fallbackConfig: string(fallbackConfig),
 		cfgs:           map[string]configs.Config{},
 		alertmanagers:  map[string]*Alertmanager{},
+		peer:           peer,
 		stop:           make(chan struct{}),
 		done:           make(chan struct{}),
 	}
@@ -433,9 +433,9 @@ func (am *MultitenantAlertmanager) newAlertmanager(userID string, amConfig *amco
 	newAM, err := New(&Config{
 		UserID:      userID,
 		DataDir:     am.cfg.DataDir,
+		Logger:      util.Logger,
 		Peer:        am.peer,
 		PeerTimeout: am.cfg.peerTimeout,
-		Logger:      util.Logger,
 		Retention:   am.cfg.Retention,
 		ExternalURL: am.cfg.ExternalURL.URL,
 	})