Merge lp://staging/~chris.macnaughton/charms/trusty/kibana/version_bump into lp://staging/charms/trusty/kibana
Proposed by
Chris MacNaughton
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~chris.macnaughton/charms/trusty/kibana/version_bump |
| Merge into: | lp://staging/charms/trusty/kibana |
| Diff against target: |
434 lines (+155/-121) 14 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/start (+1/-0) hooks/stop (+1/-0) tests/11-scale-elastic.py (+1/-1) tests/12-port-change.py (+6/-0) |
| To merge this branch: | bzr merge lp://staging/~chris.macnaughton/charms/trusty/kibana/version_bump |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrew McLeod (community) | Needs Fixing | ||
| charmers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-10-09.
Description of the change
Updates Kibana to Kibana 4 and actually gets running
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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://
Kibana log entry for first bundletester error:
http://