From d908bd2339dedbe754d0992a1dff37630bff5af8 Mon Sep 17 00:00:00 2001 From: Xenia N Date: Thu, 6 Feb 2025 13:55:59 +0500 Subject: [PATCH 1/2] fix(api): fix swagger type for typeOfProblem (#1141) --- api/dto/target.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/dto/target.go b/api/dto/target.go index 0d877185e..b73f487a0 100644 --- 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"` From cf656ba106f723fd0a26d6283d66d6a438b06ad1 Mon Sep 17 00:00:00 2001 From: HeavyPunk <66221822+HeavyPunk@users.noreply.github.com> Date: Mon, 10 Feb 2025 14:24:56 +0500 Subject: [PATCH 2/2] fix(checker): change log to warning if remote unavailable (#1142) --- checker/check.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checker/check.go b/checker/check.go index db3e90c6c..32ce2a229 100644 --- 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()).