Use setAlertStatusFn

This encapsulates the actual logic being done
previously into a single closure that gets passed
to the api when loaded/reloaded.

Additionally, the naming is now a bit clearer. The
use of the Muter interface is a bit confusing as
it was previously being used for its side effect
of marking an alert as inhibited or not, and the
return value was being ignored.

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>

api/v2/api.go

@@ -53,38 +53,36 @@ type API struct {
 	peer           *cluster.Peer
 	silences       *silence.Silences
 	alerts         provider.Alerts
-	muter          types.Muter
-	marker         types.Marker
 	getAlertStatus getAlertStatusFn
 	uptime         time.Time
 
-	// mtx protects resolveTimeout, alertmanagerConfig and route.
+	// mtx protects resolveTimeout, alertmanagerConfig, setAlertStatus and route.
 	mtx sync.RWMutex
 	// resolveTimeout represents the default resolve timeout that an alert is
 	// assigned if no end time is specified.
 	resolveTimeout     time.Duration
 	alertmanagerConfig *config.Config
 	route              *dispatch.Route
+	setAlertStatus     setAlertStatusFn
 
 	logger log.Logger
 
 	Handler http.Handler
 }
 
 type getAlertStatusFn func(prometheus_model.Fingerprint) types.AlertStatus
+type setAlertStatusFn func(prometheus_model.LabelSet) error
 
 // NewAPI returns a new Alertmanager API v2
 func NewAPI(
 	alerts provider.Alerts,
-	marker types.Marker,
 	sf getAlertStatusFn,
 	silences *silence.Silences,
 	peer *cluster.Peer,
 	l log.Logger,
 ) (*API, error) {
 	api := API{
 		alerts:         alerts,
-		marker:         marker,
 		getAlertStatus: sf,
 		peer:           peer,
 		silences:       silences,
@@ -125,14 +123,14 @@ func NewAPI(
 }
 
 // Update sets the configuration string to a new value.
-func (api *API) Update(cfg *config.Config, resolveTimeout time.Duration, muter types.Muter) error {
+func (api *API) Update(cfg *config.Config, resolveTimeout time.Duration, setAlertStatus setAlertStatusFn) error {
 	api.mtx.Lock()
 	defer api.mtx.Unlock()
 
 	api.resolveTimeout = resolveTimeout
 	api.alertmanagerConfig = cfg
 	api.route = dispatch.NewRoute(cfg.Route, nil)
-	api.muter = muter
+	api.setAlertStatus = setAlertStatus
 	return nil
 }
 
@@ -249,27 +247,10 @@ func (api *API) getAlertsHandler(params alert_ops.GetAlertsParams) middleware.Re
 			continue
 		}
 
-		// TODO: Add a timestamp now()+X, after which the Mutes() will
-		// be refreshed?
-		// Will check if the alert is inhibited, and update its status.
-		api.muter.Mutes(a.Labels)
-		// Will check if the alert is silenced, and update its status.
-		sils, err := api.silences.Query(
-			silence.QState(types.SilenceStateActive),
-			silence.QMatches(a.Labels),
-		)
-		if err != nil {
-			level.Error(api.logger).Log("msg", "Querying silences failed", "err", err)
-		}
-
-		if len(sils) > 0 {
-			ids := make([]string, len(sils))
-			for i, s := range sils {
-				ids[i] = s.Id
-			}
-			api.marker.SetSilenced(a.Labels.Fingerprint(), ids...)
+		// Set alert's current status based on its label set.
+		if err := api.setAlertStatus(a.Labels); err != nil {
+			level.Error(api.logger).Log("msg", "set alert status failed", "err", err)
 		}
-
 		// Get alert's current status after seeing if it is suppressed.
 		status := api.getAlertStatus(a.Fingerprint())
 

cmd/alertmanager/main.go

@@ -34,6 +34,7 @@ import (
 	"github.com/go-kit/kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"github.com/prometheus/common/model"
 	"github.com/prometheus/common/promlog"
 	promlogflag "github.com/prometheus/common/promlog/flag"
 	"github.com/prometheus/common/route"
@@ -302,7 +303,6 @@ func run() int {
 
 	apiV2, err := apiv2.NewAPI(
 		alerts,
-		marker,
 		marker.Status,
 		silences,
 		peer,
@@ -378,7 +378,7 @@ func run() int {
 			return err
 		}
 
-		err = apiV2.Update(conf, time.Duration(conf.Global.ResolveTimeout), inhibitor)
+		err = apiV2.Update(conf, time.Duration(conf.Global.ResolveTimeout), setAlertStatus(inhibitor, marker, silences))
 		if err != nil {
 			return err
 		}
@@ -518,3 +518,25 @@ func md5HashAsMetricValue(data []byte) float64 {
 	copy(bytes, smallSum)
 	return float64(binary.LittleEndian.Uint64(bytes))
 }
+
+func setAlertStatus(inhibitor *inhibit.Inhibitor, marker types.Marker, silences *silence.Silences) func(model.LabelSet) error {
+	return func(labels model.LabelSet) error {
+		inhibitor.Mutes(labels)
+		sils, err := silences.Query(
+			silence.QState(types.SilenceStateActive),
+			silence.QMatches(labels),
+		)
+		if err != nil {
+			return fmt.Errorf("failed to query silences: %v", err)
+		}
+
+		if len(sils) > 0 {
+			ids := make([]string, len(sils))
+			for i, s := range sils {
+				ids[i] = s.Id
+			}
+			marker.SetSilenced(labels.Fingerprint(), ids...)
+		}
+		return nil
+	}
+}