Merge pull request #344 from hamishforbes/alertmanager_advertise

Set empty alertmanager listen address in non-HA mode

Author: pracucci

cortex/alertmanager.libsonnet

@@ -26,9 +26,16 @@
       'experimental.alertmanager.enable-api': 'true',
       'alertmanager.storage.path': '/data',
       'alertmanager.web.external-url': '%s/alertmanager' % $._config.external_url,
-    } + if hasFallbackConfig then {
-      'alertmanager.configs.fallback': '/configs/alertmanager_fallback_config.yaml',
-    } else {},
+    } +
+    (if hasFallbackConfig then {
+       'alertmanager.configs.fallback': '/configs/alertmanager_fallback_config.yaml',
+     } else {}) +
+    (if isHA then {
+       'alertmanager.cluster.listen-address': '[$(POD_IP)]:%s' % $._config.alertmanager.gossip_port,
+       'alertmanager.cluster.peers': std.join(',', peers),
+     } else {
+       'alertmanager.cluster.listen-address': '',
+     }),
 
   alertmanager_fallback_config_map:
     if hasFallbackConfig then
@@ -59,13 +66,7 @@
         else [],
       ) +
       container.withEnvMixin([container.envType.fromFieldPath('POD_IP', 'status.podIP')]) +
-      container.withArgsMixin(
-        $.util.mapToFlags($.alertmanager_args) +
-        if isHA then
-          ['--alertmanager.cluster.listen-address=[$(POD_IP)]:%s' % $._config.alertmanager.gossip_port] +
-          ['--alertmanager.cluster.peers=%s' % std.join(',', peers)]
-        else [],
-      ) +
+      container.withArgsMixin($.util.mapToFlags($.alertmanager_args)) +
       container.withVolumeMountsMixin(
         [volumeMount.new('alertmanager-data', '/data')] +
         if hasFallbackConfig then