Review comments.

Signed-off-by: Steve Simpson <[email protected]>

Author: stevesg

pkg/alertmanager/alertmanager_metrics.go

@@ -176,11 +176,11 @@ func newAlertmanagerMetrics() *alertmanagerMetrics {
 			"Number of times we have failed to replicate a state to other alertmanagers",
 			[]string{"user"}, nil),
 		fetchReplicaStateTotal: prometheus.NewDesc(
-			"cortex_alertmanager_fetch_replica_state_total",
+			"cortex_alertmanager_state_fetch_replica_state_total",
 			"Number of times we have tried to read and merge the full state from another replica.",
 			[]string{"user"}, nil),
 		fetchReplicaStateFailed: prometheus.NewDesc(
-			"cortex_alertmanager_fetch_replica_state_failed_total",
+			"cortex_alertmanager_state_fetch_replica_state_failed_total",
 			"Number of times we have failed to read and merge the full state from another replica.",
 			[]string{"user"}, nil),
 		initialSyncTotal: prometheus.NewDesc(
@@ -290,8 +290,8 @@ func (m *alertmanagerMetrics) Collect(out chan<- prometheus.Metric) {
 	data.SendSumOfCountersPerUser(out, m.partialMergesFailed, "alertmanager_partial_state_merges_failed_total")
 	data.SendSumOfCountersPerUser(out, m.replicationTotal, "alertmanager_state_replication_total")
 	data.SendSumOfCountersPerUser(out, m.replicationFailed, "alertmanager_state_replication_failed_total")
-	data.SendSumOfCountersPerUser(out, m.fetchReplicaStateTotal, "alertmanager_fetch_replica_state_total")
-	data.SendSumOfCountersPerUser(out, m.fetchReplicaStateFailed, "alertmanager_fetch_replica_state_failed_total")
+	data.SendSumOfCountersPerUser(out, m.fetchReplicaStateTotal, "alertmanager_state_fetch_replica_state_total")
+	data.SendSumOfCountersPerUser(out, m.fetchReplicaStateFailed, "alertmanager_state_fetch_replica_state_failed_total")
 	data.SendSumOfCountersPerUser(out, m.initialSyncTotal, "alertmanager_state_initial_sync_total")
 	data.SendSumOfCountersPerUserWithLabels(out, m.initialSyncCompleted, "alertmanager_state_replication_total", "outcome")
 	data.SendSumOfHistograms(out, m.initialSyncDuration, "alertmanager_state_initial_sync_duration_seconds")

pkg/alertmanager/state_persister.go

@@ -72,11 +72,11 @@ func newStatePersister(cfg PersisterConfig, userID string, state PersistableStat
 		timeout: defaultPersistTimeout,
 		persistTotal: promauto.With(r).NewCounter(prometheus.CounterOpts{
 			Name: "alertmanager_state_persist_total",
-			Help: "Number of times we have tried to persist the running state to storage.",
+			Help: "Number of times we have tried to persist the running state to remote storage.",
 		}),
 		persistFailed: promauto.With(r).NewCounter(prometheus.CounterOpts{
 			Name: "alertmanager_state_persist_failed_total",
-			Help: "Number of times we have failed to persist the running state to storage.",
+			Help: "Number of times we have failed to persist the running state to remote storage.",
 		}),
 	}
 

pkg/alertmanager/state_replication.go

@@ -93,24 +93,24 @@ func newReplicatedStates(userID string, rf int, re Replicator, st alertstore.Ale
 			Help: "Number of times we have failed to replicate a state to other alertmanagers.",
 		}, []string{"key"}),
 		fetchReplicaStateTotal: promauto.With(r).NewCounter(prometheus.CounterOpts{
-			Name: "alertmanager_fetch_replica_state_total",
+			Name: "alertmanager_state_fetch_replica_state_total",
 			Help: "Number of times we have tried to read and merge the full state from another replica.",
 		}),
 		fetchReplicaStateFailed: promauto.With(r).NewCounter(prometheus.CounterOpts{
-			Name: "alertmanager_fetch_replica_state_failed_total",
+			Name: "alertmanager_state_fetch_replica_state_failed_total",
 			Help: "Number of times we have failed to read and merge the full state from another replica.",
 		}),
 		initialSyncTotal: promauto.With(r).NewCounter(prometheus.CounterOpts{
 			Name: "alertmanager_state_initial_sync_total",
-			Help: "Number of times we have tried to sync initial state from peers or storage.",
+			Help: "Number of times we have tried to sync initial state from peers or remote storage.",
 		}),
 		initialSyncCompleted: promauto.With(r).NewCounterVec(prometheus.CounterOpts{
 			Name: "alertmanager_state_initial_sync_completed_total",
 			Help: "Number of times we have completed syncing initial state for each possible outcome.",
 		}, []string{"outcome"}),
 		initialSyncDuration: promauto.With(r).NewHistogram(prometheus.HistogramOpts{
 			Name:    "alertmanager_state_initial_sync_duration_seconds",
-			Help:    "Time spent syncing initial state from peers or storage.",
+			Help:    "Time spent syncing initial state from peers or remote storage.",
 			Buckets: prometheus.ExponentialBuckets(0.008, 4, 7),
 		}),
 	}

