Merge pull request #73 from edx/nadeem/Nginx-log

feat: standardize Nginx Log Format for Datadog Integration
edx · Oct 2, 2024 · 5a19e68 · 5a19e68
2 parents 47e19f3 + b81d987
commit 5a19e68
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/playbooks/roles/nginx/templates/etc/nginx/nginx.conf.j2 b/playbooks/roles/nginx/templates/etc/nginx/nginx.conf.j2
@@ -68,9 +68,10 @@ http {
                                'upstream_connect_time=$upstream_connect_time upstream_header_time=$upstream_header_time';
 
         {% if NGINX_ENABLE_REQUEST_TRACKING_ID -%}
-        log_format cf_custom '$http_x_forwarded_for - $remote_addr - $remote_user $http_x_forwarded_proto [$time_local] $request_tracking_id  '
-                            '"$request" $status $body_bytes_sent $request_time '
-                            '"$http_referer" "$http_user_agent"';
+        log_format cf_custom '$remote_addr - $remote_user [$time_local] '
+                     '"$request" $status $body_bytes_sent $request_time '
+                     '"$http_referer" "$http_user_agent" '
+                     '"$http_x_forwarded_for" $http_x_forwarded_proto $request_tracking_id';
         {% endif %}
 
         log_format json_analytics escape=json '{'