Merge faca043 into 88feba3

moira-alert · Jul 7, 2022 · d5fd4be · d5fd4be
2 parents 88feba3 + faca043
commit d5fd4be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/checker/worker/remote.go b/checker/worker/remote.go
@@ -48,12 +48,14 @@ func (worker *Checker) checkRemote() error {
 	remoteAvailable, err := source.(*remote.Remote).IsRemoteAvailable()
 	if !remoteAvailable {
 		worker.Logger.Infof("Remote API is unavailable. Stop checking remote triggers. Error: %s", err.Error())
+		worker.Metrics.RemoteAvailabilityCheckFailed.Mark(1)
 	} else {
 		worker.Logger.Debug("Checking remote triggers")
 		triggerIds, err := worker.Database.GetRemoteTriggerIDs()
 		if err != nil {
 			return err
 		}
+		time.Sleep(time.Second * 30)
 		worker.addRemoteTriggerIDsIfNeeded(triggerIds)
 	}
 	return nil

diff --git a/metrics/checker.go b/metrics/checker.go
@@ -4,11 +4,12 @@ import "github.com/moira-alert/moira"
 
 // CheckerMetrics is a collection of metrics used in checker
 type CheckerMetrics struct {
-	LocalMetrics           *CheckMetrics
-	RemoteMetrics          *CheckMetrics
-	MetricEventsChannelLen Histogram
-	UnusedTriggersCount    Histogram
-	MetricEventsHandleTime Timer
+	LocalMetrics                  *CheckMetrics
+	RemoteMetrics                 *CheckMetrics
+	MetricEventsChannelLen        Histogram
+	UnusedTriggersCount           Histogram
+	MetricEventsHandleTime        Timer
+	RemoteAvailabilityCheckFailed Meter
 }
 
 // GetCheckMetrics return check metrics dependent on given trigger type
@@ -37,6 +38,7 @@ func ConfigureCheckerMetrics(registry Registry, remoteEnabled bool) *CheckerMetr
 	}
 	if remoteEnabled {
 		m.RemoteMetrics = configureCheckMetrics(registry, "remote")
+		m.RemoteAvailabilityCheckFailed = registry.NewMeter("remote", "unavailable")
 	}
 	return m
 }