pkg/alertmanager/state_replication_test.go

@@ -160,12 +160,12 @@ func TestStateReplication(t *testing.T) {
 
 			if tt.replicationFactor > 1 {
 				assert.NoError(t, testutil.GatherAndCompare(reg, strings.NewReader(`
-# HELP alertmanager_fetch_replica_state_failed_total Number of times we have failed to read and merge the full state from another replica.
-# TYPE alertmanager_fetch_replica_state_failed_total counter
-alertmanager_fetch_replica_state_failed_total 0
-# HELP alertmanager_fetch_replica_state_total Number of times we have tried to read and merge the full state from another replica.
-# TYPE alertmanager_fetch_replica_state_total counter
-alertmanager_fetch_replica_state_total 1
+# HELP alertmanager_state_fetch_replica_state_failed_total Number of times we have failed to read and merge the full state from another replica.
+# TYPE alertmanager_state_fetch_replica_state_failed_total counter
+alertmanager_state_fetch_replica_state_failed_total 0
+# HELP alertmanager_state_fetch_replica_state_total Number of times we have tried to read and merge the full state from another replica.
+# TYPE alertmanager_state_fetch_replica_state_total counter
+alertmanager_state_fetch_replica_state_total 1
 # HELP alertmanager_partial_state_merges_failed_total Number of times we have failed to merge a partial state received for a key.
 # TYPE alertmanager_partial_state_merges_failed_total counter
 alertmanager_partial_state_merges_failed_total{key="nflog"} 0
@@ -178,7 +178,7 @@ alertmanager_state_initial_sync_completed_total{outcome="failed"} 0
 alertmanager_state_initial_sync_completed_total{outcome="from-replica"} 1
 alertmanager_state_initial_sync_completed_total{outcome="from-storage"} 0
 alertmanager_state_initial_sync_completed_total{outcome="user-not-found"} 0
-# HELP alertmanager_state_initial_sync_total Number of times we have tried to sync initial state from peers or storage.
+# HELP alertmanager_state_initial_sync_total Number of times we have tried to sync initial state from peers or remote storage.
 # TYPE alertmanager_state_initial_sync_total counter
 alertmanager_state_initial_sync_total 1
 # HELP alertmanager_state_replication_failed_total Number of times we have failed to replicate a state to other alertmanagers.
@@ -188,8 +188,8 @@ alertmanager_state_replication_failed_total{key="nflog"} 0
 # TYPE alertmanager_state_replication_total counter
 alertmanager_state_replication_total{key="nflog"} 1
 	`),
-					"alertmanager_fetch_replica_state_failed_total",
-					"alertmanager_fetch_replica_state_total",
+					"alertmanager_state_fetch_replica_state_failed_total",
+					"alertmanager_state_fetch_replica_state_total",
 					"alertmanager_partial_state_merges_failed_total",
 					"alertmanager_partial_state_merges_total",
 					"alertmanager_state_initial_sync_completed_total",