From 426114bf8aac30067a69c9183084f4ffe90b6736 Mon Sep 17 00:00:00 2001
From: ShivaniBanke <shivani@infraspec.dev>
Date: Thu, 30 Oct 2025 22:42:49 +0530
Subject: [PATCH] fix:  Move folderUid to alert group level

---
 main.jsonnet                                 | 3 +--
 teams/stage/devops/web-server/alerts.jsonnet | 2 +-
 templates/alert-rule-template.jsonnet        | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/main.jsonnet b/main.jsonnet
index aae315b..971840c 100644
--- a/main.jsonnet
+++ b/main.jsonnet
@@ -26,14 +26,13 @@ local teamConfig = getTeamConfig(environment, team);
 local importedResource = std.parseJson(std.extVar('ALERT_CONFIGS'));
 
 // Get config from team
-local folderUid = teamConfig.folderUid;
 local contactPoint = teamConfig.contactPoint;
 
 // Create Grizzly AlertRuleGroup using alert template
 [
 alertTemplate.createAlertRuleGroup(
   title=alertGroup.name,
-  folderUid=folderUid,
+  folderUid= if std.objectHas(alertGroup, 'folderUid') && alertGroup.folderUid != null then alertGroup.folderUid else teamConfig.folderUid,
   alertRules= alertGroup.alertRules,
   interval=alertGroup.interval,
   teamConfig=teamConfig
diff --git a/teams/stage/devops/web-server/alerts.jsonnet b/teams/stage/devops/web-server/alerts.jsonnet
index 7712e3b..db24e6c 100644
--- a/teams/stage/devops/web-server/alerts.jsonnet
+++ b/teams/stage/devops/web-server/alerts.jsonnet
@@ -4,6 +4,7 @@ local alertGroups = [
 {
   name: 'per5MinuteEval',
   interval: 300,
+  folderUid: 'beu35l1zpl7uoa',
   alertRules: [
   {
     title: "Web Server High Response Time - Stage",
@@ -36,7 +37,6 @@ local alertGroups = [
         t, service
       ORDER BY t
     |||,
-    folderUid: 'beybgvo5u3i0wb'
   },
 ]
 }
diff --git a/templates/alert-rule-template.jsonnet b/templates/alert-rule-template.jsonnet
index 435cfd3..f742e28 100644
--- a/templates/alert-rule-template.jsonnet
+++ b/templates/alert-rule-template.jsonnet
@@ -90,7 +90,7 @@ local createAlertRuleGroup(title, folderUid, alertRules, interval=300, teamConfi
       keepFiringFor: if std.objectHas(rule, 'keepFiringFor') && rule.keepFiringFor != null then rule.keepFiringFor else defaultEvalConfig.keepFiringFor,
       annotations: rule.annotations,
       labels: if std.objectHas(teamConfig, 'labels') && teamConfig.labels != null then teamConfig.labels else {} + if std.objectHas(rule, 'labels') && rule.labels != null then rule.labels else {},
-      folderUID: if std.objectHas(rule, 'folderUid') && rule.folderUid != null then rule.folderUid else teamConfig.folderUid,
+      folderUID: folderUid,
       notification_settings: {
         receiver: if std.objectHas(rule, 'contactPoint') && rule.contactPoint != null 
              then rule.contactPoint