openstack/kolla-ansible
Code Issues Proposed changes

Unified Apache access log format

Browse Source 
Apache access log formats are modified to be consistent with
the format defined in wsgi-keystone.conf, which includes
the response time (%D) and X-forwarder-For fields.

Change-Id: I02aa5eb106fb894196dfb6e22daf2968e27ed3cb
Closes-Bug: #1703571
This commit is contained in:
Tatsuma Matsuki 2017-07-26 01:33:39 +00:00
parent 24c4e910e4
commit db0f469614
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/aodh/templates/wsgi-aodh.conf.j2
View File

@ -19,7 +19,8 @@ TraceEnable off
## Logging ## Logging
ErrorLog "/var/log/kolla/aodh/aodh_wsgi_error.log" ErrorLog "/var/log/kolla/aodh/aodh_wsgi_error.log"
ServerSignature Off ServerSignature Off
CustomLog "/var/log/kolla/aodh/aodh_wsgi_access.log" combined LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
CustomLog "/var/log/kolla/aodh/aodh_wsgi_access.log" logformat
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh python-path={{ python_path }} WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh python-path={{ python_path }}
WSGIProcessGroup aodh WSGIProcessGroup aodh

3
ansible/roles/cinder/templates/cinder-wsgi.conf.j2
View File

@ -13,5 +13,6 @@ TraceEnable off
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion> </IfVersion>
ErrorLog /var/log/kolla/cinder/cinder-api.log ErrorLog /var/log/kolla/cinder/cinder-api.log
CustomLog /var/log/kolla/cinder/cinder-api-access.log combined LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
CustomLog /var/log/kolla/cinder/cinder-api-access.log logformat
</VirtualHost> </VirtualHost>

3
ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2
View File

@ -11,7 +11,8 @@ TraceEnable off
WSGIScriptAlias / {{ python_path }}/freezer_api/cmd/wsgi.py WSGIScriptAlias / {{ python_path }}/freezer_api/cmd/wsgi.py
ErrorLog {{ freezer_log_dir }}/freezer-api.log ErrorLog {{ freezer_log_dir }}/freezer-api.log
CustomLog {{ freezer_log_dir }}/freezer-api_access.log combined LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
CustomLog {{ freezer_log_dir }}/freezer-api_access.log logformat
LogLevel info LogLevel info
<Directory {{ python_path }}/freezer_api> <Directory {{ python_path }}/freezer_api>

3
ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2
View File

@ -7,7 +7,8 @@ TraceEnable off
<VirtualHost *:{{ gnocchi_api_port }}> <VirtualHost *:{{ gnocchi_api_port }}>
ErrorLog "/var/log/kolla/gnocchi/gnocchi-api-error.log" ErrorLog "/var/log/kolla/gnocchi/gnocchi-api-error.log"
CustomLog "/var/log/kolla/gnocchi/gnocchi-api-access.log" combined LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
CustomLog "/var/log/kolla/gnocchi/gnocchi-api-access.log" logformat
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess gnocchi group=gnocchi processes={{ openstack_service_workers }} threads=1 user=gnocchi python-path={{ python_path }} WSGIDaemonProcess gnocchi group=gnocchi processes={{ openstack_service_workers }} threads=1 user=gnocchi python-path={{ python_path }}
WSGIProcessGroup gnocchi WSGIProcessGroup gnocchi

3
ansible/roles/horizon/templates/horizon.conf.j2
View File

@ -6,7 +6,8 @@ TraceEnable off
<VirtualHost *:{{ horizon_port }}> <VirtualHost *:{{ horizon_port }}>
LogLevel warn LogLevel warn
ErrorLog /var/log/kolla/horizon/horizon.log ErrorLog /var/log/kolla/horizon/horizon.log
CustomLog /var/log/kolla/horizon/horizon-access.log combined LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
CustomLog /var/log/kolla/horizon/horizon-access.log logformat
WSGIScriptReloading On WSGIScriptReloading On
WSGIDaemonProcess horizon-http processes={{ openstack_service_workers }} threads=1 user=horizon group=horizon display-name=%{GROUP} python-path={{ python_path }} WSGIDaemonProcess horizon-http processes={{ openstack_service_workers }} threads=1 user=horizon group=horizon display-name=%{GROUP} python-path={{ python_path }}

3
ansible/roles/panko/templates/wsgi-panko.conf.j2
View File

@ -6,7 +6,8 @@ TraceEnable off
<VirtualHost *:{{ panko_api_port }}> <VirtualHost *:{{ panko_api_port }}>
ErrorLog "/var/log/kolla/panko/panko-api-error.log" ErrorLog "/var/log/kolla/panko/panko-api-error.log"
CustomLog "/var/log/kolla/panko/panko-api-access.log" combined LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
CustomLog "/var/log/kolla/panko/panko-api-access.log" logformat
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess panko group=panko processes={{ openstack_service_workers }} threads=1 user=panko python-path={{ python_path }} WSGIDaemonProcess panko group=panko processes={{ openstack_service_workers }} threads=1 user=panko python-path={{ python_path }}
WSGIProcessGroup panko WSGIProcessGroup panko

3
ansible/roles/zun/templates/wsgi-zun.conf.j2
View File

@ -19,7 +19,8 @@ TraceEnable off
## Logging ## Logging
ErrorLog "/var/log/kolla/zun/zun_api_wsgi_error.log" ErrorLog "/var/log/kolla/zun/zun_api_wsgi_error.log"
ServerSignature Off ServerSignature Off
CustomLog "/var/log/kolla/zun/zun_api_wsgi_access.log" combined LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
CustomLog "/var/log/kolla/zun/zun_api_wsgi_access.log" logformat
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess zun group=zun processes={{ openstack_service_workers }} threads=1 user=zun python-path={{ python_path }} WSGIDaemonProcess zun group=zun processes={{ openstack_service_workers }} threads=1 user=zun python-path={{ python_path }}
WSGIProcessGroup zun WSGIProcessGroup zun