diff --git a/classes/cluster/sl_os_contrail/infra/config.yml b/classes/cluster/sl_os_contrail/infra/config.yml
index 844d189..8d5a4ae 100755
--- a/classes/cluster/sl_os_contrail/infra/config.yml
+++ b/classes/cluster/sl_os_contrail/infra/config.yml
@@ -1,5 +1,7 @@
 classes:
 - service.git.client
+- system.docker.client
+- system.docker.host
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
@@ -149,21 +151,66 @@
             stacklight_monitor_node03_address:
               value_template: <<node_control_ip>>
       node:
-        openstack_control_node01:
+        prx_node:
+          name: ${_param:openstack_proxy_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.stacklight.proxy
+          params:
+            salt_master_host: ${_param:infra_config_deploy_address}
+            linux_system_codename: xenial
+            single_address: ${_param:openstack_proxy_node01_address}
+        stacklight_monitor_node01:
+          name: ${_param:stacklight_monitor_node01_hostname}
+          domain: ${_param:cluster_domain}
           classes:
           - service.galera.master.cluster
+          - system.docker.swarm.master
+          - cluster.${_param:cluster_name}.stacklight.client
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
+            salt_master_host: ${_param:infra_config_deploy_address}
+            linux_system_codename: xenial
+            single_address: ${_param:stacklight_monitor_node01_address}
+            keepalived_vip_priority: 100
             mysql_cluster_role: master
+        openstack_control_node01:
+          name: ${_param:stacklight_monitor_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - service.galera.master.cluster
+          - system.docker.swarm.master
+          - cluster.${_param:cluster_name}.stacklight.client
+          - cluster.${_param:cluster_name}.stacklight.server
+          params:
+            salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
+            single_address: ${_param:stacklight_monitor_node01_address}
+            keepalived_vip_priority: 100
+            mysql_cluster_role: master
         openstack_control_node02:
+          name: ${_param:stacklight_monitor_node02_hostname}
+          domain: ${_param:cluster_domain}
           classes:
           - service.galera.slave.cluster
+          - system.docker.swarm.manager
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
-            mysql_cluster_role: slave
+            salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
+            single_address: ${_param:stacklight_monitor_node02_address}
+            keepalived_vip_priority: 101
+            mysql_cluster_role: slave
         openstack_control_node03:
+          name: ${_param:stacklight_monitor_node03_hostname}
+          domain: ${_param:cluster_domain}
           classes:
           - service.galera.slave.cluster
+          - system.docker.swarm.manager
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
-            mysql_cluster_role: slave
+            salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
+            single_address: ${_param:stacklight_monitor_node03_address}
+            keepalived_vip_priority: 102
+            mysql_cluster_role: slave
diff --git a/classes/cluster/sl_os_contrail/init.yml b/classes/cluster/sl_os_contrail/init.yml
index 3fd1c98..2829b40 100755
--- a/classes/cluster/sl_os_contrail/init.yml
+++ b/classes/cluster/sl_os_contrail/init.yml
@@ -1,6 +1,5 @@
 classes:
 - service.grafana.collector
-- system.heka.log_collector.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
 - system.rsyslog.client.single
diff --git a/classes/cluster/sl_os_contrail/openstack/compute.yml b/classes/cluster/sl_os_contrail/openstack/compute.yml
index 31b654e..702ce7c 100755
--- a/classes/cluster/sl_os_contrail/openstack/compute.yml
+++ b/classes/cluster/sl_os_contrail/openstack/compute.yml
@@ -8,6 +8,7 @@
 - system.opencontrail.client.cluster
 - system.opencontrail.client.resource.virtual_router
 - service.opencontrail.compute.cluster
+- system.prometheus.exporters.libvirt
 - cluster.sl_os_contrail
 parameters:
   _param:
diff --git a/classes/cluster/sl_os_contrail/openstack/control.yml b/classes/cluster/sl_os_contrail/openstack/control.yml
index e2579a3..7b02b6e 100755
--- a/classes/cluster/sl_os_contrail/openstack/control.yml
+++ b/classes/cluster/sl_os_contrail/openstack/control.yml
@@ -33,6 +33,7 @@
 - system.galera.server.database.nova
 - system.galera.server.database.designate
 - system.haproxy.proxy.listen.openstack.nova-placement
+- system.prometheus.exporters.jmx
 - cluster.sl_os_contrail
 parameters:
   _param:
diff --git a/classes/cluster/sl_os_contrail/stacklight/client.yml b/classes/cluster/sl_os_contrail/stacklight/client.yml
index efca433..2ed7c46 100755
--- a/classes/cluster/sl_os_contrail/stacklight/client.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/client.yml
@@ -3,6 +3,8 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
 - cluster.sl_os_contrail
 parameters:
   _param:
diff --git a/classes/cluster/sl_os_contrail/stacklight/init.yml b/classes/cluster/sl_os_contrail/stacklight/init.yml
index eb3bd1c..6d1102c 100755
--- a/classes/cluster/sl_os_contrail/stacklight/init.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/init.yml
@@ -1,3 +1,7 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.prometheus.collector
+- system.telegraf.agent
 parameters:
   _param:
     stacklight_monitor_address: 172.16.10.253
@@ -29,15 +33,15 @@
         mon01:
           address: ${_param:stacklight_monitor_node01_address}
           names:
-          - ${_param:stacklight_node01_hostname}
-          - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node01_hostname}
+          - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
         mon02:
           address: ${_param:stacklight_monitor_node02_address}
           names:
-          - ${_param:stacklight_node02_hostname}
-          - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node02_hostname}
+          - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
         mon03:
           address: ${_param:stacklight_monitor_node03_address}
           names:
-          - ${_param:stacklight_node03_hostname}
-          - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node03_hostname}
+          - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index ac37c38..29d0809 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -4,9 +4,6 @@
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.tcp_elastic
-- system.heka.remote_collector
-- system.heka.remote_collector.input.amqp
-- system.heka.remote_collector.output.elasticsearch
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.prometheus
 - system.elasticsearch.server.cluster
@@ -25,10 +22,10 @@
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.dashboard
+- system.docker.swarm.stack.monitoring.remote_collector
 - cluster.sl_os_contrail
 parameters:
   _param:
-    heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
@@ -50,6 +47,7 @@
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+    docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
     docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
     docker_image_grafana: grafana/grafana:4.3.2
     prometheus_glusterfs_service_host: ${_param:openstack_control_address}
@@ -68,6 +66,7 @@
     influxdb_admin_password: password
     influxdb_stacklight_password: lmapass
     openstack_version: newton
+    remote_collector_telegraf_host: monitoring_remote_agent
   linux:
     network:
       interface: