diff --git a/ansible/install/roles/collectd-openstack/files/collectd_gnocchi_status.py b/ansible/install/roles/collectd-openstack/files/collectd_gnocchi_status.py
index d37d3e885..42460b26c 100644
--- a/ansible/install/roles/collectd-openstack/files/collectd_gnocchi_status.py
+++ b/ansible/install/roles/collectd-openstack/files/collectd_gnocchi_status.py
@@ -12,7 +12,6 @@
 #   limitations under the License.
 """Collectd python plugin to read gnocchi status on an OpenStack Controller."""
 from gnocchiclient.v1 import client
-from keystoneauth1.identity import v2
 from keystoneauth1 import session
 import collectd
 import os
@@ -64,21 +63,34 @@ def read(data=None):
 
 
 def create_keystone_session():
-    auth = v2.Password(
-        username=os_username, password=os_password, tenant_name=os_tenant,
-        auth_url=os_auth_url)
+    if int(os_identity_api_version) == 3:
+        from keystoneauth1.identity import v3
+        auth = v3.Password(
+            username=os_username, password=os_password, project_name=os_tenant,
+            user_domain_name=os_user_domain_name, project_domain_name=os_project_domain_name,
+            auth_url=os_auth_url)
+    else:
+        from keystoneauth1.identity import v2
+        auth = v2.Password(
+            username=os_username, password=os_password, tenant_name=os_tenant,
+            auth_url=os_auth_url)
     return session.Session(auth=auth)
 
+os_identity_api_version = os.environ.get('OS_IDENTITY_API_VERSION')
+if os_identity_api_version is None:
+    os_identity_api_version = 2
 os_username = os.environ.get('OS_USERNAME')
 os_password = os.environ.get('OS_PASSWORD')
 os_tenant = os.environ.get('OS_TENANT_NAME')
 if os_tenant is None:
     os_tenant = os.environ.get('OS_PROJECT_NAME')
 os_auth_url = os.environ.get('OS_AUTH_URL')
+os_project_domain_name = os.environ.get('OS_PROJECT_DOMAIN_NAME')
+os_user_domain_name = os.environ.get('OS_USER_DOMAIN_NAME')
 
 collectd.info(
-    'gnocchi_status: Connecting with user={}, password={}, tenant={}, '
-    'auth_url={}'.format(os_username, os_password, os_tenant, os_auth_url))
+    'gnocchi_status: Keystone API: {} Connecting with user={}, password={}, tenant/project={}, '
+    'auth_url={}'.format(os_identity_api_version, os_username, os_password, os_tenant, os_auth_url))
 
 keystone_session = create_keystone_session()
 collectd.register_config(configure)
diff --git a/ansible/install/roles/collectd-openstack/tasks/main.yml b/ansible/install/roles/collectd-openstack/tasks/main.yml
index 1ceb37d5d..1f415a7b1 100644
--- a/ansible/install/roles/collectd-openstack/tasks/main.yml
+++ b/ansible/install/roles/collectd-openstack/tasks/main.yml
@@ -80,6 +80,11 @@
   register: mysql_root_password
   when: "'controller' in group_names"
 
+- name: (Undercloud) Get mysql root password
+  shell: cat /home/stack/undercloud-passwords.conf | grep 'undercloud_db_password=' | sed 's/undercloud_db_password=//g'
+  register: undercloud_mysql_password
+  when: "'undercloud' in group_names"
+
 - name: (Undercloud) Get password
   become: true
   shell: "hiera admin_password | awk '{$0=\"Environment=OS_PASSWORD=\"$0;print }'"
@@ -138,16 +143,17 @@
     backup: true
   when: "('controller' in group_names and {{apache_controller_collectd_request_time}} == true) and ('Newton' in osp_version['content'] | b64decode or 'Ocata' in osp_version['content'] | b64decode)"
 
-- name: (Pike) Deploy Apache httpd.conf for request timings
+- name: (Queens/Pike) Patch Apache httpd.conf for request timings
   become: true
-  copy:
-    src: httpd.conf
-    dest: /var/lib/config-data/puppet-generated/gnocchi/etc/httpd/conf/httpd.conf
-    owner: root
-    group: root
-    mode: 0644
-    backup: true
-  when: "('controller' in group_names and {{apache_controller_collectd_request_time}} == true) and ('Pike' in osp_version['content'] | b64decode)"
+  shell: sed -i 's/LogFormat "%[ah] %l %u %t \\"%r\\" %>s %b \\"%{Referer}i\\" \\"%{User-Agent}i\\"" combined/LogFormat "%h %l %u %t RT:%D \\"%r\\" %>s %b \\"%{Referer}i\\" \\"%{User-Agent}i\\"" combined/g' {{item}}
+  with_items:
+    - /var/lib/config-data/puppet-generated/gnocchi/etc/httpd/conf/httpd.conf
+    - /var/lib/config-data/puppet-generated/keystone/etc/httpd/conf/httpd.conf
+    - /var/lib/config-data/puppet-generated/nova_placement/etc/httpd/conf/httpd.conf
+  when:
+    - "'controller' in group_names"
+    - apache_controller_collectd_request_time
+    - "('Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode)"
 
 - name: (Newton, Ocata) Restart Apache
   become: true
@@ -157,10 +163,17 @@
     enabled: true
   when: "('controller' in group_names and {{apache_controller_collectd_request_time}} == true) and ('Newton' in osp_version['content'] | b64decode or 'Ocata' in osp_version['content'] | b64decode)"
 
-- name: (Pike) Restart Gnocchi API Container
+- name: (Queens/Pike) Restart Gnocchi/Keystone/Nova Placement API Containers
   become: true
-  command: docker restart gnocchi_api
-  when: "('controller' in group_names and {{apache_controller_collectd_request_time}} == true) and ('Pike' in osp_version['content'] | b64decode)"
+  command: docker restart {{item}}
+  with_items:
+    - gnocchi_api
+    - keystone
+    - nova_placement
+  when:
+    - "'controller' in group_names"
+    - apache_controller_collectd_request_time
+    - "('Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode)"
 # End Apache Request Response Timing
 
 # Apache Monitoring
diff --git a/ansible/install/roles/collectd-openstack/templates/blockstorage.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/blockstorage.collectd.conf.j2
index 75c93e8f6..93a88eec0 100644
--- a/ansible/install/roles/collectd-openstack/templates/blockstorage.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/blockstorage.collectd.conf.j2
@@ -109,6 +109,7 @@ PreCacheChain "PreCache"
   FSType sysfs
   FSType tmpfs
   FSType vboxsf
+  MountPoint "/^/var/lib/docker/.*/"
   IgnoreSelected true
   ValuesPercentage true
   ReportInodes true
diff --git a/ansible/install/roles/collectd-openstack/templates/cephstorage.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/cephstorage.collectd.conf.j2
index 762b1d5e2..beaf822fd 100644
--- a/ansible/install/roles/collectd-openstack/templates/cephstorage.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/cephstorage.collectd.conf.j2
@@ -122,6 +122,7 @@ PreCacheChain "PreCache"
   FSType sysfs
   FSType tmpfs
   FSType vboxsf
+  MountPoint "/^/var/lib/docker/.*/"
   IgnoreSelected true
   ValuesPercentage true
   ReportInodes true
diff --git a/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2
index 0b22fcbe5..d383f2d19 100644
--- a/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2
@@ -109,6 +109,7 @@ PreCacheChain "PreCache"
   FSType sysfs
   FSType tmpfs
   FSType vboxsf
+  MountPoint "/^/var/lib/docker/.*/"
   IgnoreSelected true
   ValuesPercentage true
   ReportInodes true
@@ -144,7 +145,7 @@ PreCacheChain "PreCache"
 # A Minus before the version means the process was not found in that version. (Ex -10)
 <Plugin processes>
   # Ceilometer (OpenStack Installed)
-  ProcessMatch "ceilometer-polling" "ceilometer-polling"                                # 10,11,12
+  ProcessMatch "ceilometer-polling" "ceilometer-polling"                                # 10,11,12,13
 
   # Collectd (Browbeat Installed)
   ProcessMatch "collectd" "/usr/sbin/collectd"
