Merge lp://qastaging/~brad-marshall/charms/trusty/landscape-client/add-nrpe-checks into lp://qastaging/charms/trusty/landscape-client
Proposed by
Brad Marshall
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~brad-marshall/charms/trusty/landscape-client/add-nrpe-checks |
| Merge into: | lp://qastaging/charms/trusty/landscape-client |
| Diff against target: |
2627 lines (+1805/-104) 25 files modified
charm-helpers-sync.yaml (+1/-0) config.yaml (+16/-0) hooks/charmhelpers/__init__.py (+38/-0) hooks/charmhelpers/contrib/__init__.py (+15/-0) hooks/charmhelpers/contrib/charmsupport/__init__.py (+15/-0) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+358/-0) hooks/charmhelpers/contrib/charmsupport/volumes.py (+175/-0) hooks/charmhelpers/core/__init__.py (+15/-0) hooks/charmhelpers/core/decorators.py (+57/-0) hooks/charmhelpers/core/fstab.py (+30/-12) hooks/charmhelpers/core/hookenv.py (+83/-15) hooks/charmhelpers/core/host.py (+97/-32) hooks/charmhelpers/core/services/__init__.py (+18/-2) hooks/charmhelpers/core/services/base.py (+16/-0) hooks/charmhelpers/core/services/helpers.py (+37/-9) hooks/charmhelpers/core/strutils.py (+42/-0) hooks/charmhelpers/core/sysctl.py (+56/-0) hooks/charmhelpers/core/templating.py (+20/-3) hooks/charmhelpers/core/unitdata.py (+477/-0) hooks/charmhelpers/fetch/__init__.py (+42/-13) hooks/charmhelpers/fetch/archiveurl.py (+69/-16) hooks/charmhelpers/fetch/bzrurl.py (+30/-2) hooks/charmhelpers/fetch/giturl.py (+71/-0) hooks/hooks.py (+23/-0) metadata.yaml (+4/-0) |
| To merge this branch: | bzr merge lp://qastaging/~brad-marshall/charms/trusty/landscape-client/add-nrpe-checks |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Landscape | Pending | ||
|
Review via email:
|
|||
Description of the change
Add basic NRPE checks to landscape-client charm. Currently just checks the return from the init script, and that at least one landscape-client process is running.
To post a comment you must log in.
Unmerged revisions
- 47. By Brad Marshall
-
[bradm] Make the proc check for at least one, rather than exactly one.
- 46. By Brad Marshall
-
[bradm] Look for landscape-client as an argument, not a full command
- 45. By Brad Marshall
-
[bradm] Moved nrpe config update to before the return in the config-changed hook function
- 44. By Brad Marshall
-
[bradm] Import apt_install function from charmhelpers.fetch
- 43. By Brad Marshall
-
[bradm] Initial nagios checks, sync charmhelpers
- 42. By Alberto Donato
-
Merge from lp:landscape-client-charm.
- 41. By David Britton
-
sync merge history from trunk (no file differences) [trivial]
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
