From 26c5b5ea7f3972b51e061466aba0066eefa2cd79 Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Thu, 14 Nov 2019 13:25:30 -0500
Subject: [PATCH] Add JSON logging back for NGINX container.

This configures the NGINX container to log in JSON. It also updates the
K8s config so that we mount all of the key/value pairs available in the
atst-nginx ConfigMap as files in "/etc/nginx/conf.d" inside the
container. This simplifies the config a little.
---
 deploy/azure/atst-nginx-configmap.yml | 26 ++++++++++++++++++++++++--
 deploy/azure/azure.yml                |  6 +-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/deploy/azure/atst-nginx-configmap.yml b/deploy/azure/atst-nginx-configmap.yml
index e19c6d54..22d6d97e 100644
--- a/deploy/azure/atst-nginx-configmap.yml
+++ b/deploy/azure/atst-nginx-configmap.yml
@@ -5,8 +5,10 @@ metadata:
   name: atst-nginx
   namespace: atat
 data:
-  nginx-config: |-
+  atst.conf: |-
     server {
+        access_log /var/log/nginx/access.log json;
+
         listen ${PORT_PREFIX}342;
         server_name ${MAIN_DOMAIN};
         root /usr/share/nginx/html;
@@ -18,6 +20,8 @@ data:
         }
     }
     server {
+        access_log /var/log/nginx/access.log json;
+
         listen ${PORT_PREFIX}343;
         server_name ${AUTH_DOMAIN};
         root /usr/share/nginx/html;
@@ -29,6 +33,8 @@ data:
         }
     }
     server {
+        access_log /var/log/nginx/access.log json;
+
         server_name ${MAIN_DOMAIN};
         # access_log /var/log/nginx/access.log json;
         listen ${PORT_PREFIX}442 ssl;
@@ -58,7 +64,8 @@ data:
         }
     }
     server {
-        # access_log /var/log/nginx/access.log json;
+        access_log /var/log/nginx/access.log json;
+
         server_name ${AUTH_DOMAIN};
         listen ${PORT_PREFIX}443 ssl;
         listen [::]:${PORT_PREFIX}443 ssl ipv6only=on;
@@ -88,3 +95,18 @@ data:
             uwsgi_param HTTP_X_REQUEST_ID $request_id;
         }
     }
+  00json_log.conf: |-
+    log_format json escape=json
+      '{'
+        '"timestamp":"$time_iso8601",'
+        '"msec":"$msec",'
+        '"request_id":"$request_id",'
+        '"remote_addr":"$remote_addr",'
+        '"remote_user":"$remote_user",'
+        '"request":"$request",'
+        '"status":$status,'
+        '"body_bytes_sent":$body_bytes_sent,'
+        '"referer":"$http_referer",'
+        '"user_agent":"$http_user_agent",'
+        '"http_x_forwarded_for":"$http_x_forwarded_for"'
+      '}';
diff --git a/deploy/azure/azure.yml b/deploy/azure/azure.yml
index 8d46fa4b..3ed3ea61 100644
--- a/deploy/azure/azure.yml
+++ b/deploy/azure/azure.yml
@@ -62,8 +62,7 @@ spec:
               name: auth
           volumeMounts:
             - name: nginx-config
-              mountPath: "/etc/nginx/conf.d/atst.conf"
-              subPath: atst.conf
+              mountPath: "/etc/nginx/conf.d/"
             - name: uwsgi-socket-dir
               mountPath: "/var/run/uwsgi"
             - name: nginx-htpasswd
@@ -90,9 +89,6 @@ spec:
         - name: nginx-config
           configMap:
             name: atst-nginx
-            items:
-            - key: nginx-config
-              path: atst.conf
         - name: uwsgi-socket-dir
           emptyDir:
             medium: Memory