Merge lp:~doanac/ubuntu-ci-services-itself/json-jsonp-status into lp:ubuntu-ci-services-itself

[Andy Doan]

integrate monitoring api into webui

Provide a simple mechansim for the webui to get monitor the status of other services.
(restish only for this change)

provides the charming logic required to fix:

 https://bugs.launchpad.net/bugs/1285360

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:300
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/265/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/265/rebuild

review: Needs Fixing (continuous-integration)

[Evan (ev)]

Looks good. +1

review: Approve

[Evan (ev)]

110 [e-mail]('json_status-relation-changed')
111 +def json_status_relation_changed():
112 + json_status_relation_joined()

Minor nit, but couldn't you just decorate json_status_relation_joined() with hooks.hook('json_status-relation-changed')?

[Andy Doan (doanac)]

On 03/03/2014 03:10 AM, Evan Dandrea wrote:
> 110 [e-mail]('json_status-relation-changed')
> 111 +def json_status_relation_changed():
> 112 + json_status_relation_joined()
>
> Minor nit, but couldn't you just decorate json_status_relation_joined() with hooks.hook('json_status-relation-changed')?

I wasn't positive if was safe with the hooks.hook decorator to have it
twice for a function. I'm re-doplying this morning, so it should be easy
to find out :)

[lp:~doanac/ubuntu-ci-services-itself/json-jsonp-status]

301. By Andy Doan on 2014-03-03

use one hook function for joined/changed

as noted by evan

[Andy Doan (doanac)]

revno 301 fixes ev's comment. he's already acked the patch.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:301
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/267/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/267/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:301
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/271/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/271/rebuild

review: Approve (continuous-integration)

=== modified file 'charms/precise/restish/config.yaml'
--- charms/precise/restish/config.yaml	2014-02-18 23:42:52 +0000
+++ charms/precise/restish/config.yaml	2014-03-03 17:27:54 +0000
@@ -28,6 +28,10 @@
     type: string
     description: "PYTHONPATH specification for the service. Can include paths relative to local bzr directory"
 
+  json_status_path:
+    type: string
+    description: "relative path of a URL that reports the health status of this service"
+
   # required for rabbitmq-server charm:
   amqp-user:
     type: string

=== modified file 'charms/precise/restish/hooks/hooks.py'
--- charms/precise/restish/hooks/hooks.py	2014-02-18 23:42:52 +0000
+++ charms/precise/restish/hooks/hooks.py	2014-03-03 17:27:54 +0000
@@ -135,6 +135,19 @@
     pass
 
 
+def json_status_relation_joined(config):
+    path = config.get('json_status_path')
+    if path:
+        port = config['port']
+        host = subprocess.check_output(['unit-get', 'public-address']).strip()
+        if not host:
+            juju_info('no public address found, using private')
+            host = subprocess.check_output(
+                ['unit-get', 'private-address']).strip()
+        url = 'http://%s:%s/%s' % (host, port, path)
+        _relation_set({'status-url': url})
+
+
 def wsgi_relation_joined(config):
     sdir = _service_dir(config)
 

=== added symlink 'charms/precise/restish/hooks/json_status-relation-joined'
=== target is u'hooks.py'
=== modified file 'charms/precise/restish/metadata.yaml'
--- charms/precise/restish/metadata.yaml	2014-01-16 16:52:53 +0000
+++ charms/precise/restish/metadata.yaml	2014-03-03 17:27:54 +0000
@@ -13,6 +13,9 @@
   wsgi:
     interface: wsgi
     scope: container
+  json_status:
+    interface: json_status
+    optional: true
 requires:
   amqp:
     interface: rabbitmq

=== modified file 'charms/precise/webui/hooks/hooks.py'
--- charms/precise/webui/hooks/hooks.py	2014-02-17 10:13:29 +0000
+++ charms/precise/webui/hooks/hooks.py	2014-03-03 17:27:54 +0000
@@ -2,6 +2,7 @@
 
 import distutils.dir_util
 import grp
+import json
 import os
 import pwd
 import re
@@ -26,12 +27,46 @@
 site_name = "ci-airlines.canonical.com"
 site_path = "/srv/{}".format(site_name)
 
+json_status_file = os.path.join(site_path, 'status_urls.json')
+
 config_data = config_get()
 
 web_uid = pwd.getpwnam('www-data')[2]
 web_gid = grp.getgrnam('www-data')[2]
 
 
