diff --git a/classes/cluster/virtual-mcp11-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
index 3d88f4e..b2f06f8 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
@@ -21,7 +21,7 @@
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.openstack_proxy_single
-- system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
 - cluster.virtual-mcp11-contrail.openstack.proxy
 - cluster.virtual-mcp11-contrail.stacklight.proxy
 - cluster.virtual-mcp11-contrail
@@ -78,7 +78,3 @@
           - cluster.virtual-mcp11-contrail.openstack.proxy
           params:
             linux_system_codename: xenial
-        stacklight_server_node01:
-          classes:
-          - system.influxdb.server.single
-          - system.influxdb.database.stacklight
diff --git a/classes/cluster/virtual-mcp11-contrail/init.yml b/classes/cluster/virtual-mcp11-contrail/init.yml
index 6757137..ef56be2 100755
--- a/classes/cluster/virtual-mcp11-contrail/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/init.yml
@@ -1,14 +1,18 @@
 classes:
+- system.heka.log_collector.single
+- system.linux.system.repo.mcp.extra
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.stacklight
 - system.openssh.server.team.mcp_qa
+- system.prometheus.collector
+- system.telegraf.agent
 - cluster.virtual-mcp11-contrail.infra
 - cluster.virtual-mcp11-contrail.openstack
 - cluster.virtual-mcp11-contrail.stacklight
-- cluster.virtual-mcp11-contrail.stacklight.client
+- cluster.overwrite
 parameters:
   _param:
     cluster_domain: virtual-mcp11-contrail.local
@@ -53,8 +57,6 @@
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
 
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}
 
   linux:
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
index ba57a98..54e04c7 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
@@ -5,7 +5,6 @@
 - system.linux.system.repo.saltstack.xenial
 - system.nova.compute.cluster
 - system.opencontrail.compute.cluster
-- system.heka.alarm.openstack_compute
 - system.opencontrail.client.cluster
 - system.opencontrail.client.resource.virtual_router
 - service.opencontrail.compute.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index a93e1eb..421c1a7 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -12,6 +12,7 @@
 - system.keystone.server.cluster
 - system.glusterfs.server.volume.glance
 - system.glusterfs.server.volume.keystone
+- system.glusterfs.server.volume.prometheus
 - system.glusterfs.server.cluster
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.glance
@@ -22,9 +23,7 @@
 - system.cinder.control.cluster
 - system.heat.server.cluster
 - system.ceilometer.server.cluster
-- system.ceilometer.server.backend.influxdb
 - system.aodh.server.cluster
-- system.heka.ceilometer_collector.single
 - system.galera.server.cluster
 - system.galera.server.database.aodh
 - system.galera.server.database.ceilometer
@@ -34,7 +33,6 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
-- system.heka.alarm.openstack_control
 - cluster.virtual-mcp11-contrail
 parameters:
   _param:
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/client.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/client.yml
index 6898822..393449c 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/client.yml
@@ -1,6 +1,17 @@
 classes:
-- system.collectd.client.output.heka
-- system.heka.log_collector.single
-- system.heka.metric_collector.single
-- cluster.virtual-mcp11-contrail.stacklight
-- service.grafana.collector
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+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
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
index a0ca702..f2a2b65 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
@@ -1,41 +1,8 @@
 parameters:
   _param:
-    cluster_local_address: ${_param:single_address}
-    cluster_node01_hostname: mon01
-    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
-    cluster_node02_hostname: mon02
-    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
-    cluster_node03_hostname: mon03
-    cluster_node03_address: ${_param:stacklight_monitor_node03_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}_prd
+    stacklight_environment: ${_param:cluster_domain}
     stacklight_notification_topic: stacklight_notifications
   linux:
     network:
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/proxy.yml
index e861124..91628ed 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/proxy.yml
@@ -1,8 +1,6 @@
 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.kibana
 - system.salt.minion.cert.proxy
 - cluster.virtual-mcp11-contrail
 parameters:
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 00f12ca..4f7a0bd 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -1,41 +1,49 @@
 classes:
-- system.linux.system.repo.grafana
-- system.linux.system.repo.influxdb
+- system.docker.host
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.salt
 - system.linux.system.repo.tcp_elastic
-- system.collectd.remote_client.cluster
-- system.heka.remote_collector.cluster
+- system.heka.remote_collector
 - system.heka.remote_collector.input.amqp
-- system.heka.aggregator.cluster
+- system.heka.remote_collector.output.elasticsearch
+- 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
-#- system.influxdb.database.ceilometer
-- cluster.virtual-mcp11-contrail
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.grafana
 - service.haproxy.proxy.single
-- system.keepalived.cluster.instance.stacklight_monitor_vip
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.service.dashboard.grafana_server
+- cluster.virtual-mcp11-contrail
 parameters:
   _param:
-    collectd_remote_collector_host: ${_param:stacklight_monitor_address}
-    heka_amqp_host: ${_param:openstack_message_queue_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}
+    grafana_admin_password: admin
+    docker_image_alertmanager: alertmanager:latest
+    docker_image_pushgateway: pushgateway:latest
+    docker_image_prometheus: prometheus:latest
+    docker_image_grafana: grafana/grafana:latest
+    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}
   linux:
     network:
       interface: