HttpMonitors: fix bug where we accidentally used disabled monitors also

Author: joonas-fi

cmd/alertmanager/httpmonitorscanner.go

@@ -24,7 +24,7 @@ func httpMonitorScanAndAlertFailures(ctx context.Context, app *amstate.App) erro
 
 	failures := scanMonitors(
 		ctx,
-		app.State.HttpMonitors(),
+		amstate.EnabledHttpMonitors(app.State.HttpMonitors()),
 		newRetryScanner(newScanner()),
 		logex.Prefix("httpscanner", app.Logger))
 

pkg/amstate/utils.go

@@ -47,6 +47,18 @@ func FindHttpMonitorWithId(id string, monitors []HttpMonitor) *HttpMonitor {
 	return nil
 }
 
+func EnabledHttpMonitors(monitors []HttpMonitor) []HttpMonitor {
+	enabled := []HttpMonitor{}
+
+	for _, monitor := range monitors {
+		if monitor.Enabled {
+			enabled = append(enabled, monitor)
+		}
+	}
+
+	return enabled
+}
+
 func FindDeadMansSwitchWithSubject(subject string, dmss []DeadMansSwitch) *DeadMansSwitch {
 	for _, dms := range dmss {
 		if dms.Subject == subject {