Merge lp:~michael.nelson/charms/trusty/logstash-forwarder/merge-tanuki-trunk into lp:~canonical-is-sa/charms/trusty/logstash-forwarder/trunk
Status: | Merged |
---|---|
Merged at revision: | 14 |
Proposed branch: | lp:~michael.nelson/charms/trusty/logstash-forwarder/merge-tanuki-trunk |
Merge into: | lp:~canonical-is-sa/charms/trusty/logstash-forwarder/trunk |
Diff against target: |
139 lines (+66/-5) 3 files modified
config.yaml (+11/-1) hooks/Config.py (+9/-0) hooks/hooks.py (+46/-4) |
To merge this branch: | bzr merge lp:~michael.nelson/charms/trusty/logstash-forwarder/merge-tanuki-trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paul Collins | Approve | ||
Review via email: mp+275786@code.launchpad.net |
Commit message
Set nagios_hostname from nrpe-external-
Add optional server map so logs can be forwarded to a logstash server without DNS. (thanks tanuki)
Description of the change
This adds two changes (and some pep8 cleanup) so that:
1) The nagios_hostname is set from the nrpe-external-
2) An optional server map can be set to send data to a logstash server which does not have a dns entry (helpful not only in devel, but also makes it possible to send data with the correct cert without DNS in staging when needed).
I'm assuming this supersedes Guillermo's MP at:
(as it just adds another of his commits to the MP :) ).
Revisions 15 and 16 are just formatting/doc issues that I noticed and fixed in the config.yaml, while testing the charm.
Looks pretty good, except for yaml.load() as noted below; -1 for now.