Fix support for keep_firing_for field in alert rules

pkg/ruler/rulespb/compat.go

@@ -28,12 +28,13 @@ func formattedRuleToProto(rls []rulefmt.RuleNode) []*RuleDesc {
 	rules := make([]*RuleDesc, len(rls))
 	for i := range rls {
 		rules[i] = &RuleDesc{
-			Expr:        rls[i].Expr.Value,
-			Record:      rls[i].Record.Value,
-			Alert:       rls[i].Alert.Value,
-			For:         time.Duration(rls[i].For),
-			Labels:      cortexpb.FromLabelsToLabelAdapters(labels.FromMap(rls[i].Labels)),
-			Annotations: cortexpb.FromLabelsToLabelAdapters(labels.FromMap(rls[i].Annotations)),
+			Expr:          rls[i].Expr.Value,
+			Record:        rls[i].Record.Value,
+			Alert:         rls[i].Alert.Value,
+			For:           time.Duration(rls[i].For),
+			KeepFiringFor: time.Duration(rls[i].KeepFiringFor),
+			Labels:        cortexpb.FromLabelsToLabelAdapters(labels.FromMap(rls[i].Labels)),
+			Annotations:   cortexpb.FromLabelsToLabelAdapters(labels.FromMap(rls[i].Annotations)),
 		}
 	}
 
@@ -54,10 +55,11 @@ func FromProto(rg *RuleGroupDesc) rulefmt.RuleGroup {
 		exprNode.SetString(rl.GetExpr())
 
 		newRule := rulefmt.RuleNode{
-			Expr:        exprNode,
-			Labels:      cortexpb.FromLabelAdaptersToLabels(rl.Labels).Map(),
-			Annotations: cortexpb.FromLabelAdaptersToLabels(rl.Annotations).Map(),
-			For:         model.Duration(rl.GetFor()),
+			Expr:          exprNode,
+			Labels:        cortexpb.FromLabelAdaptersToLabels(rl.Labels).Map(),
+			Annotations:   cortexpb.FromLabelAdaptersToLabels(rl.Annotations).Map(),
+			For:           model.Duration(rl.GetFor()),
+			KeepFiringFor: model.Duration(rl.GetKeepFiringFor()),
 		}
 
 		if rl.GetRecord() != "" {

pkg/ruler/rulespb/compat_test.go

@@ -0,0 +1,49 @@
+package rulespb
+
+import (
+	"github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/model/rulefmt"
+	"github.com/stretchr/testify/assert"
+	"gopkg.in/yaml.v3"
+	"testing"
+	"time"
+)
+
+func TestProto(t *testing.T) {
+	rules := make([]rulefmt.RuleNode, 0)
+
+	alertNode := yaml.Node{}
+	alertNode.SetString("test_rule")
+	exprNode := yaml.Node{}
+	exprNode.SetString("test_expr")
+
+	testRule := rulefmt.RuleNode{
+		Alert:         alertNode,
+		Expr:          exprNode,
+		Labels:        map[string]string{"label1": "value1"},
+		Annotations:   map[string]string{"key1": "value1"},
+		For:           model.Duration(time.Minute * 2),
+		KeepFiringFor: model.Duration(time.Hour),
+	}
+
+	rules = append(rules, testRule)
+
+	rg := rulefmt.RuleGroup{
+		Name:     "group1",
+		Rules:    rules,
+		Interval: model.Duration(time.Minute),
+	}
+	desc := ToProto("test", "namespace", rg)
+
+	assert.Equal(t, len(rules), len(desc.Rules))
+
+	ruleDesc := desc.Rules[0]
+
+	assert.Equal(t, "test_rule", ruleDesc.Alert)
+	assert.Equal(t, "test_expr", ruleDesc.Expr)
+	assert.Equal(t, time.Minute*2, ruleDesc.For)
+	assert.Equal(t, time.Hour, ruleDesc.KeepFiringFor)
+
+	formatted := FromProto(desc)
+	assert.Equal(t, rg, formatted)
+}