Ubuntu CI Engine

Merge lp://qastaging/~doanac/uci-engine/webui-django-health into lp://qastaging/uci-engine

  1. webui-django-health
  2. Merge into trunk
Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 552
Merged at revision: 551
Proposed branch: lp://qastaging/~doanac/uci-engine/webui-django-health
Merge into: lp://qastaging/uci-engine
Prerequisite: lp://qastaging/~joetalbott/uci-engine/django-webui
Diff against target: 388 lines (+57/-133)
10 files modified
charms/precise/webui/config.yaml (+3/-7)
charms/precise/webui/hooks/hooks.py (+8/-79)
charms/precise/webui/metadata.yaml (+2/-4)
ci-utils/ci_utils/amqp_utils.py (+8/-0)
juju-deployer/configs/webui_http_vhost (+10/-2)
juju-deployer/relations.yaml (+5/-5)
juju-deployer/webui.yaml.tmpl (+7/-5)
webui/common/templates/common/menu.html (+1/-2)
webui/status/views.py (+10/-26)
webui/tickets/static/tickets/webui_status.js (+3/-3)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/webui-django-health
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Joe Talbott (community) Approve
Review via email: mp+222434@code.qastaging.launchpad.net

Commit message

 webui: add back support for engine health

With the new django app, we needed to split things a little. The
webui charm is still subordinate to apache but its now essentially
just hooks for the proxy logic and json_status urls.

The monitoring of queues was simplified since we now have django.
Its much easier/cleaner to deal with them now.

Description of the change

get webui health back in the new django ui

To post a comment you must log in.
Revision history for this message
Joe Talbott (joetalbott) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Ubuntu CI Bot (uci-bot) wrote :

Attempt to merge into lp:uci-engine failed due to conflicts:

text conflict in charms/precise/python-django/hooks/hooks.py

lp://qastaging/~doanac/uci-engine/webui-django-health updated
551. By Andy Doan

webui: add back support for engine health

With the new django app, we needed to split things a little. The
webui charm is still subordinate to apache but its now essentially
just hooks for the proxy logic and json_status urls.

The monitoring of queues was simplified since we now have django.
Its much easier/cleaner to deal with them now.

552. By Andy Doan

pythonpath issue

Chris landed a change while this was landing that changed our python paths

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches