Merge "Fix fluentd config error"

ansible/roles/common/templates/conf/format/apache_access.conf.j2

 <filter apache_access>
   @type parser
   reserve_data true
+  format grok
   key_name message
-  <parse>
-  @type "grok"
   grok_pattern \[%{HTTPDATE:Timestamp}\] "(?:%{WORD:http_method} %{NOTSPACE:http_url}(?: HTTP/%{NUMBER:http_version})?|%{DATA:rawrequest})" %{NUMBER:http_status} (?:\d+|-)
   time_key Timestamp
   time_format %d/%b/%Y:%H:%M:%S %z
   keep_time_key true
-  </parse>
 </filter>
 
 <filter apache_access>

ansible/roles/common/templates/conf/format/wsgi_access.conf.j2

 <filter wsgi_access>
   @type parser
   reserve_data true
+  format grok
   key_name message
-  <parse>
-  @type "grok"
   grok_pattern %{IPORHOST:clientip} %{HTTPDUSER:ident} %{USER:auth} \[%{HTTPDATE:Timestamp}\] "(?:%{WORD:http_method} %{NOTSPACE:http_url}(?: HTTP/%{NUMBER:http_version})?|%{DATA:rawrequest})" %{NUMBER:http_status} (?:%{NUMBER:http_bytes}|-) (?:%{NUMBER:http_response_time_us}|-) %{QS:referrer} %{QS:agent}
   time_key Timestamp
   time_format %d/%b/%Y:%H:%M:%S %z
   keep_time_key true
-  </parse>
 </filter>

ansible/roles/common/templates/conf/format/wsgi_python.conf.j2

 <filter openstack_python>
   @type parser
   reserve_data true
+  format grok
   key_name message
-  <parse>
-  @type "grok"
   grok_pattern %{TIMESTAMP_ISO8601:Timestamp} %{NUMBER:Pid} %{LOGLEVEL:severity_label} %{NOTSPACE:python_module} \[req-(?:%{NOTSPACE:request_id}) (?:%{NOTSPACE:user_id}) (?:%{NOTSPACE:tenant_id}) .*\] %{GREEDYDATA:Payload}
   time_format "%Y-%m-%d %H:%M:%S.%L"
   time_key Timestamp
   keep_time_key true
-  </parse>
 </filter>