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

[Tim Kuhlman]

Charm Build of the latest layer changes, including revno 36.

[Tim Kuhlman (timkuhlman)]

I'll merge this as it was pointed out that since the layer was approved and this is just the result of 'charm build' on that layer there isn't much to review.

[Tim Kuhlman (timkuhlman)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2016-04-27 16:21:44 +0000
+++ config.yaml	2016-05-02 16:56:01 +0000
@@ -55,8 +55,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": !!null ""
+    "default": ""
     "type": "string"
     "description": |
       Grafana admin password. Default, pwgen(16) random password
 
=== added directory 'hooks/relations/http'
=== added file 'hooks/relations/http/README.md'
--- hooks/relations/http/README.md	1970-01-01 00:00:00 +0000
+++ hooks/relations/http/README.md	2016-05-02 16:56:01 +0000
@@ -0,0 +1,68 @@
+# Overview
+
+This interface layer implements the basic form of the `http` interface protocol,
+which is used for things such as reverse-proxies, load-balanced servers, REST
+service discovery, et cetera.
+
+# Usage
+
+## Provides
+
+By providing the `http` interface, your charm is providing an HTTP server that
+can be load-balanced, reverse-proxied, used as a REST endpoint, etc.
+
+Your charm need only provide the port on which it is serving its content, as
+soon as the `{relation_name}.available` state is set:
+
+```python
+@when('website.available')
+def configure_website(website):
+    website.configure(port=hookenv.config('port'))
+```
+
+## Requires
+
+By requiring the `http` interface, your charm is consuming one or more HTTP
+servers, as a REST endpoint, to load-balance a set of servers, etc.
+
+Your charm should respond to the `{relation_name}.available` state, which
+indicates that there is at least one HTTP server connected.
+
+The `services()` method returns a list of available HTTP services and their
+associated hosts and ports.
+
+The return value is a list of dicts of the following form:
+
+```python
+[
+    {
+        'service_name': name_of_service,
+        'hosts': [
+            {
+                'hostname': address_of_host,
+                'port': port_for_host,
+            },
+            # ...
+        ],
+    },
+    # ...
+]
+```
+
+A trivial example of handling this interface would be:
+
+```python
+from charms.reactive.helpers import data_changed
+
+@when('reverseproxy.available')
+def update_reverse_proxy_config(reverseproxy):
+    services = reverseproxy.services()
+    if not data_changed('reverseproxy.services', services):
+        return
+    for service in services:
+        for host in service['hosts']:
+            hookenv.log('{} has a unit {}:{}'.format(
+                services['service_name'],
+                host['hostname'],
+                host['port']))
+```
 
=== added file 'hooks/relations/http/__init__.py'
=== added file 'hooks/relations/http/interface.yaml'
--- hooks/relations/http/interface.yaml	1970-01-01 00:00:00 +0000
+++ hooks/relations/http/interface.yaml	2016-05-02 16:56:01 +0000
@@ -0,0 +1,4 @@
+name: http
+summary: Basic HTTP interface
+version: 1
+repo: https://git.launchpad.net/~bcsaller/charms/+source/http
 
=== added file 'hooks/relations/http/provides.py'
--- hooks/relations/http/provides.py	1970-01-01 00:00:00 +0000
+++ hooks/relations/http/provides.py	2016-05-02 16:56:01 +0000
@@ -0,0 +1,23 @@
+from charmhelpers.core import hookenv
+from charms.reactive import hook
+from charms.reactive import RelationBase
+from charms.reactive import scopes
+
+
+class HttpProvides(RelationBase):
+    scope = scopes.GLOBAL
+
+    @hook('{provides:http}-relation-{joined,changed}')
+    def changed(self):
+        self.set_state('{relation_name}.available')
+
+    @hook('{provides:http}-relation-{broken,departed}')
+    def broken(self):
+        self.remove_state('{relation_name}.available')
+
+    def configure(self, port):
+        relation_info = {
+            'hostname': hookenv.unit_get('private-address'),
+            'port': port,
+        }
+        self.set_remote(**relation_info)
 
=== added file 'hooks/relations/http/requires.py'
--- hooks/relations/http/requires.py	1970-01-01 00:00:00 +0000
+++ hooks/relations/http/requires.py	2016-05-02 16:56:01 +0000
@@ -0,0 +1,58 @@
+from charms.reactive import hook
+from charms.reactive import RelationBase
+from charms.reactive import scopes
+
+
+class HttpRequires(RelationBase):
+    scope = scopes.UNIT
+
+    @hook('{requires:http}-relation-{joined,changed}')
+    def changed(self):
+        conv = self.conversation()
+        if conv.get_remote('port'):
+            # this unit's conversation has a port, so
+            # it is part of the set of available units
+            conv.set_state('{relation_name}.available')
+
+    @hook('{requires:http}-relation-{departed,broken}')
+    def broken(self):
+        conv = self.conversation()
+        conv.remove_state('{relation_name}.available')
+
+    def services(self):
+        """
+        Returns a list of available HTTP services and their associated hosts
+        and ports.
+
+        The return value is a list of dicts of the following form::
+
+            [
+                {
+                    'service_name': name_of_service,
+                    'hosts': [
+                        {
+                            'hostname': address_of_host,
+                            'port': port_for_host,
+                        },
+                        # ...
+                    ],
+                },
+                # ...
+            ]
+        """
+        services = {}
+        for conv in self.conversations():
+            service_name = conv.scope.split('/')[0]
+            service = services.setdefault(service_name, {
+                'service_name': service_name,
+                'hosts': [],
+            })
+            host = conv.get_remote('hostname') or \
+                conv.get_remote('private-address')
+            port = conv.get_remote('port')
+            if host and port:
+                service['hosts'].append({
+                    'hostname': host,
+                    'port': port,
+                })
+        return [s for s in services.values() if s['hosts']]
 
=== added file 'hooks/website-relation-broken'
--- hooks/website-relation-broken	1970-01-01 00:00:00 +0000
+++ hooks/website-relation-broken	2016-05-02 16:56:01 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'hooks/website-relation-changed'
--- hooks/website-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/website-relation-changed	2016-05-02 16:56:01 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'hooks/website-relation-departed'
--- hooks/website-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/website-relation-departed	2016-05-02 16:56:01 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'hooks/website-relation-joined'
--- hooks/website-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/website-relation-joined	2016-05-02 16:56:01 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== modified file 'layer.yaml'
--- layer.yaml	2016-04-27 15:11:18 +0000
+++ layer.yaml	2016-05-02 16:56:01 +0000
@@ -8,5 +8,6 @@
 - "layer:basic"
 - "interface:nrpe-external-master"
 - "interface:grafana-source"
+- "interface:http"
 "ignore": [".*.swp"]
 "is": "grafana"
 
=== modified file 'lib/charms/layer/basic.py'
--- lib/charms/layer/basic.py	2016-04-27 15:11:18 +0000
+++ lib/charms/layer/basic.py	2016-05-02 16:56:01 +0000
@@ -125,13 +125,14 @@
     from charms.reactive import toggle_state
     config = hookenv.config()
     config_defaults = {}
+    config_defs = {}
     config_yaml = os.path.join(hookenv.charm_dir(), 'config.yaml')
     if os.path.exists(config_yaml):
         with open(config_yaml) as fp:
             config_defs = yaml.load(fp).get('options', {})
             config_defaults = {key: value.get('default')
                                for key, value in config_defs.items()}
-    for opt in config.keys():
+    for opt in config_defs.keys():
         if config.changed(opt):
             set_state('config.changed')
             set_state('config.changed.{}'.format(opt))
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2016-04-27 15:11:18 +0000
+++ metadata.yaml	2016-05-02 16:56:01 +0000
@@ -14,4 +14,6 @@
   "nrpe-external-master":
     "interface": "nrpe-external-master"
     "scope": "container"
+  "website":
+    "interface": "http"
 "subordinate": !!bool "false"
 
=== modified file 'reactive/grafana.py'
--- reactive/grafana.py	2016-04-27 16:52:12 +0000
+++ reactive/grafana.py	2016-05-02 16:56:01 +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