diff --git a/classes/cluster/virtual-mcp11-dvr/infra/config.yml b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
index 19508f8..3a9c09e 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
@@ -19,7 +19,7 @@
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
 - cluster.virtual-mcp11-dvr.openstack.proxy
 - cluster.virtual-mcp11-dvr.stacklight.proxy
 - cluster.virtual-mcp11-dvr
@@ -87,12 +87,8 @@
           params:
             tenant_address: 10.1.0.110
             external_address: 10.16.0.110
-        stacklight_server_node01:
-          classes:
-          - system.influxdb.server.single
-          - system.influxdb.database.stacklight
         openstack_proxy_node01:
           classes:
           - cluster.virtual-mcp11-dvr.openstack.proxy
           params:
-            linux_system_codename: xenial
\ No newline at end of file
+            linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp11-dvr/init.yml b/classes/cluster/virtual-mcp11-dvr/init.yml
index 663ac63..ad3eba8 100644
--- a/classes/cluster/virtual-mcp11-dvr/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/init.yml
@@ -1,6 +1,10 @@
 classes:
+- system.heka.log_collector.single
+- system.linux.system.repo.mcp.extra
 - system.linux.system.single
 - system.rsyslog.client.single
+- system.prometheus.collector
+- system.telegraf.agent
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.stacklight
@@ -8,7 +12,7 @@
 - cluster.virtual-mcp11-dvr.infra
 - cluster.virtual-mcp11-dvr.openstack
 - cluster.virtual-mcp11-dvr.stacklight
-- cluster.virtual-mcp11-dvr.stacklight.client
+- cluster.overwrite
 parameters:
   _param:
     cluster_domain: virtual-mcp11-dvr.local
@@ -37,6 +41,4 @@
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}
-
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp11-dvr/openstack/compute.yml
index c6cf9bc..2ee0b06 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/compute.yml
@@ -6,7 +6,6 @@
 - system.neutron.compute.cluster
 - system.linux.network.interface.single_ovs_dvr
 - cluster.virtual-mcp11-dvr
-- system.heka.alarm.openstack_compute
 parameters:
   _param:
     primary_interface: ens4
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
index efd7374..f06e83d 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
@@ -14,9 +14,9 @@
 - system.glusterfs.client.volume.keystone
 - system.glusterfs.server.volume.glance
 - system.glusterfs.server.volume.keystone
+- system.glusterfs.server.volume.prometheus
 - system.glusterfs.server.cluster
 - system.glance.control.cluster
-- system.heka.alarm.openstack_control
 - system.nova.control.cluster
 - system.neutron.control.openvswitch.cluster
 - system.cinder.control.cluster
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/client.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/client.yml
index 248e8c4..393449c 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp11-dvr/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-dvr.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-dvr/stacklight/init.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
index 48bffdc..f2a2b65 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
@@ -1,26 +1,7 @@
 parameters:
   _param:
     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
   linux:
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/proxy.yml
index eaf7117..ed66487 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-dvr/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-dvr
 parameters:
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 579a653..3405614 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -1,39 +1,49 @@
 classes:
-- system.collectd.remote_client.cluster
-- 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.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
-- cluster.virtual-mcp11-dvr
 - 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-dvr
 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_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: