]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: Set listen-addresses on alertmanager container
authordiwilli <diwilli@users.noreply.github.com>
Wed, 28 Oct 2020 17:43:05 +0000 (17:43 +0000)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 18 Nov 2020 10:52:17 +0000 (11:52 +0100)
This explicitly passes web.listen-address and cluster.listen-address to the alertmanager container allowing the use of public IP addresses.

Fixes: https://tracker.ceph.com/issues/48031
Signed-off-by: Dan Williams <dw@adventsol.co.uk>
(cherry picked from commit 29730a4bc168913d5dad6d9e487d2dc58a0e3c86)

src/cephadm/cephadm

index 73260d4fe286cca8fe8141df6b9a1b5370e3aa46..d222f57db23567732126a54aad1b3974ebf08fdb 100755 (executable)
@@ -197,7 +197,10 @@ class Monitoring(object):
             "image": "docker.io/prom/alertmanager:v0.20.0",
             "cpus": "2",
             "memory": "2GB",
-            "args": [],
+            "args": [
+               "--web.listen-address=:{}".format(port_map['alertmanager'][0]),
+               "--cluster.listen-address=:{}".format(port_map['alertmanager'][1]),
+            ],
             "config-json-files": [
                 "alertmanager.yml",
             ],