@@ -153,24 +154,24 @@ PreCacheChain "PreCache"
   ProcessMatch "neutron-l3-agent" "python.+neutron-l3-agent"                            # 10 with DVR
   ProcessMatch "neutron-ns-metadata-proxy" "python.+neutron-ns-metadata-proxy"          # 10 with DVR
   ProcessMatch "neutron-metadata-agent" "python.+neutron-metadata-agent"                # 10 with DVR
-  ProcessMatch "neutron-openvswitch-agent" "python.+neutron-openvswitch-agent"          # 10,11,12
+  ProcessMatch "neutron-openvswitch-agent" "python.+neutron-openvswitch-agent"          # 10,11,12,13
 
   # Nova (OpenStack Installed)
-  ProcessMatch "nova-compute" "python.+nova-compute"                                    # 10,11,12
-  ProcessMatch "privsep-helper" "python.+/bin/privsep-helper"                           # 11,12
+  ProcessMatch "nova-compute" "python.+nova-compute"                                    # 10,11,12,13
+  ProcessMatch "privsep-helper" "python.+/bin/privsep-helper"                           # 11,12,13
 
   # OVS (OpenStack Installed)
-  ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch"                               # 10,11,12
-  ProcessMatch "ovsdb-client" "ovsdb-client"                                            # 10,11,12
-  ProcessMatch "ovsdb-server" "ovsdb-server.+openvswitch"                               # 10,11,12
+  ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch"                               # 10,11,12,13
+  ProcessMatch "ovsdb-client" "ovsdb-client"                                            # 10,11,12,13
+  ProcessMatch "ovsdb-server" "ovsdb-server.+openvswitch"                               # 10,11,12,13
   ProcessMatch "ovn-controller" "ovn-controller.+openvswitch"                           # 9,10
   ProcessMatch "ovn-controller-vtep" "ovn-controller-vtep.+openvswitch"                 # 9,10
 
   # QEMU / libvirt (OpenStack Installed)
-  ProcessMatch "qemu-kvm" "/usr/libexec/qemu-kvm"                                       # 10,11,12
-  ProcessMatch "libvirtd" "/usr/sbin/libvirtd"                                          # 10,11,12
-  ProcessMatch "virtlockd" "/usr/sbin/virtlockd"                                        # 10,11,-12
-  ProcessMatch "virtlogd" "/usr/sbin/virtlogd"                                          # 10,11,12
+  ProcessMatch "qemu-kvm" "/usr/libexec/qemu-kvm"                                       # 10,11,12,13
+  ProcessMatch "libvirtd" "/usr/sbin/libvirtd"                                          # 10,11,12,13
+  ProcessMatch "virtlockd" "/usr/sbin/virtlockd"                                        # 10,11,-12,-13
+  ProcessMatch "virtlogd" "/usr/sbin/virtlogd"                                          # 10,11,12,13
 </Plugin>
 
 <Plugin swap>
@@ -181,7 +182,7 @@ PreCacheChain "PreCache"
 # Tail plugin configuration
 <Plugin "tail">
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/ceilometer/compute.log">
   {% else %}
   <File "/var/log/ceilometer/compute.log">
@@ -261,7 +262,12 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
+
+  {%if 'Queens' in osp_version['content'] | b64decode %}
+  <File "/var/log/containers/neutron/openvswitch-agent.log">
+  {% else %}
   <File "/var/log/neutron/openvswitch-agent.log">
+  {% endif %}
     Instance "neutron-openvswitch-agent"
     <Match>
       Regex " ERROR "
@@ -287,7 +293,7 @@ PreCacheChain "PreCache"
 {% endif %}
   </File>
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/nova/nova-compute.log">
   {% else %}
   <File "/var/log/nova/nova-compute.log">
diff --git a/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
index e08c85c98..7499d774d 100644
--- a/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
@@ -199,6 +199,7 @@ PreCacheChain "PreCache"
   FSType sysfs
   FSType tmpfs
   FSType vboxsf
+  MountPoint "/^/var/lib/docker/.*/"
   IgnoreSelected true
   ValuesPercentage true
   ReportInodes true
@@ -261,128 +262,134 @@ PreCacheChain "PreCache"
 # A Minus before the version means the process was not found in that version. (Ex -10)
 <Plugin processes>
   # Aodh (OpenStack Installed)
-  ProcessMatch "aodh-evaluator" "aodh-evaluator"                                        # 10,11,12
-  ProcessMatch "aodh-listener" "aodh-listener"                                          # 10,11,12
-  ProcessMatch "aodh-notifier" "aodh-notifier"                                          # 10,11,12
-  ProcessMatch "aodh_wsgi" "aodh_wsgi.*-DFOREGROUND"                                    # 11,12
+  ProcessMatch "aodh-evaluator" "aodh-evaluator"                                        # 10,11,12,13
+  ProcessMatch "aodh-listener" "aodh-listener"                                          # 10,11,12,13
+  ProcessMatch "aodh-notifier" "aodh-notifier"                                          # 10,11,12,13
+  ProcessMatch "aodh_wsgi" "aodh_wsgi.*-DFOREGROUND"                                    # 11,12,13
 
   # Ceilometer (OpenStack Installed)
-  ProcessMatch "ceilometer-agent-notification" "ceilometer-agent-notification"          # 10,11,12
-  ProcessMatch "ceilometer-collector" "ceilometer-collector"                            # 10,11,-12
-  ProcessMatch "ceilometer-polling" "ceilometer-polling"                                # 10,11,12
-  ProcessMatch "ceilometer_wsgi" "ceilometer_wsgi.*-DFOREGROUND"                        # 11,-12
+  ProcessMatch "ceilometer-agent-notification" "ceilometer-agent-notification"          # 10,11,12,13
+  ProcessMatch "ceilometer-collector" "ceilometer-collector"                            # 10,11,-12,-13
+  ProcessMatch "ceilometer-polling" "ceilometer-polling"                                # 10,11,12,13
+  ProcessMatch "ceilometer_wsgi" "ceilometer_wsgi.*-DFOREGROUND"                        # 11,-12,-13
 
   # Ceph (OpenStack Installed)
   # When CephStorage nodes deployed
-  ProcessMatch "ceph-mon" "^/usr/bin/ceph-mon"                                          # -10,-11,-12
+  ProcessMatch "ceph-mon" "^/usr/bin/ceph-mon"                                          # -10,-11,-12,-13
 
   # Cinder (OpenStack Installed)
   ProcessMatch "cinder-api" "python.+cinder-api"                                        # 10,-11,-12
-  ProcessMatch "cinder-scheduler" "python.+cinder-scheduler"                            # 10,11,12
-  ProcessMatch "cinder-volume" "python.+cinder-volume"                                  # 10,11,12
-  ProcessMatch "cinder_wsgi" "cinder_wsgi.*-DFOREGROUND"                                # 11,12
+  ProcessMatch "cinder-scheduler" "python.+cinder-scheduler"                            # 10,11,12,13
+  ProcessMatch "cinder-volume" "python.+cinder-volume"                                  # 10,11,12,13
+  ProcessMatch "cinder_wsgi" "cinder_wsgi.*-DFOREGROUND"                                # 11,12,13
 
   # Collectd (Browbeat Installed)
   ProcessMatch "collectd" "/usr/sbin/collectd"
 
+  # Docker (OpenStack Installed)
+  ProcessMatch "dockerd-current" "dockerd-current"                                      # 12,13
+
   # Pacemaker / Corosync (OpenStack Installed)
