commit ad08680c8ceed7f94a94a7f61065c3c59fcae82d
author Cedric Hnyda <chnyda@mirantis.com> Wed Oct 04 08:30:03 2017 +0000
committer Gerrit Code Review <gerrit2@6a1f56eca807> Wed Oct 04 08:30:03 2017 +0000
tree a7395afc8506845a78ce689b937149f1faebbddd
parent e5349fce5adf04431f6b857cabcd54e8f626494c
parent 6da031b35730bdf9c0c32b9594cf93036afcb2c5

Merge "Add external-url for prometheus and alertmanager"

docker/swarm/stack/monitoring/init.yml

diff --git a/docker/swarm/stack/monitoring/init.yml b/docker/swarm/stack/monitoring/init.yml
index e274426..6efe125 100644
--- a/docker/swarm/stack/monitoring/init.yml
+++ b/docker/swarm/stack/monitoring/init.yml
@@ -76,6 +76,7 @@
                 ALERTMANAGER_BIND_PORT: ${prometheus:alertmanager:bind:port}
                 ALERTMANAGER_BIND_ADDRESS: ${prometheus:alertmanager:bind:address}
                 ALERTMANAGER_DISCOVERY_DOMAIN: 'monitoring_alertmanager'
+                ALERTMANAGER_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15011"
             pushgateway:
               networks:
                 - monitoring
@@ -119,3 +120,4 @@
                 PROMETHEUS_STORAGE_LOCAL_RETENTION: ${prometheus:server:storage:local:retention}
                 PROMETHEUS_STORAGE_LOCAL_TARGET_HEAP_SIZE: ${prometheus:server:storage:local:target_heap_size}
                 PROMETHEUS_STORAGE_LOCAL_NUM_FINGERPRINT_MUTEXES: ${prometheus:server:storage:local:num_fingerprint_mutexes}
+                PROMETHEUS_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15010"