Merge ~jacekn/charm-prometheus-alertmanager:snap_0_15 into ~prometheus-charmers/charm-prometheus-alertmanager:master

[Jacek Nykis]

Update charm to support alertmanagaer v0.15 format arguments

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Alvaro Uria (aluria)]

lgtm

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 708789ef03f767f4ecb82140620df0f932a1bdf0

diff --git a/reactive/alertmanager.py b/reactive/alertmanager.py
index 2cc266a..96e4258 100644
--- a/reactive/alertmanager.py
+++ b/reactive/alertmanager.py
@@ -117,12 +117,13 @@ def write_alertmanager_config_def():
                      config['external_url'].format(**vars))
     if get_peers():
         hookenv.log('Found cluster peers: {}'.format(get_peers()))
-        runtime_args('--mesh.listen-address', '0.0.0.0:9094')
-        for peer in get_peers():
-            runtime_args('--mesh.peer', peer, False)
-    else:
+        # Ensure we wipe old format arguments
         runtime_args('--mesh.listen-address', False)
         runtime_args('--mesh.peer', False)
+        for peer in get_peers():
+            runtime_args('--cluster.peer', peer, False)
+    else:
+        runtime_args('--cluster.peer', False)
     args = runtime_args()
     hookenv.log('runtime_args: {}'.format(args))
     if args:
diff --git a/templates/daemon_arguments.j2 b/templates/daemon_arguments.j2
index fcc5da1..59e293c 100644
--- a/templates/daemon_arguments.j2
+++ b/templates/daemon_arguments.j2
@@ -17,21 +17,36 @@ ARGS="
 #  --alerts.gc-interval=30m   Interval between alert GC.
 #  --log.level=info           Only log messages with the given severity or above.
 #  --web.external-url=WEB.EXTERNAL-URL
-#                             The URL under which Alertmanager is externally reachable (for example, if
-#                             Alertmanager is served via a reverse proxy). Used for generating relative and
-#                             absolute links back to Alertmanager itself. If the URL has a path portion, it will
-#                             be used to prefix all HTTP endpoints served by Alertmanager. If omitted, relevant
-#                             URL components will be derived automatically.
+#                             The URL under which Alertmanager is externally reachable (for example, if Alertmanager is served via a reverse proxy). Used for generating relative and absolute
+#                             links back to Alertmanager itself. If the URL has a path portion, it will be used to prefix all HTTP endpoints served by Alertmanager. If omitted, relevant URL
+#                             components will be derived automatically.
 #  --web.route-prefix=WEB.ROUTE-PREFIX
-#                             Prefix for the internal routes of web endpoints. Defaults to path of
-#                             --web.external-url.
+#                             Prefix for the internal routes of web endpoints. Defaults to path of --web.external-url.
 #  --web.listen-address=":9093"
 #                             Address to listen on for the web interface and API.
-#  --mesh.listen-address="0.0.0.0:6783"
-#                             mesh listen address. Pass an empty string to disable.
-#  --mesh.peer-id="52:54:00:54:c1:12"
-#                             mesh peer ID
-#  --mesh.nickname="myhost"   mesh peer nickname
-#  --mesh.password=""         password to join the peer network (empty password disables encryption)
-#  --mesh.peer=MESH.PEER ...  initial peers (may be repeated)
-#  --version                  Show application version.
+#  --cluster.listen-address="0.0.0.0:9094"
+#                             Listen address for cluster.
+#  --cluster.advertise-address=CLUSTER.ADVERTISE-ADDRESS
+#                             Explicit address to advertise in cluster.
+#  --cluster.peer=CLUSTER.PEER ...
+#                             Initial peers (may be repeated).
+#  --cluster.peer-timeout=15s
+#                             Time to wait between peers to send notifications.
+#  --cluster.gossip-interval=200ms
+#                             Interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated across the cluster more quickly at the expense of
+#                             increased bandwidth.
+#  --cluster.pushpull-interval=1m0s
+#                             Interval for gossip state syncs. Setting this interval lower (more frequent) will increase convergence speeds across larger clusters at the expense of increased
+#                             bandwidth usage.
+#  --cluster.tcp-timeout=10s  Timeout for establishing a stream connection with a remote node for a full state sync, and for stream read and write operations.
+#  --cluster.probe-timeout=500ms
+#                             Timeout to wait for an ack from a probed node before assuming it is unhealthy. This should be set to 99-percentile of RTT (round-trip time) on your network.
+#  --cluster.probe-interval=1s
+#                             Interval between random node probes. Setting this lower (more frequent) will cause the cluster to detect failed nodes more quickly at the expense of increased
+#                             bandwidth usage.
+#  --cluster.settle-timeout=1m0s
+#                             Maximum time to wait for cluster connections to settle before evaluating notifications.
+#  --cluster.reconnect-interval=10s
+#                             Interval between attempting to reconnect to lost peers.
+#  --cluster.reconnect-timeout=6h0m0s
+#                             Length of time to attempt to reconnect to a lost peer.