From 5cd7bed741dd1f717dde3f8ee005a03f11a5398a Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Mon, 4 Nov 2019 22:51:24 +0100 Subject: [PATCH 1/6] add configuration for application level logging to cloudwatch --- Dockerrun.aws.json.staging | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Dockerrun.aws.json.staging b/Dockerrun.aws.json.staging index 729b0ec..5690e60 100644 --- a/Dockerrun.aws.json.staging +++ b/Dockerrun.aws.json.staging @@ -19,7 +19,15 @@ "condition": "START" } ], - "links": ["server"] + "links": ["server"], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-group": "proxy", + "awslogs-region": "eu-west-1", + "awslogs-stream-prefix": "staging" + } + } }, { "name": "server", @@ -29,7 +37,15 @@ "command": ["serve"], "environment": [ { "name": "OFFEN_SERVER_REVERSEPROXY", "value": "1" } - ] + ], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-group": "server", + "awslogs-region": "eu-west-1", + "awslogs-stream-prefix": "staging" + } + } } ] } From 5e7b82b963a292bb32d3fd21713b15f167a11a77 Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Mon, 4 Nov 2019 22:51:51 +0100 Subject: [PATCH 2/6] fix log group region --- Dockerrun.aws.json.staging | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerrun.aws.json.staging b/Dockerrun.aws.json.staging index 5690e60..98a74a7 100644 --- a/Dockerrun.aws.json.staging +++ b/Dockerrun.aws.json.staging @@ -24,7 +24,7 @@ "logDriver": "awslogs", "options": { "awslogs-group": "proxy", - "awslogs-region": "eu-west-1", + "awslogs-region": "eu-central-1", "awslogs-stream-prefix": "staging" } } @@ -42,7 +42,7 @@ "logDriver": "awslogs", "options": { "awslogs-group": "server", - "awslogs-region": "eu-west-1", + "awslogs-region": "eu-central-1", "awslogs-stream-prefix": "staging" } } From 9d01a0706db4d20fe5ac38ef659bc9777836dfbd Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Mon, 4 Nov 2019 23:01:00 +0100 Subject: [PATCH 3/6] allow creating log groups --- Dockerrun.aws.json.staging | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerrun.aws.json.staging b/Dockerrun.aws.json.staging index 98a74a7..abdf60b 100644 --- a/Dockerrun.aws.json.staging +++ b/Dockerrun.aws.json.staging @@ -23,6 +23,7 @@ "logConfiguration": { "logDriver": "awslogs", "options": { + "awslogs-create-group": true, "awslogs-group": "proxy", "awslogs-region": "eu-central-1", "awslogs-stream-prefix": "staging" @@ -41,6 +42,7 @@ "logConfiguration": { "logDriver": "awslogs", "options": { + "awslogs-create-group": true, "awslogs-group": "server", "awslogs-region": "eu-central-1", "awslogs-stream-prefix": "staging" From cc9ea71f9394dfd985e13129fcef9d1f5a6e833d Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Mon, 4 Nov 2019 23:08:44 +0100 Subject: [PATCH 4/6] add production log config --- Dockerrun.aws.json.production | 28 +++++++++++++++++++--------- Dockerrun.aws.json.staging | 8 ++++---- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Dockerrun.aws.json.production b/Dockerrun.aws.json.production index 21a69e2..13afa9d 100644 --- a/Dockerrun.aws.json.production +++ b/Dockerrun.aws.json.production @@ -1,13 +1,5 @@ { "AWSEBDockerrunVersion": 2, - "volumes": [ - { - "name": "log-socket", - "host": { - "sourcePath": "/var/run/docker.sock" - } - } - ], "containerDefinitions": [ { "name": "proxy", @@ -27,6 +19,15 @@ } ], "links": ["server"] + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-create-group": true, + "awslogs-group": "production", + "awslogs-region": "eu-central-1", + "awslogs-stream-prefix": "proxy" + } + } }, { "name": "server", @@ -36,7 +37,16 @@ "command": ["serve"], "environment": [ { "name": "OFFEN_SERVER_REVERSEPROXY", "value": "1" } - ] + ], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-create-group": true, + "awslogs-group": "production", + "awslogs-region": "eu-central-1", + "awslogs-stream-prefix": "server" + } + } } ] } diff --git a/Dockerrun.aws.json.staging b/Dockerrun.aws.json.staging index abdf60b..2125921 100644 --- a/Dockerrun.aws.json.staging +++ b/Dockerrun.aws.json.staging @@ -24,9 +24,9 @@ "logDriver": "awslogs", "options": { "awslogs-create-group": true, - "awslogs-group": "proxy", + "awslogs-group": "staging", "awslogs-region": "eu-central-1", - "awslogs-stream-prefix": "staging" + "awslogs-stream-prefix": "proxy" } } }, @@ -43,9 +43,9 @@ "logDriver": "awslogs", "options": { "awslogs-create-group": true, - "awslogs-group": "server", + "awslogs-group": "staging", "awslogs-region": "eu-central-1", - "awslogs-stream-prefix": "staging" + "awslogs-stream-prefix": "server" } } } From 6d6e28967d31317828705858c3dd41a89e6f5f59 Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Mon, 4 Nov 2019 23:13:30 +0100 Subject: [PATCH 5/6] remove unnecessary prefix --- Dockerrun.aws.json.production | 6 ++---- Dockerrun.aws.json.staging | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Dockerrun.aws.json.production b/Dockerrun.aws.json.production index 13afa9d..97bdc07 100644 --- a/Dockerrun.aws.json.production +++ b/Dockerrun.aws.json.production @@ -24,8 +24,7 @@ "options": { "awslogs-create-group": true, "awslogs-group": "production", - "awslogs-region": "eu-central-1", - "awslogs-stream-prefix": "proxy" + "awslogs-region": "eu-central-1" } } }, @@ -43,8 +42,7 @@ "options": { "awslogs-create-group": true, "awslogs-group": "production", - "awslogs-region": "eu-central-1", - "awslogs-stream-prefix": "server" + "awslogs-region": "eu-central-1" } } } diff --git a/Dockerrun.aws.json.staging b/Dockerrun.aws.json.staging index 2125921..2184b53 100644 --- a/Dockerrun.aws.json.staging +++ b/Dockerrun.aws.json.staging @@ -25,8 +25,7 @@ "options": { "awslogs-create-group": true, "awslogs-group": "staging", - "awslogs-region": "eu-central-1", - "awslogs-stream-prefix": "proxy" + "awslogs-region": "eu-central-1" } } }, @@ -44,8 +43,7 @@ "options": { "awslogs-create-group": true, "awslogs-group": "staging", - "awslogs-region": "eu-central-1", - "awslogs-stream-prefix": "server" + "awslogs-region": "eu-central-1" } } } From 4826c1ac3350c2f2b061e5e19cc564b97d2866ac Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Mon, 4 Nov 2019 23:18:32 +0100 Subject: [PATCH 6/6] add prefix as removing it will also strip container name --- Dockerrun.aws.json.production | 6 ++++-- Dockerrun.aws.json.staging | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerrun.aws.json.production b/Dockerrun.aws.json.production index 97bdc07..13afa9d 100644 --- a/Dockerrun.aws.json.production +++ b/Dockerrun.aws.json.production @@ -24,7 +24,8 @@ "options": { "awslogs-create-group": true, "awslogs-group": "production", - "awslogs-region": "eu-central-1" + "awslogs-region": "eu-central-1", + "awslogs-stream-prefix": "proxy" } } }, @@ -42,7 +43,8 @@ "options": { "awslogs-create-group": true, "awslogs-group": "production", - "awslogs-region": "eu-central-1" + "awslogs-region": "eu-central-1", + "awslogs-stream-prefix": "server" } } } diff --git a/Dockerrun.aws.json.staging b/Dockerrun.aws.json.staging index 2184b53..2125921 100644 --- a/Dockerrun.aws.json.staging +++ b/Dockerrun.aws.json.staging @@ -25,7 +25,8 @@ "options": { "awslogs-create-group": true, "awslogs-group": "staging", - "awslogs-region": "eu-central-1" + "awslogs-region": "eu-central-1", + "awslogs-stream-prefix": "proxy" } } }, @@ -43,7 +44,8 @@ "options": { "awslogs-create-group": true, "awslogs-group": "staging", - "awslogs-region": "eu-central-1" + "awslogs-region": "eu-central-1", + "awslogs-stream-prefix": "server" } } }