Skip to content

Commit 4e72dec

Browse files
rjjaegerawsrjjaegeraws
authored
fix for 1127 Rsyslog IMDSv2 (#1161)
* update rsyslog script for IMDSv2 * update script * update rsyslog to IMDSv2
1 parent caee051 commit 4e72dec

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

‎reference-artifacts/SAMPLE_CONFIGS/config.SSM-Patching-example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,7 @@
13111311
"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
13121312
"rsyslog-instance-type": "t3.large",
13131313
"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
1314-
"rsyslog-enforce-imdsv2": false,
1314+
"rsyslog-enforce-imdsv2": true,
13151315
"rsyslog-root-volume-size": 100,
13161316
"rsyslog-max-instance-age": 7
13171317
}

‎reference-artifacts/SAMPLE_CONFIGS/config.example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@
12781278
"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
12791279
"rsyslog-instance-type": "t3.large",
12801280
"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
1281-
"rsyslog-enforce-imdsv2": false,
1281+
"rsyslog-enforce-imdsv2": true,
12821282
"rsyslog-root-volume-size": 100,
12831283
"rsyslog-max-instance-age": 7
12841284
}

‎reference-artifacts/SAMPLE_CONFIGS/config.lite-CTNFW-example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@
12511251
"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
12521252
"rsyslog-instance-type": "t3.large",
12531253
"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
1254-
"rsyslog-enforce-imdsv2": false,
1254+
"rsyslog-enforce-imdsv2": true,
12551255
"rsyslog-root-volume-size": 100,
12561256
"rsyslog-max-instance-age": 7
12571257
}

‎reference-artifacts/SAMPLE_CONFIGS/config.lite-GWLB-example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@
12391239
"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
12401240
"rsyslog-instance-type": "t3.large",
12411241
"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
1242-
"rsyslog-enforce-imdsv2": false,
1242+
"rsyslog-enforce-imdsv2": true,
12431243
"rsyslog-root-volume-size": 100,
12441244
"rsyslog-max-instance-age": 7
12451245
}

‎reference-artifacts/SAMPLE_CONFIGS/config.lite-NFW-example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@
12341234
"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
12351235
"rsyslog-instance-type": "t3.large",
12361236
"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
1237-
"rsyslog-enforce-imdsv2": false,
1237+
"rsyslog-enforce-imdsv2": true,
12381238
"rsyslog-root-volume-size": 100,
12391239
"rsyslog-max-instance-age": 7
12401240
}

‎reference-artifacts/SAMPLE_CONFIGS/config.lite-VPN-example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@
12281228
"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
12291229
"rsyslog-instance-type": "t3.large",
12301230
"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
1231-
"rsyslog-enforce-imdsv2": false,
1231+
"rsyslog-enforce-imdsv2": true,
12321232
"rsyslog-root-volume-size": 100,
12331233
"rsyslog-max-instance-age": 7
12341234
}

‎reference-artifacts/SAMPLE_CONFIGS/config.multi-region-example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@
15021502
"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
15031503
"rsyslog-instance-type": "t3.large",
15041504
"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
1505-
"rsyslog-enforce-imdsv2": false,
1505+
"rsyslog-enforce-imdsv2": true,
15061506
"rsyslog-root-volume-size": 100,
15071507
"rsyslog-max-instance-age": 7
15081508
}

‎src/lib/cdk-constructs/src/vpc/asg.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export class RsysLogAutoScalingGroup extends Construct {
121121
],
122122
});
123123

124-
let rsyslogUserData = `#!/bin/bash\necho "[v8-stable]\nname=Adiscon CentOS-6 - local packages for \\$basearch\nbaseurl=http://rpms.adiscon.com/v8-stable/epel-6/\\$basearch\nenabled=0\ngpgcheck=0\ngpgkey=http://rpms.adiscon.com/RPM-GPG-KEY-Adiscon\nprotect=1" >> /etc/yum.repos.d/rsyslog.repo\nyum update -y\nyum install -y rsyslog --enablerepo=v8-stable --setopt=v8-stable.priority=1\nchkconfig rsyslog on\naws s3 cp s3://${props.centralBucketName}/rsyslog/rsyslog.conf /etc/rsyslog.conf\nservice rsyslog restart\nwget https://s3.${cdk.Aws.REGION}.amazonaws.com/amazoncloudwatch-agent-${cdk.Aws.REGION}/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm\nrpm -U ./amazon-cloudwatch-agent.rpm\ninstanceid=$(curl http://169.254.169.254/latest/meta-data/instance-id)\necho "{\\"logs\\": {\\"logs_collected\\": {\\"files\\": {\\"collect_list\\": [{\\"file_path\\": \\"/var/log/messages\\",\\"log_group_name\\": \\"${props.logGroupName}\\",\\"log_stream_name\\": \\"$instanceid\\"}]}}}}" >> /opt/aws/amazon-cloudwatch-agent/bin/config.json\n/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -s -a fetch-config -m ec2 -c file:/opt/aws/amazon-cloudwatch-agent/bin/config.json`;
124+
let rsyslogUserData = `#!/bin/bash\necho "[v8-stable]\nname=Adiscon CentOS-6 - local packages for \\$basearch\nbaseurl=http://rpms.adiscon.com/v8-stable/epel-6/\\$basearch\nenabled=0\ngpgcheck=0\ngpgkey=http://rpms.adiscon.com/RPM-GPG-KEY-Adiscon\nprotect=1" >> /etc/yum.repos.d/rsyslog.repo\nyum update -y\nyum install -y rsyslog --enablerepo=v8-stable --setopt=v8-stable.priority=1\nchkconfig rsyslog on\naws s3 cp s3://${props.centralBucketName}/rsyslog/rsyslog.conf /etc/rsyslog.conf\nservice rsyslog restart\nwget https://s3.${cdk.Aws.REGION}.amazonaws.com/amazoncloudwatch-agent-${cdk.Aws.REGION}/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm\nrpm -U ./amazon-cloudwatch-agent.rpm\nTOKEN=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")\ninstanceid=$(curl -H "X-aws-ec2-metadata-token: $TOKEN" -v http://169.254.169.254/latest/meta-data/instance-id)\necho "{\\"logs\\": {\\"logs_collected\\": {\\"files\\": {\\"collect_list\\": [{\\"file_path\\": \\"/var/log/messages\\",\\"log_group_name\\": \\"${props.logGroupName}\\",\\"log_stream_name\\": \\"$instanceid\\"}]}}}}" >> /opt/aws/amazon-cloudwatch-agent/bin/config.json\n/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -s -a fetch-config -m ec2 -c file:/opt/aws/amazon-cloudwatch-agent/bin/config.json`;
125125

126126
if (props.userData) {
127127
/* eslint-disable no-template-curly-in-string */

0 commit comments

Comments
 (0)