Skip to content

Commit 5614e56

Browse files
zzhloginzzhlogin
authored
Update python expected-data-template to match with cw agent rpm latest version (#34)
* Update python expected-data-template to match with cw agent rpm latest version * Update terraform. * Fix aws.local.operation.
1 parent d9f555b commit 5614e56

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
lines changed

‎terraform/python/ec2/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ resource "null_resource" "main_service_setup" {
115115
"echo $agent_config > amazon-cloudwatch-agent.json",
116116

117117
# Get and run CW agent rpm
118-
"wget -O cw-agent.rpm https://amazoncloudwatch-agent-us-east-1.s3.us-east-1.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm",
118+
"${var.get_cw_agent_rpm_command}",
119119
"sudo rpm -U ./cw-agent.rpm",
120120
"sudo /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -s -c file:./amazon-cloudwatch-agent.json",
121121

@@ -191,7 +191,7 @@ resource "null_resource" "remote_service_setup" {
191191
"echo $agent_config > amazon-cloudwatch-agent.json",
192192

193193
# Get and run CW agent rpm
194-
"wget -O cw-agent.rpm https://amazoncloudwatch-agent-us-east-1.s3.us-east-1.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm",
194+
"${var.get_cw_agent_rpm_command}",
195195
"sudo rpm -U ./cw-agent.rpm",
196196
"sudo /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -s -c file:./amazon-cloudwatch-agent.json",
197197

‎validator/src/main/resources/expected-data-template/python/ec2/aws-sdk-call-trace.mustache

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"account_id": "^{{accountId}}$"
1414
},
1515
"annotations": {
16-
"aws_local_service": "^{{serviceName}}$",
17-
"HostedIn_Environment": "^EC2$",
18-
"aws_local_operation": "^GET aws-sdk-call$"
16+
"aws.local.service": "^{{serviceName}}$",
17+
"HostedIn.Environment": "^EC2$",
18+
"aws.local.operation": "^GET aws-sdk-call$"
1919
},
2020
"metadata": {
2121
"default": {
@@ -37,12 +37,12 @@
3737
"operation": "^GetBucketLocation$"
3838
},
3939
"annotations": {
40-
"HostedIn_Environment": "^EC2$",
41-
"aws_local_service": "^{{serviceName}}$",
42-
"aws_local_operation": "^GET aws-sdk-call$",
43-
"aws_remote_service": "^AWS\\.SDK\\.S3$",
44-
"aws_remote_operation": "^GetBucketLocation$",
45-
"aws_remote_target": "^::s3:::e2e-test-bucket-name$"
40+
"HostedIn.Environment": "^EC2$",
41+
"aws.local.service": "^{{serviceName}}$",
42+
"aws.local.operation": "^GET aws-sdk-call$",
43+
"aws.remote.service": "^AWS\\.SDK\\.S3$",
44+
"aws.remote.operation": "^GetBucketLocation$",
45+
"aws.remote.target": "^::s3:::e2e-test-bucket-name$"
4646
},
4747
"metadata": {
4848
"default": {

‎validator/src/main/resources/expected-data-template/python/ec2/client-call-trace.mustache

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[{
22
"name": "^{{serviceName}}$",
33
"annotations": {
4-
"aws_local_service": "^{{serviceName}}$",
5-
"HostedIn_Environment": "^EC2$",
6-
"aws_local_operation": "^InternalOperation$"
4+
"aws.local.service": "^{{serviceName}}$",
5+
"HostedIn.Environment": "^EC2$",
6+
"aws.local.operation": "^InternalOperation$"
77
},
88
"metadata": {
99
"default": {
@@ -23,11 +23,11 @@
2323
}
2424
},
2525
"annotations": {
26-
"HostedIn_Environment": "^EC2$",
27-
"aws_local_service": "^{{serviceName}}$",
28-
"aws_local_operation": "^InternalOperation$",
29-
"aws_remote_service": "^local-root-client-call$",
30-
"aws_remote_operation": "GET /"
26+
"HostedIn.Environment": "^EC2$",
27+
"aws.local.service": "^{{serviceName}}$",
28+
"aws.local.operation": "^InternalOperation$",
29+
"aws.remote.service": "^local-root-client-call$",
30+
"aws.remote.operation": "GET /"
3131
},
3232
"metadata": {
3333
"default": {
@@ -50,7 +50,7 @@
5050
}
5151
},
5252
"annotations": {
53-
"aws_local_service": "^local-root-client-call$",
54-
"aws_local_operation": "^GET /$"
53+
"aws.local.service": "^local-root-client-call$",
54+
"aws.local.operation": "^GET /$"
5555
}
5656
}]

‎validator/src/main/resources/expected-data-template/python/ec2/outgoing-http-call-trace.mustache

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"account_id": "^{{accountId}}$"
1414
},
1515
"annotations": {
16-
"aws_local_service": "^{{serviceName}}$",
17-
"HostedIn_Environment": "^EC2$",
18-
"aws_local_operation": "^GET outgoing-http-call$"
16+
"aws.local.service": "^{{serviceName}}$",
17+
"HostedIn.Environment": "^EC2$",
18+
"aws.local.operation": "^GET outgoing-http-call$"
1919
},
2020
"metadata": {
2121
"default": {
@@ -35,11 +35,11 @@
3535
}
3636
},
3737
"annotations": {
38-
"HostedIn_Environment": "^EC2$",
39-
"aws_local_service": "^{{serviceName}}$",
40-
"aws_local_operation": "^GET outgoing-http-call$",
41-
"aws_remote_service": "^www.amazon.com$",
42-
"aws_remote_operation": "^GET /$"
38+
"HostedIn.Environment": "^EC2$",
39+
"aws.local.service": "^{{serviceName}}$",
40+
"aws.local.operation": "^GET outgoing-http-call$",
41+
"aws.remote.service": "^www.amazon.com$",
42+
"aws.remote.operation": "^GET /$"
4343
},
4444
"metadata": {
4545
"default": {

‎validator/src/main/resources/expected-data-template/python/ec2/remote-service-trace.mustache

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"account_id": "^{{accountId}}$"
1414
},
1515
"annotations": {
16-
"aws_local_service": "^{{serviceName}}$",
17-
"HostedIn_Environment": "^EC2$",
18-
"aws_local_operation": "^GET remote-service$"
16+
"aws.local.service": "^{{serviceName}}$",
17+
"HostedIn.Environment": "^EC2$",
18+
"aws.local.operation": "^GET remote-service$"
1919
},
2020
"metadata": {
2121
"default": {
@@ -35,10 +35,10 @@
3535
}
3636
},
3737
"annotations": {
38-
"aws_local_service": "^{{serviceName}}$",
39-
"aws_local_operation": "^GET remote-service$",
40-
"aws_remote_service": "^{{remoteServiceDeploymentName}}$",
41-
"aws_remote_operation": "^GET /healthcheck$"
38+
"aws.local.service": "^{{serviceName}}$",
39+
"aws.local.operation": "^GET remote-service$",
40+
"aws.remote.service": "^{{remoteServiceDeploymentName}}$",
41+
"aws.remote.operation": "^GET /healthcheck$"
4242
},
4343
"metadata": {
4444
"default": {
@@ -58,9 +58,9 @@
5858
}
5959
},
6060
"annotations": {
61-
"HostedIn_Environment": "^EC2$",
62-
"aws_local_service": "^{{remoteServiceName}}$",
63-
"aws_local_operation": "^GET healthcheck$"
61+
"HostedIn.Environment": "^EC2$",
62+
"aws.local.service": "^{{remoteServiceName}}$",
63+
"aws.local.operation": "^GET healthcheck$"
6464
},
6565
"metadata": {
6666
"default": {

0 commit comments

Comments
 (0)