Skip to content

Commit 31587b0

Browse files
pigerpiger
committed
log to stdout and stderr
1 parent ab107ea commit 31587b0

File tree

8 files changed

+148
-154
lines changed

8 files changed

+148
-154
lines changed

‎.gitignore

-2
This file was deleted.

‎docker-compose.yml

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ services:
1212
- "8443:443"
1313
volumes:
1414
- ./outer-proxy/conf:/etc/nginx
15-
- ./outer-proxy/logs:/var/log/nginx
1615
networks:
1716
fakelan:
1817
ipv4_address: 10.20.30.2
@@ -30,7 +29,6 @@ services:
3029
- "9443:443"
3130
volumes:
3231
- ./inner-proxy/conf:/etc/nginx
33-
- ./inner-proxy/logs:/var/log/nginx
3432
networks:
3533
fakelan:
3634
ipv4_address: 10.20.30.3

‎inner-proxy/conf/log-schema.conf

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
log_format main_json escape=json
2+
'{'
3+
'"@timestamp": "$time_iso8601",'
4+
'"nginx":{'
5+
'"connection": $connection,'
6+
'"connection_requests": $connection_requests'
7+
'},'
8+
'"remote_user": "$remote_user",'
9+
'"http":{'
10+
'"body_bytes_sent": $body_bytes_sent,'
11+
'"content_length": "$content_length",'
12+
'"content_type": "$content_type",'
13+
'"document_root": "$document_root",'
14+
'"headers":{'
15+
'"x_forwarded_for": "$http_x_forwarded_for",'
16+
'"x_forwarded_host": "$http_x_forwarded_host",'
17+
'"x_forwarded_proto": "$http_x_forwarded_proto"'
18+
'},'
19+
'"host": "$host",'
20+
'"method": "$request_method", '
21+
'"protocol": "$server_protocol",'
22+
'"referer": "$http_referer",'
23+
'"request": "$request",'
24+
'"request_completion": "$request_completion",'
25+
'"request_length": $request_length,'
26+
'"request_time": $request_time,'
27+
'"status_code": $status,'
28+
'"url_details":{'
29+
'"path": "$uri",'
30+
'"scheme": "$scheme"'
31+
'},'
32+
'"user_agent": "$http_user_agent"'
33+
'},'
34+
'"request_id": "$request_id",'
35+
'"tcp_conn":{'
36+
'"realip_remote_addr": "$realip_remote_addr",'
37+
'"realip_remote_port": $realip_remote_port,'
38+
'"remote_addr": "$remote_addr",'
39+
'"remote_port": "$remote_port",'
40+
'"server_name": "$server_name",'
41+
'"server_port": $server_port'
42+
'},'
43+
'"tcp_stats":{'
44+
'"rtt": $tcpinfo_rtt,'
45+
'"rttvar": $tcpinfo_rttvar,'
46+
'"snd_cwnd": $tcpinfo_snd_cwnd,'
47+
'"rcv_space": $tcpinfo_rcv_space'
48+
'},'
49+
'"ssl":{'
50+
'"ssl_server_name": "$ssl_server_name",'
51+
'"ssl_protocol": "$ssl_protocol",'
52+
'"ssl_cipher": "$ssl_cipher"'
53+
'},'
54+
'"time_local": "$time_local",'
55+
'"upstream":{'
56+
'"addr": "$upstream_addr",'
57+
'"bytes_received": "$upstream_bytes_received",'
58+
'"cache_status": "$upstream_cache_status",'
59+
'"connect_time": "$upstream_connect_time",'
60+
'"header_time": "$upstream_header_time",'
61+
'"headers":{'
62+
'"x_accel_redirect": "$upstream_http_x_accel_redirect"'
63+
'},'
64+
'"response_time": "$upstream_response_time",'
65+
'"status": "$upstream_status"'
66+
'}'
67+
'}';

‎inner-proxy/conf/nginx.conf

+7-75
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,23 @@
1+
# inner proxy configuration
12

23
user www-data;
34
worker_processes auto;
45

56
load_module modules/ndk_http_module.so;
67
load_module modules/ngx_http_lua_module.so;
7-
8-
error_log /var/log/nginx/error.log notice;
9-
pid /var/run/nginx.pid;
8+
pid /var/run/nginx.pid;
109

1110
events {
1211
worker_connections 1024;
1312
}
1413