[e-mail]('json_status-relation-joined')
[e-mail]('json_status-relation-changed')
+def json_status_relation_joined():
+    url = charmhelpers.core.hookenv.relation_get('status-url')
+    unit = charmhelpers.core.hookenv.remote_unit()
+    log('status URL is: %s' % url)
+
+    data = {}
+    if os.path.exists(json_status_file):
+        data = json.load(open(json_status_file))
+    data[charmhelpers.core.hookenv.relation_id()] = {
+        'url': url,
+        'unit': unit,
+    }
+
+    with open(json_status_file, 'w') as f:
+        json.dump(data, f)
+
+
[e-mail]('json_status-relation-broken')
+def json_status_relation_broken():
+    if not os.path.exists(json_status_file):
+        return
+
+    data = json.load(open(json_status_file))
+    rid = charmhelpers.core.hookenv.relation_id()
+    if rid in data:
+        del data[rid]
+    with open(json_status_file, 'w') as f:
+        json.dump(data, f)
+
+
 @hooks.hook()
 def install():
     if os.path.exists(site_path):

=== added symlink 'charms/precise/webui/hooks/json_status-relation-broken'
=== target is u'hooks.py'
=== added symlink 'charms/precise/webui/hooks/json_status-relation-changed'
=== target is u'hooks.py'
=== added symlink 'charms/precise/webui/hooks/json_status-relation-joined'
=== target is u'hooks.py'
=== modified file 'charms/precise/webui/metadata.yaml'
--- charms/precise/webui/metadata.yaml	2014-01-23 17:11:17 +0000
+++ charms/precise/webui/metadata.yaml	2014-03-03 17:27:54 +0000
@@ -10,3 +10,5 @@
   website:
     interface: http
     scope: container
+  json_status:
+    interface: json_status

=== modified file 'juju-deployer/branch-source-builder.yaml.tmpl'
--- juju-deployer/branch-source-builder.yaml.tmpl	2014-02-25 23:16:13 +0000
+++ juju-deployer/branch-source-builder.yaml.tmpl	2014-03-03 17:27:54 +0000
@@ -10,6 +10,7 @@
                 python_path: ./branch-source-builder:./ci-utils
                 # need non-default package python-amqplib for this service
                 packages: "python-webtest python-mock python-jinja2 python-amqplib"
+                json_status_path: api/v1/status
         bsb-gunicorn:
             charm: gunicorn
             branch: lp:charms/precise/gunicorn@28

=== modified file 'juju-deployer/image-builder.yaml.tmpl'
--- juju-deployer/image-builder.yaml.tmpl	2014-02-28 09:25:47 +0000
+++ juju-deployer/image-builder.yaml.tmpl	2014-03-03 17:27:54 +0000
@@ -9,6 +9,7 @@
                 tarball: ${CI_PAYLOAD_URL}
                 python_path: ./image-builder:./ci-utils
                 packages: "python-webtest python-mock python-jinja2 python-amqplib"
+                json_status_path: api/v1/status
         imagebuild-gunicorn:
             charm: gunicorn
             branch: lp:charms/precise/gunicorn@28

=== modified file 'juju-deployer/relations.yaml'
--- juju-deployer/relations.yaml	2014-01-30 13:12:40 +0000
+++ juju-deployer/relations.yaml	2014-03-03 17:27:54 +0000
@@ -7,3 +7,6 @@
        - ["imagebuild-restish:lander-jenkins", lander-jenkins-sub]
        - ["ts-django:lander-jenkins", lander-jenkins-sub]
        - ["tr-restish:lander-jenkins", lander-jenkins-sub]
+       - ["imagebuild-restish:json_status", "webui-app:json_status"]
+       - ["tr-restish:json_status", "webui-app:json_status"]
+       - ["bsb-restish:json_status", "webui-app:json_status"]

=== modified file 'juju-deployer/test-runner.yaml.tmpl'
--- juju-deployer/test-runner.yaml.tmpl	2014-02-25 23:16:13 +0000
+++ juju-deployer/test-runner.yaml.tmpl	2014-03-03 17:27:54 +0000
@@ -14,6 +14,7 @@
                 branch: ${CI_BRANCH}
                 tarball: ${CI_PAYLOAD_URL}
                 python_path: test_runner:ci-utils
+                json_status_path: api/v1/status
 
                 # python-webtest is required for tests