Provide remote_storage_adapter variables
Change-Id: I0508a4b0d2371caf2a746b1080f197918a7bc43d
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 28ac052..5abf51c 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -46,6 +46,7 @@
docker_image_pushgateway: mirantis/pushgateway:latest
docker_image_prometheus: mirantis/prometheus:latest
docker_image_remote_agent: mirantis/telegraf:latest
+ docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:latest
prometheus_glusterfs_service_host: ${_param:openstack_control_address}
glusterfs_node01_address: ${_param:openstack_control_node01_address}
@@ -54,6 +55,10 @@
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}
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index f0f082d..d49442a 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -46,6 +46,7 @@
docker_image_pushgateway: mirantis/pushgateway:latest
docker_image_prometheus: mirantis/prometheus:latest
docker_image_remote_agent: mirantis/telegraf:latest
+ docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:latest
prometheus_glusterfs_service_host: ${_param:openstack_control_address}
glusterfs_node01_address: ${_param:openstack_control_node01_address}
@@ -54,6 +55,10 @@
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}
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
index 656980d..6f944b7 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -33,6 +33,7 @@
docker_image_pushgateway: mirantis/pushgateway:latest
docker_image_prometheus: mirantis/prometheus:latest
docker_image_remote_agent: mirantis/telegraf:latest
+ docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:latest
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
@@ -55,6 +56,10 @@
grafana_database_host: ${_param:cluster_vip_address}
grafana_database_password: ${_param:mysql_grafana_password}
grafana_database_type: mysql
+ prometheus_influxdb_url: "http://${_param:stacklight_address}:8086/"
+ prometheus_influxdb_db: lma
+ prometheus_influxdb_username: lma
+ prometheus_influxdb_password: lmapass
keepalived:
cluster:
instance:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index ef47ea4..bfe35e8 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -37,6 +37,7 @@
docker_image_pushgateway: mirantis/pushgateway:latest
docker_image_prometheus: mirantis/prometheus:latest
docker_image_remote_agent: mirantis/telegraf:latest
+ docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:latest
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
@@ -62,6 +63,10 @@
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}
keepalived:
cluster:
instance:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index ac90c31..d3be389 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -33,6 +33,7 @@
docker_image_pushgateway: mirantis/pushgateway:latest
docker_image_prometheus: mirantis/prometheus:latest
docker_image_remote_agent: mirantis/telegraf:latest
+ docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:latest
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
@@ -50,3 +51,7 @@
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}
diff --git a/scripts/stacklightv2_infra_install.sh b/scripts/stacklightv2_infra_install.sh
index 79b9881..08cb962 100755
--- a/scripts/stacklightv2_infra_install.sh
+++ b/scripts/stacklightv2_infra_install.sh
@@ -37,7 +37,7 @@
# Configure the services running in Docker Swarm
salt -C 'I@docker:swarm' state.sls prometheus.server,prometheus.alertmanager -b 1
-for img in pushgateway alertmanager prometheus telegraf; do
+for img in pushgateway alertmanager prometheus telegraf remote_storage_adapter; do
salt -C 'I@docker:swarm' dockerng.pull "docker-sandbox.sandbox.mirantis.net/bkupidura/$img"
salt -C 'I@docker:swarm' dockerng.tag "docker-sandbox.sandbox.mirantis.net/bkupidura/$img:latest" "mirantis/$img:latest"
done