Merge ~aieri/charm-prometheus-alertmanager:proxy into ~prometheus-charmers/charm-prometheus-alertmanager:master

[Andrea Ieri]

Add support for http proxies

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Giuseppe Petralia (peppepetra)]

Comments inline

review: Needs Fixing

[Giuseppe Petralia (peppepetra)]

lgtm

review: Approve

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

Change successfully merged at revision 8905bb3a611223f6985ed520231e433a23c5389c

diff --git a/metadata.yaml b/metadata.yaml
index 1690019..b3c1a7e 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -17,4 +17,4 @@ provides:
     interface: http
 peers:
   alertmanager-cluster:
-    interface: alertmanger-cluster
+    interface: alertmanager-cluster
diff --git a/reactive/alertmanager.py b/reactive/alertmanager.py
index b72e97f..791abdf 100644
--- a/reactive/alertmanager.py
+++ b/reactive/alertmanager.py
@@ -98,9 +98,13 @@ def write_alertmanager_config_yml():
         with open(ALERTMANAGER_YML, "w") as f:
             f.write(content)
     else:
+        proxy_settings = hookenv.env_proxy_settings()
+        proxy_url = (proxy_settings.get('https_proxy') or
+                     proxy_settings.get('http_proxy'))
         render(source=ALERTMANAGER_YML_TMPL,
                target=ALERTMANAGER_YML,
-               context={'config': config}
+               context={'config': config,
+                        'proxy_url': proxy_url}
                )
     validate_config()
     set_state('alertmanager.do-restart')
diff --git a/templates/alertmanager.yml.j2 b/templates/alertmanager.yml.j2
index a79f1f3..5fe9e35 100644
--- a/templates/alertmanager.yml.j2
+++ b/templates/alertmanager.yml.j2
@@ -5,6 +5,10 @@ global:
   # The smarthost and SMTP sender used for mail notifications.
   smtp_smarthost: '{{ config.smtp_smarthost }}'
   smtp_from: '{{ config.smtp_from }}'
+{%- if proxy_url is defined and proxy_url %}
+  http_config:
+    proxy_url: '{{ proxy_url }}'
+{% endif %}
 
 # The root route on which each incoming alert enters.
 route: