infra/ansible-role-nginx
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add promtail and geoip support

Browse source
This commit is contained in:
nd 2021-11-26 03:33:55 +01:00
parent 08c567f7af
commit e71de82cdf
No known key found for this signature in database
GPG key ID: 21B5CD4DEE3670E9
5 changed files with 60 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
files/config/conf.d/geoip.conf Normal file
View file

@ -0,0 +1,3 @@
geoip_country /usr/share/GeoIP/GeoIPv6.dat;
geoip_city /usr/share/GeoIP/GeoIPCity.dat;
geoip_org /usr/share/GeoIP/GeoIPASNum.dat;

47
files/config/conf.d/logging.conf
View file

@ -1,4 +1,51 @@
log_format vcombined '$host:$server_port $remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"';
log_format promtail_analytics escape=json '{'
'"msec": "$msec", ' # request unixtime in seconds with a milliseconds resolution
'"connection": "$connection", ' # connection serial number
'"connection_requests": "$connection_requests", ' # number of requests made in connection
'"pid": "$pid", ' # process pid
'"request_id": "$request_id", ' # the unique request id
'"request_length": "$request_length", ' # request length (including headers and body)
'"remote_addr": "$remote_addr", ' # client IP
'"remote_user": "$remote_user", ' # client HTTP username
'"remote_port": "$remote_port", ' # client port
'"time_local": "$time_local", '
'"time_iso8601": "$time_iso8601", ' # local time in the ISO 8601 standard format
'"request": "$request", ' # full path no arguments if the request
'"request_uri": "$request_uri", ' # full path and arguments if the request
'"args": "$args", ' # args
'"status": "$status", ' # response status code
'"body_bytes_sent": "$body_bytes_sent", ' # the number of body bytes exclude headers sent to a client
'"bytes_sent": "$bytes_sent", ' # the number of bytes sent to a client
'"http_referer": "$http_referer", ' # HTTP referer
'"http_user_agent": "$http_user_agent", ' # user agent
'"http_x_forwarded_for": "$http_x_forwarded_for", ' # http_x_forwarded_for
'"http_host": "$http_host", ' # the request Host: header
'"server_name": "$server_name", ' # the name of the vhost serving the request
'"request_time": "$request_time", ' # request processing time in seconds with msec resolution
'"upstream": "$upstream_addr", ' # upstream backend server for proxied requests
'"upstream_connect_time": "$upstream_connect_time", ' # upstream handshake time incl. TLS
'"upstream_header_time": "$upstream_header_time", ' # time spent receiving upstream headers
'"upstream_response_time": "$upstream_response_time", ' # time spend receiving upstream body
'"upstream_response_length": "$upstream_response_length", ' # upstream response length
'"upstream_cache_status": "$upstream_cache_status", ' # cache HIT/MISS where applicable
'"ssl_protocol": "$ssl_protocol", ' # TLS protocol
'"ssl_cipher": "$ssl_cipher", ' # TLS cipher
'"scheme": "$scheme", ' # http or https
'"request_method": "$request_method", ' # request method
'"server_protocol": "$server_protocol", ' # request protocol, like HTTP/1.1 or HTTP/2.0
'"pipe": "$pipe", ' # "p" if request was pipelined, "." otherwise
'"gzip_ratio": "$gzip_ratio", '
'"http_cf_ray": "$http_cf_ray",'
'"geoip_country_code": "$geoip_country_code",'
'"geoip_region": "$geoip_region",'
'"geoip_city": "$geoip_city",'
'"geoip_org": "$geoip_org",'
'"geoip_latitude": "$geoip_latitude",'
'"geoip_longitude": "$geoip_longitude"'
'}';
access_log /var/log/nginx/access.log vcombined;
access_log /var/log/nginx/access-promtail.log promtail_analytics;
error_log /var/log/nginx/error.log warn;

1
files/config/nginx.conf
View file

@ -4,6 +4,7 @@ pid /run/nginx.pid;
load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so;
load_module /usr/lib/nginx/modules/ngx_stream_module.so;
load_module /usr/lib/nginx/modules/ngx_http_geoip_module.so;
events {
use epoll;

3
tasks/main.yml
View file

@ -23,7 +23,10 @@
- nginx
- libnginx-mod-http-headers-more-filter
- libnginx-mod-stream
- libnginx-mod-http-geoip
- goaccess
- geoip-database
- geoip-database-extra
notify:
- delete nginx index.nginx-debian.html
- restart nginx

6
templates/proxy.conf.j2
View file

@ -3,3 +3,9 @@ set_real_ip_from {{ ip }};
{% endfor %}
real_ip_header {{ nginx.real_ip_header }};
real_ip_recursive on;
{% for ip in nginx.real_ip_from %}
geoip_proxy {{ ip }};
{% endfor %}
geoip_proxy_recursive on;