diff --git a/cinder/controller.sls b/cinder/controller.sls
index 9d9c83b..7e3ecaa 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -28,6 +28,10 @@
   {%- set cinder_log_services = controller.services %}
 {%- endif %}
 
+{%- if controller.version not in ('ocata','pike') %}
+  {%- do cinder_log_services.append('cinder-api') %}
+{%- endif %}
+
 {%- for service_name in cinder_log_services %}
 {{ service_name }}_default:
   file.managed:
diff --git a/cinder/files/logging.conf b/cinder/files/logging.conf
index 7130ebf..01d5ad1 100644
--- a/cinder/files/logging.conf
+++ b/cinder/files/logging.conf
@@ -5,7 +5,7 @@
   {%- endif %}
 {%- endfor %}
 [loggers]
-keys = root, cinder
+keys = root, cinder, eventletwsgi
 
 [handlers]
 keys = {{ log_handlers | join(", ") }}
@@ -47,7 +47,7 @@
 qualname = suds
 
 [logger_eventletwsgi]
-level = WARNING
+level = INFO
 handlers = {{ log_handlers | join(", ") }}
 qualname = eventlet.wsgi.server
 
diff --git a/cinder/meta/fluentd.yml b/cinder/meta/fluentd.yml
index 0951dd0..1e19ecc 100644
--- a/cinder/meta/fluentd.yml
+++ b/cinder/meta/fluentd.yml
@@ -100,8 +100,8 @@
             emit_invalid_record_to_error: false
             parser:
               type: regexp
-              # Parse openstack http stats: https://regex101.com/r/Tf0XUK/1/
-              format: '\"(?<http_method>GET|POST|OPTIONS|DELETE|PUT|HEAD|TRACE|CONNECT|PATCH)\s(?<http_url>\S+)\s(?<http_version>[.\/\dHTFSP]+)\"\sstatus:\s(?<http_status>\d{3})\slen:\s(?<http_response_size>\d+)\stime:\s(?<http_response_time>\d+\.\d+)'
+              # Parse openstack http stats: https://regex101.com/r/Tf0XUK/6
+              format: '\"(?<http_method>GET|POST|OPTIONS|DELETE|PUT|HEAD|TRACE|CONNECT|PATCH)\s(?<http_url>\S+)\s(?<http_version>[.\/\dHTFSP]+)\"(\s+status:|)\s(?<http_status>\d{3})(\s+len:|)\s(?<http_response_size>\d+)(\s+time:|)\s(?<http_response_time>\d+\.\d+)'
               types: http_response_time:float
         match:
           unify_tag: