From fd9566d47127b99fc427b5012e3e5b3501f168de Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Mon, 11 Dec 2023 16:09:28 +0530 Subject: [PATCH] fix: incorrect alert description and summary for prom rules (#4190) --- pkg/query-service/rules/promRule.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/query-service/rules/promRule.go b/pkg/query-service/rules/promRule.go index 6d0cafa930..94ace4137b 100644 --- a/pkg/query-service/rules/promRule.go +++ b/pkg/query-service/rules/promRule.go @@ -3,7 +3,6 @@ package rules import ( "context" "fmt" - "strconv" "sync" "time" @@ -367,7 +366,10 @@ func (r *PromRule) Eval(ctx context.Context, ts time.Time, queriers *Queriers) ( l[lbl.Name] = lbl.Value } - tmplData := AlertTemplateData(l, valueFormatter.Format(smpl.F, r.Unit()), strconv.FormatFloat(r.targetVal(), 'f', 2, 64)+converter.UnitToName(r.ruleCondition.TargetUnit)) + thresholdFormatter := formatter.FromUnit(r.ruleCondition.TargetUnit) + threshold := thresholdFormatter.Format(r.targetVal(), r.ruleCondition.TargetUnit) + + tmplData := AlertTemplateData(l, valueFormatter.Format(smpl.F, r.Unit()), threshold) // Inject some convenience variables that are easier to remember for users // who are not used to Go's templating system. defs := "{{$labels := .Labels}}{{$value := .Value}}{{$threshold := .Threshold}}"