1514
http {
16-
include /etc/nginx/mime.types;
15+
include mime.types;
1716
default_type application/octet-stream;
1817

19-
log_format main_json escape=json
20-
'{'
21-
'"@timestamp": "$time_iso8601",'
22-
'"nginx":{'
23-
'"connection": $connection,'
24-
'"connection_requests": $connection_requests'
25-
'},'
26-
'"remote_user": "$remote_user",'
27-
'"http":{'
28-
'"body_bytes_sent": $body_bytes_sent,'
29-
'"content_length": "$content_length",'
30-
'"content_type": "$content_type",'
31-
'"document_root": "$document_root",'
32-
'"headers":{'
33-
'"x_forwarded_for": "$http_x_forwarded_for",'
34-
'"x_forwarded_host": "$http_x_forwarded_host",'
35-
'"x_forwarded_proto": "$http_x_forwarded_proto"'
36-
'},'
37-
'"host": "$host",'
38-
'"method": "$request_method", '
39-
'"protocol": "$server_protocol",'
40-
'"referer": "$http_referer",'
41-
'"request": "$request",'
42-
'"request_completion": "$request_completion",'
43-
'"request_length": $request_length,'
44-
'"request_time": $request_time,'
45-
'"status_code": $status,'
46-
'"url_details":{'
47-
'"path": "$uri",'
48-
'"scheme": "$scheme"'
49-
'},'
50-
'"user_agent": "$http_user_agent"'
51-
'},'
52-
'"request_id": "$request_id",'
53-
'"tcp_conn":{'
54-
'"realip_remote_addr": "$realip_remote_addr",'
55-
'"realip_remote_port": $realip_remote_port,'
56-
'"remote_addr": "$remote_addr",'
57-
'"remote_port": "$remote_port",'
58-
'"server_name": "$server_name",'
59-
'"server_port": $server_port'
60-
'},'
61-
'"tcp_stats":{'
62-
'"rtt": $tcpinfo_rtt,'
63-
'"rttvar": $tcpinfo_rttvar,'
64-
'"snd_cwnd": $tcpinfo_snd_cwnd,'
65-
'"rcv_space": $tcpinfo_rcv_space'
66-
'},'
67-
'"ssl":{'
68-
'"ssl_server_name": "$ssl_server_name",'
69-
'"ssl_protocol": "$ssl_protocol",'
70-
'"ssl_cipher": "$ssl_cipher"'
71-
'},'
72-
'"time_local": "$time_local",'
73-
'"upstream":{'
74-
'"addr": "$upstream_addr",'
75-
'"bytes_received": "$upstream_bytes_received",'
76-
'"cache_status": "$upstream_cache_status",'
77-
'"connect_time": "$upstream_connect_time",'
78-
'"header_time": "$upstream_header_time",'
79-
'"headers":{'
80-
'"x_accel_redirect": "$upstream_http_x_accel_redirect"'
81-
'},'
82-
'"response_time": "$upstream_response_time",'
83-
'"status": "$upstream_status"'
84-
'}'
85-
'}';
86-
87-
access_log /var/log/nginx/access.log combined;
88-
access_log /var/log/nginx/access.log.json main_json;
18+
include log-schema.conf;
19+
access_log /dev/stdout main_json;
20+
error_log stderr info;
8921

9022
# Set the search path for lua packages to /etc/nginx/lua
9123
lua_package_path "$prefix/lua/?.lua;/etc/nginx/lua/?.lua;;";
@@ -99,5 +31,5 @@ http {
9931
real_ip_header X-Forwarded-For;
10032

10133
# Include the rest of the configuration
102-
include /etc/nginx/conf.d/*.conf;
34+
include conf.d/*.conf;
10335
}

‎inner-proxy/logs/.gitkeep

Whitespace-only changes.

‎outer-proxy/conf/log-schema.conf

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
log_format main_json escape=json
2+
'{'
3+
'"@timestamp": "$time_iso8601",'
4+
'"nginx":{'
5+
'"connection": $connection,'
6+
'"connection_requests": $connection_requests'
7+
'},'
8+
'"remote_user": "$remote_user",'
9+
'"http":{'
10+
'"body_bytes_sent": $body_bytes_sent,'
11+
'"content_length": "$content_length",'
12+
'"content_type": "$content_type",'
13+
'"document_root": "$document_root",'
14+
'"headers":{'
15+
'"x_forwarded_for": "$http_x_forwarded_for",'
16+
'"x_forwarded_host": "$http_x_forwarded_host",'
17+
'"x_forwarded_proto": "$http_x_forwarded_proto"'
18+
'},'
19+
'"host": "$host",'
20+
'"method": "$request_method", '
21+
'"protocol": "$server_protocol",'
22+
'"referer": "$http_referer",'
23+
'"request": "$request",'
24+
'"request_completion": "$request_completion",'
25+
'"request_length": $request_length,'
26+
'"request_time": $request_time,'
27+
'"status_code": $status,'
28+
'"url_details":{'
29+
'"path": "$uri",'
30+
'"scheme": "$scheme"'
31+
'},'
32+
'"user_agent": "$http_user_agent"'
33+
'},'
34+
'"request_id": "$request_id",'
35+
'"tcp_conn":{'
36+
'"realip_remote_addr": "$realip_remote_addr",'
37+
'"realip_remote_port": $realip_remote_port,'
38+
'"remote_addr": "$remote_addr",'
39+
'"remote_port": "$remote_port",'
40+
'"server_name": "$server_name",'
41+
'"server_port": $server_port'
42+
'},'
43+
'"tcp_stats":{'
44+
'"rtt": $tcpinfo_rtt,'
45+
'"rttvar": $tcpinfo_rttvar,'
46+
'"snd_cwnd": $tcpinfo_snd_cwnd,'
47+
'"rcv_space": $tcpinfo_rcv_space'
48+
'},'
49+
'"ssl":{'
50+
'"ssl_server_name": "$ssl_server_name",'
51+
'"ssl_protocol": "$ssl_protocol",'
52+
'"ssl_cipher": "$ssl_cipher"'
53+
'},'
54+
'"time_local": "$time_local",'
55+
'"upstream":{'
56+
'"addr": "$upstream_addr",'
57+
'"bytes_received": "$upstream_bytes_received",'
58+
'"cache_status": "$upstream_cache_status",'
59+
'"connect_time": "$upstream_connect_time",'
60+
'"header_time": "$upstream_header_time",'
61+
'"headers":{'
62+
'"x_accel_redirect": "$upstream_http_x_accel_redirect"'
63+
'},'
64+
'"response_time": "$upstream_response_time",'
65+
'"status": "$upstream_status"'
66+
'}'
67+
'}';

‎outer-proxy/conf/nginx.conf

+7-75
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,23 @@
1+
# outer proxy configuration
12

23
user www-data;
34
worker_processes auto;
45

56
load_module modules/ndk_http_module.so;
67
load_module modules/ngx_http_lua_module.so;
7-
8-
error_log /var/log/nginx/error.log notice;
9-
pid /var/run/nginx.pid;
8+
pid /var/run/nginx.pid;
109

1110
events {
1211
worker_connections 1024;
1312
}
1413

1514
http {
16-
include /etc/nginx/mime.types;
15+
include mime.types;
1716
default_type application/octet-stream;
1817

19-
log_format main_json escape=json
20-
'{'
21-
'"@timestamp": "$time_iso8601",'
22-
'"nginx":{'
23-
'"connection": $connection,'
24-
'"connection_requests": $connection_requests'
25-
'},'
26-
'"remote_user": "$remote_user",'
27-
'"http":{'
28-
'"body_bytes_sent": $body_bytes_sent,'
29-
'"content_length": "$content_length",'
30-
'"content_type": "$content_type",'
31-
'"document_root": "$document_root",'
32-
'"headers":{'
33-
'"x_forwarded_for": "$http_x_forwarded_for",'
34-
'"x_forwarded_host": "$http_x_forwarded_host",'
35-
'"x_forwarded_proto": "$http_x_forwarded_proto"'
36-
'},'
37-
'"host": "$host",'
38-
'"method": "$request_method", '
39-
'"protocol": "$server_protocol",'
40-
'"referer": "$http_referer",'
41-
'"request": "$request",'
42-
'"request_completion": "$request_completion",'
43-
'"request_length": $request_length,'
44-
'"request_time": $request_time,'
45-
'"status_code": $status,'
46-
'"url_details":{'
47-
'"path": "$uri",'
48-
'"scheme": "$scheme"'
49-
'},'
50-
'"user_agent": "$http_user_agent"'
51-
'},'
52-
'"request_id": "$request_id",'
53-
'"tcp_conn":{'
54-
'"realip_remote_addr": "$realip_remote_addr",'
55-
'"realip_remote_port": $realip_remote_port,'
56-
'"remote_addr": "$remote_addr",'
57-
'"remote_port": "$remote_port",'
58-
'"server_name": "$server_name",'
59-
'"server_port": $server_port'
60-
'},'
61-
'"tcp_stats":{'
62-
'"rtt": $tcpinfo_rtt,'
63-
'"rttvar": $tcpinfo_rttvar,'
64-
'"snd_cwnd": $tcpinfo_snd_cwnd,'
65-
'"rcv_space": $tcpinfo_rcv_space'
66-
'},'
67-
'"ssl":{'
68-
'"ssl_server_name": "$ssl_server_name",'
69-
'"ssl_protocol": "$ssl_protocol",'
70-
'"ssl_cipher": "$ssl_cipher"'
71-
'},'
72-
'"time_local": "$time_local",'
73-
'"upstream":{'
74-
'"addr": "$upstream_addr",'
75-
'"bytes_received": "$upstream_bytes_received",'
76-
'"cache_status": "$upstream_cache_status",'
77-
'"connect_time": "$upstream_connect_time",'
78-
'"header_time": "$upstream_header_time",'
79-
'"headers":{'
80-
'"x_accel_redirect": "$upstream_http_x_accel_redirect"'
81-
'},'
82-
'"response_time": "$upstream_response_time",'
83-
'"status": "$upstream_status"'
84-
'}'
85-
'}';
86-
87-
access_log /var/log/nginx/access.log combined;
88-
access_log /var/log/nginx/access.log.json main_json;
18+
include log-schema.conf;
19+
access_log /dev/stdout main_json;
20+
error_log stderr info;
8921

9022
# Set the search path for lua packages to /etc/nginx/lua
9123
lua_package_path "$prefix/lua/?.lua;/etc/nginx/lua/?.lua;;";
@@ -103,5 +35,5 @@ http {
10335
keepalive_timeout 65;
10436

10537
# Include the rest of the configuration
106-
include /etc/nginx/conf.d/*.conf;
38+
include conf.d/*.conf;
10739
}

‎outer-proxy/logs/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)