Pw/upgrade cloudwatch plugin (#2403)

* Pw/logging and optimisations (#2398) * Logging and optimsation improvements * Terraform for fluent bit changes * Use upgraded cloudwatch plugin in AWS fluent-bit * Merge fix
mohsobh · Feb 21, 2023 · 052a4ea · 052a4ea
1 parent de5188d
commit 052a4ea
Show file tree

Hide file tree

Showing 15 changed files with 153 additions and 154 deletions.
diff --git a/yarn-project/block-server/terraform/dev/main.tf b/yarn-project/block-server/terraform/dev/main.tf
@@ -105,15 +105,7 @@ resource "aws_ecs_task_definition" "block-server" {
       }
     ],
     "logConfiguration": {
-      "logDriver":"awsfirelens",
-      "options": {
-        "Name": "cloudwatch",
-        "region": "eu-west-2",
-        "log_key": "log",
-        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
-        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/block-server",
-        "auto_create_group": "false"
-      }
+      "logDriver":"awsfirelens"
     }
   },
   {
@@ -177,6 +169,14 @@ resource "aws_ecs_task_definition" "block-server" {
       {
         "name": "LOKI_PORT",
         "value": "3100"
+      },
+      {
+        "name": "LOG_LEVEL",
+        "value": "info"
+      },
+      {
+        "name": "REGION",
+        "value": "eu-west-2"
       }
     ],
     "memoryReservation": 64

diff --git a/yarn-project/block-server/terraform/prod/main.tf b/yarn-project/block-server/terraform/prod/main.tf
@@ -105,15 +105,7 @@ resource "aws_ecs_task_definition" "block-server" {
       }
     ],
     "logConfiguration": {
-      "logDriver":"awsfirelens",
-      "options": {
-        "Name": "cloudwatch",
-        "region": "eu-west-2",
-        "log_key": "log",
-        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
-        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/block-server",
-        "auto_create_group": "false"
-      }
+      "logDriver":"awsfirelens"
     }
   },
   {
@@ -177,6 +169,14 @@ resource "aws_ecs_task_definition" "block-server" {
       {
         "name": "LOKI_PORT",
         "value": "3100"
+      },
+      {
+        "name": "LOG_LEVEL",
+        "value": "info"
+      },
+      {
+        "name": "REGION",
+        "value": "eu-west-2"
       }
     ],
     "memoryReservation": 64

diff --git a/yarn-project/block-server/terraform/stage/main.tf b/yarn-project/block-server/terraform/stage/main.tf
@@ -107,15 +107,7 @@ resource "aws_ecs_task_definition" "block-server" {
       }
     ],
     "logConfiguration": {
-      "logDriver":"awsfirelens",
-      "options": {
-        "Name": "cloudwatch",
-        "region": "eu-west-2",
-        "log_key": "log",
-        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
-        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/block-server",
-        "auto_create_group": "false"
-      }
+      "logDriver":"awsfirelens"
     }
   },
   {
@@ -179,6 +171,14 @@ resource "aws_ecs_task_definition" "block-server" {
       {
         "name": "LOKI_PORT",
         "value": "3100"
+      },
+      {
+        "name": "LOG_LEVEL",
+        "value": "info"
+      },
+      {
+        "name": "REGION",
+        "value": "eu-west-2"
       }
     ],
     "memoryReservation": 64

diff --git a/yarn-project/block-server/terraform/testnet/main.tf b/yarn-project/block-server/terraform/testnet/main.tf
@@ -105,15 +105,7 @@ resource "aws_ecs_task_definition" "block-server" {
       }
     ],
     "logConfiguration": {
-      "logDriver":"awsfirelens",
-      "options": {
-        "Name": "cloudwatch",
-        "region": "eu-west-2",
-        "log_key": "log",
-        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
-        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/block-server",
-        "auto_create_group": "false"
-      }
+      "logDriver":"awsfirelens"
     }
   },
   {
@@ -177,8 +169,15 @@ resource "aws_ecs_task_definition" "block-server" {
       {
         "name": "LOKI_PORT",
         "value": "3100"
+      },
+      {
+        "name": "LOG_LEVEL",
+        "value": "info"
+      },
+      {
+        "name": "REGION",
+        "value": "eu-west-2"
       }
-    ],
     "memoryReservation": 64
   }
 ]