-  ProcessMatch "attrd" "/usr/libexec/pacemaker/attrd"                                   # 10,11,12
-  ProcessMatch "cib" "/usr/libexec/pacemaker/cib"                                       # 10,11,12
-  Process "corosync"                                                                    # 10,11,12
-  ProcessMatch "crmd" "/usr/libexec/pacemaker/crmd"                                     # 10,11,12
-  ProcessMatch "lrmd" "/usr/libexec/pacemaker/lrmd"                                     # 10,11,12
-  ProcessMatch "pacemakerd" "/usr/sbin/pacemakerd"                                      # 10,11,12
-  ProcessMatch "pcsd" "^/usr/bin/ruby.+/usr/lib/pcsd"                                   # 10,11,12
-  ProcessMatch "pengine" "/usr/libexec/pacemaker/pengine"                               # 10,11,12
-  ProcessMatch "stonithd" "/usr/libexec/pacemaker/stonithd"                             # 10,11,12
+  ProcessMatch "attrd" "/usr/libexec/pacemaker/attrd"                                   # 10,11,12,13
+  ProcessMatch "cib" "/usr/libexec/pacemaker/cib"                                       # 10,11,12,13
+  Process "corosync"                                                                    # 10,11,12,13
+  ProcessMatch "crmd" "/usr/libexec/pacemaker/crmd"                                     # 10,11,12,13
+  ProcessMatch "lrmd" "/usr/libexec/pacemaker/lrmd"                                     # 10,11,12,13
+  ProcessMatch "pacemakerd" "/usr/sbin/pacemakerd"                                      # 10,11,12,13
+  ProcessMatch "pcsd" "^/usr/bin/ruby.+/usr/lib/pcsd"                                   # 10,11,12,13
+  ProcessMatch "pengine" "/usr/libexec/pacemaker/pengine"                               # 10,11,12,13
+  ProcessMatch "stonithd" "/usr/libexec/pacemaker/stonithd"                             # 10,11,12,13
 
   # Everything Else (OpenStack Installed)
   # (Processes displayed under "Everything Else" on Grafana Dashboards)
   ProcessMatch "dnsmasq" "^dnsmasq.+"                                                   # 10,11,12
-  ProcessMatch "haproxy" "/usr/sbin/haproxy.+/etc/haproxy/haproxy.cfg"                  # 10,11,12
-  Process "httpd"                                                                       # 10,11,12
+  ProcessMatch "haproxy" "/usr/sbin/haproxy.+/etc/haproxy/haproxy.cfg"                  # 10,11,12,13
+  Process "httpd"                                                                       # 10,11,12,13
   Process "keepalived"                                                                  # 10,11,12
-  Process "memcached"                                                                   # 10,11,12
-  Process "mongod"                                                                      # 10,11,-12
-  ProcessMatch "mysqld" "/usr/libexec/mysqld"                                           # 10,11,12
-  ProcessMatch "rabbitmq" "/usr/lib64/erlang/erts-.+/bin/beam.smp"                      # 10,11,12
-  Process "redis-server"                                                                # 10,11,12
+  Process "memcached"                                                                   # 10,11,12,13
+  Process "mongod"                                                                      # 10,11,-12,-13
+  ProcessMatch "mysqld" "/usr/libexec/mysqld"                                           # 10,11,12,13
+  ProcessMatch "rabbitmq" "/usr/lib64/erlang/erts-.+/bin/beam.smp"                      # 10,11,12,13
+  Process "redis-server"                                                                # 10,11,12,13
   ProcessMatch "karaf" "java.+karaf"                                                    # ODL Specific
 
   # Glance (OpenStack Installed)
-  ProcessMatch "glance-api" "python.+glance-api"                                        # 10,11,12
-  ProcessMatch "glance-registry" "python.+glance-registry"                              # 10,-11,-12
+  ProcessMatch "glance-api" "python.+glance-api"                                        # 10,11,12,13
+  ProcessMatch "glance-registry" "python.+glance-registry"                              # 10,-11,-12,-13
 
   # Gnocchi (OpenStack Installed)
-  ProcessMatch "gnocchi-metricd-master" "gnocchi-metricd.*master"                       # 11,12
-  ProcessMatch "gnocchi-metricd-scheduler" "gnocchi-metricd.*scheduler"                 # 10,11,-12
-  ProcessMatch "gnocchi-metricd-processing" "gnocchi-metricd.*processing"               # 10,11,12
-  ProcessMatch "gnocchi-metricd-reporting" "gnocchi-metricd.*reporting"                 # 10,11,12
-  ProcessMatch "gnocchi-metricd-janitor" "gnocchi-metricd.*janitor"                     # 10,11,12
+  ProcessMatch "gnocchi-metricd-master" "gnocchi-metricd.*master"                       # 11,12,13
+  ProcessMatch "gnocchi-metricd-scheduler" "gnocchi-metricd.*scheduler"                 # 10,11,-12,-13
+  ProcessMatch "gnocchi-metricd-processing" "gnocchi-metricd.*processing"               # 10,11,12,13
+  ProcessMatch "gnocchi-metricd-reporting" "gnocchi-metricd.*reporting"                 # 10,11,12,13
+  ProcessMatch "gnocchi-metricd-janitor" "gnocchi-metricd.*janitor"                     # 10,11,12,13
   ProcessMatch "gnocchi-metricd" "gnocchi-metricd "                                     # 10(Old proctitle)
-  ProcessMatch "gnocchi-statsd" "python.+gnocchi-statsd"                                # 10,11,12
-  ProcessMatch "gnocchi_wsgi" "gnocchi_wsgi.*-DFOREGROUND"                              # 11,12
+  ProcessMatch "gnocchi-statsd" "python.+gnocchi-statsd"                                # 10,11,12,13
+  ProcessMatch "gnocchi_wsgi" "gnocchi_wsgi.*-DFOREGROUND"                              # 11,12,13
 
   # Heat (OpenStack Installed)
-  ProcessMatch "heat-api" "python.+heat-api --config-file"                              # 10,11,-12(httpd)
-  ProcessMatch "heat-api-cfn" "python.+heat-api-cfn"                                    # 10,11,-12(httpd)
-  ProcessMatch "heat-api-cloudwatch" "python.+heat-api-cloudwatch"                      # 10,11,-12(httpd)
-  ProcessMatch "heat_api_cfn" "heat_api_cfn_ws"                                         # 12
-  ProcessMatch "heat_api_cloudwatch" "heat_api_cloudw"                                  # 12
-  ProcessMatch "heat_api_wsgi" "heat_api_wsgi"                                          # 12
-  ProcessMatch "heat-engine" "python.+heat-engine"                                      # 10,11,12
+  ProcessMatch "heat-api" "python.+heat-api --config-file"                              # 10,11,-12,-13
+  ProcessMatch "heat-api-cfn" "python.+heat-api-cfn"                                    # 10,11,-12,-13
+  ProcessMatch "heat-api-cloudwatch" "python.+heat-api-cloudwatch"                      # 10,11,-12,-123
+  ProcessMatch "heat_api_cfn" "heat_api_cfn_ws"                                         # 12,13
+  ProcessMatch "heat_api_cloudwatch" "heat_api_cloudw"                                  # 12,-13
+  ProcessMatch "heat_api_wsgi" "heat_api_wsgi"                                          # 12,13
+  ProcessMatch "heat-engine" "python.+heat-engine"                                      # 10,11,12,13
+
+  # Horizon (OpenStack Installed)
+  ProcessMatch "horizon" "horizon"                                                      # 13
 
   # Keystone (OpenStack Installed)
-  ProcessMatch "keystone-admin" "keystone-admin.*-DFOREGROUND"                          # 10,11,12
-  ProcessMatch "keystone-main" "keystone-main.*-DFOREGROUND"                            # 10,11,12
+  ProcessMatch "keystone-admin" "keystone-admin.*-DFOREGROUND"                          # 10,11,12,13
+  ProcessMatch "keystone-main" "keystone-main.*-DFOREGROUND"                            # 10,11,12,13
   # Starting Pike, fernet tokens are default thus token_flush not needed
-  ProcessMatch "keystone-token-flush" "keystone-manage.*token_flush"                    # 10,11,-12
+  ProcessMatch "keystone-token-flush" "keystone-manage.*token_flush"                    # 10,11,-12,-13
 
   # Neutron (OpenStack Installed)
-  ProcessMatch "neutron-dhcp-agent" "python.+neutron-dhcp-agent"                        # 10,11,12
-  ProcessMatch "neutron-l3-agent" "python.+neutron-l3-agent"                            # 10,11,12
-  ProcessMatch "neutron-metadata-agent" "python.+neutron-metadata-agent"                # 10,11,12
+  ProcessMatch "neutron-dhcp-agent" "python.+neutron-dhcp-agent"                        # 10,11,12,13
+  ProcessMatch "neutron-l3-agent" "python.+neutron-l3-agent"                            # 10,11,12,13
+  ProcessMatch "neutron-metadata-agent" "python.+neutron-metadata-agent"                # 10,11,12,13
   ProcessMatch "neutron-ns-metadata-proxy" "python.+neutron-ns-metadata-proxy"          # 10,11
