merge master into feat/senders-delivery-metrics

moira-alert · Feb 11, 2025 · 1a0b4f3 · 1a0b4f3
2 parents ef52f21 + cf656ba
commit 1a0b4f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/dto/target.go b/api/dto/target.go
@@ -104,7 +104,7 @@ var (
 
 type ProblemOfTarget struct {
 	Argument    string            `json:"argument" example:"consolidateBy"`
-	Type        typeOfProblem     `json:"type,omitempty" example:"warn"`
+	Type        typeOfProblem     `json:"type,omitempty" example:"warn" swaggertype:"string"` //nolint:govet
 	Description string            `json:"description,omitempty" example:"This function affects only visual graph representation. It is meaningless in Moira"`
 	Position    int               `json:"position" example:"0"`
 	Problems    []ProblemOfTarget `json:"problems,omitempty"`

diff --git a/checker/check.go b/checker/check.go
@@ -136,7 +136,7 @@ func (triggerChecker *TriggerChecker) handleFetchError(checkData moira.CheckData
 		checkData.State = moira.StateEXCEPTION
 		checkData.Message = fmt.Sprintf("Remote server unavailable. Trigger is not checked since: %v", checkData.LastSuccessfulCheckTimestamp)
 
-		triggerChecker.logger.Error().
+		triggerChecker.logger.Warning().
 			String(moira.LogFieldNameTriggerID, triggerChecker.triggerID).
 			String("trigger.cluster_id", triggerChecker.trigger.ClusterId.String()).
 			String("trigger.source", triggerChecker.trigger.TriggerSource.String()).
@@ -169,7 +169,7 @@ func (triggerChecker *TriggerChecker) handleUndefinedError(checkData moira.Check
 	checkData.State = moira.StateEXCEPTION
 	checkData.Message = err.Error()
 
-	triggerChecker.logger.Error().
+	triggerChecker.logger.Warning().
 		String(moira.LogFieldNameTriggerID, triggerChecker.triggerID).
 		String("trigger.cluster_id", triggerChecker.trigger.ClusterId.String()).
 		String("trigger.source", triggerChecker.trigger.TriggerSource.String()).