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

makes solr ec2 based and adds resiliency to running balances.

Browse Source
This commit is contained in:
Bryce
2024-09-25 22:01:12 -07:00
parent dc44233640
commit db9e0dc459
8 changed files with 977 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

397
terraform/terraform.tfstate.d/prod/terraform.tfstate
View File

@@ -1,7 +1,7 @@
{
"version": 4,
"terraform_version": "1.8.3",
"serial": 693,
"terraform_version": "1.9.2",
"serial": 712,
"lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51",
"outputs": {
"aws_access_key_id": {
@@ -18,12 +18,107 @@
"type": "string",
"sensitive": true
},
"ec2_public_ip": {
"value": "54.175.3.15",
"type": "string"
},
"queue_url": {
"value": "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-prod",
"type": "string"
}
},
"resources": [
{
"mode": "data",
"type": "aws_ami",
"name": "amazon_linux_2023",
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"architecture": "arm64",
"arn": "arn:aws:ec2:us-east-1::image/ami-0fea1219385942eb5",
"block_device_mappings": [
{
"device_name": "/dev/xvda",
"ebs": {
"delete_on_termination": "true",
"encrypted": "false",
"iops": "3000",
"snapshot_id": "snap-0631ed3b265acda34",
"throughput": "125",
"volume_size": "30",
"volume_type": "gp3"
},
"no_device": "",
"virtual_name": ""
}
],
"boot_mode": "uefi",
"creation_date": "2024-09-17T21:17:56.000Z",
"deprecation_time": "2026-09-17T21:17:56.000Z",
"description": "Amazon Linux AMI 2023.0.20240917 arm64 ECS HVM EBS",
"ena_support": true,
"executable_users": null,
"filter": [
{
"name": "architecture",
"values": [
"arm64"
]
},
{
"name": "name",
"values": [
"al2023-ami-*"
]
},
{
"name": "virtualization-type",
"values": [
"hvm"
]
}
],
"hypervisor": "xen",
"id": "ami-0fea1219385942eb5",
"image_id": "ami-0fea1219385942eb5",
"image_location": "amazon/al2023-ami-ecs-hvm-2023.0.20240917-kernel-6.1-arm64",
"image_owner_alias": "amazon",
"image_type": "machine",
"imds_support": "v2.0",
"include_deprecated": false,
"kernel_id": "",
"most_recent": true,
"name": "al2023-ami-ecs-hvm-2023.0.20240917-kernel-6.1-arm64",
"name_regex": null,
"owner_id": "591542846629",
"owners": null,
"platform": "",
"platform_details": "Linux/UNIX",
"product_codes": [],
"public": true,
"ramdisk_id": "",
"root_device_name": "/dev/xvda",
"root_device_type": "ebs",
"root_snapshot_id": "snap-0631ed3b265acda34",
"sriov_net_support": "simple",
"state": "available",
"state_reason": {
"code": "UNSET",
"message": "UNSET"
},
"tags": {},
"timeouts": null,
"tpm_support": "",
"usage_operation": "RunInstances",
"virtualization_type": "hvm"
},
"sensitive_attributes": []
}
]
},
{
"mode": "data",
"type": "aws_caller_identity",
@@ -115,8 +210,8 @@
"early_renewal_duration": "",
"id": "arn:aws:acm:us-east-1:679918342773:certificate/edf1d7f0-8358-4a40-a44f-3ccdb81da12f",
"key_algorithm": "RSA_2048",
"not_after": "2024-07-27T23:59:59Z",
"not_before": "2023-06-29T00:00:00Z",
"not_after": "2025-06-27T23:59:59Z",
"not_before": "2024-05-29T00:00:00Z",
"options": [
{
"certificate_transparency_logging_preference": "ENABLED"
@@ -129,7 +224,7 @@
{
"renewal_status": "SUCCESS",
"renewal_status_reason": "",
"updated_at": "2023-06-29T04:17:46Z"
"updated_at": "2024-05-29T05:27:07Z"
}
],
"status": "ISSUED",
@@ -180,8 +275,8 @@
"early_renewal_duration": "",
"id": "arn:aws:acm:us-east-1:679918342773:certificate/9dce79fb-fc06-438b-8188-f54313b5161a",
"key_algorithm": "RSA_2048",
"not_after": "2024-09-01T23:59:59Z",
"not_before": "2023-08-04T00:00:00Z",
"not_after": "2025-08-03T23:59:59Z",
"not_before": "2024-07-04T00:00:00Z",
"options": [
{
"certificate_transparency_logging_preference": "ENABLED"
@@ -190,7 +285,13 @@
"pending_renewal": false,
"private_key": null,
"renewal_eligibility": "ELIGIBLE",
"renewal_summary": [],
"renewal_summary": [
{
"renewal_status": "SUCCESS",
"renewal_status_reason": "",
"updated_at": "2024-07-04T02:01:27Z"
}
],
"status": "ISSUED",
"subject_alternative_names": [
"data.prod.app.integreatconsult.com"
@@ -214,6 +315,45 @@
}
]
},
{
"mode": "managed",
"type": "aws_ebs_volume",
"name": "solr_ec2_storage",
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"arn": "arn:aws:ec2:us-east-1:679918342773:volume/vol-0069283d41ff6c010",
"availability_zone": "us-east-1a",
"encrypted": false,
"final_snapshot": false,
"id": "vol-0069283d41ff6c010",
"iops": 100,
"kms_key_id": "",
"multi_attach_enabled": false,
"outpost_arn": "",
"size": 30,
"snapshot_id": "",
"tags": {
"Name": "solr_storage_prod"
},
"tags_all": {
"Name": "solr_storage_prod"
},
"throughput": 0,
"timeouts": null,
"type": "gp2"
},
"sensitive_attributes": [],
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJ1cGRhdGUiOjMwMDAwMDAwMDAwMH19",
"dependencies": [
"aws_instance.solr_ec2",
"data.aws_ami.amazon_linux_2023"
]
}
]
},
{
"mode": "managed",
"type": "aws_ecs_service",
@@ -295,7 +435,7 @@
],
"tags": {},
"tags_all": {},
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:789",
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:834",
"timeouts": {
"create": null,
"delete": null,
@@ -385,7 +525,7 @@
],
"tags": {},
"tags_all": {},
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/solr_prod:2",
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/solr_prod:4",
"timeouts": {
"create": null,
"delete": null,
@@ -527,9 +667,9 @@
"provisioned_throughput_in_mibps": 0,
"size_in_bytes": [
{
"value": 757790720,
"value": 1429075968,
"value_in_ia": 0,
"value_in_standard": 757790720
"value_in_standard": 1429075968
}
],
"tags": {
@@ -569,13 +709,13 @@
[
{
"type": "get_attr",
"value": "secret"
"value": "ses_smtp_password_v4"
}
],
[
{
"type": "get_attr",
"value": "ses_smtp_password_v4"
"value": "secret"
}
]
],
@@ -628,6 +768,137 @@
}
]
},
{
"mode": "managed",
"type": "aws_instance",
"name": "solr_ec2",
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
"instances": [
{
"schema_version": 1,
"attributes": {
"ami": "ami-0fea1219385942eb5",
"arn": "arn:aws:ec2:us-east-1:679918342773:instance/i-0ce809d16781daada",
"associate_public_ip_address": true,
"availability_zone": "us-east-1a",
"capacity_reservation_specification": [
{
"capacity_reservation_preference": "open",
"capacity_reservation_target": []
}
],
"cpu_core_count": 2,
"cpu_options": [
{
"amd_sev_snp": "",
"core_count": 2,
"threads_per_core": 1
}
],
"cpu_threads_per_core": 1,
"credit_specification": [],
"disable_api_stop": false,
"disable_api_termination": false,
"ebs_block_device": [],
"ebs_optimized": false,
"enclave_options": [
{
"enabled": false
}
],
"ephemeral_block_device": [],
"get_password_data": false,
"hibernation": false,
"host_id": "",
"host_resource_group_arn": null,
"iam_instance_profile": "",
"id": "i-0ce809d16781daada",
"instance_initiated_shutdown_behavior": "stop",
"instance_state": "running",
"instance_type": "m7g.large",
"ipv6_address_count": 0,
"ipv6_addresses": [],
"key_name": "http-proxy",
"launch_template": [],
"maintenance_options": [
{
"auto_recovery": "default"
}
],
"metadata_options": [
{
"http_endpoint": "enabled",
"http_put_response_hop_limit": 2,
"http_tokens": "required",
"instance_metadata_tags": "disabled"
}
],
"monitoring": false,
"network_interface": [],
"outpost_arn": "",
"password_data": "",
"placement_group": "",
"placement_partition_number": 0,
"primary_network_interface_id": "eni-07dec2725fa4c70ed",
"private_dns": "ip-172-31-38-103.ec2.internal",
"private_dns_name_options": [
{
"enable_resource_name_dns_a_record": false,
"enable_resource_name_dns_aaaa_record": false,
"hostname_type": "ip-name"
}
],
"private_ip": "172.31.38.103",
"public_dns": "ec2-54-175-3-15.compute-1.amazonaws.com",
"public_ip": "54.175.3.15",
"root_block_device": [
{
"delete_on_termination": true,
"device_name": "/dev/xvda",
"encrypted": false,
"iops": 3000,
"kms_key_id": "",
"tags": null,
"throughput": 125,
"volume_id": "vol-0ec6fb488e712ba93",
"volume_size": 30,
"volume_type": "gp3"
}
],
"secondary_private_ips": [],
"security_groups": [
"datomic-access",
"http-proxy-2",
"integreat-app"
],
"source_dest_check": true,
"subnet_id": "subnet-89bab8d4",
"tags": {
"Name": "solr_ec2_prod"
},
"tags_all": {
"Name": "solr_ec2_prod"
},
"tenancy": "default",
"timeouts": null,
"user_data": null,
"user_data_base64": null,
"user_data_replace_on_change": false,
"volume_tags": null,
"vpc_security_group_ids": [
"sg-004e5855310c453a3",
"sg-02d167406b1082698",
"sg-08cd873bd29a2b3c9"
]
},
"sensitive_attributes": [],
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMCwidXBkYXRlIjo2MDAwMDAwMDAwMDB9LCJzY2hlbWFfdmVyc2lvbiI6IjEifQ==",
"dependencies": [
"data.aws_ami.amazon_linux_2023"
]
}
]
},
{
"mode": "managed",
"type": "aws_lb",
@@ -1334,6 +1605,32 @@
}
]
},
{
"mode": "managed",
"type": "aws_service_discovery_instance",
"name": "solr_instance",
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"attributes": {
"AWS_INSTANCE_IPV4": "172.31.38.103"
},
"id": "solr-ec2",
"instance_id": "solr-ec2",
"service_id": "srv-ren22oppkwwryqqr"
},
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"aws_instance.solr_ec2",
"aws_service_discovery_service.solr_ec2",
"data.aws_ami.amazon_linux_2023"
]
}
]
},
{
"mode": "managed",
"type": "aws_service_discovery_service",
@@ -1418,6 +1715,48 @@
}
]
},
{
"mode": "managed",
"type": "aws_service_discovery_service",
"name": "solr_ec2",
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-ren22oppkwwryqqr",
"description": "",
"dns_config": [
{
"dns_records": [
{
"ttl": 60,
"type": "A"
}
],
"namespace_id": "ns-gv2z744em7myo2jp",
"routing_policy": "MULTIVALUE"
}
],
"force_destroy": false,
"health_check_config": [],
"health_check_custom_config": [
{
"failure_threshold": 1
}
],
"id": "srv-ren22oppkwwryqqr",
"name": "solr-ec2-prod",
"namespace_id": "ns-gv2z744em7myo2jp",
"tags": {},
"tags_all": {},
"type": "DNS_HTTP"
},
"sensitive_attributes": [],
"private": "bnVsbA=="
}
]
},
{
"mode": "managed",
"type": "aws_ses_receipt_rule",
@@ -1594,6 +1933,34 @@
}
]
},
{
"mode": "managed",
"type": "aws_volume_attachment",
"name": "attach_solr_storage",
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"device_name": "/dev/xvdf",
"force_detach": null,
"id": "vai-3578365595",
"instance_id": "i-0ce809d16781daada",
"skip_destroy": null,
"stop_instance_before_detaching": null,
"timeouts": null,
"volume_id": "vol-0069283d41ff6c010"
},
"sensitive_attributes": [],
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwfX0=",
"dependencies": [
"aws_ebs_volume.solr_ec2_storage",
"aws_instance.solr_ec2",
"data.aws_ami.amazon_linux_2023"
]
}
]
},
{
"module": "module.bulk_journal_import_job[0]",
"mode": "managed",
@@ -3404,7 +3771,7 @@
"revision": 5,
"runtime_platform": [],
"skip_destroy": false,
"tags": null,
"tags": {},
"tags_all": {},
"task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb",
"volume": []