diff --git a/classes/cluster/sl_os_ovs/infra/config.yml b/classes/cluster/sl_os_ovs/infra/config.yml
index cac737a..ff65a40 100644
--- a/classes/cluster/sl_os_ovs/infra/config.yml
+++ b/classes/cluster/sl_os_ovs/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
diff --git a/classes/cluster/sl_os_ovs/openstack/compute.yml b/classes/cluster/sl_os_ovs/openstack/compute.yml
index 6c5324e..337e062 100644
--- a/classes/cluster/sl_os_ovs/openstack/compute.yml
+++ b/classes/cluster/sl_os_ovs/openstack/compute.yml
@@ -4,6 +4,7 @@
 - system.linux.system.repo.saltstack.xenial
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
+- system.prometheus.exporters.libvirt
 - cluster.sl_os_ovs
 parameters:
   _param:
diff --git a/classes/cluster/sl_os_ovs/openstack/proxy.yml b/classes/cluster/sl_os_ovs/openstack/proxy.yml
index 456d7c9..3a76f36 100644
--- a/classes/cluster/sl_os_ovs/openstack/proxy.yml
+++ b/classes/cluster/sl_os_ovs/openstack/proxy.yml
@@ -1,15 +1,18 @@
 classes:
 - system.nginx.server.single
-- system.nginx.server.proxy.openstack_api
-- system.nginx.server.proxy.openstack_vnc
-- system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
 - cluster.sl_os_ovs
 parameters:
   _param:
+    nginx_proxy_grafana_port: 15013
+    cluster_public_host: ${_param:prometheus_control_address}
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/sl_os_ovs/stacklight/client.yml b/classes/cluster/sl_os_ovs/stacklight/client.yml
index 3f8a5e0..3ca0f10 100644
--- a/classes/cluster/sl_os_ovs/stacklight/client.yml
+++ b/classes/cluster/sl_os_ovs/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_ovs
 parameters:
   _param:
diff --git a/classes/cluster/sl_os_ovs/stacklight/init.yml b/classes/cluster/sl_os_ovs/stacklight/init.yml
index 71b5ff3..2293764 100644
--- a/classes/cluster/sl_os_ovs/stacklight/init.yml
+++ b/classes/cluster/sl_os_ovs/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.252
diff --git a/classes/cluster/sl_os_ovs/stacklight/proxy.yml b/classes/cluster/sl_os_ovs/stacklight/proxy.yml
index f7c5364..e510cef 100644
--- a/classes/cluster/sl_os_ovs/stacklight/proxy.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/proxy.yml
@@ -7,6 +7,7 @@
 - cluster.sl_os_ovs
 parameters:
   _param:
+    cluster_public_host: ${_param:prometheus_control_address}
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/sl_os_ovs/stacklight/server.yml b/classes/cluster/sl_os_ovs/stacklight/server.yml
index ebd4859..fd5a54b 100644
--- a/classes/cluster/sl_os_ovs/stacklight/server.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/server.yml
@@ -10,12 +10,8 @@
 - system.haproxy.proxy.listen.stacklight.kibana
 - system.haproxy.proxy.listen.stacklight.influxdb
 - service.haproxy.proxy.single
-- system.heka.remote_collector.cluster
-- system.heka.remote_collector.input.amqp
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.prometheus
-- system.glusterfs.server.cluster
-- system.glusterfs.server.volume.prometheus
 - system.galera.server.cluster
 - system.galera.server.database.grafana
 - system.influxdb.server.single
@@ -29,10 +25,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_ovs
 parameters:
   _param:
-    collectd_remote_collector_host: ${_param:stacklight_monitor_address}
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
@@ -53,6 +49,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
     grafana_admin_password: admin
@@ -71,6 +68,7 @@
     glusterfs_node01_address: ${_param:openstack_control_node01_address}
     glusterfs_node02_address: ${_param:openstack_control_node02_address}
     glusterfs_node03_address: ${_param:openstack_control_node03_address}
+    remote_collector_telegraf_host: monitoring_remote_agent
   linux:
     network:
       interface: