nginx: log used upstream, and avoid unneccessary upstream switches

License: MIT
Signed-off-by: Lars Gierth <[email protected]>

Author: Lars Gierth

mtail/progs/nginx.mtail

@@ -18,7 +18,8 @@ counter http_response_size_bytes_sum by vhost, method, code, content_type
 /(?P<request_seconds>\d+)\.(?P<request_milliseconds>\d+) / +
 /"(?P<http_referer>\S+)" / +
 /"(?P<http_user_agent>[[:print:]]+)" / +
-/"(?P<content_type>[^;]+)(;.*)?"/ +
+/"(?P<content_type>[^;]+)(;.*)?" / +
+/upstream="(?P<upstream>[[:print:]]*)"/ +
 /$/ {
   http_requests_total[$vhost][tolower($request_method)][$status][$content_type]++
   http_request_duration_milliseconds_sum[$vhost][tolower($request_method)][$status][$content_type] += $request_seconds * 1000 + $request_milliseconds

nginx/nginx.conf

@@ -1,9 +1,6 @@
 user  nginx;
 worker_processes  1;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
+pid /var/run/nginx.pid;
 
 events {
     worker_connections  10240;
@@ -17,7 +14,7 @@ http {
 
     log_format mtail '$server_name $remote_addr - $remote_user [$time_local] '
                      '"$request" $status $bytes_sent $request_time '
-                     '"$http_referer" "$http_user_agent" "$sent_http_content_type"';
+                     '"$http_referer" "$http_user_agent" "$sent_http_content_type" upstream="$upstream_addr"';
 
     access_log off;
     error_log /var/log/nginx/error.log warn;
@@ -63,6 +60,7 @@ http {
       text/x-cross-domain-policy;
     # text/html is always compressed by gzip module
 
+    proxy_next_upstream error;
     proxy_buffering off;
     proxy_buffer_size 4k;