Merge lp:~timkuhlman/charms/trusty/grafana/layer-grafana-http into lp:~canonical-is-sa/charms/trusty/grafana/layer-grafana

[Tim Kuhlman]

Added a website relation, specifically so it can be related to the apache charm which will easily add an https + openid frontend.

[Tom Haddon (mthaddon)]

Looks good, merging.

review: Approve

[lp:~timkuhlman/charms/trusty/grafana/layer-grafana-http]

36. By Tom Haddon on 2016-05-02

[timkuhlman,r=mthaddon] Added a website relation, specifically so it can be related to the apache charm which will easily add an https + openid frontend

=== modified file 'config.yaml'
--- config.yaml	2016-04-27 16:42:30 +0000
+++ config.yaml	2016-04-29 23:34:37 +0000
@@ -61,8 +61,13 @@
     type: string
     description: |
       Comma separated list of nagios servicegroups for the graphite check
+  port:
+    type: string
+    default: "3000"
+    description: |
+        The port grafana will expose web services on.
   admin_password:
-    default:
+    default: ""
     type: string
     description: |
       Grafana admin password. Default, pwgen(16) random password

=== modified file 'layer.yaml'
--- layer.yaml	2016-04-13 16:43:03 +0000
+++ layer.yaml	2016-04-29 23:34:37 +0000
@@ -1,2 +1,2 @@
-includes: ['layer:basic', 'interface:nrpe-external-master', 'interface:grafana-source']
+includes: ['layer:basic', 'interface:nrpe-external-master', 'interface:grafana-source', 'interface:http']
 ignore: ['.*.swp' ]

=== modified file 'metadata.yaml'
--- metadata.yaml	2016-04-27 13:46:26 +0000
+++ metadata.yaml	2016-04-29 23:34:37 +0000
@@ -12,6 +12,8 @@
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container
+  website:
+    interface: http
 requires:
   grafana-source:
     interface: grafana-source

=== modified file 'reactive/grafana.py'
--- reactive/grafana.py	2016-04-27 16:42:30 +0000
+++ reactive/grafana.py	2016-04-29 23:34:37 +0000
@@ -77,7 +77,7 @@
                owner='root', group='grafana',
                perms=0o640,
                )
-    check_ports(config.get('port', '3000'))
+    check_ports(config.get('port'))
     set_state('grafana.start')
     hookenv.status_set('active', 'Ready')
 
@@ -148,6 +148,11 @@
     pass
 
 
+@when('website.available')
+def configure_website(website):
+    website.configure(port=hookenv.config('port'))
+
+
 def validate_datasources():
     """TODO: make sure datasources option is merged with
     relation data