aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-12 08:31:01 +0000
committerGerrit Code Review <review@openstack.org>2017-09-12 08:31:01 +0000
commitb20182266af889d4aae01ad50796e4ba62f3a1a9 (patch)
treebe27ca5420c70b3dfb9b94d0ec2853600cfd5307
parent3d41e49887e8754fa1b3db2c1f310d4bd98e2629 (diff)
parent1d1fbcfbeb9c189a8841864f8db8383c79fc4f04 (diff)
downloadkolla-ansible-b20182266af889d4aae01ad50796e4ba62f3a1a9.tar.gz
kolla-ansible-b20182266af889d4aae01ad50796e4ba62f3a1a9.zip
Merge "Fix barbican-api log filter in fluentd"
-rw-r--r--ansible/roles/common/templates/conf/filter/01-rewrite.conf.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2 b/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2
index 3c094d40f..925d085c2 100644
--- a/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2
+++ b/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2
@@ -2,7 +2,7 @@
@type rewrite_tag_filter
capitalize_regex_backreference yes
rewriterule1 programname ^(cinder-api-access|cloudkitty-api-access|gnocchi-api-access|horizon-access|keystone-apache-admin-access|keystone-apache-public-access|placement-api-access|panko-api-access)$ apache_access
- rewriterule2 programname ^(aodh_wsgi_access | zun_api_wsgi_access)$ wsgi_access
+ rewriterule2 programname ^(aodh_wsgi_access|barbican-api|zun_api_wsgi_access)$ wsgi_access
rewriterule3 programname ^(nova-api|nova-compute|nova-conductor|nova-consoleauth|nova-manage|nova-novncproxy|nova-scheduler|nova-placement-api|placement-api|privsep-helper)$ openstack_python
rewriterule4 programname ^(sahara-api|sahara-engine)$ openstack_python
rewriterule5 programname ^(neutron-server|neutron-openvswitch-agent|neutron-ns-metadata-proxy|neutron-metadata-agent|neutron-l3-agent|neutron-dhcp-agent)$ openstack_python
@@ -12,7 +12,7 @@
rewriterule9 programname ^(glance-api|glance-registry)$ openstack_python
rewriterule10 programname ^(cloudkitty-storage-init|cloudkitty-processor|cloudkitty-dbsync|cloudkitty-api)$ openstack_python
rewriterule11 programname ^(ceilometer-polling|ceilometer-agent-notification)$ openstack_python
- rewriterule12 programname ^(barbican-worker|barbican-keystone-listener|barbican-db-manage|barbican-api|app)$ openstack_python
+ rewriterule12 programname ^(barbican-worker|barbican-keystone-listener|barbican-db-manage|app)$ openstack_python
rewriterule13 programname ^(aodh-notifier|aodh-listener|aodh-evaluator|aodh-dbsync)$ openstack_python
rewriterule14 programname ^(cinder-api|cinder-scheduler|cinder-manage|cinder-volume|cinder-backup|privsep-helper)$ openstack_python
rewriterule15 programname ^(mistral-server)$ openstack_python