From 4f7796062bc5c5bef878d49333b8eddef72af127 Mon Sep 17 00:00:00 2001
From: King'ori Maina <j@kingori.co>
Date: Wed, 10 Feb 2021 12:06:53 +0300
Subject: [PATCH 1/7] Remove unnecessary double space

---
 config/log.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/log.conf b/config/log.conf
index 047b6e4..3baae9f 100644
--- a/config/log.conf
+++ b/config/log.conf
@@ -1,4 +1,4 @@
-log_format main '$remote_addr - $remote_user [$time_local]  $status '
+log_format main '$remote_addr - $remote_user [$time_local] $status '
                 '"$request" $body_bytes_sent "$http_referer" '
                 '"$http_user_agent" "$http_x_forwarded_for" $proxy_x_request_id';
 

From 3b2b0c9b60eab8f99573bdc9cf061e21138f41e5 Mon Sep 17 00:00:00 2001
From: King'ori Maina <j@kingori.co>
Date: Wed, 10 Feb 2021 13:23:01 +0300
Subject: [PATCH 2/7] Renamed main logging format to main_default

---
 config/log.conf | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/log.conf b/config/log.conf
index 3baae9f..85df957 100644
--- a/config/log.conf
+++ b/config/log.conf
@@ -1,6 +1,7 @@
-log_format main '$remote_addr - $remote_user [$time_local] $status '
-                '"$request" $body_bytes_sent "$http_referer" '
-                '"$http_user_agent" "$http_x_forwarded_for" $proxy_x_request_id';
+log_format main_default escape=default
+  '$remote_addr - $remote_user [$time_local] $status '
+  '"$request" $body_bytes_sent "$http_referer" '
+  '"$http_user_agent" "$http_x_forwarded_for" $proxy_x_request_id';
 
-access_log /dev/stdout main;
+access_log /dev/stdout main_default;
 error_log /dev/stdout warn;

From 839b200910963fffe432498325e8833329cb171d Mon Sep 17 00:00:00 2001
From: King'ori Maina <j@kingori.co>
Date: Wed, 10 Feb 2021 13:25:10 +0300
Subject: [PATCH 3/7] Add main_json logging format

* http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format
* https://stackoverflow.com/questions/25049667/how-to-generate-a-json-log-from-nginx
---
 config/log.conf | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/config/log.conf b/config/log.conf
index 85df957..24ba48c 100644
--- a/config/log.conf
+++ b/config/log.conf
@@ -3,5 +3,21 @@ log_format main_default escape=default
   '"$request" $body_bytes_sent "$http_referer" '
   '"$http_user_agent" "$http_x_forwarded_for" $proxy_x_request_id';
 
+log_format main_json escape=json
+  '{'
+    '"body_bytes_sent":"$body_bytes_sent",'
+    '"http_referrer":"$http_referer",'
+    '"http_user_agent":"$http_user_agent",'
+    '"http_x_forwarded_for":"$http_x_forwarded_for",'
+    '"proxy_x_request_id":"$proxy_x_request_id",'
+    '"remote_addr":"$remote_addr",'
+    '"remote_user":"$remote_user",'
+    '"request":"$request",'
+    '"request_length":"$request_length",'
+    '"request_time":"$request_time",'
+    '"status": "$status",'
+    '"time_local":"$time_local"'
+  '}';
+
 access_log /dev/stdout main_default;
 error_log /dev/stdout warn;

From e54e57424064a24f11d84590748560f4638ea157 Mon Sep 17 00:00:00 2001
From: King'ori Maina <j@kingori.co>
Date: Wed, 10 Feb 2021 13:31:18 +0300
Subject: [PATCH 4/7] Configure access_log with main_json

---
 config/log.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/log.conf b/config/log.conf
index 24ba48c..49cd550 100644
--- a/config/log.conf
+++ b/config/log.conf
@@ -19,5 +19,5 @@ log_format main_json escape=json
     '"time_local":"$time_local"'
   '}';
 
-access_log /dev/stdout main_default;
+access_log /dev/stdout main_json;
 error_log /dev/stdout warn;

From ddd075db53423271cc363f8372fd2dccb74e94c0 Mon Sep 17 00:00:00 2001
From: King'ori Maina <j@kingori.co>
Date: Wed, 10 Feb 2021 13:31:29 +0300
Subject: [PATCH 5/7] Bump version and update CHANGELOG

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b38dec..88c1349 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.19.5-4
+
+* Renamed `main` logging format to `main_default`.
+* Remove unnecessary double space between `$time_local` & `$status` from
+  `main_default` logging format.
+* Add `main_json` logging format and configure it on `access_log`.
+
 ## 1.19.5-3
 
 * Set or forward `X-Request-ID`.

From 05abb6724e8cd8bf5ff3fa7a0f2d0ca533fd6ba4 Mon Sep 17 00:00:00 2001
From: King'ori Maina <j@kingori.co>
Date: Wed, 10 Feb 2021 13:46:22 +0300
Subject: [PATCH 6/7] Add some more info to main_json

That may be useful for debugging.
---
 config/log.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/log.conf b/config/log.conf
index 49cd550..0395fe8 100644
--- a/config/log.conf
+++ b/config/log.conf
@@ -6,9 +6,13 @@ log_format main_default escape=default
 log_format main_json escape=json
   '{'
     '"body_bytes_sent":"$body_bytes_sent",'
+    '"host":"$host",'
     '"http_referrer":"$http_referer",'
     '"http_user_agent":"$http_user_agent",'
     '"http_x_forwarded_for":"$http_x_forwarded_for",'
+    '"proxy_x_forwarded_port":"$proxy_x_forwarded_port",'
+    '"proxy_x_forwarded_proto":"$proxy_x_forwarded_proto",'
+    '"proxy_x_forwarded_ssl":"$proxy_x_forwarded_ssl",'
     '"proxy_x_request_id":"$proxy_x_request_id",'
     '"remote_addr":"$remote_addr",'
     '"remote_user":"$remote_user",'

From c2b081f4bd75997491db3e73b8892999ba4f9707 Mon Sep 17 00:00:00 2001
From: King'ori Maina <j@kingori.co>
Date: Wed, 10 Feb 2021 16:08:00 +0300
Subject: [PATCH 7/7] Prefer time_iso8601 over time_local for time format

---
 config/log.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/log.conf b/config/log.conf
index 0395fe8..385f33d 100644
--- a/config/log.conf
+++ b/config/log.conf
@@ -20,7 +20,7 @@ log_format main_json escape=json
     '"request_length":"$request_length",'
     '"request_time":"$request_time",'
     '"status": "$status",'
-    '"time_local":"$time_local"'
+    '"time_iso8601":"$time_iso8601"'
   '}';
 
 access_log /dev/stdout main_json;