Merge "Generate random keystone users"
diff --git a/docker/swarm/stack/monitoring/elasticsearch_exporter.yml b/docker/swarm/stack/monitoring/elasticsearch_exporter.yml
index 5cbc05e..ce02782 100644
--- a/docker/swarm/stack/monitoring/elasticsearch_exporter.yml
+++ b/docker/swarm/stack/monitoring/elasticsearch_exporter.yml
@@ -12,7 +12,7 @@
encrypted: 1
service:
elasticsearch_exporter:
- command: --es-cluster ${_param:stacklight_log_address}:9200 --nodes-stats-disable --cluster-health-disable --indices-stats-disable
+ command: --es-cluster ${_param:fluentd_elasticsearch_scheme}://${_param:stacklight_log_address}:9200 --nodes-stats-disable --cluster-health-disable --indices-stats-disable
networks:
- monitoring
deploy:
@@ -26,3 +26,4 @@
image: ${_param:docker_image_prometheus_es_exporter}
volumes:
- "${prometheus:elasticsearch_exporter:dir:config}/elasticsearch_exporter.cfg:/usr/src/app/exporter.cfg"
+ - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
diff --git a/docker/swarm/stack/monitoring/remote_agent/init.yml b/docker/swarm/stack/monitoring/remote_agent/init.yml
index 9e9455e..3d9fd62 100644
--- a/docker/swarm/stack/monitoring/remote_agent/init.yml
+++ b/docker/swarm/stack/monitoring/remote_agent/init.yml
@@ -23,3 +23,4 @@
volumes:
- ${telegraf:remote_agent:dir:config}:/etc/telegraf
- ${telegraf:remote_agent:dir:config_d}:/etc/telegraf/telegraf.d
+ - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro