diff --git a/terraform/deployed/ccdc/backend.yml b/terraform/deployed/ccdc/backend.yml index 516702185..9699339ea 100644 --- a/terraform/deployed/ccdc/backend.yml +++ b/terraform/deployed/ccdc/backend.yml @@ -1,6 +1,6 @@ --- - name: backend - image: cbiitssrepo/bento-backend:release + image: cbiitssrepo/ccdc-webservice:latest essential: true portMappings: - protocol: tcp diff --git a/terraform/deployed/ccdc/etl.tf b/terraform/deployed/ccdc/etl.tf deleted file mode 100644 index cd83fefce..000000000 --- a/terraform/deployed/ccdc/etl.tf +++ /dev/null @@ -1,113 +0,0 @@ -resource "aws_ecs_service" "etl_service" { - name = "${var.stack_name}-${var.env}-etl" - cluster = aws_ecs_cluster.ecs_cluster.id - task_definition = aws_ecs_task_definition.etl.arn - desired_count = var.container_replicas - iam_role = aws_iam_role.ecs-service-role.name - deployment_minimum_healthy_percent = 0 - deployment_maximum_percent = 100 - load_balancer { - target_group_arn = aws_lb_target_group.etl_target_group.arn - container_name = "etl" - container_port = var.etl_container_port - } - depends_on = [module.alb] -} - -resource "aws_ecs_task_definition" "etl" { - family = "${var.stack_name}-${var.env}-etl" - network_mode = "bridge" - cpu = "512" - memory = "1024" - container_definitions = jsonencode(yamldecode(file("etl.yml"))) - tags = merge( - { - "Name" =format("%s-%s-%s",var.stack_name,var.env,"task-definition") - }, - var.tags, - ) -} - - -#create alb target group -resource "aws_lb_target_group" "etl_target_group" { - name = "${var.stack_name}-${var.env}-etl" - port = var.etl_container_port - protocol = "HTTP" - vpc_id = data.terraform_remote_state.network.outputs.vpc_id - stickiness { - type = "lb_cookie" - cookie_duration = 1800 - enabled = true - } - health_check { - path = "/" - protocol = "HTTP" - matcher = "200" - interval = 15 - port = var.etl_container_port - timeout = 3 - healthy_threshold = 2 - unhealthy_threshold = 2 - } - tags = merge( - { - "Name" = format("%s-%s",var.stack_name,"etl-alb-target-group") - }, - var.tags, - ) -} - -resource "aws_security_group_rule" "inbound_etl_alb" { - from_port = var.etl_container_port - protocol = local.tcp_protocol - to_port = var.etl_container_port - security_group_id = aws_security_group.frontend_sg.id - source_security_group_id = module.alb.alb_security_group_id - type = "ingress" -} - -resource "aws_lb_listener_rule" "etl_alb_listener_prod" { - count = var.env == "prod" ? 1:0 - listener_arn = module.alb.alb_https_listener_arn - priority = var.etl_rule_priority - action { - type = "forward" - target_group_arn = aws_lb_target_group.etl_target_group.arn - } - - condition { - host_header { - values = ["${lower(var.stack_name)}.${var.domain_name}"] - } - } - condition { - path_pattern { - values = ["/*"] - } - } -} - -resource "aws_lb_listener_rule" "etl_alb_listener" { - count = var.env != "prod" ? 1:0 - listener_arn = module.alb.alb_https_listener_arn - priority = var.etl_rule_priority - action { - type = "forward" - target_group_arn = aws_lb_target_group.etl_target_group.arn - } - - condition { - host_header { - values = ["${lower(var.stack_name)}-${var.env}.${var.domain_name}"] - } - } - condition { - path_pattern { - values = ["/"] - } - } - -} - - diff --git a/terraform/deployed/ccdc/etl.yml b/terraform/deployed/ccdc/etl.yml deleted file mode 100644 index c9305ec90..000000000 --- a/terraform/deployed/ccdc/etl.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: etl - image: cbiitssrepo/ccdc-etl:latest - essential: true - portMappings: - - protocol: tcp - containerPort: 8081 - hostPort: 8081 diff --git a/terraform/deployed/ccdc/frontend.yml b/terraform/deployed/ccdc/frontend.yml index 13f04951a..f5fbd5e1a 100644 --- a/terraform/deployed/ccdc/frontend.yml +++ b/terraform/deployed/ccdc/frontend.yml @@ -1,6 +1,6 @@ --- - name: frontend - image: cbiitssrepo/bento-frontend:latest + image: cbiitssrepo/ccdc-webportal:latest essential: true portMappings: - protocol: tcp diff --git a/terraform/deployed/ccdc/route53.tf b/terraform/deployed/ccdc/route53.tf deleted file mode 100644 index d35fed10d..000000000 --- a/terraform/deployed/ccdc/route53.tf +++ /dev/null @@ -1,50 +0,0 @@ - -data "aws_route53_zone" "zone" { - name = var.domain_name -} - -resource "aws_route53_record" "www" { - count = var.env == "prod" ? 1 : 0 - name = "www" - type = "CNAME" - zone_id = data.aws_route53_zone.zone.zone_id - ttl = "5" - records = [var.domain_name] -} - - -resource "aws_route53_record" "bento_url" { - count = var.env == "prod" && var.stack_name == "bento" ? 1 : 0 - name = var.domain_name - type = "A" - zone_id = data.aws_route53_zone.zone.zone_id - alias { - evaluate_target_health = false - name = module.alb.alb_dns_name - zone_id = module.alb.alb_zone_id - } -} - -resource "aws_route53_record" "prod_tier_records" { - count = var.env == "prod" ? 1 : 0 - name = "${lower(var.stack_name)}.${var.domain_name}" - type = "A" - zone_id = data.aws_route53_zone.zone.zone_id - alias { - evaluate_target_health = false - name = module.alb.alb_dns_name - zone_id = module.alb.alb_zone_id - } -} - -resource "aws_route53_record" "lower_tiers_records" { - count = var.env != "prod" ? 1 : 0 - name ="${lower(var.stack_name)}-${var.env}" - type = "A" - zone_id = data.aws_route53_zone.zone.zone_id - alias { - evaluate_target_health = false - name = module.alb.alb_dns_name - zone_id = module.alb.alb_zone_id - } -} diff --git a/terraform/modules/elasticsearch/main.tf b/terraform/modules/elasticsearch/main.tf index f607fbd2e..30fa94ff1 100644 --- a/terraform/modules/elasticsearch/main.tf +++ b/terraform/modules/elasticsearch/main.tf @@ -70,14 +70,14 @@ resource "aws_elasticsearch_domain" "es" { snapshot_options { automated_snapshot_start_hour = 23 } - log_publishing_options { - cloudwatch_log_group_arn = aws_cloudwatch_log_group.cloudwatch_log_group.arn - log_type = "INDEX_SLOW_LOGS" - } +// log_publishing_options { +// cloudwatch_log_group_arn = aws_cloudwatch_log_group.cloudwatch_log_group.arn +// log_type = "INDEX_SLOW_LOGS" +// } tags = var.tags } - +/* resource "aws_cloudwatch_log_group" "cloudwatch_log_group" { name = "${var.stack_name}-${terraform.workspace}-es-log-group" } @@ -105,3 +105,4 @@ resource "aws_cloudwatch_log_resource_policy" "cloudwatch_policy" { } CONFIG } +*/ \ No newline at end of file