Skip to content

Commit a9789a2

Browse files
Merge pull request #10 from Scalingo/fix/logs/rename_fields
fix(logs): add new fields for log_format
2 parents 741a5e3 + 65211d4 commit a9789a2

File tree

2 files changed

+15
-66
lines changed

2 files changed

+15
-66
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

nginx.conf

Lines changed: 15 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -27,66 +27,30 @@ http {
2727
server_tokens off;
2828
more_clear_headers Server;
2929

30-
# Use a debug-oriented logging format.
31-
log_format debugging escape=json
30+
log_format tweaked escape=json
3231
'{'
3332
'"access_time":"$time_local",'
34-
'"remote_addr":"$remote_addr",'
35-
'"remote_user":"$remote_user",'
36-
'"request":"$request",'
33+
'"from":"$remote_addr",'
34+
'"method":"$request_method",'
35+
'"path":"$uri",'
36+
'"http_version":"$server_protocol",'
3737
'"status":"$status",'
3838
'"bytes_sent":"$body_bytes_sent",'
39+
'"referrer":"$http_referer",'
40+
'"user_agent":"$http_user_agent",'
3941
'"host":"$host",'
4042
'"proxy_host":"$proxy_host",'
41-
'"upstream":"$upstream_addr",'
42-
'"scheme_upstream":"$targetScheme",'
43-
'"upstream_status":"$upstream_status",'
44-
'"ssl_protocol":"$ssl_protocol",'
45-
'"connect_host":"$connect_host",'
46-
'"connect_port":"$connect_port",'
47-
'"connect_addr":"$connect_addr",'
48-
'"upstream_http_location":"$upstream_http_location",'
43+
'"upstream_addr":"$upstream_addr",'
44+
'"upstream_response_time":"$upstream_response_time",'
4945
'"upstream_cache_status":"$upstream_cache_status",'
50-
'"http_authorization":"$http_authorization"'
51-
'}';
52-
53-
log_format debug_proxy escape=json
54-
'{'
55-
'"access_time":"$time_local",'
56-
'"remote_addr":"$remote_addr",'
57-
'"remote_user":"$remote_user",'
58-
'"request":"$request",'
59-
'"status":"$status",'
60-
'"bytes_sent":"$body_bytes_sent",'
61-
'"host":"$host",'
62-
'"proxy_host":"$proxy_host",'
63-
'"upstream":"$upstream_addr",'
64-
'"scheme_upstream":"$targetScheme",'
65-
'"upstream_status":"$upstream_status",'
66-
'"ssl_protocol":"$ssl_protocol",'
67-
'"connect_host":"$connect_host",'
68-
'"connect_port":"$connect_port",'
69-
'"connect_addr":"$connect_addr",'
7046
'"upstream_http_location":"$upstream_http_location",'
71-
'"upstream_cache_status":"$upstream_cache_status",'
72-
'"http_authorization":"$http_authorization"'
73-
'}';
74-
75-
log_format tweaked escape=json
76-
'{'
77-
'"access_time":"$time_local",'
78-
'"upstream_cache_status":"$upstream_cache_status",'
79-
'"method":"$request_method",'
80-
'"uri":"$uri",'
47+
'"upstream_status":"$upstream_status",'
48+
'"upstream_backend_name":"$targetHost",'
49+
'"upstream_bytes_received":"$upstream_bytes_received",'
50+
'"upstream_bytes_sent":"$upstream_bytes_sent",'
51+
'"proxy_pass":"$targetScheme://$targetHost",'
8152
'"request_type":"$docker_proxy_request_type",'
82-
'"status":"$status",'
83-
'"bytes_sent":"$body_bytes_sent",'
84-
'"upstream_response_time":"$upstream_response_time",'
85-
'"host":"$host",'
86-
'"proxy_host":"$proxy_host",'
87-
'"upstream":"$upstream_addr",'
88-
'"request":"$request",'
89-
'"scheme_upstream":"$targetScheme"'
53+
'"duration":"$request_time"'
9054
'}';
9155

9256
gzip off;

0 commit comments

Comments
 (0)