Skip to content

Commit 2b4cc33

Browse files
committed
Update env in grafana and postgres modules
1 parent a757367 commit 2b4cc33

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

ops/ecs/modules/grafana/main.tf

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,25 @@ resource "aws_ecs_task_definition" "task" {
2929
memory : 512,
3030
environment : [
3131
{
32-
"name" : "DB_USER",
32+
"name" : "POSTGRES_USER",
3333
"value" : jsondecode(data.aws_secretsmanager_secret_version.configs.secret_string)["DATABASE_USERNAME"]
3434
},
3535
{
36-
"name" : "DB_PASSWORD",
36+
"name" : "POSTGRES_PASSWORD",
3737
"value" : jsondecode(data.aws_secretsmanager_secret_version.configs.secret_string)["DATABASE_PASSWORD"]
3838
},
3939
{
40-
"name" : "DB_HOST",
40+
"name" : "POSTGRES_HOST",
4141
"value" : jsondecode(data.aws_secretsmanager_secret_version.configs.secret_string)["DATABASE_HOST"]
4242
},
4343
{
44-
"name" : "DB_NAME",
44+
"name" : "POSTGRES_DB",
4545
"value" : jsondecode(data.aws_secretsmanager_secret_version.configs.secret_string)["DATABASE_NAME"]
4646
},
47+
{
48+
"name" : "POSTGRES_PORT",
49+
"value" : "5432"
50+
}
4751
]
4852
logConfiguration : {
4953
logDriver : "awslogs",
@@ -64,7 +68,7 @@ resource "aws_ecs_task_definition" "task" {
6468
}
6569

6670
resource "aws_service_discovery_service" "grafana" {
67-
name = "grafana-service"
71+
name = "grafana"
6872
dns_config {
6973
namespace_id = var.namespace_id
7074
dns_records {
@@ -81,7 +85,7 @@ resource "aws_cloudwatch_log_group" "log_group" {
8185

8286
# Creating an ECS service
8387
resource "aws_ecs_service" "service" {
84-
name = "grafana-service"
88+
name = "grafana"
8589
cluster = var.cluster_id
8690
task_definition = aws_ecs_task_definition.task.arn
8791
desired_count = 1

ops/ecs/modules/postgres/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ resource "aws_ecs_task_definition" "task" {
6262
}
6363

6464
resource "aws_service_discovery_service" "database" {
65-
name = "database-service"
65+
name = "postgres"
6666
dns_config {
6767
namespace_id = var.namespace_id
6868
dns_records {
@@ -79,7 +79,7 @@ resource "aws_cloudwatch_log_group" "log_group" {
7979

8080
# Creating an ECS service
8181
resource "aws_ecs_service" "service" {
82-
name = "database-service"
82+
name = "postgres"
8383
cluster = var.cluster_id
8484
task_definition = aws_ecs_task_definition.task.arn
8585
desired_count = 1
@@ -92,7 +92,7 @@ resource "aws_ecs_service" "service" {
9292

9393
service_registries {
9494
registry_arn = aws_service_discovery_service.database.arn
95-
container_name = "database-service"
95+
container_name = "postgres"
9696
}
9797

9898
lifecycle {

0 commit comments

Comments
 (0)