Merge lp:~foli/charms/trusty/logstash/add-lumberjack-protocol into lp:~lazypower/charms/trusty/logstash/trunk
Proposed by
Michael Foley
Status: | Merged |
---|---|
Merged at revision: | 47 |
Proposed branch: | lp:~foli/charms/trusty/logstash/add-lumberjack-protocol |
Merge into: | lp:~lazypower/charms/trusty/logstash/trunk |
Diff against target: |
165 lines (+72/-5) 6 files modified
config.yaml (+8/-0) hooks/config-changed (+36/-4) hooks/install (+3/-0) hooks/lumberjack-relation-changed (+7/-0) metadata.yaml (+5/-1) templates/input-lumberjack.conf (+13/-0) |
To merge this branch: | bzr merge lp:~foli/charms/trusty/logstash/add-lumberjack-protocol |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Butler | Approve | ||
Review via email: mp+256630@code.launchpad.net |
Description of the change
Have added input-lumberjac
Added code to only install the conf file if necessary SSL certs are available, otherwise logstash fails to start.
Added a relation to haproxy of the lumberjack protocol so that multiple logstash units can be placed behind haproxy.
Tom added support for exec.d infrastructure so we can customise instances.
To post a comment you must log in.
All of this looks good to me. I just have a single comment - that we need to get a test built that leverages the lumberjack relationship and validate everything is working so we know if it breaks in the future.
I'll assign a bug for this and happily merge. Thanks for the contributions!