mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Alerting: Handful of small adjustments to log levels and parameters (#64572)
Calculate duration earlier in scheduler
This commit is contained in:
parent
ae38501675
commit
9bcf8819d3
@ -391,15 +391,16 @@ func (sch *schedule) ruleRoutine(grafanaCtx context.Context, key ngmodels.AlertR
|
|||||||
ruleEval, err := sch.evaluatorFactory.Create(evalCtx, e.rule.GetEvalCondition())
|
ruleEval, err := sch.evaluatorFactory.Create(evalCtx, e.rule.GetEvalCondition())
|
||||||
var results eval.Results
|
var results eval.Results
|
||||||
var dur time.Duration
|
var dur time.Duration
|
||||||
if err == nil {
|
if err != nil {
|
||||||
|
dur = sch.clock.Now().Sub(start)
|
||||||
|
logger.Error("Failed to build rule evaluator", "error", err)
|
||||||
|
} else {
|
||||||
results, err = ruleEval.Evaluate(ctx, e.scheduledAt)
|
results, err = ruleEval.Evaluate(ctx, e.scheduledAt)
|
||||||
|
dur = sch.clock.Now().Sub(start)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("Failed to evaluate rule", "error", err, "duration", dur)
|
logger.Error("Failed to evaluate rule", "error", err, "duration", dur)
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
logger.Error("Failed to build rule evaluator", "error", err)
|
|
||||||
}
|
}
|
||||||
dur = sch.clock.Now().Sub(start)
|
|
||||||
|
|
||||||
evalTotal.Inc()
|
evalTotal.Inc()
|
||||||
evalDuration.Observe(dur.Seconds())
|
evalDuration.Observe(dur.Seconds())
|
||||||
|
Loading…
Reference in New Issue
Block a user