Merge branch 'main' into template-url

Author: SuperQ

.circleci/config.yml

@@ -18,3 +18,8 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+  - package-ecosystem: "npm"
+    directory: "/ui/mantine-ui"
+    open-pull-requests-limit: 20
+    schedule:
+      interval: "monthly"

.github/dependabot.yml

@@ -13,7 +13,10 @@
 
 package metrics
 
-import "github.com/prometheus/client_golang/prometheus"
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
 
 // Alerts stores metrics for alerts.
 type Alerts struct {
@@ -25,19 +28,19 @@ type Alerts struct {
 // NewAlerts returns an *Alerts struct for the given API version.
 // Since v1 was deprecated in 0.27, v2 is now hardcoded.
 func NewAlerts(r prometheus.Registerer) *Alerts {
-	numReceivedAlerts := prometheus.NewCounterVec(prometheus.CounterOpts{
+	if r == nil {
+		return nil
+	}
+	numReceivedAlerts := promauto.With(r).NewCounterVec(prometheus.CounterOpts{
 		Name:        "alertmanager_alerts_received_total",
 		Help:        "The total number of received alerts.",
 		ConstLabels: prometheus.Labels{"version": "v2"},
 	}, []string{"status"})
-	numInvalidAlerts := prometheus.NewCounter(prometheus.CounterOpts{
+	numInvalidAlerts := promauto.With(r).NewCounter(prometheus.CounterOpts{
 		Name:        "alertmanager_alerts_invalid_total",
 		Help:        "The total number of received alerts that were invalid.",
 		ConstLabels: prometheus.Labels{"version": "v2"},
 	})
-	if r != nil {
-		r.MustRegister(numReceivedAlerts, numInvalidAlerts)
-	}
 	return &Alerts{
 		firing:   numReceivedAlerts.WithLabelValues("firing"),
 		resolved: numReceivedAlerts.WithLabelValues("resolved"),

api/metrics/metrics.go

@@ -21,6 +21,7 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/hashicorp/memberlist"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
 
 	"github.com/prometheus/alertmanager/cluster/clusterpb"
 )
@@ -53,22 +54,25 @@ func NewChannel(
 	stopc <-chan struct{},
 	reg prometheus.Registerer,
 ) *Channel {
-	oversizeGossipMessageFailureTotal := prometheus.NewCounter(prometheus.CounterOpts{
+	if reg == nil {
+		return nil
+	}
+	oversizeGossipMessageFailureTotal := promauto.With(reg).NewCounter(prometheus.CounterOpts{
 		Name:        "alertmanager_oversized_gossip_message_failure_total",
 		Help:        "Number of oversized gossip message sends that failed.",
 		ConstLabels: prometheus.Labels{"key": key},
 	})
-	oversizeGossipMessageSentTotal := prometheus.NewCounter(prometheus.CounterOpts{
+	oversizeGossipMessageSentTotal := promauto.With(reg).NewCounter(prometheus.CounterOpts{
 		Name:        "alertmanager_oversized_gossip_message_sent_total",
 		Help:        "Number of oversized gossip message sent.",
 		ConstLabels: prometheus.Labels{"key": key},
 	})
-	oversizeGossipMessageDroppedTotal := prometheus.NewCounter(prometheus.CounterOpts{
+	oversizeGossipMessageDroppedTotal := promauto.With(reg).NewCounter(prometheus.CounterOpts{
 		Name:        "alertmanager_oversized_gossip_message_dropped_total",
 		Help:        "Number of oversized gossip messages that were dropped due to a full message queue.",
 		ConstLabels: prometheus.Labels{"key": key},
 	})
-	oversizeGossipDuration := prometheus.NewHistogram(prometheus.HistogramOpts{
+	oversizeGossipDuration := promauto.With(reg).NewHistogram(prometheus.HistogramOpts{
 		Name:                            "alertmanager_oversize_gossip_message_duration_seconds",
 		Help:                            "Duration of oversized gossip message requests.",
 		ConstLabels:                     prometheus.Labels{"key": key},
@@ -78,8 +82,6 @@ func NewChannel(
 		NativeHistogramMinResetDuration: 1 * time.Hour,
 	})
 
-	reg.MustRegister(oversizeGossipDuration, oversizeGossipMessageFailureTotal, oversizeGossipMessageDroppedTotal, oversizeGossipMessageSentTotal)
-
 	c := &Channel{
 		key:                               key,
 		send:                              send,

cluster/channel.go

@@ -1,4 +1,4 @@
-// Copyright 2018 Prometheus Team
+// Copyright The Prometheus Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -29,6 +29,7 @@ import (
 	"github.com/hashicorp/memberlist"
 	"github.com/oklog/ulid"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
 // ClusterPeer represents a single Peer in a gossip cluster.
@@ -142,6 +143,7 @@ func Create(
 	tlsTransportConfig *TLSTransportConfig,
 	allowInsecureAdvertise bool,
 	label string,
+	name string,
 ) (*Peer, error) {
 	bindHost, bindPortStr, err := net.SplitHostPort(bindAddr)
 	if err != nil {
@@ -187,10 +189,13 @@ func Create(
 		advertisePort = bindPort
 	}
 
-	// TODO(fabxc): generate human-readable but random names?
-	name, err := ulid.New(ulid.Now(), rand.New(rand.NewSource(time.Now().UnixNano())))
-	if err != nil {
-		return nil, err
+	// Generate a random name if none is provided.
+	if name == "" {
+		id, err := ulid.New(ulid.Now(), rand.New(rand.NewSource(time.Now().UnixNano())))
+		if err != nil {
+			return nil, err
+		}
+		name = id.String()
 	}
 
 	p := &Peer{
@@ -203,7 +208,7 @@ func Create(
 		knownPeers:    knownPeers,
 	}
 
-	p.register(reg, name.String())
+	p.register(reg, name)
 
 	retransmit := len(knownPeers) / 2
 	if retransmit < 3 {
@@ -212,13 +217,14 @@ func Create(
 	p.delegate = newDelegate(l, reg, p, retransmit)
 
 	cfg := memberlist.DefaultLANConfig()
-	cfg.Name = name.String()
+	cfg.Name = name
 	cfg.BindAddr = bindHost
 	cfg.BindPort = bindPort
 	cfg.Delegate = p.delegate
 	cfg.Ping = p.delegate
 	cfg.Alive = p.delegate
 	cfg.Events = p.delegate
+	cfg.Conflict = p.delegate
 	cfg.GossipInterval = gossipInterval
 	cfg.PushPullInterval = pushPullInterval
 	cfg.TCPTimeout = tcpTimeout
@@ -333,15 +339,15 @@ func (p *Peer) setInitialFailed(peers []string, myAddr string) {
 }
 
 func (p *Peer) register(reg prometheus.Registerer, name string) {
-	peerInfo := prometheus.NewGauge(
+	peerInfo := promauto.With(reg).NewGauge(
 		prometheus.GaugeOpts{
 			Name:        "alertmanager_cluster_peer_info",
 			Help:        "A metric with a constant '1' value labeled by peer name.",
 			ConstLabels: prometheus.Labels{"peer": name},
 		},
 	)
 	peerInfo.Set(1)
-	clusterFailedPeers := prometheus.NewGaugeFunc(prometheus.GaugeOpts{
+	promauto.With(reg).NewGaugeFunc(prometheus.GaugeOpts{
 		Name: "alertmanager_cluster_failed_peers",
 		Help: "Number indicating the current number of failed peers in the cluster.",
 	}, func() float64 {
@@ -350,40 +356,37 @@ func (p *Peer) register(reg prometheus.Registerer, name string) {
 
 		return float64(len(p.failedPeers))
 	})
-	p.failedReconnectionsCounter = prometheus.NewCounter(prometheus.CounterOpts{
+	p.failedReconnectionsCounter = promauto.With(reg).NewCounter(prometheus.CounterOpts{
 		Name: "alertmanager_cluster_reconnections_failed_total",
 		Help: "A counter of the number of failed cluster peer reconnection attempts.",
 	})
 
-	p.reconnectionsCounter = prometheus.NewCounter(prometheus.CounterOpts{
+	p.reconnectionsCounter = promauto.With(reg).NewCounter(prometheus.CounterOpts{
 		Name: "alertmanager_cluster_reconnections_total",
 		Help: "A counter of the number of cluster peer reconnections.",
 	})
 
-	p.failedRefreshCounter = prometheus.NewCounter(prometheus.CounterOpts{
+	p.failedRefreshCounter = promauto.With(reg).NewCounter(prometheus.CounterOpts{
 		Name: "alertmanager_cluster_refresh_join_failed_total",
 		Help: "A counter of the number of failed cluster peer joined attempts via refresh.",
 	})
-	p.refreshCounter = prometheus.NewCounter(prometheus.CounterOpts{
+	p.refreshCounter = promauto.With(reg).NewCounter(prometheus.CounterOpts{
 		Name: "alertmanager_cluster_refresh_join_total",
 		Help: "A counter of the number of cluster peer joined via refresh.",
 	})
 
-	p.peerLeaveCounter = prometheus.NewCounter(prometheus.CounterOpts{
+	p.peerLeaveCounter = promauto.With(reg).NewCounter(prometheus.CounterOpts{
 		Name: "alertmanager_cluster_peers_left_total",
 		Help: "A counter of the number of peers that have left.",
 	})
-	p.peerUpdateCounter = prometheus.NewCounter(prometheus.CounterOpts{
+	p.peerUpdateCounter = promauto.With(reg).NewCounter(prometheus.CounterOpts{
 		Name: "alertmanager_cluster_peers_update_total",
 		Help: "A counter of the number of peers that have updated metadata.",
 	})
-	p.peerJoinCounter = prometheus.NewCounter(prometheus.CounterOpts{
+	p.peerJoinCounter = promauto.With(reg).NewCounter(prometheus.CounterOpts{
 		Name: "alertmanager_cluster_peers_joined_total",
 		Help: "A counter of the number of peers that have joined.",
 	})
-
-	reg.MustRegister(peerInfo, clusterFailedPeers, p.failedReconnectionsCounter, p.reconnectionsCounter,
-		p.peerLeaveCounter, p.peerUpdateCounter, p.peerJoinCounter, p.refreshCounter, p.failedRefreshCounter)
 }
 
 func (p *Peer) runPeriodicTask(d time.Duration, f func()) {