Juju Charms Collection
kibana package

Merge lp://staging/~canonical-is-sa/charms/trusty/kibana/trunk into lp://staging/charms/trusty/kibana

Trusty Tahr (14.04)
trunk
Merge into trunk

Proposed by Michael Foley on 2015-05-25

Status:	Superseded
Proposed branch:	lp://staging/~canonical-is-sa/charms/trusty/kibana/trunk
Merge into:	lp://staging/charms/trusty/kibana
Diff against target:	82 lines (+13/-10) 4 files modified config.yaml (+4/-0) files/charm/config.js (+1/-1) hooks/install (+8/-0) hooks/web-relation-joined (+0/-9)
To merge this branch:	bzr merge lp://staging/~canonical-is-sa/charms/trusty/kibana/trunk
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Adam Israel (community)		Needs Fixing on 2015-05-27
charmers	2015-05-25	Pending
Review via email: mp+260026@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-10-30.

Description of the change

Added ability to change the elasticsearch url for kibana so that it can be set to https. This is so that kibana can be secured behind an apache2 proxy with openid.

Also added support for ubuntu basenode.

Revision history for this message

Adam Israel (aisrael) wrote on 2015-05-27:

Hi Michael,

I had a chance to review this merge proposal today. Thanks for your work on improving the kibana charm!

`charm proof` alerted me to 'hooks/website-relation-joined' not being executable. That's not a blocker, as juju should do the right thing, but is an easy fix.

With a new feature such as this, I look for two things that I'm not seeing: some documentation about the new feature in the README, and a test to exercise it. If you could address both of those issues, I'll happily approve this merge.

Thanks once again for your work on this!

review: Needs Fixing

Revision history for this message

Michael Nelson (michael.nelson) wrote on 2015-10-28:

Hey there Michael. I'm just looking at this charm change, and it looks like upstream has already changed the web relation to 'http'. So I think that part is done. There are two other features you've included - the elasticsearch url config option, and the exec.d support.

I'll give you an MP to merge into your canonical-is-sa branch which re-merges trunk, so we can push those two options up for review again.

lp://staging/~canonical-is-sa/charms/trusty/kibana/trunk updated on 2015-10-30

20. By Michael Foley on 2015-10-30: [michael.nelson,r=foli] Merge upstream (which now has web-relation-joined http relation). Fixed conflicts. Fixed charm proof errors. RT#85874