feat: Meet devx-logs requirements

https://github.com/guardian/devx-logs requires additional ASG tags
and the `ec2:DescribeInstances` IAM permission.

Author: akash1810

cdk/lib/__snapshots__/registration.test.ts.snap

@@ -739,6 +739,11 @@ exports[`The Registration stack matches the snapshot for CODE 1`] = `
             "PropagateAtLaunch": true,
             "Value": "CODE",
           },
+          {
+            "Key": "SystemdUnit",
+            "PropagateAtLaunch": true,
+            "Value": "registration.service",
+          },
         ],
         "VPCZoneIdentifier": {
           "Ref": "PrivateSubnets",
@@ -1570,6 +1575,11 @@ exports[`The Registration stack matches the snapshot for PROD 1`] = `
             "PropagateAtLaunch": true,
             "Value": "PROD",
           },
+          {
+            "Key": "SystemdUnit",
+            "PropagateAtLaunch": true,
+            "Value": "registration.service",
+          },
         ],
         "VPCZoneIdentifier": {
           "Ref": "PrivateSubnets",

cdk/lib/__snapshots__/report.test.ts.snap

@@ -150,6 +150,11 @@ exports[`The Report stack matches the snapshot for CODE 1`] = `
             "PropagateAtLaunch": true,
             "Value": "CODE",
           },
+          {
+            "Key": "SystemdUnit",
+            "PropagateAtLaunch": true,
+            "Value": "report.service",
+          },
         ],
         "TargetGroupARNs": [
           {
@@ -1821,6 +1826,11 @@ exports[`The Report stack matches the snapshot for PROD 1`] = `
             "PropagateAtLaunch": true,
             "Value": "PROD",
           },
+          {
+            "Key": "SystemdUnit",
+            "PropagateAtLaunch": true,
+            "Value": "report.service",
+          },
         ],
         "TargetGroupARNs": [
           {

cdk/lib/report.ts

@@ -85,6 +85,10 @@ export class Report extends GuStack {
 				timeout: Duration.seconds(10), // The default is 5s
 				unhealthyThresholdCount: 10, // This also seems unusually high - the default is 2
 			},
+			applicationLogging: {
+				enabled: true,
+				systemdUnitName: app,
+			},
 		});
 
 		//TODO check if this customisation is really necessary (it has been copied across from

notification/conf/notification.yaml

@@ -95,7 +95,12 @@ Parameters:
   RunbookCopy:
     Type: String
     Default: <<<Runbook|https://docs.google.com/document/d/1aJMytnPGeWH8YLpD2_66doxqyr8dPvAVonYIOG-zmOA>>>
-
+  LoggingStreamName:
+    Type: AWS::SSM::Parameter::Value<String>
+    Description: SSM parameter containing the Name (not ARN) on the kinesis stream
+    AllowedValues:
+      - /account/services/logging.stream.name.code
+      - /account/services/logging.stream.name
 Resources:
   DnsRecord:
     Type: AWS::Route53::RecordSet
@@ -238,7 +243,9 @@ Resources:
             Resource:
             - !Sub arn:aws:s3:::${DistBucket}/*
             - !Sub arn:aws:s3:::${S3TopicCountBucket}/*
-          - Action: ec2:DescribeTags
+          - Action:
+            - ec2:DescribeTags
+            - ec2:DescribeInstances
             Effect: Allow
             Resource: '*'
           - Action:
@@ -324,6 +331,12 @@ Resources:
         PropagateAtLaunch: true
         Value:
           !FindInMap [Constants, App, Value]
+      - Key: SystemdUnit
+        Value: notification.service
+        PropagateAtLaunch: true
+      - Key: LogKinesisStreamName
+        Value: !Ref LoggingStreamName
+        PropagateAtLaunch: true
       VPCZoneIdentifier: !Ref PrivateSubnets
   NotificationInstanceProfile:
     Type: AWS::IAM::InstanceProfile

notification/conf/riff-raff.yaml

@@ -13,8 +13,10 @@ deployments:
       templateStageParameters:
         CODE:
           SloSqsQueueArn: /notifications/CODE/mobile-notifications/notifications.queues.sloMonitoringArn
+          LoggingStreamName: /account/services/logging.stream.name.code
         PROD:
           SloSqsQueueArn: /notifications/PROD/mobile-notifications/notifications.queues.sloMonitoringArn
+          LoggingStreamName: /account/services/logging.stream.name
   notification:
     type: autoscaling
     parameters:

registration/conf/registration.yaml

@@ -80,6 +80,12 @@ Parameters:
   RunbookCopy:
     Type: String
     Default: <<<Runbook|https://docs.google.com/document/d/1aJMytnPGeWH8YLpD2_66doxqyr8dPvAVonYIOG-zmOA>>>
+  LoggingStreamName:
+    Type: AWS::SSM::Parameter::Value<String>
+    Description: SSM parameter containing the Name (not ARN) on the kinesis stream
+    AllowedValues:
+      - /account/services/logging.stream.name.code
+      - /account/services/logging.stream.name
 Resources:
   DistributionInstanceProfile:
     Type: AWS::IAM::InstanceProfile
@@ -105,7 +111,9 @@ Resources:
           - Action: s3:GetObject
             Effect: Allow
             Resource: !Sub arn:aws:s3:::${DistBucket}/*
-          - Action: ec2:DescribeTags
+          - Action:
+            - ec2:DescribeTags
+            - ec2:DescribeInstances
             Effect: Allow
             Resource: '*'
           - Action:
@@ -267,6 +275,12 @@ Resources:
         PropagateAtLaunch: true
         Value:
           !FindInMap [Constants, App, Value]
+      - Key: SystemdUnit
+        Value: registration.service
+        PropagateAtLaunch: true
+      - Key: LogKinesisStreamName
+        Value: !Ref LoggingStreamName
+        PropagateAtLaunch: true
       VPCZoneIdentifier: !Ref PrivateSubnets
   RegistrationLaunchConfig:
     Type: AWS::AutoScaling::LaunchConfiguration

registration/conf/riff-raff.yaml

@@ -12,6 +12,11 @@ deployments:
       templateStagePaths:
         CODE: Registration-CODE.template.json
         PROD: Registration-PROD.template.json
+      templateStageParameters:
+        CODE:
+          LoggingStreamName: /account/services/logging.stream.name.code
+        PROD:
+          LoggingStreamName: /account/services/logging.stream.name
   registration:
     type: autoscaling
     parameters: