Skip to content

Commit 5e80736

Browse files
sshriharsshrihar
authored
Merge pull request 0xPolygon#2456 from 0xPolygon/hosted/DEVOPS-3415-deployment-fix-after-datadog-integration-enabled
Fix for taskdef template after datadog integration enabled
2 parents 804d946 + 8e460af commit 5e80736

File tree

3 files changed

+94
-151
lines changed

3 files changed

+94
-151
lines changed

‎.github/assets/polygon-docs-dev-taskdef.json‎

Lines changed: 44 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,19 @@
99
"logConfiguration": {
1010
"logDriver": "awsfirelens",
1111
"options": {
12-
"Name": "OpenTelemetry"
13-
}
12+
"Name": "datadog",
13+
"Host": "http-intake.logs.datadoghq.com",
14+
"dd_service": "polygon-docs-dev",
15+
"dd_source": "nodejs",
16+
"TLS": "on",
17+
"provider": "ecs"
18+
},
19+
"secretOptions": [
20+
{
21+
"name": "apiKey",
22+
"valueFrom": "arn:aws:ssm:eu-west-1:058264511034:parameter/DATADOG_APIKEY"
23+
}
24+
]
1425
},
1526
"entryPoint": null,
1627
"portMappings": [{
@@ -55,67 +66,37 @@
5566
"credentialsParameter": ""
5667
}
5768
},
58-
{
59-
"essential": false,
60-
"name": "otel-collector",
61-
"image": "otel/opentelemetry-collector-contrib",
62-
"firelensConfiguration": {
63-
"type": "fluentbit",
64-
"options": {}
65-
},
66-
"portMappings": [
67-
{
68-
"name": "otel-collector-4317-tcp",
69-
"containerPort": 4317,
70-
"hostPort": 4317,
71-
"protocol": "tcp",
72-
"appProtocol": "grpc"
73-
},
74-
{
75-
"name": "otel-collector-4318-tcp",
76-
"containerPort": 4318,
77-
"hostPort": 4318,
78-
"protocol": "tcp",
79-
"appProtocol": "grpc"
80-
}
81-
],
82-
"command": [
83-
"--config",
84-
"env:SSM_CONFIG"
85-
],
86-
"environment": [
87-
{
88-
"name": "CORALOGIX_DOMAIN",
89-
"value": "eu2.coralogix.com"
90-
}
91-
],
92-
"secrets": [
93-
{
94-
"name": "SSM_CONFIG",
95-
"valueFrom": "arn:aws:ssm:eu-west-1:058264511034:parameter/CORALOGIX/CX_OTEL/config.yaml"
96-
},
97-
{
98-
"name": "PRIVATE_KEY",
99-
"valueFrom": "arn:aws:ssm:eu-west-1:058264511034:parameter/CORALOGIX/PRIVATE_KEY"
100-
}
101-
],
102-
"user": "0",
103-
"memoryReservation": 50,
104-
"resourceRequirements": null,
105-
"environmentFiles": [],
106-
"mountPoints": null,
107-
"volumesFrom": null,
108-
"hostname": null,
109-
"workingDirectory": null,
110-
"extraHosts": null,
111-
"logConfiguration": null,
112-
"ulimits": null,
113-
"dockerLabels": null,
114-
"dependsOn": null,
115-
"repositoryCredentials": {
116-
"credentialsParameter": ""
117-
}
118-
}],
69+
{
70+
"essential": true,
71+
"image": "amazon/aws-for-fluent-bit:stable",
72+
"name": "log_router",
73+
"firelensConfiguration": {
74+
"type": "fluentbit",
75+
"options": {
76+
"enable-ecs-log-metadata": "true"
77+
}
78+
},
79+
"environment": null,
80+
"secrets": null,
81+
"memoryReservation": 50,
82+
"resourceRequirements": null,
83+
"portMappings": [],
84+
"environmentFiles": [],
85+
"mountPoints": null,
86+
"volumesFrom": null,
87+
"hostname": null,
88+
"user": null,
89+
"workingDirectory": null,
90+
"extraHosts": null,
91+
"logConfiguration": null,
92+
"ulimits": null,
93+
"dockerLabels": null,
94+
"dependsOn": null,
95+
"repositoryCredentials": {
96+
"credentialsParameter": ""
97+
}
98+
}
99+
],
119100
"volumes": [],
120101
"networkMode": "awsvpc",
121102
"memory": "1024",

‎.github/assets/polygon-docs-staging-taskdef.json‎

Lines changed: 25 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,19 @@
99
"logConfiguration": {
1010
"logDriver": "awsfirelens",
1111
"options": {
12-
"Name": "OpenTelemetry"
13-
}
12+
"Name": "datadog",
13+
"Host": "http-intake.logs.datadoghq.com",
14+
"dd_service": "polygon-docs-staging",
15+
"dd_source": "nodejs",
16+
"TLS": "on",
17+
"provider": "ecs"
18+
},
19+
"secretOptions": [
20+
{
21+
"name": "apiKey",
22+
"valueFrom": "arn:aws:ssm:eu-west-1:070528468658:parameter/DATADOG_APIKEY"
23+
}
24+
]
1425
},
1526
"entryPoint": null,
1627
"portMappings": [{
@@ -56,56 +67,25 @@
5667
}
5768
},
5869
{
59-
"essential": false,
60-
"name": "otel-collector",
61-
"image": "otel/opentelemetry-collector-contrib",
70+
"essential": true,
71+
"image": "amazon/aws-for-fluent-bit:stable",
72+
"name": "log_router",
6273
"firelensConfiguration": {
6374
"type": "fluentbit",
64-
"options": {}
65-
},
66-
"portMappings": [
67-
{
68-
"name": "otel-collector-4317-tcp",
69-
"containerPort": 4317,
70-
"hostPort": 4317,
71-
"protocol": "tcp",
72-
"appProtocol": "grpc"
73-
},
74-
{
75-
"name": "otel-collector-4318-tcp",
76-
"containerPort": 4318,
77-
"hostPort": 4318,
78-
"protocol": "tcp",
79-
"appProtocol": "grpc"
80-
}
81-
],
82-
"command": [
83-
"--config",
84-
"env:SSM_CONFIG"
85-
],
86-
"environment": [
87-
{
88-
"name": "CORALOGIX_DOMAIN",
89-
"value": "eu2.coralogix.com"
75+
"options": {
76+
"enable-ecs-log-metadata": "true"
9077
}
91-
],
92-
"secrets": [
93-
{
94-
"name": "SSM_CONFIG",
95-
"valueFrom": "arn:aws:ssm:eu-west-1:070528468658:parameter/CORALOGIX/CX_OTEL/config.yaml"
96-
},
97-
{
98-
"name": "PRIVATE_KEY",
99-
"valueFrom": "arn:aws:ssm:eu-west-1:070528468658:parameter/CORALOGIX/PRIVATE_KEY"
100-
}
101-
],
102-
"user": "0",
78+
},
79+
"environment": null,
80+
"secrets": null,
10381
"memoryReservation": 50,
10482
"resourceRequirements": null,
83+
"portMappings": [],
10584
"environmentFiles": [],
10685
"mountPoints": null,
10786
"volumesFrom": null,
10887
"hostname": null,
88+
"user": null,
10989
"workingDirectory": null,
11090
"extraHosts": null,
11191
"logConfiguration": null,
@@ -114,8 +94,9 @@
11494
"dependsOn": null,
11595
"repositoryCredentials": {
11696
"credentialsParameter": ""
97+
}
11798
}
118-
}],
99+
],
119100
"volumes": [],
120101
"networkMode": "awsvpc",
121102
"memory": "512",

‎.github/assets/polygon-docs-taskdef.json‎

Lines changed: 25 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,19 @@
99
"logConfiguration": {
1010
"logDriver": "awsfirelens",
1111
"options": {
12-
"Name": "OpenTelemetry"
13-
}
12+
"Name": "datadog",
13+
"Host": "http-intake.logs.datadoghq.com",
14+
"dd_service": "polygon-docs",
15+
"dd_source": "nodejs",
16+
"TLS": "on",
17+
"provider": "ecs"
18+
},
19+
"secretOptions": [
20+
{
21+
"name": "apiKey",
22+
"valueFrom": "arn:aws:ssm:eu-west-1:042947190491:parameter/DATADOG_APIKEY"
23+
}
24+
]
1425
},
1526
"entryPoint": null,
1627
"portMappings": [{
@@ -56,56 +67,25 @@
5667
}
5768
},
5869
{
59-
"essential": false,
60-
"name": "otel-collector",
61-
"image": "otel/opentelemetry-collector-contrib",
70+
"essential": true,
71+
"image": "amazon/aws-for-fluent-bit:stable",
72+
"name": "log_router",
6273
"firelensConfiguration": {
6374
"type": "fluentbit",
64-
"options": {}
65-
},
66-
"portMappings": [
67-
{
68-
"name": "otel-collector-4317-tcp",
69-
"containerPort": 4317,
70-
"hostPort": 4317,
71-
"protocol": "tcp",
72-
"appProtocol": "grpc"
73-
},
74-
{
75-
"name": "otel-collector-4318-tcp",
76-
"containerPort": 4318,
77-
"hostPort": 4318,
78-
"protocol": "tcp",
79-
"appProtocol": "grpc"
80-
}
81-
],
82-
"command": [
83-
"--config",
84-
"env:SSM_CONFIG"
85-
],
86-
"environment": [
87-
{
88-
"name": "CORALOGIX_DOMAIN",
89-
"value": "eu2.coralogix.com"
75+
"options": {
76+
"enable-ecs-log-metadata": "true"
9077
}
91-
],
92-
"secrets": [
93-
{
94-
"name": "SSM_CONFIG",
95-
"valueFrom": "arn:aws:ssm:eu-west-1:042947190491:parameter/CORALOGIX/CX_OTEL/config.yaml"
96-
},
97-
{
98-
"name": "PRIVATE_KEY",
99-
"valueFrom": "arn:aws:ssm:eu-west-1:042947190491:parameter/CORALOGIX/PRIVATE_KEY"
100-
}
101-
],
102-
"user": "0",
78+
},
79+
"environment": null,
80+
"secrets": null,
10381
"memoryReservation": 50,
10482
"resourceRequirements": null,
83+
"portMappings": [],
10584
"environmentFiles": [],
10685
"mountPoints": null,
10786
"volumesFrom": null,
10887
"hostname": null,
88+
"user": null,
10989
"workingDirectory": null,
11090
"extraHosts": null,
11191
"logConfiguration": null,
@@ -114,8 +94,9 @@
11494
"dependsOn": null,
11595
"repositoryCredentials": {
11696
"credentialsParameter": ""
97+
}
11798
}
118-
}],
99+
],
119100
"volumes": [],
120101
"networkMode": "awsvpc",
121102
"memory": "1024",

0 commit comments

Comments
 (0)