-  ProcessMatch "neutron-openvswitch-agent" "python.+neutron-openvswitch-agent"          # 10,11,12
-  ProcessMatch "neutron-rootwrap-daemon" "python.+neutron-rootwrap-daemon"              # 10,11,12
-  ProcessMatch "neutron-server" "python.+neutron-server"                                # 10,11,12
+  ProcessMatch "neutron-openvswitch-agent" "python.+neutron-openvswitch-agent"          # 10,11,12,13
+  ProcessMatch "neutron-rootwrap-daemon" "python.+neutron-rootwrap-daemon"              # 10,11,12,13
+  ProcessMatch "neutron-server" "python.+neutron-server"                                # 10,11,12,13
 
   # Nova (OpenStack Installed)
-  ProcessMatch "nova-api" "python.+nova-api"                                            # 10,11
-  ProcessMatch "nova-api-metadata" "python.+nova-api-metadata"                          # 12
-  ProcessMatch "nova_api_wsgi" "nova_api_wsgi"                                          # 12
-  ProcessMatch "nova-conductor" "python.+nova-conductor"                                # 10,11,12
-  ProcessMatch "nova-consoleauth" "python.+nova-consoleauth"                            # 10,11,12
-  ProcessMatch "nova-novncproxy" "python.+nova-novncproxy"                              # 10,11,12
-  ProcessMatch "nova-scheduler" "python.+nova-scheduler"                                # 10,11,12
-  ProcessMatch "placement_wsgi" "placement_wsgi.*-DFOREGROUND"                          # 11,12
+  ProcessMatch "nova-api" "python.+nova-api$"                                           # 10,11,-12,-13
+  ProcessMatch "nova-api-metadata" "python.+nova-api-metadata"                          # 12,13
+  ProcessMatch "nova_api_wsgi" "nova_api_wsgi"                                          # 12,13
+  ProcessMatch "nova-conductor" "python.+nova-conductor"                                # 10,11,12,13
+  ProcessMatch "nova-consoleauth" "python.+nova-consoleauth"                            # 10,11,12,13
+  ProcessMatch "nova-novncproxy" "python.+nova-novncproxy"                              # 10,11,12,13
+  ProcessMatch "nova-scheduler" "python.+nova-scheduler"                                # 10,11,12,13
+  ProcessMatch "placement_wsgi" "placement_wsgi.*-DFOREGROUND"                          # 11,12,13
 
   # OVS (OpenStack Installed)
-  ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch"                               # 10,11,12
-  ProcessMatch "ovsdb-client" "ovsdb-client"                                            # 10,11,12
-  ProcessMatch "ovsdb-server" "ovsdb-server.+openvswitch"                               # 10,11,12
+  ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch"                               # 10,11,12,13
+  ProcessMatch "ovsdb-client" "ovsdb-client"                                            # 10,11,12,13
+  ProcessMatch "ovsdb-server" "ovsdb-server.+openvswitch"                               # 10,11,12,13
   ProcessMatch "ovn-northd" "ovn-northd.+openvswitch"                                   # 9,10
   ProcessMatch "ovn-controller" "ovn-controller.+openvswitch"                           # 9,10
   ProcessMatch "ovn-controller-vtep" "ovn-controller-vtep.+openvswitch"                 # 9,10
 
   # Panko (OpenStack Installed)
-  ProcessMatch "panko_wsgi" "panko_wsgi.*-DFOREGROUND"                                  # 11,12
+  ProcessMatch "panko_wsgi" "panko_wsgi.*-DFOREGROUND"                                  # 11,12,13
 
   # Swift (OpenStack Installed)
-  ProcessMatch "swift-account-auditor" "python.+swift-account-auditor"                  # 10,11,12
-  ProcessMatch "swift-account-reaper" "python.+swift-account-reaper"                    # 10,11,12
-  ProcessMatch "swift-account-replicator" "python.+swift-account-replicator"            # 10,11,12
-  ProcessMatch "swift-account-server" "python.+swift-account-server"                    # 10,11,12
-  ProcessMatch "swift-container-auditor" "python.+swift-container-auditor"              # 10,11,12
-  ProcessMatch "swift-container-replicator" "python.+swift-container-replicator"        # 10,11,12
-  ProcessMatch "swift-container-server" "python.+swift-container-server"                # 10,11,12
-  ProcessMatch "swift-container-updater" "python.+swift-container-updater"              # 10,11,12
-  ProcessMatch "swift-object-auditor" "python.+swift-object-auditor"                    # 10,11,12
-  ProcessMatch "swift-object-expirer" "python.+swift-object-expirer"                    # 11,12
-  ProcessMatch "swift-object-replicator" "python.+swift-object-replicator"              # 10,11,12
-  ProcessMatch "swift-object-server" "python.+swift-object-server"                      # 10,11,12
-  ProcessMatch "swift-object-updater" "python.+swift-object-updater"                    # 10,11,12
-  ProcessMatch "swift-proxy-server" "python.+swift-proxy-server"                        # 10,11,12
+  ProcessMatch "swift-account-auditor" "python.+swift-account-auditor"                  # 10,11,12,13
+  ProcessMatch "swift-account-reaper" "python.+swift-account-reaper"                    # 10,11,12,13
+  ProcessMatch "swift-account-replicator" "python.+swift-account-replicator"            # 10,11,12,13
+  ProcessMatch "swift-account-server" "python.+swift-account-server"                    # 10,11,12,13
+  ProcessMatch "swift-container-auditor" "python.+swift-container-auditor"              # 10,11,12,13
+  ProcessMatch "swift-container-replicator" "python.+swift-container-replicator"        # 10,11,12,13
+  ProcessMatch "swift-container-server" "python.+swift-container-server"                # 10,11,12,13
+  ProcessMatch "swift-container-updater" "python.+swift-container-updater"              # 10,11,12,13
+  ProcessMatch "swift-object-auditor" "python.+swift-object-auditor"                    # 10,11,12,13
+  ProcessMatch "swift-object-expirer" "python.+swift-object-expirer"                    # 11,12,13
+  ProcessMatch "swift-object-replicator" "python.+swift-object-replicator"              # 10,11,12,13
+  ProcessMatch "swift-object-server" "python.+swift-object-server"                      # 10,11,12,13
+  ProcessMatch "swift-object-updater" "python.+swift-object-updater"                    # 10,11,12,13
+  ProcessMatch "swift-proxy-server" "python.+swift-proxy-server"                        # 10,11,12,13
 </Plugin>
 
 {%if rabbitmq_controller_collectd_plugin %}
@@ -458,7 +465,7 @@ PreCacheChain "PreCache"
 
 # Tail httpd request time
 {%if apache_controller_collectd_request_time %}
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/httpd/gnocchi-api/gnocchi_wsgi_access.log">
   {% else %}
   <File "/var/log/httpd/gnocchi_wsgi_access.log">
@@ -571,8 +578,7 @@ PreCacheChain "PreCache"
     </Match>
   </File>
 
-
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/httpd/keystone/keystone_wsgi_admin_access.log">
   {% else %}
   <File "/var/log/httpd/keystone_wsgi_admin_access.log">
@@ -650,7 +656,7 @@ PreCacheChain "PreCache"
     </Match>
   </File>
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/httpd/keystone/keystone_wsgi_main_access.log">
   {% else %}
   <File "/var/log/httpd/keystone_wsgi_main_access.log">
@@ -728,7 +734,7 @@ PreCacheChain "PreCache"
     </Match>
   </File>
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/httpd/nova-placement/placement_wsgi_access.log">
   {% else %}
   <File "/var/log/httpd/placement_wsgi_access.log">
@@ -844,7 +850,7 @@ PreCacheChain "PreCache"
 {% endif %}
 # End Tail httpd request time
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/aodh/aodh-evaluator.log">
   {% else %}
   <File "/var/log/aodh/evaluator.log">
@@ -873,7 +879,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/aodh/aodh-listener.log">
   {% else %}
   <File "/var/log/aodh/listener.log">
