From 33b11d5c76baa5f6885776e16ba9090bcbd1a71f Mon Sep 17 00:00:00 2001
From: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date: Wed, 5 Feb 2025 14:15:02 -0500
Subject: [PATCH] Alerting: Remove ID and OrgID from hash calculation (#100140)

---
 pkg/services/ngalert/schedule/registry.go      | 2 --
 pkg/services/ngalert/schedule/registry_test.go | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/services/ngalert/schedule/registry.go b/pkg/services/ngalert/schedule/registry.go
index 2b162ca87be..11f72229f51 100644
--- a/pkg/services/ngalert/schedule/registry.go
+++ b/pkg/services/ngalert/schedule/registry.go
@@ -314,8 +314,6 @@ func (r ruleWithFolder) Fingerprint() fingerprint {
 
 	// fields that do not affect the state.
 	// TODO consider removing fields below from the fingerprint
-	writeInt(rule.ID)
-	writeInt(rule.OrgID)
 	writeInt(int64(rule.For))
 	if rule.DashboardUID != nil {
 		writeString(*rule.DashboardUID)
diff --git a/pkg/services/ngalert/schedule/registry_test.go b/pkg/services/ngalert/schedule/registry_test.go
index 6ee2517a706..fb779c346ea 100644
--- a/pkg/services/ngalert/schedule/registry_test.go
+++ b/pkg/services/ngalert/schedule/registry_test.go
@@ -262,6 +262,8 @@ func TestRuleWithFolderFingerprint(t *testing.T) {
 			"UpdatedBy":       {},
 			"IntervalSeconds": {},
 			"Annotations":     {},
+			"ID":              {},
+			"OrgID":           {},
 		}
 
 		tp := reflect.TypeOf(rule).Elem()