Merge lp:~jacekn/charms/trusty/prometheus-alertmanager/port-fixes into lp:~canonical-is-sa/charms/trusty/prometheus-alertmanager/layer-prometheus-alertmanager

[Jacek Nykis]

Rename the charm to prometheus-alertmanger to match other prometheus charms. Ensure network port is opened

[Stuart Bishop (stub)]

Looks good.

review: Approve

=== modified file 'metadata.yaml'
--- metadata.yaml	2016-03-14 00:54:44 +0000
+++ metadata.yaml	2016-06-22 16:33:54 +0000
@@ -1,4 +1,4 @@
-name: alertmanager
+name: prometheus-alertmanager
 summary: Alertmanager for Prometheus
 maintainer: JuanJo Ciarlante <JuanJo.Ciarlante@localhost>
 description: |

=== modified file 'reactive/alertmanager.py'
--- reactive/alertmanager.py	2016-03-16 18:16:52 +0000
+++ reactive/alertmanager.py	2016-06-22 16:33:54 +0000
@@ -40,6 +40,15 @@
     return sorted(args_list)
 
 
+def check_ports(new_port):
+    kv = unitdata.kv()
+    if kv.get('alertmanager.port') != new_port:
+        hookenv.open_port(new_port)
+        if kv.get('alertmanager.port'):  # Dont try to close non existing ports
+            hookenv.close_port(kv.get('alertmanager.port'))
+        kv.set('alertmanager.port', new_port)
+
+
 def validate_config():
     return yaml.safe_load(open(ALERTMANAGER_YML))
 
@@ -59,15 +68,16 @@
 @when('alertmanager.do-reconfig-def')
 def write_alertmanager_config_def():
     config = hookenv.config()
-    if config.get('port', False):
-        runtime_args('-web.listen-address',
-                     ':{}'.format(config['port']))
+    port = config.get('port', '9093')
+    check_ports(port)
+    runtime_args('-web.listen-address',
+                 ':{}'.format(port))
     if config.get('external_url', False):
         vars = {
             'private_address': hookenv.unit_get('private-address'),
             'public_address': hookenv.unit_get('public-address'),
             # alertmanager default:
-            'port': config.get('port', '9093'),
+            'port': port,
         }
         runtime_args('-web.external-url',
                      config['external_url'].format(**vars))