Juju Charms Collection
kibana package

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

  1. Trusty Tahr (14.04)
  2. kibana4
  3. Merge into trunk
Proposed by Michael Nelson
Status: Merged
Merged at revision: 20
Proposed branch: lp://staging/~canonical-is-sa/charms/trusty/kibana/kibana4
Merge into: lp://staging/charms/trusty/kibana
Diff against target: 212 lines (+33/-40)
9 files modified
README.md (+1/-1)
config.yaml (+2/-6)
files/charm/config.yml (+2/-1)
files/charm/kibana.init (+1/-1)
files/charm/kibana_lb.conf (+4/-1)
hooks/config-changed (+0/-2)
hooks/install (+10/-6)
hooks/web-relation-joined (+0/-9)
tests/11-scale-elastic.py (+13/-13)
To merge this branch: bzr merge lp://staging/~canonical-is-sa/charms/trusty/kibana/kibana4
Reviewer Review Type Date Requested Status
Kevin W Monroe (community) Approve
Konstantinos Tsakalozos (community) Approve
Chris MacNaughton (community) Approve
Review Queue (community) automated testing Approve
Review via email: mp+276944@code.staging.launchpad.net

Commit message

Fixes nginx proxy so only local requests to :9200 are forwarded to elasticsearch units.
Updates to latest kibana4 as default.
Specifies missing kibana config file and uses explicit logging option.
Adds support for exec.d pre-install hook.

Description of the change

Note: I wasn't planning on merging these changes to upstream kibana, because I thought you might see fallout if the kibana charm now defaults to kibana4, but other related charms (elatsicsearch, logstash) don't default to the required newer versions. But since the kibana4 changes have already been landed, here are some small changes :)

I'll comment below inline on each change, but I've tested the 11-scale-elastec locally:

dev-trusty# ~/charms/kibana/trusty/kibana
$ ./tests/11-scale-elastic.py
2015-11-09 03:09:35 Starting deployment of local
2015-11-09 03:09:35 Deploying services...
2015-11-09 03:09:35 Deploying service elasticsearch using cs:trusty/elasticsearch-12
2015-11-09 03:09:43 Deploying service kibana using /home/michael/charms/kibana/trusty/kibana
2015-11-09 03:09:48 Deploying service logstash-indexer using cs:precise/logstash-indexer-4
2015-11-09 03:13:08 Adding relations...
2015-11-09 03:13:08 Adding relation logstash-indexer:cluster <-> elasticsearch:client
2015-11-09 03:13:09 Adding relation kibana:rest <-> elasticsearch:client
2015-11-09 03:14:09 Exposing service 'kibana'
2015-11-09 03:14:09 Deployment complete in 275.00 seconds
dev-trusty# ~/charms/kibana/trusty/kibana
$

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :

Adding inline comments.

Revision history for this message
Michael Nelson (michael.nelson) :
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1423/

review: Needs Fixing (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1420/

review: Approve (automated testing)
Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

Hi Michael,

Great work on these changes, making things more secure for everybody!

Looks good to me, according to http://reports.vapour.ws/all-bundle-and-charm-results/https%3A%252F%252Fcode.launchpad.net%252F~canonical-is-sa%252Fcharms%252Ftrusty%252Fkibana%252Fkibana4%252F%2Bmerge%252F276944 tests are in fact all passing.

Approve.

review: Approve
Revision history for this message
Konstantinos Tsakalozos (kos.tsakalozos) wrote :

LGTM. Thank you for doing this!

review: Approve
Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

Thanks for these changes and the reviews! I made a small tweak to the README.md, which was still referencing the removed unpack dir:

-checksum verification, but respecting the 'kibana_source_unpack_directory'.
+checksum verification, and unpacked to /srv/kibana4.

This merge has been committed to lp:charms/trusty/kibana. An updated charm should be available in the store shortly. Thanks again!

review: Approve

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