Major update to all SL models, remove old params, renaming
Change-Id: I9d089bcdc7deee8a3ec6d8b722e440a832ef2db0
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index ac37c38..29d0809 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -4,9 +4,6 @@
- system.linux.system.repo.influxdb
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.tcp_elastic
-- system.heka.remote_collector
-- system.heka.remote_collector.input.amqp
-- system.heka.remote_collector.output.elasticsearch
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
- system.elasticsearch.server.cluster
@@ -25,10 +22,10 @@
- system.prometheus.server.target.dns
- system.docker.swarm.stack.monitoring
- system.docker.swarm.stack.dashboard
+- system.docker.swarm.stack.monitoring.remote_collector
- cluster.sl_os_contrail
parameters:
_param:
- heka_amqp_host: ${_param:openstack_control_address}
kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_password: 'password'
@@ -50,6 +47,7 @@
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_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:4.3.2
prometheus_glusterfs_service_host: ${_param:openstack_control_address}
@@ -68,6 +66,7 @@
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
openstack_version: newton
+ remote_collector_telegraf_host: monitoring_remote_agent
linux:
network:
interface: