Merge lp:~michael.nelson/charms/trusty/logstash/trunk into lp:~canonical-is-sa/charms/trusty/logstash/trunk
Status: | Merged |
---|---|
Merged at revision: | 54 |
Proposed branch: | lp:~michael.nelson/charms/trusty/logstash/trunk |
Merge into: | lp:~canonical-is-sa/charms/trusty/logstash/trunk |
Diff against target: |
238 lines (+90/-21) 5 files modified
README.md (+4/-5) config.yaml (+8/-0) hooks/client-relation-changed (+17/-13) hooks/config-changed (+13/-3) hooks/nrpe-external-master-relation-changed (+48/-0) |
To merge this branch: | bzr merge lp:~michael.nelson/charms/trusty/logstash/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Foley (community) | Approve | ||
Review via email: mp+275269@code.launchpad.net |
Commit message
Add a nagios cert check to avoid cert expiry.
Add extra_config to enable juju setting extra filters.
Description of the change
This branch just merges fixes that the spi (tanuki) team have added to their custom branch and adds two new features (extra-config and nagios_
Test still passes (below) but I've not tested with a deploy yet. EDIT: I've just tested this with a local deploy and it worked fine (with the new nagios check pointing out that my cert had only 29 days left of validity).
dev-trusty# ~/charms/
$ ./tests/10-deploy
/usr/lib/
return self.fetch_
2015-10-22 05:38:58 Starting deployment of local
2015-10-22 05:38:58 Deploying services...
2015-10-22 05:38:59 Deploying service elasticsearch using cs:trusty/
2015-10-22 05:39:03 Deploying service logstash using /home/michael/
2015-10-22 05:41:55 Adding relations...
2015-10-22 05:41:55 Adding relation elasticsearch:
2015-10-22 05:42:56 Deployment complete in 238.55 seconds
/usr/lib/
testMethod()
..
-------
Ran 2 tests in 339.381s
OK
You mention specifically leaving out opening port 5959 from the spi/tanuki team merge but then the added "example 4" shows using port 5959. I think "example 4" should be left out for now or replaced with an example that actually works with this version of the charm.