makes cloud search possible.
This commit is contained in:
2
terraform/connect-ports-cloud.sh
Executable file
2
terraform/connect-ports-cloud.sh
Executable file
@@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
ssh -L 2049:172.31.38.113:2049 3.213.115.86 -L 8983:solr-prod-cloud.local:8983 -L 4334:datomic-iol-dev.local:4334
|
||||
@@ -55,15 +55,10 @@ resource "aws_ecs_service" "integreat_app" {
|
||||
}
|
||||
|
||||
capacity_provider_strategy {
|
||||
base = 0
|
||||
base = 1
|
||||
capacity_provider = "FARGATE_SPOT"
|
||||
weight = 5
|
||||
}
|
||||
capacity_provider_strategy {
|
||||
base = 1
|
||||
capacity_provider = "FARGATE"
|
||||
weight = 1
|
||||
}
|
||||
|
||||
deployment_circuit_breaker {
|
||||
enable = false
|
||||
@@ -457,7 +452,6 @@ module "load_historical_sales_job" {
|
||||
memory = 4096
|
||||
cpu = 1024
|
||||
}
|
||||
*/
|
||||
|
||||
module "restore_from_backup_job" {
|
||||
source = "./background-job/"
|
||||
@@ -483,3 +477,4 @@ module "ntg_job" {
|
||||
memory = 4096
|
||||
cpu = 1024
|
||||
}
|
||||
*/
|
||||
|
||||
62
terraform/prod-cloud-solr-taskdef.json
Normal file
62
terraform/prod-cloud-solr-taskdef.json
Normal file
@@ -0,0 +1,62 @@
|
||||
[
|
||||
{
|
||||
"environment": [
|
||||
{
|
||||
"name": "DD_ENV",
|
||||
"value": "prod-cloud"
|
||||
},
|
||||
{
|
||||
"name": "DD_SERVICE",
|
||||
"value": "solr"
|
||||
}
|
||||
],
|
||||
"essential": true,
|
||||
"image": "solr",
|
||||
|
||||
"logConfiguration": {
|
||||
"logDriver": "awslogs",
|
||||
"options": {
|
||||
"awslogs-group": "/ecs/solr-prod-cloud",
|
||||
"awslogs-region": "us-east-1",
|
||||
"awslogs-stream-prefix": "ecs"
|
||||
}
|
||||
},
|
||||
"dockerLabels": {
|
||||
"com.datadoghq.tags.env": "prod-cloud",
|
||||
"com.datadoghq.tags.service": "solr"
|
||||
},
|
||||
"mountPoints": [],
|
||||
"name": "solr",
|
||||
"portMappings": [
|
||||
{
|
||||
"containerPort": 8983,
|
||||
"hostPort": 8983,
|
||||
"protocol": "tcp"
|
||||
}
|
||||
],
|
||||
"volumesFrom": [],
|
||||
"mountPoints": [
|
||||
{
|
||||
"sourceVolume": "solr-storage",
|
||||
"containerPath": "/var/solr",
|
||||
"readOnly": false
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"environment": [
|
||||
{
|
||||
"name": "DD_API_KEY",
|
||||
"value": "ce10d932c47b358e81081ae67bd8c112"
|
||||
},
|
||||
{
|
||||
"name": "ECS_FARGATE",
|
||||
"value": "true"
|
||||
}
|
||||
],
|
||||
"essential": true,
|
||||
"image": "public.ecr.aws/datadog/agent:latest",
|
||||
"name": "datadog-agent"
|
||||
}
|
||||
]
|
||||
|
||||
97
terraform/solr.tf
Normal file
97
terraform/solr.tf
Normal file
@@ -0,0 +1,97 @@
|
||||
resource "aws_efs_file_system" "solr_storage" {
|
||||
creation_token = "solr_storage-${var.stage}"
|
||||
|
||||
tags = {
|
||||
Name = "solr_storage_${var.stage}"
|
||||
}
|
||||
}
|
||||
|
||||
resource "aws_ecs_task_definition" "solr" {
|
||||
family = "solr_${var.stage}"
|
||||
container_definitions = file("${var.stage}-solr-taskdef.json")
|
||||
memory = 4096
|
||||
cpu = 1024
|
||||
network_mode = "awsvpc"
|
||||
requires_compatibilities = ["FARGATE"]
|
||||
execution_role_arn = var.execution_role_arn
|
||||
task_role_arn = var.task_role_arn
|
||||
|
||||
volume {
|
||||
name = "solr-storage"
|
||||
|
||||
efs_volume_configuration {
|
||||
file_system_id = aws_efs_file_system.solr_storage.id
|
||||
root_directory = "/"
|
||||
/*
|
||||
authorization_config {
|
||||
access_point_id = aws_efs_access_point.test.id
|
||||
iam = "ENABLED"
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
resource "aws_ecs_service" "solr" {
|
||||
name = "solr_app_${var.stage}"
|
||||
cluster = var.ecs_cluster
|
||||
task_definition = aws_ecs_task_definition.solr.arn
|
||||
desired_count = 1
|
||||
deployment_controller {
|
||||
type = "ECS"
|
||||
}
|
||||
scheduling_strategy = "REPLICA"
|
||||
platform_version = "LATEST"
|
||||
|
||||
network_configuration {
|
||||
assign_public_ip = true
|
||||
security_groups = [ "sg-004e5855310c453a3", "sg-02d167406b1082698"]
|
||||
subnets = [ "subnet-5e675761", "subnet-8519fde2", "subnet-89bab8d4" ]
|
||||
}
|
||||
|
||||
service_registries {
|
||||
container_port = 0
|
||||
port = 0
|
||||
registry_arn = aws_service_discovery_service.solr.arn
|
||||
}
|
||||
|
||||
capacity_provider_strategy {
|
||||
base = 1
|
||||
capacity_provider = "FARGATE_SPOT"
|
||||
weight = 5
|
||||
}
|
||||
|
||||
deployment_circuit_breaker {
|
||||
enable = false
|
||||
rollback = false
|
||||
}
|
||||
|
||||
wait_for_steady_state = true
|
||||
|
||||
|
||||
timeouts {}
|
||||
lifecycle {
|
||||
ignore_changes = [task_definition]
|
||||
}
|
||||
}
|
||||
|
||||
resource "aws_service_discovery_service" "solr" {
|
||||
name = "solr-${var.stage}"
|
||||
|
||||
dns_config {
|
||||
namespace_id = var.local_namespace
|
||||
|
||||
dns_records {
|
||||
ttl = 10
|
||||
type = "A"
|
||||
}
|
||||
|
||||
routing_policy = "MULTIVALUE"
|
||||
}
|
||||
|
||||
health_check_custom_config {
|
||||
failure_threshold = 1
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 4,
|
||||
"terraform_version": "1.3.8",
|
||||
"serial": 78,
|
||||
"terraform_version": "1.4.3",
|
||||
"serial": 104,
|
||||
"lineage": "cf731bb4-8fb3-47af-6e29-22030e089d96",
|
||||
"outputs": {
|
||||
"aws_access_key_id": {
|
||||
@@ -94,14 +94,9 @@
|
||||
"attributes": {
|
||||
"capacity_provider_strategy": [
|
||||
{
|
||||
"base": 0,
|
||||
"base": 1,
|
||||
"capacity_provider": "FARGATE_SPOT",
|
||||
"weight": 5
|
||||
},
|
||||
{
|
||||
"base": 1,
|
||||
"capacity_provider": "FARGATE",
|
||||
"weight": 1
|
||||
}
|
||||
],
|
||||
"cluster": "arn:aws:ecs:us-east-1:679918342773:cluster/default",
|
||||
@@ -164,7 +159,7 @@
|
||||
],
|
||||
"tags": {},
|
||||
"tags_all": {},
|
||||
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod-cloud:17",
|
||||
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod-cloud:51",
|
||||
"timeouts": {
|
||||
"delete": null
|
||||
},
|
||||
@@ -180,6 +175,90 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_ecs_service",
|
||||
"name": "solr",
|
||||
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"capacity_provider_strategy": [
|
||||
{
|
||||
"base": 1,
|
||||
"capacity_provider": "FARGATE_SPOT",
|
||||
"weight": 5
|
||||
}
|
||||
],
|
||||
"cluster": "arn:aws:ecs:us-east-1:679918342773:cluster/default",
|
||||
"deployment_circuit_breaker": [
|
||||
{
|
||||
"enable": false,
|
||||
"rollback": false
|
||||
}
|
||||
],
|
||||
"deployment_controller": [
|
||||
{
|
||||
"type": "ECS"
|
||||
}
|
||||
],
|
||||
"deployment_maximum_percent": 200,
|
||||
"deployment_minimum_healthy_percent": 100,
|
||||
"desired_count": 1,
|
||||
"enable_ecs_managed_tags": false,
|
||||
"enable_execute_command": false,
|
||||
"force_new_deployment": null,
|
||||
"health_check_grace_period_seconds": 0,
|
||||
"iam_role": "aws-service-role",
|
||||
"id": "arn:aws:ecs:us-east-1:679918342773:service/default/solr_app_prod-cloud",
|
||||
"launch_type": "",
|
||||
"load_balancer": [],
|
||||
"name": "solr_app_prod-cloud",
|
||||
"network_configuration": [
|
||||
{
|
||||
"assign_public_ip": true,
|
||||
"security_groups": [
|
||||
"sg-004e5855310c453a3",
|
||||
"sg-02d167406b1082698"
|
||||
],
|
||||
"subnets": [
|
||||
"subnet-5e675761",
|
||||
"subnet-8519fde2",
|
||||
"subnet-89bab8d4"
|
||||
]
|
||||
}
|
||||
],
|
||||
"ordered_placement_strategy": [],
|
||||
"placement_constraints": [],
|
||||
"platform_version": "LATEST",
|
||||
"propagate_tags": "NONE",
|
||||
"scheduling_strategy": "REPLICA",
|
||||
"service_registries": [
|
||||
{
|
||||
"container_name": "",
|
||||
"container_port": 0,
|
||||
"port": 0,
|
||||
"registry_arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-smnd6gtc2jtbnkvu"
|
||||
}
|
||||
],
|
||||
"tags": null,
|
||||
"tags_all": {},
|
||||
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/solr_prod-cloud:3",
|
||||
"timeouts": {
|
||||
"delete": null
|
||||
},
|
||||
"wait_for_steady_state": true
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxMjAwMDAwMDAwMDAwfX0=",
|
||||
"dependencies": [
|
||||
"aws_ecs_task_definition.solr",
|
||||
"aws_service_discovery_service.solr"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_ecs_task_definition",
|
||||
@@ -218,6 +297,105 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_ecs_task_definition",
|
||||
"name": "solr",
|
||||
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 1,
|
||||
"attributes": {
|
||||
"arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/solr_prod-cloud:3",
|
||||
"container_definitions": "[{\"cpu\":0,\"dockerLabels\":{\"com.datadoghq.tags.env\":\"prod-cloud\",\"com.datadoghq.tags.service\":\"solr\"},\"environment\":[{\"name\":\"DD_ENV\",\"value\":\"prod-cloud\"},{\"name\":\"DD_SERVICE\",\"value\":\"solr\"}],\"essential\":true,\"image\":\"solr\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/solr-prod-cloud\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[{\"containerPath\":\"/var/solr\",\"readOnly\":false,\"sourceVolume\":\"solr-storage\"}],\"name\":\"solr\",\"portMappings\":[{\"containerPort\":8983,\"hostPort\":8983,\"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",
|
||||
"ephemeral_storage": [],
|
||||
"execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole",
|
||||
"family": "solr_prod-cloud",
|
||||
"id": "solr_prod-cloud",
|
||||
"inference_accelerator": [],
|
||||
"ipc_mode": "",
|
||||
"memory": "4096",
|
||||
"network_mode": "awsvpc",
|
||||
"pid_mode": "",
|
||||
"placement_constraints": [],
|
||||
"proxy_configuration": [],
|
||||
"requires_compatibilities": [
|
||||
"FARGATE"
|
||||
],
|
||||
"revision": 3,
|
||||
"runtime_platform": [],
|
||||
"tags": {},
|
||||
"tags_all": {},
|
||||
"task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb",
|
||||
"volume": [
|
||||
{
|
||||
"docker_volume_configuration": [],
|
||||
"efs_volume_configuration": [
|
||||
{
|
||||
"authorization_config": [],
|
||||
"file_system_id": "fs-0a72af98fd255b75e",
|
||||
"root_directory": "/",
|
||||
"transit_encryption": "",
|
||||
"transit_encryption_port": 0
|
||||
}
|
||||
],
|
||||
"fsx_windows_file_server_volume_configuration": [],
|
||||
"host_path": "",
|
||||
"name": "solr-storage"
|
||||
}
|
||||
]
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==",
|
||||
"dependencies": [
|
||||
"aws_efs_file_system.solr_storage"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_efs_file_system",
|
||||
"name": "solr_storage",
|
||||
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"arn": "arn:aws:elasticfilesystem:us-east-1:679918342773:file-system/fs-0a72af98fd255b75e",
|
||||
"availability_zone_id": "",
|
||||
"availability_zone_name": "",
|
||||
"creation_token": "solr_storage-prod-cloud",
|
||||
"dns_name": "fs-0a72af98fd255b75e.efs.us-east-1.amazonaws.com",
|
||||
"encrypted": false,
|
||||
"id": "fs-0a72af98fd255b75e",
|
||||
"kms_key_id": "",
|
||||
"lifecycle_policy": [],
|
||||
"number_of_mount_targets": 6,
|
||||
"owner_id": "679918342773",
|
||||
"performance_mode": "generalPurpose",
|
||||
"provisioned_throughput_in_mibps": 0,
|
||||
"size_in_bytes": [
|
||||
{
|
||||
"value": 6739968,
|
||||
"value_in_ia": 0,
|
||||
"value_in_standard": 6739968
|
||||
}
|
||||
],
|
||||
"tags": {
|
||||
"Name": "solr_storage_prod-cloud"
|
||||
},
|
||||
"tags_all": {
|
||||
"Name": "solr_storage_prod-cloud"
|
||||
},
|
||||
"throughput_mode": "bursting"
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "bnVsbA=="
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_iam_access_key",
|
||||
@@ -634,7 +812,7 @@
|
||||
"lifecycle_rule": [],
|
||||
"logging": [],
|
||||
"object_lock_configuration": [],
|
||||
"policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":[\"s3:GetObject\"],\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::data.prod-cloud.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"},{\"Action\":\"s3:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::679918342773:role/datomic-ddb\"},\"Resource\":\"arn:aws:s3:::data.prod-cloud.app.integreatconsult.com\",\"Sid\":\"AllowReadForProd\"}],\"Version\":\"2012-10-17\"}",
|
||||
"policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":[\"s3:GetObject\"],\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::data.prod-cloud.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"},{\"Action\":\"s3:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::679918342773:role/datomic-ddb\"},\"Resource\":\"arn:aws:s3:::data.prod-cloud.app.integreatconsult.com\",\"Sid\":\"AllowReadForProd\"},{\"Action\":\"s3:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::679918342773:role/http-proxy\"},\"Resource\":\"arn:aws:s3:::data.prod-cloud.app.integreatconsult.com\",\"Sid\":\"AllowReadForProdProxy\"}],\"Version\":\"2012-10-17\"}",
|
||||
"region": "us-east-1",
|
||||
"replication_configuration": [],
|
||||
"request_payer": "BucketOwner",
|
||||
@@ -900,6 +1078,47 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_service_discovery_service",
|
||||
"name": "solr",
|
||||
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-smnd6gtc2jtbnkvu",
|
||||
"description": "",
|
||||
"dns_config": [
|
||||
{
|
||||
"dns_records": [
|
||||
{
|
||||
"ttl": 10,
|
||||
"type": "A"
|
||||
}
|
||||
],
|
||||
"namespace_id": "ns-gv2z744em7myo2jp",
|
||||
"routing_policy": "MULTIVALUE"
|
||||
}
|
||||
],
|
||||
"force_destroy": false,
|
||||
"health_check_config": [],
|
||||
"health_check_custom_config": [
|
||||
{
|
||||
"failure_threshold": 1
|
||||
}
|
||||
],
|
||||
"id": "srv-smnd6gtc2jtbnkvu",
|
||||
"name": "solr-prod-cloud",
|
||||
"namespace_id": "ns-gv2z744em7myo2jp",
|
||||
"tags": {},
|
||||
"tags_all": {}
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "bnVsbA=="
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_ses_receipt_rule",
|
||||
@@ -1075,45 +1294,6 @@
|
||||
"private": "bnVsbA=="
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"module": "module.restore_from_backup_job",
|
||||
"mode": "managed",
|
||||
"type": "aws_ecs_task_definition",
|
||||
"name": "background_taskdef",
|
||||
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 1,
|
||||
"attributes": {
|
||||
"arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/restore_from_backup_prod_cloud:3",
|
||||
"container_definitions": "[{\"cpu\":0,\"dockerLabels\":{\"com.datadoghq.tags.env\":\"prod-cloud\",\"com.datadoghq.tags.service\":\"restore-from-backup\"},\"environment\":[{\"name\":\"DD_CONTAINER_ENV_AS_TAGS\",\"value\":\"{\\\"INTEGREAT_JOB\\\":\\\"background_job\\\"}\"},{\"name\":\"DD_ENV\",\"value\":\"prod-cloud\"},{\"name\":\"DD_SERVICE\",\"value\":\"restore-from-backup\"},{\"name\":\"INTEGREAT_JOB\",\"value\":\"restore-from-backup\"},{\"name\":\"config\",\"value\":\"/usr/local/config/prod-cloud-background-worker.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat-cloud:prod-cloud\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-prod\",\"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": "4096",
|
||||
"ephemeral_storage": [],
|
||||
"execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole",
|
||||
"family": "restore_from_backup_prod_cloud",
|
||||
"id": "restore_from_backup_prod_cloud",
|
||||
"inference_accelerator": [],
|
||||
"ipc_mode": "",
|
||||
"memory": "8192",
|
||||
"network_mode": "awsvpc",
|
||||
"pid_mode": "",
|
||||
"placement_constraints": [],
|
||||
"proxy_configuration": [],
|
||||
"requires_compatibilities": [
|
||||
"FARGATE"
|
||||
],
|
||||
"revision": 3,
|
||||
"runtime_platform": [],
|
||||
"tags": null,
|
||||
"tags_all": {},
|
||||
"task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb",
|
||||
"volume": []
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ=="
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"check_results": null
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 4,
|
||||
"terraform_version": "1.3.8",
|
||||
"serial": 72,
|
||||
"terraform_version": "1.4.3",
|
||||
"serial": 98,
|
||||
"lineage": "cf731bb4-8fb3-47af-6e29-22030e089d96",
|
||||
"outputs": {
|
||||
"aws_access_key_id": {
|
||||
@@ -94,14 +94,9 @@
|
||||
"attributes": {
|
||||
"capacity_provider_strategy": [
|
||||
{
|
||||
"base": 0,
|
||||
"base": 1,
|
||||
"capacity_provider": "FARGATE_SPOT",
|
||||
"weight": 5
|
||||
},
|
||||
{
|
||||
"base": 1,
|
||||
"capacity_provider": "FARGATE",
|
||||
"weight": 1
|
||||
}
|
||||
],
|
||||
"cluster": "arn:aws:ecs:us-east-1:679918342773:cluster/default",
|
||||
@@ -164,7 +159,7 @@
|
||||
],
|
||||
"tags": {},
|
||||
"tags_all": {},
|
||||
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod-cloud:16",
|
||||
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod-cloud:51",
|
||||
"timeouts": {
|
||||
"delete": null
|
||||
},
|
||||
@@ -180,6 +175,91 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_ecs_service",
|
||||
"name": "solr",
|
||||
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"capacity_provider_strategy": [
|
||||
{
|
||||
"base": 1,
|
||||
"capacity_provider": "FARGATE_SPOT",
|
||||
"weight": 5
|
||||
}
|
||||
],
|
||||
"cluster": "arn:aws:ecs:us-east-1:679918342773:cluster/default",
|
||||
"deployment_circuit_breaker": [
|
||||
{
|
||||
"enable": false,
|
||||
"rollback": false
|
||||
}
|
||||
],
|
||||
"deployment_controller": [
|
||||
{
|
||||
"type": "ECS"
|
||||
}
|
||||
],
|
||||
"deployment_maximum_percent": 200,
|
||||
"deployment_minimum_healthy_percent": 100,
|
||||
"desired_count": 1,
|
||||
"enable_ecs_managed_tags": false,
|
||||
"enable_execute_command": false,
|
||||
"force_new_deployment": null,
|
||||
"health_check_grace_period_seconds": 0,
|
||||
"iam_role": "aws-service-role",
|
||||
"id": "arn:aws:ecs:us-east-1:679918342773:service/default/solr_app_prod-cloud",
|
||||
"launch_type": "",
|
||||
"load_balancer": [],
|
||||
"name": "solr_app_prod-cloud",
|
||||
"network_configuration": [
|
||||
{
|
||||
"assign_public_ip": true,
|
||||
"security_groups": [
|
||||
"sg-004e5855310c453a3",
|
||||
"sg-02d167406b1082698"
|
||||
],
|
||||
"subnets": [
|
||||
"subnet-5e675761",
|
||||
"subnet-8519fde2",
|
||||
"subnet-89bab8d4"
|
||||
]
|
||||
}
|
||||
],
|
||||
"ordered_placement_strategy": [],
|
||||
"placement_constraints": [],
|
||||
"platform_version": "LATEST",
|
||||
"propagate_tags": "NONE",
|
||||
"scheduling_strategy": "REPLICA",
|
||||
"service_registries": [
|
||||
{
|
||||
"container_name": "",
|
||||
"container_port": 0,
|
||||
"port": 0,
|
||||
"registry_arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-cmwdohq6dvf3pbjv"
|
||||
}
|
||||
],
|
||||
"tags": null,
|
||||
"tags_all": {},
|
||||
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/solr_prod-cloud:3",
|
||||
"timeouts": {
|
||||
"delete": null
|
||||
},
|
||||
"wait_for_steady_state": true
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxMjAwMDAwMDAwMDAwfX0=",
|
||||
"dependencies": [
|
||||
"aws_ecs_task_definition.solr",
|
||||
"aws_efs_file_system.solr_storage",
|
||||
"aws_service_discovery_service.service"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_ecs_task_definition",
|
||||
@@ -218,6 +298,105 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_ecs_task_definition",
|
||||
"name": "solr",
|
||||
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 1,
|
||||
"attributes": {
|
||||
"arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/solr_prod-cloud:3",
|
||||
"container_definitions": "[{\"cpu\":0,\"dockerLabels\":{\"com.datadoghq.tags.env\":\"prod-cloud\",\"com.datadoghq.tags.service\":\"solr\"},\"environment\":[{\"name\":\"DD_ENV\",\"value\":\"prod-cloud\"},{\"name\":\"DD_SERVICE\",\"value\":\"solr\"}],\"essential\":true,\"image\":\"solr\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/solr-prod-cloud\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[{\"containerPath\":\"/var/solr\",\"readOnly\":false,\"sourceVolume\":\"solr-storage\"}],\"name\":\"solr\",\"portMappings\":[{\"containerPort\":8983,\"hostPort\":8983,\"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",
|
||||
"ephemeral_storage": [],
|
||||
"execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole",
|
||||
"family": "solr_prod-cloud",
|
||||
"id": "solr_prod-cloud",
|
||||
"inference_accelerator": [],
|
||||
"ipc_mode": "",
|
||||
"memory": "4096",
|
||||
"network_mode": "awsvpc",
|
||||
"pid_mode": "",
|
||||
"placement_constraints": [],
|
||||
"proxy_configuration": [],
|
||||
"requires_compatibilities": [
|
||||
"FARGATE"
|
||||
],
|
||||
"revision": 3,
|
||||
"runtime_platform": [],
|
||||
"tags": null,
|
||||
"tags_all": {},
|
||||
"task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb",
|
||||
"volume": [
|
||||
{
|
||||
"docker_volume_configuration": [],
|
||||
"efs_volume_configuration": [
|
||||
{
|
||||
"authorization_config": [],
|
||||
"file_system_id": "fs-0a72af98fd255b75e",
|
||||
"root_directory": "/",
|
||||
"transit_encryption": "",
|
||||
"transit_encryption_port": null
|
||||
}
|
||||
],
|
||||
"fsx_windows_file_server_volume_configuration": [],
|
||||
"host_path": "",
|
||||
"name": "solr-storage"
|
||||
}
|
||||
]
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==",
|
||||
"dependencies": [
|
||||
"aws_efs_file_system.solr_storage"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_efs_file_system",
|
||||
"name": "solr_storage",
|
||||
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"arn": "arn:aws:elasticfilesystem:us-east-1:679918342773:file-system/fs-0a72af98fd255b75e",
|
||||
"availability_zone_id": "",
|
||||
"availability_zone_name": "",
|
||||
"creation_token": "solr_storage-prod-cloud",
|
||||
"dns_name": "fs-0a72af98fd255b75e.efs.us-east-1.amazonaws.com",
|
||||
"encrypted": false,
|
||||
"id": "fs-0a72af98fd255b75e",
|
||||
"kms_key_id": "",
|
||||
"lifecycle_policy": [],
|
||||
"number_of_mount_targets": 1,
|
||||
"owner_id": "679918342773",
|
||||
"performance_mode": "generalPurpose",
|
||||
"provisioned_throughput_in_mibps": 0,
|
||||
"size_in_bytes": [
|
||||
{
|
||||
"value": 6144,
|
||||
"value_in_ia": 0,
|
||||
"value_in_standard": 6144
|
||||
}
|
||||
],
|
||||
"tags": {
|
||||
"Name": "solr_storage_prod-cloud"
|
||||
},
|
||||
"tags_all": {
|
||||
"Name": "solr_storage_prod-cloud"
|
||||
},
|
||||
"throughput_mode": "bursting"
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "bnVsbA=="
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_iam_access_key",
|
||||
@@ -634,7 +813,7 @@
|
||||
"lifecycle_rule": [],
|
||||
"logging": [],
|
||||
"object_lock_configuration": [],
|
||||
"policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":[\"s3:GetObject\"],\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::data.prod-cloud.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"},{\"Action\":\"s3:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::679918342773:role/datomic-ddb\"},\"Resource\":\"arn:aws:s3:::data.prod-cloud.app.integreatconsult.com\",\"Sid\":\"AllowReadForProd\"}],\"Version\":\"2012-10-17\"}",
|
||||
"policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":[\"s3:GetObject\"],\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::data.prod-cloud.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"},{\"Action\":\"s3:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::679918342773:role/datomic-ddb\"},\"Resource\":\"arn:aws:s3:::data.prod-cloud.app.integreatconsult.com\",\"Sid\":\"AllowReadForProd\"},{\"Action\":\"s3:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::679918342773:role/http-proxy\"},\"Resource\":\"arn:aws:s3:::data.prod-cloud.app.integreatconsult.com\",\"Sid\":\"AllowReadForProdProxy\"}],\"Version\":\"2012-10-17\"}",
|
||||
"region": "us-east-1",
|
||||
"replication_configuration": [],
|
||||
"request_payer": "BucketOwner",
|
||||
@@ -900,6 +1079,47 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_service_discovery_service",
|
||||
"name": "solr",
|
||||
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-smnd6gtc2jtbnkvu",
|
||||
"description": "",
|
||||
"dns_config": [
|
||||
{
|
||||
"dns_records": [
|
||||
{
|
||||
"ttl": 10,
|
||||
"type": "A"
|
||||
}
|
||||
],
|
||||
"namespace_id": "ns-gv2z744em7myo2jp",
|
||||
"routing_policy": "MULTIVALUE"
|
||||
}
|
||||
],
|
||||
"force_destroy": false,
|
||||
"health_check_config": [],
|
||||
"health_check_custom_config": [
|
||||
{
|
||||
"failure_threshold": 1
|
||||
}
|
||||
],
|
||||
"id": "srv-smnd6gtc2jtbnkvu",
|
||||
"name": "solr-prod-cloud",
|
||||
"namespace_id": "ns-gv2z744em7myo2jp",
|
||||
"tags": null,
|
||||
"tags_all": {}
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "bnVsbA=="
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "aws_ses_receipt_rule",
|
||||
@@ -1075,45 +1295,6 @@
|
||||
"private": "bnVsbA=="
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"module": "module.restore_from_backup_job",
|
||||
"mode": "managed",
|
||||
"type": "aws_ecs_task_definition",
|
||||
"name": "background_taskdef",
|
||||
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 1,
|
||||
"attributes": {
|
||||
"arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/restore_from_backup_prod_cloud:2",
|
||||
"container_definitions": "[{\"cpu\":0,\"dockerLabels\":{\"com.datadoghq.tags.env\":\"prod-cloud\",\"com.datadoghq.tags.service\":\"restore-from-backup\"},\"environment\":[{\"name\":\"DD_CONTAINER_ENV_AS_TAGS\",\"value\":\"{\\\"INTEGREAT_JOB\\\":\\\"background_job\\\"}\"},{\"name\":\"DD_ENV\",\"value\":\"prod-cloud\"},{\"name\":\"DD_SERVICE\",\"value\":\"restore-from-backup\"},{\"name\":\"INTEGREAT_JOB\",\"value\":\"restore-from-backup\"},{\"name\":\"config\",\"value\":\"/usr/local/config/prod-cloud-background-worker.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat-cloud:prod-cloud\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-background-worker-prod-cloud\",\"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": "4096",
|
||||
"ephemeral_storage": [],
|
||||
"execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole",
|
||||
"family": "restore_from_backup_prod_cloud",
|
||||
"id": "restore_from_backup_prod_cloud",
|
||||
"inference_accelerator": [],
|
||||
"ipc_mode": "",
|
||||
"memory": "8192",
|
||||
"network_mode": "awsvpc",
|
||||
"pid_mode": "",
|
||||
"placement_constraints": [],
|
||||
"proxy_configuration": [],
|
||||
"requires_compatibilities": [
|
||||
"FARGATE"
|
||||
],
|
||||
"revision": 2,
|
||||
"runtime_platform": [],
|
||||
"tags": null,
|
||||
"tags_all": {},
|
||||
"task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb",
|
||||
"volume": []
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ=="
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"check_results": null
|
||||
|
||||
Reference in New Issue
Block a user