diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml
index 78ef43c..44b6178 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml
@@ -1,6 +1,23 @@
 classes:
-- system.collectd.client.output.heka
-- system.heka.log_collector.single
-- system.heka.metric_collector.single
-- cluster.virtual-mcp-ocata-ovs.stacklight
-- service.grafana.collector
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+- cluster.virtual-mcp-ocata-ovs
+parameters:
+  _param:
+    # Elasticsearch/Kibana client parameters
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    # Grafana client parameters
+    grafana_address: ${_param:stacklight_monitor_address}
+    grafana_port: 15013
+    grafana_user: admin
+    grafana_password: ${_param:grafana_admin_password}
+    grafana_prometheus_address: ${_param:stacklight_monitor_address}
+    grafana_prometheus_port: 15010
+    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
+
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/init.yml
index b756f90..883bad0 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/init.yml
@@ -1,29 +1,15 @@
 parameters:
   _param:
     linux_system_codename: xenial
+    prometheus_control_address: ${_param:stacklight_monitor_address}
     heka_elasticsearch_host: ${_param:stacklight_monitor_address}
-    heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
-    heka_aggregator_host: ${_param:stacklight_monitor_address}
-    aggregator_port: 5565
-    grafana_user: admin
-    grafana_password: password
-    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
     elasticsearch_port: 9200
-    influxdb_stacklight_password: lmapass
-    influxdb_admin_password: password
-    influxdb_port: 8086
-    influxdb_database: lma
-    influxdb_user: lma
-    influxdb_password: lmapass
-    nagios_host: ${_param:stacklight_monitor_address}
-    nagios_status_port: 8001
-    nagios_username: nagiosadmin
-    nagios_password: secret
-    nagios_notification_smtp_server: 127.0.0.1
-    nagios_notification_from: 'nagios@localhost'
-    nagios_notification_email: 'root@localhost'
     stacklight_environment: ${_param:cluster_domain}
     stacklight_notification_topic: stacklight_notifications
+    grafana_admin_password: admin
+    grafana_database_type: mysql
+    grafana_database_host: ${_param:openstack_database_address}
+    grafana_database_password: ${_param:mysql_grafana_password}
   linux:
     network:
       host:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/proxy.yml
index 10d7577..f1c017a 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/proxy.yml
@@ -1,13 +1,14 @@
 classes:
 - system.nginx.server.single
-- system.nginx.server.proxy.grafana_web
-- system.nginx.server.proxy.kibana_web
-- system.nginx.server.proxy.nagios_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.virtual-mcp-ocata-ovs
 parameters:
   _param:
-    linux_system_codename: xenial
+    nginx_proxy_grafana_port: 15013
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
index 1b84d4d..6f1b9e0 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
@@ -1,40 +1,69 @@
 classes:
-- system.collectd.remote_client.cluster
-- system.heka.remote_collector.cluster
+- system.docker.host
+- system.linux.system.repo.glusterfs
 - system.linux.system.repo.influxdb
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.tcp_elastic
+- system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
-- system.heka.aggregator.cluster
-- system.linux.system.repo.tcp_elastic 
+- system.heka.remote_collector.output.elasticsearch
+- system.heka.remote_collector.output.telegraf
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.prometheus
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
-- system.grafana.server.single
-- system.nagios.server.cluster
-- cluster.virtual-mcp-ocata-ovs
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.grafana
+- system.haproxy.proxy.listen.stacklight.influxdb
 - service.haproxy.proxy.single
-- system.keepalived.cluster.instance.stacklight_monitor_vip
+- system.influxdb.server.single
+- system.influxdb.database.stacklight
+- system.influxdb.database.ceilometer
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
+- system.prometheus.server.remote_write.docker
+- system.prometheus.server.alertmanager.dns
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.dashboard
+- cluster.virtual-mcp-ocata-ovs
 parameters:
   _param:
-    linux_system_codename: xenial
-    collectd_remote_collector_host: ${_param:stacklight_monitor_address}
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
-    keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
-    keepalived_stacklight_monitor_vip_password: 'password'
-    keepalived_stacklight_monitor_vip_interface: ens4
+    keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
+    keepalived_prometheus_vip_password: 'password'
+    keepalived_prometheus_vip_interface: ens4
     cluster_vip_address: ${_param:stacklight_monitor_address}
     cluster_elasticsearch_port: 9200
     cluster_kibana_port: 5601
-    cluster_grafana_port: 3000
-    cluster_node01_name: mon01
+    cluster_node01_hostname: mon01
     cluster_node01_address: ${_param:stacklight_monitor_node01_address}
-    cluster_node02_name: mon02
+    cluster_node02_hostname: mon02
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
-    cluster_node03_name: mon03
+    cluster_node03_hostname: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+    docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+    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_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
+    docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
+    docker_image_grafana: grafana/grafana:4.3.2
+    prometheus_glusterfs_service_host: ${_param:openstack_control_address}
+    glusterfs_node01_address: ${_param:openstack_control_node01_address}
+    glusterfs_node02_address: ${_param:openstack_control_node02_address}
+    glusterfs_node03_address: ${_param:openstack_control_node03_address}
+    influxdb_port: 8086
+    influxdb_admin_password: password
+    influxdb_stacklight_password: lmapass
+    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
+    prometheus_influxdb_db: lma
+    prometheus_influxdb_username: lma
+    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+    remote_collector_telegraf_host: monitoring_remote_agent
   linux:
     network:
       interface: