notid/integreat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating for staging

Browse Source
This commit is contained in:
Bryce Covert
2022-01-04 16:20:45 -08:00
parent f889d27baf
commit 83f2827553
7 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/background/metrics.clj
View File

@@ -5,4 +5,4 @@
(mount/defstate metrics-setup (mount/defstate metrics-setup
:start (statsd/setup! :host "127.0.0.1" :port 8125 :prefix "integreat.app" :tags #{(:dd-env env)}) :start (statsd/setup! :host "127.0.0.1" :port 8125 :prefix "integreat.app" :tags #{(:dd-env env)})
:stop nil) :stop (statsd/shutdown!))

10
terraform/prod-background-worker-taskdef.json
View File

@@ -6,8 +6,12 @@
"value": "/usr/local/config/prod-background-worker.edn" "value": "/usr/local/config/prod-background-worker.edn"
}, },
{ {
"name": "which_env", "name": "DD_ENV",
"value": "prod" "value": "prod"
},
{
"name": "DD_SERVICE",
"value": "integreat-background-worker"
} }
], ],
"essential": true, "essential": true,
@@ -20,6 +24,10 @@
"awslogs-stream-prefix": "ecs" "awslogs-stream-prefix": "ecs"
} }
}, },
"dockerLabels": {
"com.datadoghq.tags.env": "prod",
"com.datadoghq.tags.service": "integreat-background-worker"
},
"mountPoints": [], "mountPoints": [],
"name": "integreat-app", "name": "integreat-app",
"portMappings": [ "portMappings": [

10
terraform/prod-taskdef.json
View File

@@ -6,8 +6,12 @@
"value": "/usr/local/config/prod.edn" "value": "/usr/local/config/prod.edn"
}, },
{ {
"name": "which_env", "name": "DD_ENV",
"value": "prod" "value": "prod"
},
{
"name": "DD_SERVICE",
"value": "integreat-app"
} }
], ],
"essential": true, "essential": true,
@@ -20,6 +24,10 @@
"awslogs-stream-prefix": "ecs" "awslogs-stream-prefix": "ecs"
} }
}, },
"dockerLabels": {
"com.datadoghq.tags.env": "prod",
"com.datadoghq.tags.service": "integreat-app"
},
"mountPoints": [], "mountPoints": [],
"name": "integreat-app", "name": "integreat-app",
"portMappings": [ "portMappings": [

14
terraform/staging-background-worker-taskdef.json
View File

@@ -6,8 +6,12 @@
"value": "/usr/local/config/staging-background-worker.edn" "value": "/usr/local/config/staging-background-worker.edn"
}, },
{ {
"name": "which_env", "name": "DD_ENV",
"value": "staging" "value": "staging"
},
{
"name": "DD_SERVICE",
"value": "integreat-background-worker"
} }
], ],
"essential": true, "essential": true,
@@ -20,6 +24,10 @@
"awslogs-stream-prefix": "ecs" "awslogs-stream-prefix": "ecs"
} }
}, },
"dockerLabels": {
"com.datadoghq.tags.env": "staging",
"com.datadoghq.tags.service": "integreat-background-worker"
},
"mountPoints": [], "mountPoints": [],
"name": "integreat-app", "name": "integreat-app",
"portMappings": [ "portMappings": [
@@ -45,10 +53,6 @@
{ {
"name": "ECS_FARGATE", "name": "ECS_FARGATE",
"value": "true" "value": "true"
},
{
"name": "DD_DOCKER_ENV_AS_TAGS",
"value": "{\"which_env\":\"env\"}"
} }
], ],
"essential": true, "essential": true,

10
terraform/staging-taskdef.json
View File

@@ -6,8 +6,12 @@
"value": "/usr/local/config/staging.edn" "value": "/usr/local/config/staging.edn"
}, },
{ {
"name": "which_env", "name": "DD_ENV",
"value": "staging" "value": "staging"
},
{
"name": "DD_SERVICE",
"value": "integreat-app"
} }
], ],
"essential": true, "essential": true,
@@ -20,6 +24,10 @@
"awslogs-stream-prefix": "ecs" "awslogs-stream-prefix": "ecs"
} }
}, },
"dockerLabels": {
"com.datadoghq.tags.env": "staging",
"com.datadoghq.tags.service": "integreat-app"
},
"mountPoints": [], "mountPoints": [],
"name": "integreat-app", "name": "integreat-app",
"portMappings": [ "portMappings": [

18
terraform/terraform.tfstate.d/staging/terraform.tfstate
View File

@@ -1,7 +1,7 @@
{ {
"version": 4, "version": 4,
"terraform_version": "0.14.4", "terraform_version": "0.14.4",
"serial": 89, "serial": 99,
"lineage": "91d10fe0-8033-8778-c202-78d5a81632e8", "lineage": "91d10fe0-8033-8778-c202-78d5a81632e8",
"outputs": { "outputs": {
"aws_access_key_id": { "aws_access_key_id": {
@@ -153,7 +153,7 @@
], ],
"tags": {}, "tags": {},
"tags_all": {}, "tags_all": {},
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:97", "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:101",
"timeouts": { "timeouts": {
"delete": null "delete": null
}, },
@@ -232,7 +232,7 @@
], ],
"tags": {}, "tags": {},
"tags_all": {}, "tags_all": {},
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:17", "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:21",
"timeouts": { "timeouts": {
"delete": null "delete": null
}, },
@@ -256,8 +256,8 @@
{ {
"schema_version": 1, "schema_version": 1,
"attributes": { "attributes": {
"arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:98", "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:103",
"container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/staging.edn\"},{\"name\":\"which_env\",\"value\":\"staging\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat:staging\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-staging\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":3000,\"hostPort\":3000,\"protocol\":\"tcp\"},{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"}],\"volumesFrom\":[]},{\"cpu\":0,\"environment\":[{\"name\":\"DD_API_KEY\",\"value\":\"ce10d932c47b358e81081ae67bd8c112\"},{\"name\":\"DD_DOCKER_ENV_AS_TAGS\",\"value\":\"{\\\"which_env\\\":\\\"environment\\\"}\"},{\"name\":\"ECS_FARGATE\",\"value\":\"true\"}],\"essential\":true,\"image\":\"public.ecr.aws/datadog/agent:latest\",\"mountPoints\":[],\"name\":\"datadog-agent\",\"portMappings\":[],\"volumesFrom\":[]}]", "container_definitions": "[{\"cpu\":0,\"dockerLabels\":{\"com.datadoghq.tags.env\":\"staging\",\"com.datadoghq.tags.service\":\"integreat-app\"},\"environment\":[{\"name\":\"DD_ENV\",\"value\":\"staging\"},{\"name\":\"DD_SERVICE\",\"value\":\"integreat-app\"},{\"name\":\"config\",\"value\":\"/usr/local/config/staging.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat:staging\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-staging\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":3000,\"hostPort\":3000,\"protocol\":\"tcp\"},{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"}],\"volumesFrom\":[]},{\"cpu\":0,\"environment\":[{\"name\":\"DD_API_KEY\",\"value\":\"ce10d932c47b358e81081ae67bd8c112\"},{\"name\":\"DD_DOCKER_ENV_AS_TAGS\",\"value\":\"{\\\"which_env\\\":\\\"env\\\"}\"},{\"name\":\"ECS_FARGATE\",\"value\":\"true\"}],\"essential\":true,\"image\":\"public.ecr.aws/datadog/agent:latest\",\"mountPoints\":[],\"name\":\"datadog-agent\",\"portMappings\":[],\"volumesFrom\":[]}]",
"cpu": "2048", "cpu": "2048",
"ephemeral_storage": [], "ephemeral_storage": [],
"execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole", "execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole",
@@ -273,7 +273,7 @@
"requires_compatibilities": [ "requires_compatibilities": [
"FARGATE" "FARGATE"
], ],
"revision": 98, "revision": 103,
"runtime_platform": [], "runtime_platform": [],
"tags": null, "tags": null,
"tags_all": {}, "tags_all": {},
@@ -294,8 +294,8 @@
{ {
"schema_version": 1, "schema_version": 1,
"attributes": { "attributes": {
"arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:18", "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:23",
"container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/staging-background-worker.edn\"},{\"name\":\"which_env\",\"value\":\"staging\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat:staging\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-background-worker-staging\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"},{\"containerPort\":9090,\"hostPort\":9090,\"protocol\":\"tcp\"}],\"volumesFrom\":[]},{\"cpu\":0,\"environment\":[{\"name\":\"DD_API_KEY\",\"value\":\"ce10d932c47b358e81081ae67bd8c112\"},{\"name\":\"DD_DOCKER_ENV_AS_TAGS\",\"value\":\"{\\\"which_env\\\":\\\"environment\\\"}\"},{\"name\":\"ECS_FARGATE\",\"value\":\"true\"}],\"essential\":true,\"image\":\"public.ecr.aws/datadog/agent:latest\",\"mountPoints\":[],\"name\":\"datadog-agent\",\"portMappings\":[],\"volumesFrom\":[]}]", "container_definitions": "[{\"cpu\":0,\"dockerLabels\":{\"com.datadoghq.tags.env\":\"staging\",\"com.datadoghq.tags.service\":\"integreat-background-worker\"},\"environment\":[{\"name\":\"DD_ENV\",\"value\":\"staging\"},{\"name\":\"DD_SERVICE\",\"value\":\"integreat-background-worker\"},{\"name\":\"config\",\"value\":\"/usr/local/config/staging-background-worker.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat:staging\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-background-worker-staging\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"},{\"containerPort\":9090,\"hostPort\":9090,\"protocol\":\"tcp\"}],\"volumesFrom\":[]},{\"cpu\":0,\"environment\":[{\"name\":\"DD_API_KEY\",\"value\":\"ce10d932c47b358e81081ae67bd8c112\"},{\"name\":\"ECS_FARGATE\",\"value\":\"true\"}],\"essential\":true,\"image\":\"public.ecr.aws/datadog/agent:latest\",\"mountPoints\":[],\"name\":\"datadog-agent\",\"portMappings\":[],\"volumesFrom\":[]}]",
"cpu": "1024", "cpu": "1024",
"ephemeral_storage": [], "ephemeral_storage": [],
"execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole", "execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole",
@@ -311,7 +311,7 @@
"requires_compatibilities": [ "requires_compatibilities": [
"FARGATE" "FARGATE"
], ],
"revision": 18, "revision": 23,
"runtime_platform": [], "runtime_platform": [],
"tags": null, "tags": null,
"tags_all": {}, "tags_all": {},

33
terraform/terraform.tfstate.d/staging/terraform.tfstate.backup
View File

@@ -1,7 +1,7 @@
{ {
"version": 4, "version": 4,
"terraform_version": "0.14.4", "terraform_version": "0.14.4",
"serial": 84, "serial": 94,
"lineage": "91d10fe0-8033-8778-c202-78d5a81632e8", "lineage": "91d10fe0-8033-8778-c202-78d5a81632e8",
"outputs": { "outputs": {
"aws_access_key_id": { "aws_access_key_id": {
@@ -151,9 +151,9 @@
"registry_arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-nsn252bfk4r6bzpj" "registry_arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-nsn252bfk4r6bzpj"
} }
], ],
"tags": null, "tags": {},
"tags_all": {}, "tags_all": {},
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:81", "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:101",
"timeouts": { "timeouts": {
"delete": null "delete": null
}, },
@@ -230,9 +230,9 @@
"registry_arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-4cuqgdwqo5acwqtq" "registry_arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-4cuqgdwqo5acwqtq"
} }
], ],
"tags": null, "tags": {},
"tags_all": {}, "tags_all": {},
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:1", "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:21",
"timeouts": { "timeouts": {
"delete": null "delete": null
}, },
@@ -256,8 +256,8 @@
{ {
"schema_version": 1, "schema_version": 1,
"attributes": { "attributes": {
"arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:81", "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:102",
"container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/staging.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-staging\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":3000,\"hostPort\":3000,\"protocol\":\"tcp\"},{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"}],\"volumesFrom\":[]}]", "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/staging.edn\"},{\"name\":\"which_env\",\"value\":\"staging\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat:staging\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-staging\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":3000,\"hostPort\":3000,\"protocol\":\"tcp\"},{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"}],\"volumesFrom\":[]},{\"cpu\":0,\"environment\":[{\"name\":\"DD_API_KEY\",\"value\":\"ce10d932c47b358e81081ae67bd8c112\"},{\"name\":\"DD_DOCKER_ENV_AS_TAGS\",\"value\":\"{\\\"which_env\\\":\\\"env\\\"}\"},{\"name\":\"ECS_FARGATE\",\"value\":\"true\"}],\"essential\":true,\"image\":\"public.ecr.aws/datadog/agent:latest\",\"mountPoints\":[],\"name\":\"datadog-agent\",\"portMappings\":[],\"volumesFrom\":[]}]",
"cpu": "2048", "cpu": "2048",
"ephemeral_storage": [], "ephemeral_storage": [],
"execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole", "execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole",
@@ -273,7 +273,7 @@
"requires_compatibilities": [ "requires_compatibilities": [
"FARGATE" "FARGATE"
], ],
"revision": 81, "revision": 102,
"runtime_platform": [], "runtime_platform": [],
"tags": null, "tags": null,
"tags_all": {}, "tags_all": {},
@@ -294,8 +294,8 @@
{ {
"schema_version": 1, "schema_version": 1,
"attributes": { "attributes": {
"arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:1", "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:22",
"container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/staging-background-worker.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-background-worker-staging\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"},{\"containerPort\":9090,\"hostPort\":9090,\"protocol\":\"tcp\"}],\"volumesFrom\":[]}]", "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/staging-background-worker.edn\"},{\"name\":\"which_env\",\"value\":\"staging\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat:staging\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-background-worker-staging\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"},{\"containerPort\":9090,\"hostPort\":9090,\"protocol\":\"tcp\"}],\"volumesFrom\":[]},{\"cpu\":0,\"environment\":[{\"name\":\"DD_API_KEY\",\"value\":\"ce10d932c47b358e81081ae67bd8c112\"},{\"name\":\"DD_DOCKER_ENV_AS_TAGS\",\"value\":\"{\\\"which_env\\\":\\\"env\\\"}\"},{\"name\":\"ECS_FARGATE\",\"value\":\"true\"}],\"essential\":true,\"image\":\"public.ecr.aws/datadog/agent:latest\",\"mountPoints\":[],\"name\":\"datadog-agent\",\"portMappings\":[],\"volumesFrom\":[]}]",
"cpu": "1024", "cpu": "1024",
"ephemeral_storage": [], "ephemeral_storage": [],
"execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole", "execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole",
@@ -311,7 +311,7 @@
"requires_compatibilities": [ "requires_compatibilities": [
"FARGATE" "FARGATE"
], ],
"revision": 1, "revision": 22,
"runtime_platform": [], "runtime_platform": [],
"tags": null, "tags": null,
"tags_all": {}, "tags_all": {},
@@ -649,7 +649,10 @@
"sensitive_attributes": [], "sensitive_attributes": [],
"private": "bnVsbA==", "private": "bnVsbA==",
"dependencies": [ "dependencies": [
"aws_lb_listener.https" "aws_acm_certificate.cert",
"aws_lb.integreat_app",
"aws_lb_listener.https",
"aws_lb_target_group.integreat_app"
] ]
} }
] ]
@@ -947,7 +950,7 @@
"id": "srv-4cuqgdwqo5acwqtq", "id": "srv-4cuqgdwqo5acwqtq",
"name": "integreat-background-worker-staging", "name": "integreat-background-worker-staging",
"namespace_id": "ns-gv2z744em7myo2jp", "namespace_id": "ns-gv2z744em7myo2jp",
"tags": null, "tags": {},
"tags_all": {} "tags_all": {}
}, },
"sensitive_attributes": [], "sensitive_attributes": [],
@@ -988,7 +991,7 @@
"id": "srv-nsn252bfk4r6bzpj", "id": "srv-nsn252bfk4r6bzpj",
"name": "integreat-app-staging", "name": "integreat-app-staging",
"namespace_id": "ns-gv2z744em7myo2jp", "namespace_id": "ns-gv2z744em7myo2jp",
"tags": null, "tags": {},
"tags_all": {} "tags_all": {}
}, },
"sensitive_attributes": [], "sensitive_attributes": [],
@@ -1084,7 +1087,7 @@
"receive_wait_time_seconds": 0, "receive_wait_time_seconds": 0,
"redrive_policy": "", "redrive_policy": "",
"sqs_managed_sse_enabled": false, "sqs_managed_sse_enabled": false,
"tags": null, "tags": {},
"tags_all": {}, "tags_all": {},
"url": "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-background-request-staging", "url": "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-background-request-staging",
"visibility_timeout_seconds": 30 "visibility_timeout_seconds": 30