From 74c7b5a29220301d8809d2fc0caad2efe9f4e853 Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Fri, 5 Dec 2025 18:02:11 +0100
Subject: [PATCH] Alerting: Fix creating a new alert rule vesion when only
 keep_firing_for changes (#114926)

Alerting: Create alert rule vesion when keep_firing_for changes
---
 pkg/services/ngalert/store/models.go      | 1 +
 pkg/services/ngalert/store/models_test.go | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/pkg/services/ngalert/store/models.go b/pkg/services/ngalert/store/models.go
index 24167a225dd..25b81053e66 100644
--- a/pkg/services/ngalert/store/models.go
+++ b/pkg/services/ngalert/store/models.go
@@ -88,6 +88,7 @@ func (a alertRuleVersion) EqualSpec(b alertRuleVersion) bool {
 		a.NoDataState == b.NoDataState &&
 		a.ExecErrState == b.ExecErrState &&
 		a.For == b.For &&
+		a.KeepFiringFor == b.KeepFiringFor &&
 		a.Annotations == b.Annotations &&
 		a.Labels == b.Labels &&
 		a.IsPaused == b.IsPaused &&
diff --git a/pkg/services/ngalert/store/models_test.go b/pkg/services/ngalert/store/models_test.go
index ddbc34b4036..98703609007 100644
--- a/pkg/services/ngalert/store/models_test.go
+++ b/pkg/services/ngalert/store/models_test.go
@@ -21,6 +21,7 @@ func TestAlertRuleVersion_EqualSpec(t *testing.T) {
 		NoDataState:                 "state1",
 		ExecErrState:                "state2",
 		For:                         time.Minute,
+		KeepFiringFor:               2 * time.Minute,
 		Annotations:                 `{ "test": "annotation" }`,
 		Labels:                      `{ "test": "label" }`,
 		IsPaused:                    true,
@@ -119,6 +120,12 @@ func TestAlertRuleVersion_EqualSpec(t *testing.T) {
 			b:      func() alertRuleVersion { v := baseVersion; v.For = 2 * time.Minute; return v }(),
 			expect: false,
 		},
+		{
+			name:   "different KeepFiringFor durations",
+			a:      baseVersion,
+			b:      func() alertRuleVersion { v := baseVersion; v.KeepFiringFor = 5 * time.Minute; return v }(),
+			expect: false,
+		},
 		{
 			name: "exact match including bools and other types",
 			a: func() alertRuleVersion {