diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index b4553ed..b5b4729 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -2,7 +2,6 @@
 - system.docker.host
 - system.linux.system.repo.mcp.apt_mirantis.elastic.5x
 - system.linux.system.repo.mcp.apt_mirantis.kibana.5x
-- system.linux.system.repo.mcp.apt_mirantis.influxdb
 - system.linux.system.repo.mcp.apt_mirantis.docker
 # Needed to install Galera packages
 - system.linux.system.repo.mcp.apt_mirantis.openstack
@@ -10,14 +9,10 @@
 - system.elasticsearch.server.curator
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
-- system.haproxy.proxy.listen.stacklight.influxdb_relay
 - system.haproxy.proxy.listen.stacklight.kibana
 - service.haproxy.proxy.single
-- system.influxdb.relay.cluster
 - system.galera.server.cluster
 - system.galera.server.database.grafana
-- system.influxdb.server.single
-- system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -25,10 +20,17 @@
 - system.prometheus.alerta
 - system.prometheus.alertmanager.notification.alerta
 - system.prometheus.server.alert.alerta_relabel
-- system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
+- system.docker.swarm.stack.monitoring.remote_agent
 - system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - cluster.sl-k8s-calico
@@ -41,12 +43,10 @@
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:${_param:apt_mk_version}
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:${_param:apt_mk_version}
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
     docker_image_alerta: docker-prod-virtual.docker.mirantis.net/mirantis/external/alerta-web:${_param:apt_mk_version}
     elasticsearch_version: 5
-    docker_influxdb_image: influxdb:1.2
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
     keepalived_prometheus_vip_password: password
@@ -72,18 +72,6 @@
     grafana_database_type: mysql
     grafana_database_host: ${_param:cluster_vip_address}
     grafana_database_password: ${_param:mysql_grafana_password}
-    # InfluxDB
-    influxdb_admin_password: password
-    influxdb_port: 15016
-    influxdb_stacklight_password: lmapass
-    influxdb_client_host: ${_param:stacklight_monitor_address}
-    influxdb_client_port: ${_param:influxdb_port}
-    influxdb_client_password: ${_param:influxdb_admin_password}
-    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
-    prometheus_influxdb_db: prometheus
-    prometheus_influxdb_username: lma
-    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
-    telegraf_remote_agent_influxdb_address: ${_param:stacklight_monitor_address}
   elasticsearch:
     server:
       heap:
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/server.yml b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
index 84ef2a3..cac402c 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
@@ -1,5 +1,4 @@
 classes:
-- system.linux.system.repo.influxdb
 - system.linux.system.repo.elasticsearch.5
 - system.linux.system.repo.kibana.5
 - system.linux.system.repo.docker
@@ -11,13 +10,9 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb_relay
 - service.haproxy.proxy.single
 - system.galera.server.cluster
 - system.galera.server.database.grafana
-- system.influxdb.relay.cluster
-- system.influxdb.server.single
-- system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -25,10 +20,17 @@
 - system.prometheus.alerta
 - system.prometheus.alertmanager.notification.alerta
 - system.prometheus.server.alert.alerta_relabel
-- system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
+- system.docker.swarm.stack.monitoring.remote_agent
 - system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - cluster.sl-k8s-contrail.infra
@@ -41,7 +43,6 @@
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:${_param:apt_mk_version}
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:${_param:apt_mk_version}
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
     docker_image_alerta: docker-prod-virtual.docker.mirantis.net/mirantis/external/alerta-web:${_param:apt_mk_version}
@@ -66,13 +67,6 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
     cluster_node03_address: ${_param:stacklight_monitor_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: prometheus
-    prometheus_influxdb_username: lma
-    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
     rabbitmq_openstack_password: workshop
     heka_amqp_host: ${_param:kubernetes_control_address}
   elasticsearch:
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster/sl-os-contrail/stacklight/server.yml
index 7b6b684..8cd2552 100755
--- a/classes/cluster/sl-os-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/server.yml
@@ -26,10 +26,17 @@
 - system.prometheus.alerta
 - system.prometheus.alertmanager.notification.alerta
 - system.prometheus.server.alert.alerta_relabel
-- system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
+- system.docker.swarm.stack.monitoring.remote_agent
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
@@ -58,7 +65,6 @@
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:${_param:apt_mk_version}
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:${_param:apt_mk_version}
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
diff --git a/classes/cluster/sl-os-ovs/stacklight/server.yml b/classes/cluster/sl-os-ovs/stacklight/server.yml
index 43376a6..62eaf87 100644
--- a/classes/cluster/sl-os-ovs/stacklight/server.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/server.yml
@@ -23,10 +23,17 @@
 - system.prometheus.alerta
 - system.prometheus.alertmanager.notification.alerta
 - system.prometheus.server.alert.alerta_relabel
-- system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
+- system.docker.swarm.stack.monitoring.remote_agent
 - system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - system.docker.swarm.stack.monitoring.remote_collector
@@ -57,7 +64,6 @@
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:${_param:apt_mk_version}
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:${_param:apt_mk_version}
     docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
     grafana_admin_password: admin
diff --git a/classes/cluster/sl-pike-dvr/stacklight/server.yml b/classes/cluster/sl-pike-dvr/stacklight/server.yml
index 07324aa..fa6f3c7 100644
--- a/classes/cluster/sl-pike-dvr/stacklight/server.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/server.yml
@@ -26,10 +26,17 @@
 - system.prometheus.alerta
 - system.prometheus.alertmanager.notification.alerta
 - system.prometheus.server.alert.alerta_relabel
-- system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
+- system.docker.swarm.stack.monitoring.remote_agent
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
@@ -61,7 +68,6 @@
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:${_param:apt_mk_version}
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:${_param:apt_mk_version}
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}