Ubuntu CI Engine

Merge lp://qastaging/~doanac/uci-engine/webui-nagios-check into lp://qastaging/uci-engine

webui-nagios-check
Merge into trunk

Proposed by Andy Doan on 2014-06-09

Status:	Merged
Approved by:	Andy Doan on 2014-07-17
Approved revision:	554
Merged at revision:	688
Proposed branch:	lp://qastaging/~doanac/uci-engine/webui-nagios-check
Merge into:	lp://qastaging/uci-engine
Diff against target:	113 lines (+69/-2) 3 files modified webui/status/tests.py (+32/-0) webui/status/urls.py (+1/-1) webui/status/views.py (+36/-1)
To merge this branch:	bzr merge lp://qastaging/~doanac/uci-engine/webui-nagios-check
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Evan (community)			Approve on 2014-07-17
Joe Talbott (community)		2014-06-09	Approve on 2014-07-17
PS Jenkins bot (community)	continuous-integration		Approve on 2014-06-09
Review via email: mp+222573@code.qastaging.launchpad.net

Commit message

webui: add a health_check call that returns http500

This builds off our health logic to provide a URL that will return
an HTTP 500 error if any of our checks are failed. We can use this
to provide a nagios check

Description of the change

ev - this is the basis of what you want. I wasn't sure how to define the nagios check properly though. you think you can point this out to me?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-09:

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

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

review: Approve (continuous-integration)

Revision history for this message

Joe Talbott (joetalbott) wrote on 2014-07-17:

This looks good to me. I'll leave it to Evan to comment on your comment about the nagios checks, but I think this can land without the nagios checks.

review: Approve

Revision history for this message

Evan (ev) wrote on 2014-07-17:

> ev - this is the basis of what you want. I wasn't sure how to define the nagios
> check properly though. you think you can point this out to me?

From ./push-http-api-server/config.yaml in lp:~ubuntuone-pqm-team/canonical-is-charms/push-http-api-server/
14 nagios_check_http_params:
15 type: string
16 default: '-I 127.0.0.1 -p 8080 --url "/nagios" -e "200 OK" --regex="OK" -t 10'

See also nrpe_external_master in hooks/hooks.py, which pulls in charmhelpers.contrib.charmsupport.nrpe.

Happy to have that carved out as a follow-on task by someone other than you :)

Revision history for this message

Evan (ev) wrote on 2014-07-17:

Otherwise, I agree with Joe. Let's get this landed.

review: Approve