From 2dc0628b3dc95c84e2e88d1966e4cd433ce96014 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Wed, 18 Jun 2025 13:02:55 +0200 Subject: [PATCH] [release-12.0.3] CloudMigrations: Add Mute Timings as dependency for Notification Policies (#106884) CloudMigrations: Add Mute Timings as dependency for Notification Policies (#106751) (cherry picked from commit db845ed8de3aa3ddcf71e624a12b8a69975348ec) Co-authored-by: Matheus Macabu --- .../migration-guide/cloud-migration-assistant.md | 2 +- pkg/services/cloudmigration/resource_dependency.go | 2 +- pkg/services/cloudmigration/resource_dependency_test.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/sources/administration/migration-guide/cloud-migration-assistant.md b/docs/sources/administration/migration-guide/cloud-migration-assistant.md index 119e37ac9ea..258238c4252 100644 --- a/docs/sources/administration/migration-guide/cloud-migration-assistant.md +++ b/docs/sources/administration/migration-guide/cloud-migration-assistant.md @@ -114,7 +114,7 @@ After connecting to the cloud stack, this is the empty state of the migration as | Folders | Nothing else | | All Alert rule groups | All other resources | | Alert Rules | | - | Notification Policies | | + | Notification Policies | | | Notification Templates | Nothing else | | Contact Points | Notification Templates | | Mute Timings | Nothing else | diff --git a/pkg/services/cloudmigration/resource_dependency.go b/pkg/services/cloudmigration/resource_dependency.go index fe6a947e473..a1d70fe0669 100644 --- a/pkg/services/cloudmigration/resource_dependency.go +++ b/pkg/services/cloudmigration/resource_dependency.go @@ -24,7 +24,7 @@ var ResourceDependency = DependencyMap{ MuteTimingType: nil, NotificationTemplateType: nil, ContactPointType: {NotificationTemplateType}, - NotificationPolicyType: {ContactPointType}, + NotificationPolicyType: {ContactPointType, MuteTimingType}, AlertRuleType: {DatasourceDataType, FolderDataType, DashboardDataType, MuteTimingType, ContactPointType, NotificationPolicyType}, AlertRuleGroupType: {AlertRuleType}, } diff --git a/pkg/services/cloudmigration/resource_dependency_test.go b/pkg/services/cloudmigration/resource_dependency_test.go index d28a5065e97..9e267880a6f 100644 --- a/pkg/services/cloudmigration/resource_dependency_test.go +++ b/pkg/services/cloudmigration/resource_dependency_test.go @@ -144,10 +144,11 @@ func TestResourceDependencyParse(t *testing.T) { NotificationPolicyType, ContactPointType, NotificationTemplateType, + MuteTimingType, } result, err := ResourceDependency.Parse(input) require.NoError(t, err) - require.Len(t, result, 3) + require.Len(t, result, len(input)) }) })