@@ -902,7 +908,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/aodh/aodh-notifier.log">
   {% else %}
   <File "/var/log/aodh/notifier.log">
@@ -931,7 +937,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/httpd/aodh-api/aodh_wsgi_error.log">
   {% else %}
   <File "/var/log/httpd/aodh_wsgi_error.log">
@@ -945,7 +951,7 @@ PreCacheChain "PreCache"
     </Match>
   </File>
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/ceilometer/agent-notification.log">
   {% else %}
   <File "/var/log/ceilometer/agent-notification.log">
@@ -974,7 +980,11 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
+  {%if 'Queens' in osp_version['content'] | b64decode %}
+  <File "/var/log/containers/ceilometer/central.log">
+  {% else %}
   <File "/var/log/ceilometer/central.log">
+  {% endif %}
     Instance "ceilometer-central"
     <Match>
       Regex " ERROR "
@@ -999,8 +1009,8 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-{%if 'Pike' in osp_version['content'] | b64decode %}
-  # No need to tail for ceilometer-collector/ceilometer_wsgi in Pike
+{%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
+  # No need to tail for ceilometer-collector/ceilometer_wsgi in Queens/Pike
 {% else %}
   <File "/var/log/ceilometer/collector.log">
     Instance "ceilometer-collector"
@@ -1064,7 +1074,9 @@ PreCacheChain "PreCache"
 {% endif %}
   </File>
 
-  {%if ('Pike' in osp_version['content'] | b64decode) or ('Ocata' in osp_version['content'] | b64decode) %}
+  {%if ('Queens' in osp_version['content'] | b64decode) %}
+  <File "/var/log/containers/cinder/cinder-api.log">
+  {%elif 'Pike' in osp_version['content'] | b64decode or 'Ocata' in osp_version['content'] | b64decode %}
   <File "/var/log/cinder/cinder-api.log">
   {% else %}
   <File "/var/log/cinder/api.log">
@@ -1093,7 +1105,11 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
+  {%if ('Queens' in osp_version['content'] | b64decode) %}
+  <File "/var/log/containers/cinder/cinder-scheduler.log">
+  {% else %}
   <File "/var/log/cinder/scheduler.log">
+  {% endif %}
     Instance "cinder-scheduler"
     <Match>
       Regex " ERROR "
@@ -1118,7 +1134,11 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
+  {%if ('Queens' in osp_version['content'] | b64decode) %}
+  <File "/var/log/containers/cinder/cinder-volume.log">
+  {% else %}
   <File "/var/log/cinder/volume.log">
+  {% endif %}
     Instance "cinder-volume"
     <Match>
       Regex " ERROR "
@@ -1144,7 +1164,7 @@ PreCacheChain "PreCache"
 {% endif %}
   </File>
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/glance/api.log">
   {% else %}
   <File "/var/log/glance/api.log">
@@ -1174,8 +1194,8 @@ PreCacheChain "PreCache"
 {% endif %}
   </File>
 
-{%if 'Pike' in osp_version['content'] | b64decode %}
-  # No Glance registry in Pike
+{%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
+  # No Glance registry in Queens/Pike
 {% else %}
   <File "/var/log/glance/registry.log">
     Instance "glance-registry"
@@ -1204,7 +1224,7 @@ PreCacheChain "PreCache"
   </File>
 {% endif %}
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/gnocchi/app.log">
   {% else %}
   <File "/var/log/gnocchi/app.log">
@@ -1233,7 +1253,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/gnocchi/gnocchi-metricd.log">
   {% else %}
   <File "/var/log/gnocchi/metricd.log">
@@ -1262,7 +1282,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/gnocchi/gnocchi-statsd.log">
   {% else %}
   <File "/var/log/gnocchi/statsd.log">
@@ -1291,7 +1311,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/httpd/gnocchi-api/gnocchi_wsgi_error.log">
   {% else %}
   <File "/var/log/httpd/gnocchi_wsgi_error.log">
@@ -1305,7 +1325,7 @@ PreCacheChain "PreCache"
     </Match>
   </File>
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/heat/heat_api_cfn.log">
   {% else %}
   <File "/var/log/heat/heat-api-cfn.log">
@@ -1334,8 +1354,8 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
-  <File "/var/log/heat/heat_api_cloudwatch.log">
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
+  <File "/var/log/containers/heat/heat_api_cfn.log">
   {% else %}
   <File "/var/log/heat/heat-api-cloudwatch.log">
   {% endif %}
@@ -1363,7 +1383,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/heat/heat_api.log">
   {% else %}
   <File "/var/log/heat/heat-api.log">
@@ -1392,7 +1412,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/heat/heat-engine.log">
   {% else %}
   <File "/var/log/heat/heat-engine.log">
@@ -1422,7 +1442,7 @@ PreCacheChain "PreCache"
 {% endif %}
   </File>
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/keystone/keystone.log">
   {% else %}
   <File "/var/log/keystone/keystone.log">
@@ -1451,7 +1471,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/httpd/keystone/keystone_wsgi_admin_error.log">
   {% else %}
   <File "/var/log/httpd/keystone_wsgi_admin_error.log">
@@ -1464,7 +1484,7 @@ PreCacheChain "PreCache"
       Instance "error"
     </Match>
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/httpd/keystone/keystone_wsgi_main_error.log">
   {% else %}
   <File "/var/log/httpd/keystone_wsgi_main_error.log">
@@ -1478,7 +1498,7 @@ PreCacheChain "PreCache"
     </Match>
   </File>
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/pacemaker/bundles/galera-bundle-0/mysqld.log">
   {% else %}
   <File "/var/log/mysqld.log">
@@ -1508,7 +1528,11 @@ PreCacheChain "PreCache"
 {% endif %}
   </File>
 
+  {%if 'Queens' in osp_version['content'] | b64decode %}
+  <File "/var/log/containers/neutron/dhcp-agent.log">
+  {% else %}
   <File "/var/log/neutron/dhcp-agent.log">
+  {% endif %}
     Instance "neutron-dhcp-agent"
     <Match>
       Regex " ERROR "
@@ -1533,7 +1557,11 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
+  {%if 'Queens' in osp_version['content'] | b64decode %}
+  <File "/var/log/containers/neutron/l3-agent.log">
+  {% else %}
   <File "/var/log/neutron/l3-agent.log">
+  {% endif %}
     Instance "neutron-l3-agent"
     <Match>
       Regex " ERROR "
@@ -1558,7 +1586,11 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
+  {%if 'Queens' in osp_version['content'] | b64decode %}
+  <File "/var/log/containers/neutron/metadata-agent.log">
+  {% else %}
   <File "/var/log/neutron/metadata-agent.log">
+  {% endif %}
     Instance "neutron-metadata-agent"
     <Match>
       Regex " ERROR "
@@ -1583,7 +1615,11 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
+  {%if 'Queens' in osp_version['content'] | b64decode %}
+  <File "/var/log/containers/neutron/openvswitch-agent.log">
+  {% else %}
   <File "/var/log/neutron/openvswitch-agent.log">
+  {% endif %}
     Instance "neutron-openvswitch-agent"
     <Match>
       Regex " ERROR "
@@ -1608,7 +1644,11 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
+  {%if 'Queens' in osp_version['content'] | b64decode %}
+  <File "/var/log/containers/neutron/server.log">
+  {% else %}
   <File "/var/log/neutron/server.log">
+  {% endif %}
     Instance "neutron-server"
     <Match>
       Regex " ERROR "
@@ -1634,7 +1674,7 @@ PreCacheChain "PreCache"
 {% endif %}
   </File>
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/nova/nova-api.log">
   {% else %}
   <File "/var/log/nova/nova-api.log">
@@ -1663,7 +1703,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-{%if 'Pike' in osp_version['content'] | b64decode %}
+{%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/nova/nova-api-metadata.log">
     Instance "nova-api-metadata"
     <Match>
@@ -1691,7 +1731,7 @@ PreCacheChain "PreCache"
   </File>
 {% endif %}
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/nova/nova-conductor.log">
   {% else %}
   <File "/var/log/nova/nova-conductor.log">
@@ -1720,7 +1760,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/nova/nova-consoleauth.log">
   {% else %}
   <File "/var/log/nova/nova-consoleauth.log">
@@ -1749,7 +1789,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/nova/nova-novncproxy.log">
   {% else %}
   <File "/var/log/nova/nova-novncproxy.log">
@@ -1778,7 +1818,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/nova/nova-placement-api.log">
   {% else %}
   <File "/var/log/nova/nova-placement-api.log">
@@ -1807,7 +1847,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/nova/nova-scheduler.log">
   {% else %}
   <File "/var/log/nova/nova-scheduler.log">
@@ -1836,7 +1876,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/httpd/nova-placement/placement_wsgi_error.log">
   {% else %}
   <File "/var/log/httpd/placement_wsgi_error.log">
@@ -1850,7 +1890,7 @@ PreCacheChain "PreCache"
     </Match>
   </File>
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/panko/app.log">
   {% else %}
   <File "/var/log/panko/app.log">
@@ -1879,7 +1919,7 @@ PreCacheChain "PreCache"
     </Match>
 {% endif %}
   </File>
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Pike' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/containers/httpd/panko-api/panko_wsgi_error.log">
   {% else %}
   <File "/var/log/httpd/panko_wsgi_error.log">
@@ -1893,7 +1933,7 @@ PreCacheChain "PreCache"
     </Match>
   </File>
 
-  {%if 'Pike' in osp_version['content'] | b64decode %}
+  {%if 'Queens' in osp_version['content'] | b64decode or 'Pike' in osp_version['content'] | b64decode %}
   <File "/var/log/pacemaker/bundles/rabbitmq-bundle-0/rabbitmq/rabbit\@{{ansible_hostname}}.log">
   {% else %}
   <File "/var/log/rabbitmq/rabbit\@{{ansible_hostname}}.log">
diff --git a/ansible/install/roles/collectd-openstack/templates/networker.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/networker.collectd.conf.j2
index e8d944af1..0e6a38bb6 100644
--- a/ansible/install/roles/collectd-openstack/templates/networker.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/networker.collectd.conf.j2
@@ -107,6 +107,7 @@ PreCacheChain "PreCache"
   FSType sysfs
   FSType tmpfs
   FSType vboxsf
+  MountPoint "/^/var/lib/docker/.*/"
   IgnoreSelected true
   ValuesPercentage true
   ReportInodes true
diff --git a/ansible/install/roles/collectd-openstack/templates/objectstorage.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/objectstorage.collectd.conf.j2
index 68bf62fdf..edb731e5f 100644
--- a/ansible/install/roles/collectd-openstack/templates/objectstorage.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/objectstorage.collectd.conf.j2
@@ -109,6 +109,7 @@ PreCacheChain "PreCache"
   FSType sysfs
   FSType tmpfs
   FSType vboxsf
+  MountPoint "/^/var/lib/docker/.*/"
   IgnoreSelected true
   ValuesPercentage true
   ReportInodes true
@@ -147,22 +148,24 @@ PreCacheChain "PreCache"
   ProcessMatch "collectd" "/usr/sbin/collectd"
 
   # OVS (OpenStack Installed)
-  ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch"                               # 10,11
-  ProcessMatch "ovsdb-server" "ovsdb-server.+openvswitch"                               # 10,11
+  ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch"                               # 10,11,12,13
+  ProcessMatch "ovsdb-server" "ovsdb-server.+openvswitch"                               # 10,11,12,13
 
   # Swift (OpenStack Installed)
-  ProcessMatch "swift-account-auditor" "python.+swift-account-auditor"                  # 10,11
-  ProcessMatch "swift-account-reaper" "python.+swift-account-reaper"                    # 10,11
-  ProcessMatch "swift-account-replicator" "python.+swift-account-replicator"            # 10,11
-  ProcessMatch "swift-account-server" "python.+swift-account-server"                    # 10,11
-  ProcessMatch "swift-container-auditor" "python.+swift-container-auditor"              # 10,11
-  ProcessMatch "swift-container-replicator" "python.+swift-container-replicator"        # 10,11
-  ProcessMatch "swift-container-server" "python.+swift-container-server"                # 10,11
-  ProcessMatch "swift-container-updater" "python.+swift-container-updater"              # 10,11
-  ProcessMatch "swift-object-auditor" "python.+swift-object-auditor"                    # 10,11
-  ProcessMatch "swift-object-replicator" "python.+swift-object-replicator"              # 10,11
-  ProcessMatch "swift-object-server" "python.+swift-object-server"                      # 10,11
-  ProcessMatch "swift-object-updater" "python.+swift-object-updater"                    # 10,11
+  ProcessMatch "swift-account-auditor" "python.+swift-account-auditor"                  # 10,11,12,13
+  ProcessMatch "swift-account-reaper" "python.+swift-account-reaper"                    # 10,11,12,13
+  ProcessMatch "swift-account-replicator" "python.+swift-account-replicator"            # 10,11,12,13
+  ProcessMatch "swift-account-server" "python.+swift-account-server"                    # 10,11,12,13
+  ProcessMatch "swift-container-auditor" "python.+swift-container-auditor"              # 10,11,12,13
+  ProcessMatch "swift-container-replicator" "python.+swift-container-replicator"        # 10,11,12,13
+  ProcessMatch "swift-container-server" "python.+swift-container-server"                # 10,11,12,13
+  ProcessMatch "swift-container-updater" "python.+swift-container-updater"              # 10,11,12,13
+  ProcessMatch "swift-object-auditor" "python.+swift-object-auditor"                    # 10,11,12,13
+  ProcessMatch "swift-object-expirer" "python.+swift-object-expirer"                    # 13
+  ProcessMatch "swift-object-replicator" "python.+swift-object-replicator"              # 10,11,12,13
+  ProcessMatch "swift-object-server" "python.+swift-object-server"                      # 10,11,12,13
+  ProcessMatch "swift-object-updater" "python.+swift-object-updater"                    # 10,11,12,13
+  Process "rsync"                                                                       # 13
 </Plugin>
 
 <Plugin swap>
diff --git a/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2
index 1f90ef256..64c1b193f 100644
--- a/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2
@@ -153,6 +153,8 @@ PreCacheChain "PreCache"
   FSType sysfs
   FSType tmpfs
   FSType vboxsf
+  MountPoint "/^/tmp/.*/"
+  MountPoint "/^/var/lib/docker/.*/"
   IgnoreSelected true
   ValuesPercentage true
   ReportInodes true
@@ -198,7 +200,8 @@ PreCacheChain "PreCache"
 <Plugin mysql>
   <Database "undercloud">
     Host "localhost"
-    Socket "/var/lib/mysql/mysql.sock"
+    User "root"
+    Password "{{undercloud_mysql_password.stdout}}"
     InnodbStats true
   </Database>
 </Plugin>
@@ -208,7 +211,7 @@ PreCacheChain "PreCache"
 # A Minus before the version means the process was not found in that version. (Ex -10)
 <Plugin processes>
   # Ansible
-  ProcessMatch "ansible-playbook" "ansible-playbook"                                    # 12
+  ProcessMatch "ansible-playbook" "ansible-playbook"                                    # 12,13
 
   # Aodh (OpenStack Installed)
   ProcessMatch "aodh-evaluator" "aodh-evaluator"                                        # -10,11
@@ -227,21 +230,22 @@ PreCacheChain "PreCache"
   ProcessMatch "collectd" "/usr/sbin/collectd"
 
   # Docker (OpenStack Installed)
-  ProcessMatch "docker-registry" "registry.+serve.+/etc/docker-distribution"            # 11,12
-  ProcessMatch "dockerd-current" "dockerd-current"                                      # 11,12
-  ProcessMatch "docker-containerd-current" "docker-containerd-current"                  # 11,12
+  ProcessMatch "docker-registry" "registry.+serve.+/etc/docker-distribution"            # 11,12,13
+  ProcessMatch "dockerd-current" "dockerd-current"                                      # 11,12,13
+  ProcessMatch "docker-containerd-current" "docker-containerd-current"                  # 11,12,13
 
   # Everything Else (OpenStack Installed)
   # (Processes displayed under "Everything Else" on Grafana Dashboards)
-  Process "httpd"                                                                       # 10,11,12
-  Process "memcached"                                                                   # 10,11,12
-  Process "mongod"                                                                      # 10,11,-12
-  ProcessMatch "mysqld" "/usr/libexec/mysqld"                                           # 10,11,12
-  ProcessMatch "rabbitmq" "/usr/lib64/erlang/erts-.+/bin/beam.smp"                      # 10,11,12
+  Process "httpd"                                                                       # 10,11,12,13
+  Process "iscsid"                                                                      # 10,11,12,13
+  Process "memcached"                                                                   # 10,11,12,13
+  Process "mongod"                                                                      # 10,11,-12,-13
+  ProcessMatch "mysqld" "/usr/libexec/mysqld"                                           # 10,11,12,13
+  ProcessMatch "rabbitmq" "/usr/lib64/erlang/erts-.+/bin/beam.smp"                      # 10,11,12,13
 
   # Glance (OpenStack Installed)
-  ProcessMatch "glance-api" "python.+glance-api"                                        # 10,11,12
-  ProcessMatch "glance-registry" "python.+glance-registry"                              # 10,-11,-12
+  ProcessMatch "glance-api" "python.+glance-api"                                        # 10,11,12,13
+  ProcessMatch "glance-registry" "python.+glance-registry"                              # 10,-11,-12,-13
 
   # Gnocchi (OpenStack Installed)
   ProcessMatch "gnocchi-metricd-master" "gnocchi-metricd:.*master"                      # 11
@@ -253,73 +257,77 @@ PreCacheChain "PreCache"
   ProcessMatch "gnocchi_wsgi" "gnocchi_wsgi.*-DFOREGROUND"                              # 11
 
   # Heat (OpenStack Installed)
-  ProcessMatch "heat-api" "python.+heat-api"                                            # 10,11,-12
-  ProcessMatch "heat-api-cfn" "python.+heat-api-cfn"                                    # 10,11,-12
-  ProcessMatch "heat-engine" "python.+heat-engine"                                      # 10,11,12
-  ProcessMatch "heat_api_wsgi" "heat_api_wsgi.*-DFOREGROUND"                            # 12
-  ProcessMatch "heat_api_cfn_ws" "heat_api_cfn_ws.*-DFOREGROUND"                        # 12
+  ProcessMatch "heat-api" "python.+heat-api"                                            # 10,11,-12,-13
+  ProcessMatch "heat-api-cfn" "python.+heat-api-cfn"                                    # 10,11,-12,-13
+  ProcessMatch "heat-engine" "python.+heat-engine"                                      # 10,11,12,13
+  ProcessMatch "heat_api_wsgi" "heat_api_wsgi.*-DFOREGROUND"                            # 12,13
+  ProcessMatch "heat_api_cfn_ws" "heat_api_cfn_ws.*-DFOREGROUND"                        # 12,13
 
   # Ironic (OpenStack Installed)
-  ProcessMatch "ironic-api" "python.+ironic-api"                                        # 10,11,-12
-  ProcessMatch "ironic-conductor" "python.+ironic-conductor"                            # 10,11,12
-  ProcessMatch "ironic-inspector" "python.+ironic-inspector"                            # 10,11,12
-  ProcessMatch "dnsmasq-ironic" "dnsmasq.+/etc/dnsmasq-ironic.conf"                     # 10,11,12
-  ProcessMatch "dnsmasq-ironicinspector" "/sbin/dnsmasq.+/etc/ironic-inspector/"        # 10,11,12
-  ProcessMatch "ironic_wsgi" "ironic_wsgi.*-DFOREGROUND"                                # 12
+  ProcessMatch "ironic-api" "python.+ironic-api"                                        # 10,11,-12,-13
+  ProcessMatch "ironic-conductor" "python.+ironic-conductor"                            # 10,11,12,13
+  ProcessMatch "ironic-inspector" "python.+ironic-inspector"                            # 10,11,12,13
+  ProcessMatch "dnsmasq-ironic" "dnsmasq.+/etc/dnsmasq-ironic.conf"                     # 10,11,12,13
+  ProcessMatch "dnsmasq-ironicinspector" "/sbin/dnsmasq.+/etc/ironic-inspector/"        # 10,11,12,13
+  ProcessMatch "ironic_wsgi" "ironic_wsgi.*-DFOREGROUND"                                # 12,13
 
   # Keystone (OpenStack Installed)
-  ProcessMatch "keystone-admin" "keystone-admin.*-DFOREGROUND"                          # 10,11,12
-  ProcessMatch "keystone-main" "keystone-main.*-DFOREGROUND"                            # 10,11,12
+  ProcessMatch "keystone-admin" "keystone-admin.*-DFOREGROUND"                          # 10,11,12,13
+  ProcessMatch "keystone-main" "keystone-main.*-DFOREGROUND"                            # 10,11,12,13
   # Starting Ocata, fernet tokens are default thus token_flush not needed
-  ProcessMatch "keystone-token-flush" "keystone-manage.*token_flush"                    # 10,11,-12
+  ProcessMatch "keystone-token-flush" "keystone-manage.*token_flush"                    # 10,11,-12,-13
 
   # Mistral (Openstack Installed)
-  ProcessMatch "mistral-server-api" "python.+mistral-server.+api"                       # 10,11,12
-  ProcessMatch "mistral-server-engine" "python.+mistral-server.+engine"                 # 10,11,12
-  ProcessMatch "mistral-server-executor" "python.+mistral-server.+executor"             # 10,11,12
+  ProcessMatch "mistral-server-api" "python.+mistral-server.+api"                       # 10,11,12,13
+  ProcessMatch "mistral-server-engine" "python.+mistral-server.+engine"                 # 10,11,12,13
+  ProcessMatch "mistral-server-executor" "python.+mistral-server.+executor"             # 10,11,12,13
 
   # Neutron (OpenStack Installed)
-  ProcessMatch "neutron-dhcp-agent" "python.+neutron-dhcp-agent"                        # 10,11,12
-  ProcessMatch "neutron-openvswitch-agent" "python.+neutron-openvswitch-agent"          # 10,11,12
-  ProcessMatch "neutron-server" "python.+neutron-server"                                # 10,11,12
-  ProcessMatch "neutron-rootwrap-daemon" "python.+neutron-rootwrap-daemon"              # 10,11,12
+  ProcessMatch "neutron-dhcp-agent" "python.+neutron-dhcp-agent"                        # 10,11,12,13
+  ProcessMatch "neutron-openvswitch-agent" "python.+neutron-openvswitch-agent"          # 10,11,12,13
+  ProcessMatch "neutron-rootwrap-daemon" "python.+neutron-rootwrap-daemon"              # 10,11,12,13
+  ProcessMatch "neutron-server" "python.+neutron-server"                                # 10,11,12,13
+  ProcessMatch "neutron-rootwrap-daemon" "python.+neutron-rootwrap-daemon"              # 10,11,12,13
+  ProcessMatch "neutron-l3-agent" "python.+neutron-l3-agent"                            # 13
 
   # Nova (OpenStack Installed)
-  ProcessMatch "nova-api" "python.+nova-api"                                            # 10,11,12
-  ProcessMatch "nova-cert" "python.+nova-cert"                                          # 10,11,-12
-  ProcessMatch "nova-compute" "python.+nova-compute"                                    # 10,11,12
-  ProcessMatch "nova-conductor" "python.+nova-conductor"                                # 10,11,12
-  ProcessMatch "nova-scheduler" "python.+nova-scheduler"                                # 10,11,12
-  ProcessMatch "placement_wsgi" "placement_wsgi.*-DFOREGROUND"                          # 11,12
+  ProcessMatch "nova-api" "python.+nova-api"                                            # 10,11,12,13
+  ProcessMatch "nova-cert" "python.+nova-cert"                                          # 10,11,-12,-13
+  ProcessMatch "nova-compute" "python.+nova-compute"                                    # 10,11,12,13
+  ProcessMatch "nova-conductor" "python.+nova-conductor"                                # 10,11,12,13
+  ProcessMatch "nova-scheduler" "python.+nova-scheduler"                                # 10,11,12,13
+  ProcessMatch "placement_wsgi" "placement_wsgi.*-DFOREGROUND"                          # 11,12,13
+  ProcessMatch "nova_api_wsgi" "nova_api_wsgi.*-DFOREGROUND"                            # 13
 
   # OVS (OpenStack Installed)
-  ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch"                               # 10,11,12
-  ProcessMatch "ovsdb-client" "ovsdb-client"                                            # 10,11,12
-  ProcessMatch "ovsdb-server" "ovsdb-server.+openvswitch"                               # 10,11,12
+  ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch"                               # 10,11,12,13
+  ProcessMatch "ovsdb-client" "ovsdb-client"                                            # 10,11,12,13
+  ProcessMatch "ovsdb-server" "ovsdb-server.+openvswitch"                               # 10,11,12,13
 
   # Panko (OpenStack Installed)
   ProcessMatch "panko_wsgi" "panko_wsgi.*-DFOREGROUND"                                  # 11
 
   # Swift (OpenStack Installed)
-  ProcessMatch "swift-account-auditor" "python.+swift-account-auditor"                  # 10,-11,-12
-  ProcessMatch "swift-account-reaper" "python.+swift-account-reaper"                    # 10,11,12
-  ProcessMatch "swift-account-replicator" "python.+swift-account-replicator"            # 10,-11,-12
-  ProcessMatch "swift-account-server" "python.+swift-account-server"                    # 10,11,12
-  ProcessMatch "swift-container-auditor" "python.+swift-container-auditor"              # 10,-11,-12
-  ProcessMatch "swift-container-replicator" "python.+swift-container-replicator"        # 10,-11,-12
-  ProcessMatch "swift-container-server" "python.+swift-container-server"                # 10,11,12
-  ProcessMatch "swift-container-sync" "python.+swift-container-sync"                    # 12
-  ProcessMatch "swift-container-updater" "python.+swift-container-updater"              # 10,11,12
-  ProcessMatch "swift-object-auditor" "python.+swift-object-auditor"                    # 10,-11,-12
-  ProcessMatch "swift-object-reconstructor" "python.+swift-object-reconstructor"        # 12
-  ProcessMatch "swift-object-replicator" "python.+swift-object-replicator"              # 10,-11,-12
-  ProcessMatch "swift-object-server" "python.+swift-object-server"                      # 10,11,12
-  ProcessMatch "swift-object-updater" "python.+swift-object-updater"                    # 10,11,12
-  ProcessMatch "swift-proxy-server" "python.+swift-proxy-server"                        # 10,11,12
+  ProcessMatch "swift-account-auditor" "python.+swift-account-auditor"                  # 10,-11,-12,-13
+  ProcessMatch "swift-account-reaper" "python.+swift-account-reaper"                    # 10,11,12,13
+  ProcessMatch "swift-account-replicator" "python.+swift-account-replicator"            # 10,-11,-12,-13
+  ProcessMatch "swift-account-server" "python.+swift-account-server"                    # 10,11,12,13
+  ProcessMatch "swift-container-auditor" "python.+swift-container-auditor"              # 10,-11,-12,-13
+  ProcessMatch "swift-container-replicator" "python.+swift-container-replicator"        # 10,-11,-12,-13
+  ProcessMatch "swift-container-server" "python.+swift-container-server"                # 10,11,12,13
+  ProcessMatch "swift-container-sync" "python.+swift-container-sync"                    # 12,13
+  ProcessMatch "swift-container-updater" "python.+swift-container-updater"              # 10,11,12,13
+  ProcessMatch "swift-object-auditor" "python.+swift-object-auditor"                    # 10,-11,-12,-13
+  ProcessMatch "swift-object-expirer" "python.+swift-object-expirer"                    # 13
+  ProcessMatch "swift-object-reconstructor" "python.+swift-object-reconstructor"        # 12,13
+  ProcessMatch "swift-object-replicator" "python.+swift-object-replicator"              # 10,-11,-12,-13
+  ProcessMatch "swift-object-server" "python.+swift-object-server"                      # 10,11,12,13
+  ProcessMatch "swift-object-updater" "python.+swift-object-updater"                    # 10,11,12,13
+  ProcessMatch "swift-proxy-server" "python.+swift-proxy-server"                        # 10,11,12,13
 
   # Zaqar (Openstack Installed)
-  ProcessMatch "zaqar-server" "python.+zaqar-server"                                    # 10,11,12
-  ProcessMatch "zaqar_wsgi" "zaqar_wsgi.*-DFOREGROUND"                                  # 12
+  ProcessMatch "zaqar-server" "python.+zaqar-server"                                    # 10,11,12,13
+  ProcessMatch "zaqar_wsgi" "zaqar_wsgi.*-DFOREGROUND"                                  # 12,13
 </Plugin>
 
 {%if rabbitmq_undercloud_collectd_plugin %}
diff --git a/ansible/install/roles/grafana-dashboards/templates/partials/tail.yaml b/ansible/install/roles/grafana-dashboards/templates/partials/tail.yaml
index 02f3b4b3d..740c07c16 100644
--- a/ansible/install/roles/grafana-dashboards/templates/partials/tail.yaml
+++ b/ansible/install/roles/grafana-dashboards/templates/partials/tail.yaml
@@ -3,7 +3,7 @@
       height: 200px
       showTitle: true
       panels:
-        - title: $Cloud - $Node - Tail Info
+        - title: $Cloud - $Node - Tail Error
           type: graph
           legend:
             alignAsTable: true
diff --git a/ansible/install/roles/grafana-dashboards/vars/main.yml b/ansible/install/roles/grafana-dashboards/vars/main.yml
index cbd510bb6..f15bf73ce 100644
--- a/ansible/install/roles/grafana-dashboards/vars/main.yml
+++ b/ansible/install/roles/grafana-dashboards/vars/main.yml
@@ -100,6 +100,7 @@ per_process_panels:
     - name: "Everything Else"
       processes:
         - httpd
+        - iscsid
         - memcached
         - mongod
         - mysqld
@@ -145,12 +146,14 @@ per_process_panels:
     - name: "Neutron"
       processes:
         - neutron-dhcp-agent
+        - neutron-l3-agent
         - neutron-openvswitch-agent
         - neutron-rootwrap-daemon
         - neutron-server
     - name: "Nova"
       processes:
         - nova-api
+        - nova_api_wsgi
         - nova-cert
         - nova-compute
         - nova-conductor
@@ -176,6 +179,7 @@ per_process_panels:
         - swift-container-sync
         - swift-container-updater
         - swift-object-auditor
+        - swift-object-expirer
         - swift-object-reconstructor
         - swift-object-replicator
         - swift-object-server
@@ -225,6 +229,9 @@ per_process_panels:
         - pcsd
         - pengine
         - stonithd
+    - name: "Docker"
+      processes:
+        - dockerd-current
     - name: "Everything Else"
       processes:
         - dnsmasq
@@ -261,6 +268,9 @@ per_process_panels:
         - heat_api_cfn
         - heat_api_cloudwatch
         - heat_api_wsgi
+    - name: "Horizon"
+      processes:
+        - horizon
     - name: "Keystone"
       processes:
         - keystone-admin
@@ -350,9 +360,11 @@ per_process_panels:
         - swift-container-server
         - swift-container-updater
         - swift-object-auditor
+        - swift-object-expirer
         - swift-object-replicator
         - swift-object-server
         - swift-object-updater
+        - rsync
     - name: "Collectd"
       processes:
         - collectd
@@ -448,11 +460,17 @@ per_process_panels:
         - pcsd
         - pengine
         - stonithd
+    - name: "Docker"
+      processes:
+        - docker-registry
+        - dockerd-current
+        - docker-containerd-current
     - name: "Everything Else"
       processes:
         - dnsmasq
         - haproxy
         - httpd
+        - iscsid
         - keepalived
         - memcached
         - mongod
@@ -484,6 +502,9 @@ per_process_panels:
         - heat_api_cfn
         - heat_api_cloudwatch
         - heat_api_wsgi
+    - name: "Horizon"
+      processes:
+        - horizon
     - name: "Ironic"
       processes:
         - ironic-api
@@ -559,6 +580,7 @@ per_process_panels:
         - swift-object-server
         - swift-object-updater
         - swift-proxy-server
+        - rsync
     - name: "Zaqar"
       processes:
         - zaqar-server