fix build

Sage-Bionetworks-IT · Mar 13, 2024 · e11ba31 · e11ba31
1 parent dab3353
commit e11ba31
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/org-formation/740-cloudwatch-dashboard/Cloudwatch-Link-Management-Account.yaml b/org-formation/740-cloudwatch-dashboard/Cloudwatch-Link-Management-Account.yaml
@@ -8,6 +8,9 @@ Parameters:
   MonitoringAccountId:
     Description: Allows one or more monitoring accounts to view your data. Enter AWS account ids, 12 numeric digits in comma-separated list
     Type: String
+  SinkIdentifier:
+    Description: ID of the attachment point in the cloudwatch monitoring account.
+    Type: String
 
 Resources:
   Link:
@@ -19,4 +22,4 @@ Resources:
         - "AWS::Logs::LogGroup"
         - "AWS::XRay::Trace"
         - "AWS::ApplicationInsights::Application"
-      SinkIdentifier: !Sub "arn:aws:oam:us-east-1:${MonitoringAccountId}:sink/6046cc13-135d-4e41-ae56-63327a7a7b8c"
+      SinkIdentifier: !Sub "arn:aws:oam:us-east-1:${MonitoringAccountId}:sink/${SinkIdentifier}"
diff --git a/org-formation/740-cloudwatch-dashboard/_tasks.yaml b/org-formation/740-cloudwatch-dashboard/_tasks.yaml
@@ -27,6 +27,7 @@ LinkManagementAccount:
     ExcludeAccount: !Ref MonitorCentralAccount
   Parameters:
     MonitoringAccountId: !Ref MonitorCentralAccount
+    SinkIdentifier: "6046cc13-135d-4e41-ae56-63327a7a7b8c"
 
 # Allow member accounts to share cloudwatch data with MonitorCentral
 CrossAccountSharingRole:
@@ -36,6 +37,8 @@ CrossAccountSharingRole:
   DefaultOrganizationBindingRegion: !Ref primaryRegion
   DefaultOrganizationBinding:
     Account: '*'
-    ExcludeAccount: !Ref MonitorCentralAccount
+    ExcludeAccount:
+      - !Ref MonitorCentralAccount
+      - !Ref TransitAccount
   Parameters:
     MonitoringAccountIds: !Ref MonitorCentralAccount