Merge pull request #14 from optiop/fix/grafana-postgres-conn

Fix/grafana postgres conn

Author: mehr74

README.md

@@ -13,7 +13,7 @@
   <a href="https://optiop.org#gh-light-mode-only">
     <img src="./docs/images/banner.light.png#gh-light-mode-only" style="height: 48px">
   </a>
-  <a href="https://coder.com#gh-dark-mode-only">
+  <a href="https://optiop.org#gh-dark-mode-only">
     <img src="./docs/images/banner.dark.png#gh-dark-mode-only" style="height: 48px">
   </a>
 

ops/ecs/modules/grafana/main.tf

@@ -29,21 +29,25 @@ resource "aws_ecs_task_definition" "task" {
       memory : 512,
       environment : [
         {
-          "name" : "DB_USER",
+          "name" : "POSTGRES_USER",
           "value" : jsondecode(data.aws_secretsmanager_secret_version.configs.secret_string)["DATABASE_USERNAME"]
         },
         {
-          "name" : "DB_PASSWORD",
+          "name" : "POSTGRES_PASSWORD",
           "value" : jsondecode(data.aws_secretsmanager_secret_version.configs.secret_string)["DATABASE_PASSWORD"]
         },
         {
-          "name" : "DB_HOST",
+          "name" : "POSTGRES_HOST",
           "value" : jsondecode(data.aws_secretsmanager_secret_version.configs.secret_string)["DATABASE_HOST"]
         },
         {
-          "name" : "DB_NAME",
+          "name" : "POSTGRES_DB",
           "value" : jsondecode(data.aws_secretsmanager_secret_version.configs.secret_string)["DATABASE_NAME"]
         },
+        {
+          "name" : "POSTGRES_PORT",
+          "value" : "5432"
+        }
       ]
       logConfiguration : {
         logDriver : "awslogs",
@@ -64,7 +68,7 @@ resource "aws_ecs_task_definition" "task" {
 }
 
 resource "aws_service_discovery_service" "grafana" {
-  name = "grafana-service"
+  name = "grafana"
   dns_config {
     namespace_id = var.namespace_id
     dns_records {
@@ -81,7 +85,7 @@ resource "aws_cloudwatch_log_group" "log_group" {
 
 # Creating an ECS service
 resource "aws_ecs_service" "service" {
-  name            = "grafana-service"
+  name            = "grafana"
   cluster         = var.cluster_id
   task_definition = aws_ecs_task_definition.task.arn
   desired_count   = 1

ops/ecs/modules/postgres/main.tf

@@ -62,7 +62,7 @@ resource "aws_ecs_task_definition" "task" {
 }
 
 resource "aws_service_discovery_service" "database" {
-  name = "database-service"
+  name = "postgres"
   dns_config {
     namespace_id = var.namespace_id
     dns_records {
@@ -79,7 +79,7 @@ resource "aws_cloudwatch_log_group" "log_group" {
 
 # Creating an ECS service
 resource "aws_ecs_service" "service" {
-  name            = "database-service"
+  name            = "postgres"
   cluster         = var.cluster_id
   task_definition = aws_ecs_task_definition.task.arn
   desired_count   = 1
@@ -92,7 +92,7 @@ resource "aws_ecs_service" "service" {
 
   service_registries {
     registry_arn   = aws_service_discovery_service.database.arn
-    container_name = "database-service"
+    container_name = "postgres"
   }
 
   lifecycle {