Merge lp:~jorge/charms/trusty/kibana/update-defaults-to-4 into lp:charms/trusty/kibana

Proposed by Jorge Castro
Status: Work in progress
Proposed branch: lp:~jorge/charms/trusty/kibana/update-defaults-to-4
Merge into: lp:charms/trusty/kibana
Diff against target: 21 lines (+4/-3)
1 file modified
config.yaml (+4/-3)
To merge this branch: bzr merge lp:~jorge/charms/trusty/kibana/update-defaults-to-4
Reviewer Review Type Date Requested Status
Adam Israel (community) Needs Fixing
Review Queue (community) automated testing Needs Fixing
charmers Pending
Review via email: mp+250379@code.launchpad.net

Description of the change

I am updating the Kibana charm to default to the new shiny upstream 4.0 version.

To post a comment you must log in.
Revision history for this message
Review Queue (review-queue) wrote :

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-11046-results

review: Needs Fixing (automated testing)
Revision history for this message
Adam Israel (aisrael) wrote :

Hey Jorge,

Thanks for your work on upgrading the Kibana charm. I had the opportunity to review this merge proposal today. The install hook was failing due to a change in the naming schema of the kibana tarball. While investigating that, I discovered the new 4.0 version was being installed to the `kibana3` directory.

I made a couple changes to fix the above, and pushed those up for reference:
https://code.launchpad.net/~aisrael/charms/trusty/kibana/fix_v4

With those changes, there'll be no problem pushing this forward.

Thanks again!

review: Needs Fixing
Revision history for this message
Jay R. Wren (evarlast) wrote :

It is worth nothing that kibana 4.0 requires minimal Elasticsearch version 1.4.4 or later and the elasticsearch charm defaults to 1.3.x. These things won't work together nicely OOTB as is.

It would be nice if the kibana charm could support both 4.0 and 3.x so that users who are not ready to upgrade their elasticsearch will not have to fork from a previous kibana charm to make changes to the kibana charm.

Unmerged revisions

14. By Jorge Castro

Change defaults to Kibana 4.0.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2014-11-05 05:21:37 +0000
3+++ config.yaml 2015-02-19 20:38:28 +0000
4@@ -1,13 +1,14 @@
5 options:
6 kibana_source:
7 type: string
8- default: 'https://download.elasticsearch.org/kibana/kibana/kibana-3.1.1.tar.gz'
9+ default: 'https://download.elasticsearch.org/kibana/kibana/kibana-4.0.0-linux-x64.tar.gz'
10 description: URL to download the source for kibana
11 kibana_source_unpack_directory:
12 type: string
13- default: 'kibana-3.1.1'
14+ default: 'kibana-4.0.0'
15 description: the name of the directory the tar.gz will unpack to
16 kibana_source_checksum:
17 type: string
18- default: '74c6b8b79d1bfc7e4d5376e3c9ecb0fa1e79c986'
19+ default: 'f53725cdba35bdc221d7a59c44445c8c543a9897'
20 description: the sha1sum of the kibana_source
21+

Subscribers

People subscribed via source and target branches