Add log_format variable for apache openstack sites
Add openstack default variables with log formats for apache sites
Aligh log settings with settings from formulas for openstack
services: aodh, barbican, cinder, gnocchi, manila, nova-placement,
panko.
Change-Id: Ie59d341c39e9c50292f4fe28c6227766961d250c
PROD-Related: PROD-28066 (PROD:28066)
(cherry picked from commit 3369142157ac5b705955b9b8754124c4c24cbd4f)
diff --git a/apache/server/site/aodh.yml b/apache/server/site/aodh.yml
index 6ce5ede..3b7fc23 100644
--- a/apache/server/site/aodh.yml
+++ b/apache/server/site/aodh.yml
@@ -22,8 +22,8 @@
port: ${_param:apache_aodh_api_port}
log:
custom:
- format: >-
- %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ format: ${_param:apache_site_openstack_aodh_log_format}
+ file: /var/log/apache2/aodh_access.log
wsgi:
daemon_process: aodh-api
processes: ${_param:aodh_api_workers}
diff --git a/apache/server/site/barbican.yml b/apache/server/site/barbican.yml
index 0e7da2c..7a4297b 100644
--- a/apache/server/site/barbican.yml
+++ b/apache/server/site/barbican.yml
@@ -31,7 +31,7 @@
port: 9311
log:
custom:
- format: 'combined'
+ format: ${_param:apache_site_openstack_barbican_log_format}
file: '/var/log/barbican/barbican-api.log'
error:
enabled: true
@@ -55,7 +55,7 @@
port: 9312
log:
custom:
- format: 'combined'
+ format: ${_param:apache_site_openstack_barbican_log_format}
file: '/var/log/barbican/barbican-api.log'
error:
enabled: true
diff --git a/apache/server/site/cinder.yml b/apache/server/site/cinder.yml
index d1e3475..785817a 100644
--- a/apache/server/site/cinder.yml
+++ b/apache/server/site/cinder.yml
@@ -35,8 +35,8 @@
port: 8776
log:
custom:
- format: >-
- %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ format: ${_param:apache_site_openstack_cinder_log_format}
+ file: /var/log/apache2/cinder.log
error:
enabled: true
format: '%M'
diff --git a/apache/server/site/gnocchi.yml b/apache/server/site/gnocchi.yml
index 12d5f24..7aaba6f 100644
--- a/apache/server/site/gnocchi.yml
+++ b/apache/server/site/gnocchi.yml
@@ -22,8 +22,7 @@
port: ${_param:apache_gnocchi_api_port}
log:
custom:
- format: >-
- %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ format: ${_param:apache_site_openstack_gnocchi_log_format}
wsgi:
daemon_process: gnocchi-api
processes: ${_param:gnocchi_api_workers}
diff --git a/apache/server/site/horizon.yml b/apache/server/site/horizon.yml
index 5cfca1e..e909d4c 100644
--- a/apache/server/site/horizon.yml
+++ b/apache/server/site/horizon.yml
@@ -56,8 +56,7 @@
allow: 'from all'
log:
custom:
- format: >-
- %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ format: ${_param:apache_site_openstack_horizon_log_format}
error:
enabled: true
level: debug
diff --git a/apache/server/site/manila.yml b/apache/server/site/manila.yml
index 3080d1d..163f237 100644
--- a/apache/server/site/manila.yml
+++ b/apache/server/site/manila.yml
@@ -38,8 +38,8 @@
port: 8786
log:
custom:
- format: >-
- %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ format: ${_param:apache_site_openstack_manila_log_format}
+ file: /var/log/apache2/manila.access.log
error:
enabled: true
level: debug
diff --git a/apache/server/site/nova-placement.yml b/apache/server/site/nova-placement.yml
index 7c8e8bd..a869fea 100644
--- a/apache/server/site/nova-placement.yml
+++ b/apache/server/site/nova-placement.yml
@@ -37,8 +37,7 @@
port: 8778
log:
custom:
- format: >-
- %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ format: ${_param:apache_site_openstack_placement_log_format}
file: '/var/log/apache2/nova_placement_access.log'
error:
enabled: true
diff --git a/apache/server/site/panko.yml b/apache/server/site/panko.yml
index eff49c5..a34190d 100644
--- a/apache/server/site/panko.yml
+++ b/apache/server/site/panko.yml
@@ -22,8 +22,8 @@
port: ${_param:apache_panko_api_port}
log:
custom:
- format: >-
- %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ format: ${_param:apache_site_openstack_panko_log_format}
+ file: /var/log/apache2/panko.access.log
wsgi:
daemon_process: panko-api
processes: ${_param:panko_api_workers}