diff --git a/yarn-project/falafel/terraform/dev/main.tf b/yarn-project/falafel/terraform/dev/main.tf
@@ -235,15 +235,7 @@ resource "aws_ecs_task_definition" "falafel" {
       }
     ],
     "logConfiguration": {
-      "logDriver":"awsfirelens",
-      "options": {
-        "Name": "cloudwatch",
-        "region": "eu-west-2",
-        "log_key": "log",
-        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
-        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/falafel",
-        "auto_create_group": "false"
-      }
+      "logDriver":"awsfirelens"
     }
   },
   {
@@ -307,6 +299,14 @@ resource "aws_ecs_task_definition" "falafel" {
       {
         "name": "LOKI_PORT",
         "value": "3100"
+      },
+      {
+        "name": "LOG_LEVEL",
+        "value": "debug"
+      },
+      {
+        "name": "REGION",
+        "value": "eu-west-2"
       }
     ],
     "memoryReservation": 64

diff --git a/yarn-project/falafel/terraform/prod/main.tf b/yarn-project/falafel/terraform/prod/main.tf
@@ -236,15 +236,7 @@ resource "aws_ecs_task_definition" "falafel" {
       }
     ],
     "logConfiguration": {
-      "logDriver":"awsfirelens",
-      "options": {
-        "Name": "cloudwatch",
-        "region": "eu-west-2",
-        "log_key": "log",
-        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
-        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/falafel",
-        "auto_create_group": "false"
-      }
+      "logDriver":"awsfirelens"
     }
   },
   {
@@ -312,6 +304,14 @@ resource "aws_ecs_task_definition" "falafel" {
       {
         "name": "LOKI_PORT",
         "value": "3100"
+      },
+      {
+        "name": "LOG_LEVEL",
+        "value": "info"
+      },
+      {
+        "name": "REGION",
+        "value": "eu-west-2"
       }
     ],
     "memoryReservation": 64

diff --git a/yarn-project/falafel/terraform/stage/main.tf b/yarn-project/falafel/terraform/stage/main.tf
@@ -244,15 +244,7 @@ resource "aws_ecs_task_definition" "falafel" {
       }
     ],
     "logConfiguration": {
-      "logDriver":"awsfirelens",
-      "options": {
-        "Name": "cloudwatch",
-        "region": "eu-west-2",
-        "log_key": "log",
-        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
-        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/falafel",
-        "auto_create_group": "false"
-      }
+      "logDriver":"awsfirelens"
     }
   },
   {
@@ -320,6 +312,14 @@ resource "aws_ecs_task_definition" "falafel" {
       {
         "name": "LOKI_PORT",
         "value": "3100"
+      },
+      {
+        "name": "LOG_LEVEL",
+        "value": "info"
+      },
+      {
+        "name": "REGION",
+        "value": "eu-west-2"
       }
     ],
     "memoryReservation": 64

diff --git a/yarn-project/falafel/terraform/testnet/main.tf b/yarn-project/falafel/terraform/testnet/main.tf
@@ -247,15 +247,7 @@ resource "aws_ecs_task_definition" "falafel" {
       }
     ],
     "logConfiguration": {
-      "logDriver":"awsfirelens",
-      "options": {
-        "Name": "cloudwatch",
-        "region": "eu-west-2",
-        "log_key": "log",
-        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
-        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/falafel",
-        "auto_create_group": "false"
-      }
+      "logDriver":"awsfirelens"
     }
   },
   {
@@ -323,6 +315,14 @@ resource "aws_ecs_task_definition" "falafel" {
       {
         "name": "LOKI_PORT",
         "value": "3100"
+      },
+      {
+        "name": "LOG_LEVEL",
+        "value": "info"
+      },
+      {
+        "name": "REGION",
+        "value": "eu-west-2"
       }
     ],
     "memoryReservation": 64

diff --git a/yarn-project/halloumi/terraform/dev/main.tf b/yarn-project/halloumi/terraform/dev/main.tf
@@ -147,15 +147,7 @@ resource "aws_ecs_task_definition" "halloumi" {
       }
     ],
     "logConfiguration": {
-      "logDriver":"awsfirelens",
-      "options": {
-        "Name": "cloudwatch",
-        "region": "eu-west-2",
-        "log_key": "log",
-        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
-        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/halloumi",
-        "auto_create_group": "false"
-      }
+      "logDriver":"awsfirelens"
     }
   },
   {
@@ -219,6 +211,14 @@ resource "aws_ecs_task_definition" "halloumi" {
       {
         "name": "LOKI_PORT",
         "value": "3100"
+      },
+      {
+        "name": "LOG_LEVEL",
+        "value": "info"
+      },
+      {
+        "name": "REGION",
+        "value": "eu-west-2"
       }
     ],
     "memoryReservation": 64

diff --git a/yarn-project/halloumi/terraform/prod/main.tf b/yarn-project/halloumi/terraform/prod/main.tf
@@ -209,15 +209,7 @@ resource "aws_ecs_task_definition" "halloumi_inner" {
       }
     ],
     "logConfiguration": {
-      "logDriver":"awsfirelens",
-      "options": {
-        "Name": "cloudwatch",
-        "region": "eu-west-2",
-        "log_key": "log",
-        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
-        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/halloumi",
-        "auto_create_group": "false"
-      }
+      "logDriver":"awsfirelens"
     }
   },
   {
@@ -285,6 +277,14 @@ resource "aws_ecs_task_definition" "halloumi_inner" {
       {
         "name": "LOKI_PORT",
         "value": "3100"
+      },
+      {
+        "name": "LOG_LEVEL",
+        "value": "info"
+      },
+      {
+        "name": "REGION",
+        "value": "eu-west-2"
       }
     ],
     "memoryReservation": 64
@@ -382,15 +382,7 @@ resource "aws_ecs_task_definition" "halloumi_outer" {
       }
     ],
     "logConfiguration": {
-      "logDriver":"awsfirelens",
-      "options": {
-        "Name": "cloudwatch",
-        "region": "eu-west-2",
-        "log_key": "log",
-        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
-        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/halloumi",
-        "auto_create_group": "false"
-      }
+      "logDriver":"awsfirelens"
     }
   },
   {
@@ -458,6 +450,14 @@ resource "aws_ecs_task_definition" "halloumi_outer" {
       {
         "name": "LOKI_PORT",
         "value": "3100"
+      },
+      {
+        "name": "LOG_LEVEL",
+        "value": "info"
+      },
+      {
+        "name": "REGION",
+        "value": "eu-west-2"
       }
     ],
     "memoryReservation": 64