Merge lp://staging/~canonical-is-sa/charms/trusty/logstash/trunk into lp://staging/~lazypower/charms/trusty/logstash/trunk
Proposed by
Michael Foley
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~canonical-is-sa/charms/trusty/logstash/trunk |
| Merge into: | lp://staging/~lazypower/charms/trusty/logstash/trunk |
| Diff against target: |
2990 lines (+1996/-154) 31 files modified
README.md (+4/-5) charm-helpers.yaml (+1/-0) config.yaml (+32/-0) hooks/client-relation-changed (+20/-14) hooks/config-changed (+14/-2) hooks/nrpe-external-master-relation-changed (+87/-0) lib/charmhelpers/contrib/charmsupport/__init__.py (+15/-0) lib/charmhelpers/contrib/charmsupport/nrpe.py (+360/-0) lib/charmhelpers/contrib/charmsupport/volumes.py (+175/-0) lib/charmhelpers/contrib/templating/__init__.py (+15/-0) lib/charmhelpers/contrib/templating/jinja.py (+25/-9) lib/charmhelpers/core/__init__.py (+15/-0) lib/charmhelpers/core/decorators.py (+57/-0) lib/charmhelpers/core/fstab.py (+30/-12) lib/charmhelpers/core/hookenv.py (+105/-22) lib/charmhelpers/core/host.py (+103/-38) lib/charmhelpers/core/services/__init__.py (+18/-2) lib/charmhelpers/core/services/base.py (+16/-0) lib/charmhelpers/core/services/helpers.py (+37/-9) lib/charmhelpers/core/strutils.py (+42/-0) lib/charmhelpers/core/sysctl.py (+56/-0) lib/charmhelpers/core/templating.py (+20/-3) lib/charmhelpers/core/unitdata.py (+477/-0) lib/charmhelpers/fetch/__init__.py (+44/-14) lib/charmhelpers/fetch/archiveurl.py (+76/-22) lib/charmhelpers/fetch/bzrurl.py (+30/-2) lib/charmhelpers/fetch/giturl.py (+71/-0) lib/charmhelpers/payload/__init__.py (+16/-0) lib/charmhelpers/payload/archive.py (+16/-0) lib/charmhelpers/payload/execd.py (+16/-0) metadata.yaml (+3/-0) |
| To merge this branch: | bzr merge lp://staging/~canonical-is-sa/charms/trusty/logstash/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Butler | Pending | ||
|
Review via email:
|
|||
Description of the change
Have added nagios checks for logstash and fixed client-
Also updated charmhelpers.
To post a comment you must log in.
Revision history for this message
| Guillermo Gonzalez (verterok) wrote | # |
Unmerged revisions
- 54. By Michael Foley
-
[michael.
nelson, r=foli] Add a nagios cert check to avoid cert expiry. Add extra_config to enable juju setting extra filters. RT#85874 - 53. By Michael Foley
-
[foli] adjust nagios checks
- 52. By Michael Foley
-
[foli] fix nrpe-external-
master relation, don't add lumberjack port check if not configured - 51. By Michael Foley
-
[foli] initial add of nrpe-external-
master relation and custom checks - 50. By Michael Foley
-
[foli] addedh charmhelpers contrib.
charmsupport - 49. By Michael Foley
-
[foli] updated charmhelpers from upstream
- 48. By Michael Foley
-
[foli] Fix client-
relation- changed to use most recently joined elasticsearch unit
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FWIW, applied this to our logstash charm fork and it worked as expected.
Michael, thanks for working on this!