Juju Charms Collection
kibana package

Merge lp://staging/~chris.macnaughton/charms/trusty/kibana/version_bump into lp://staging/charms/trusty/kibana

Proposed by Chris MacNaughton on 2015-11-04

Status:	Merged
Merged at revision:	19
Proposed branch:	lp://staging/~chris.macnaughton/charms/trusty/kibana/version_bump
Merge into:	lp://staging/charms/trusty/kibana
Diff against target:	484 lines (+163/-125) 17 files modified README.md (+2/-2) config.yaml (+3/-3) files/charm/config.js (+0/-75) files/charm/config.yml (+78/-0) files/charm/kibana.init (+32/-0) files/charm/kibana_lb.conf (+12/-0) files/charm/nginx.conf (+3/-33) files/charm/nginx_lb.conf (+1/-1) hooks/config-changed (+2/-1) hooks/install (+13/-5) hooks/rest-relation-departed (+1/-0) hooks/rest-relation-joined (+1/-0) hooks/start (+1/-0) hooks/stop (+1/-0) metadata.yaml (+3/-1) tests/11-scale-elastic.py (+3/-3) tests/12-port-change.py (+7/-1)
To merge this branch:	bzr merge lp://staging/~chris.macnaughton/charms/trusty/kibana/version_bump
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Andrew McLeod	2015-11-04	Pending
charmers	2015-11-04	Pending
Review via email: mp+276709@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-10-09.

Commit message

Update Kibana to Kibana 4

Description of the change

Updates Kibana to Kibana 4 and actually gets running

Revision history for this message

Andrew McLeod (admcleod) wrote on 2015-10-08: Posted in a previous version of this proposal

Hi Chris,

Nice work on the merge there, but I've run into some problems with bundletester

bundletester was run from the charm root as follows:

bundletester -e local -l DEBUG -vF

bundletester error log:

http://pastebin.ubuntu.com/12716770/

Kibana log entry for first bundletester error:

http://pastebin.ubuntu.com/12716784/

review: Needs Fixing

Revision history for this message

Andrew McLeod (admcleod) wrote on 2015-10-22: Posted in a previous version of this proposal

Hi Chris,

I've re-run bundletester on this in AWS and it all looks good until test 11 - the deployment is OK, I can access kibana GUI, however test 11 then tries to access kibana on port 9200 and times out:

Test 11:

url = 'http://%s:9200/_all/_search' % kibana_unit.info['public-address']
(diff comment line 412)

Test 12:

Also I set -F for bundletester so it continued with the tests - the next kibana service is deployed as kibana/2, but test 12 is looking for kibana/0:

kibana_unit = d.sentry.unit['kibana/0']

Perhaps you could use d.sentry['kibana'][0] to get the first kibana unit deployed?

bundletester output: http://pastebin.ubuntu.com/12894780/

review: Needs Fixing

Revision history for this message

Andrew McLeod (admcleod) wrote on 2015-11-05: Posted in a previous version of this proposal

Looks good, tests are passing now, Approve.

review: Approve

Revision history for this message

Charles Butler (lazypower) wrote on 2015-11-05: Posted in a previous version of this proposal

Nice work on this one Icey! +1

Thanks for the contribution. Approved and merged.

review: Approve

Revision history for this message

Michael Nelson (michael.nelson) wrote on 2015-11-09:

I think you'll find that the kibana_lb.conf below actually proxies *any* request for 9200 from the kibana unit through to the ES unit. That is, anyone who can access the kibana unit on port 80, is able to POST/DELETE whatever they like in ES.

I've fixed this, with a bunch of other smaller changes here:

https://code.launchpad.net/~canonical-is-sa/charms/trusty/kibana/kibana4/+merge/276944