Merge lp:~paulcz/charms/precise/kibana/trunk into lp:charms/kibana
Proposed by
Paul Czarkowski
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 6 | ||||
Proposed branch: | lp:~paulcz/charms/precise/kibana/trunk | ||||
Merge into: | lp:charms/kibana | ||||
Diff against target: |
313 lines (+138/-65) 11 files modified
README.md (+4/-1) files/charm/config.js (+54/-0) files/charm/nginx.conf (+35/-0) files/charm/nginx_lb.conf (+3/-0) hooks/install (+27/-44) hooks/rest-relation-changed (+9/-11) hooks/rest-relation-joined (+1/-2) hooks/start (+1/-3) hooks/stop (+1/-3) metadata.yaml (+2/-0) revision (+1/-1) |
||||
To merge this branch: | bzr merge lp:~paulcz/charms/precise/kibana/trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Ceppi (community) | Approve | ||
Review via email: mp+188243@code.launchpad.net |
Description of the change
* updated for kibana3
* uses nginx to serve up kibana3
* uses nginx to proxy/LB for elasticsearch connectivity
To post a comment you must log in.
LGTM +1