commit 082566b9c9e253a21b68644364e1d4f9b3538c5b
author Filip Pytloun <fpytloun@mirantis.com> Thu May 25 08:44:39 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Thu May 25 08:44:41 2017 +0000
tree 6f1a164021d84ab9b7732425d26ea2b97379d0d4
parent 873998df59542576ab6cca0fd162a97ba8638b1a
parent bdcc3c7bc71da4173178903fbf15317ae828ca15

Merge "Add autodiscovery for alertmanager"

docker/swarm/stack/monitoring.yml

diff --git a/docker/swarm/stack/monitoring.yml b/docker/swarm/stack/monitoring.yml
index 091add5..755b5d7 100644
--- a/docker/swarm/stack/monitoring.yml
+++ b/docker/swarm/stack/monitoring.yml
@@ -77,10 +77,8 @@
                 data_dir: ${_param:prometheus_server_data_directory}
                 bind_port: ${prometheus:server:bind:port}
                 bind_address: ${prometheus:server:bind:address}
-                alertmanager_port: ${prometheus:alertmanager:bind:port}
                 storage_local_engine: ${prometheus:server:storage:local:engine}
                 storage_local_retention: ${prometheus:server:storage:local:retention}
                 storage_local_memory_chunks: ${prometheus:server:storage:local:memory_chunks}
                 storage_local_max_chunks_to_persist: ${prometheus:server:storage:local:max_chunks_to_persist}
                 storage_local_num_fingerprint_mutexes: ${prometheus:server:storage:local:num_fingerprint_mutexes}
-                discovery_domain: 'monitoring_alertmanager'

prometheus/server/alertmanager/dns.yml

diff --git a/prometheus/server/alertmanager/dns.yml b/prometheus/server/alertmanager/dns.yml
new file mode 100644
index 0000000..99fd4db
--- /dev/null
+++ b/prometheus/server/alertmanager/dns.yml
@@ -0,0 +1,12 @@
+parameters:
+  prometheus:
+    server:
+      config:
+        alertmanager:
+          docker_swarm_alertmanager:
+            enabled: true
+            dns_sd_configs:
+              domain:
+                - tasks.monitoring_alertmanager
+              type: A
+              port: ${prometheus:alertmanager:bind:port}