Skip to content

Commit 0804c2c

Browse files
committed
feat: Remove aws-kinesis-agent
Logs are now sent to Central ELK via https://github.com/guardian/devx-logs.
1 parent 79f592b commit 0804c2c

5 files changed

Lines changed: 2 additions & 13 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,6 @@ exports[`The Registration stack matches the snapshot for CODE 1`] = `
786786
"#!/bin/bash -ev
787787
aws --region \${AWS::Region} s3 cp s3://\${DistBucket}/\${Stack}/\${Stage}/\${App}/\${App}_1.0-latest_all.deb /tmp
788788
dpkg -i /tmp/\${App}_1.0-latest_all.deb
789-
/opt/aws-kinesis-agent/configure-aws-kinesis-agent \${AWS::Region} mobile-log-aggregation-\${Stage} /var/log/\${App}/application.log
790789
",
791790
{
792791
"App": {
@@ -1622,7 +1621,6 @@ exports[`The Registration stack matches the snapshot for PROD 1`] = `
16221621
"#!/bin/bash -ev
16231622
aws --region \${AWS::Region} s3 cp s3://\${DistBucket}/\${Stack}/\${Stage}/\${App}/\${App}_1.0-latest_all.deb /tmp
16241623
dpkg -i /tmp/\${App}_1.0-latest_all.deb
1625-
/opt/aws-kinesis-agent/configure-aws-kinesis-agent \${AWS::Region} mobile-log-aggregation-\${Stage} /var/log/\${App}/application.log
16261624
",
16271625
{
16281626
"App": {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,8 +1621,7 @@ aws s3 cp 's3://",
16211621
"Ref": "DistributionBucketName",
16221622
},
16231623
"/mobile-notifications/CODE/report/report_1.0-latest_all.deb' '/report/report_1.0-latest_all.deb'
1624-
dpkg -i /report/report_1.0-latest_all.deb
1625-
/opt/aws-kinesis-agent/configure-aws-kinesis-agent eu-west-1 mobile-log-aggregation-CODE /var/log/report/application.log",
1624+
dpkg -i /report/report_1.0-latest_all.deb",
16261625
],
16271626
],
16281627
},
@@ -3297,8 +3296,7 @@ aws s3 cp 's3://",
32973296
"Ref": "DistributionBucketName",
32983297
},
32993298
"/mobile-notifications/PROD/report/report_1.0-latest_all.deb' '/report/report_1.0-latest_all.deb'
3300-
dpkg -i /report/report_1.0-latest_all.deb
3301-
/opt/aws-kinesis-agent/configure-aws-kinesis-agent eu-west-1 mobile-log-aggregation-PROD /var/log/report/application.log",
3299+
dpkg -i /report/report_1.0-latest_all.deb",
33023300
],
33033301
],
33043302
},

cdk/lib/report.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ export class Report extends GuStack {
9797
const cfnAsg = autoScalingGroup.node.defaultChild as CfnAutoScalingGroup;
9898
cfnAsg.healthCheckGracePeriod = Duration.seconds(400).toSeconds();
9999

100-
//TODO replace configure-aws-kinesis-agent with devx-logs?
101-
autoScalingGroup.userData.addCommands(
102-
`/opt/aws-kinesis-agent/configure-aws-kinesis-agent ${region} mobile-log-aggregation-${stage} /var/log/${app}/application.log`,
103-
);
104-
105100
adjustCloudformationParameters(this);
106101

107102
new GuCname(this, 'DnsRecordForReport', {

notification/conf/notification.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ Resources:
363363
#!/bin/bash -ev
364364
aws --region ${AWS::Region} s3 cp s3://${DistBucket}/${Stack}/${Stage}/${App}/${App}_1.0-latest_all.deb /tmp
365365
dpkg -i /tmp/${App}_1.0-latest_all.deb
366-
/opt/aws-kinesis-agent/configure-aws-kinesis-agent ${AWS::Region} mobile-log-aggregation-${Stage} /var/log/${App}/application.log
367366
- Stack: !FindInMap [Constants, Stack, Value]
368367
App: !FindInMap [Constants, App, Value]
369368
ScaleDownPolicy:

registration/conf/registration.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ Resources:
301301
#!/bin/bash -ev
302302
aws --region ${AWS::Region} s3 cp s3://${DistBucket}/${Stack}/${Stage}/${App}/${App}_1.0-latest_all.deb /tmp
303303
dpkg -i /tmp/${App}_1.0-latest_all.deb
304-
/opt/aws-kinesis-agent/configure-aws-kinesis-agent ${AWS::Region} mobile-log-aggregation-${Stage} /var/log/${App}/application.log
305304
- Stack: !FindInMap [Constants, Stack, Value]
306305
App: !FindInMap [Constants, App, Value]
307306
ScaleDownPolicy:

0 commit comments

Comments
 (0)