Merge lp://staging/~brad-marshall/charms/trusty/ntp/add-nrpe-checks into lp://staging/charms/trusty/ntp
Proposed by
Brad Marshall
Status: | Merged |
---|---|
Merged at revision: | 18 |
Proposed branch: | lp://staging/~brad-marshall/charms/trusty/ntp/add-nrpe-checks |
Merge into: | lp://staging/charms/trusty/ntp |
Diff against target: |
3925 lines (+3087/-116) 29 files modified
charm-helpers-sync.yaml (+1/-0) config.yaml (+23/-1) files/nagios/check_ntpd.pl (+154/-0) files/nagios/check_ntpmon.py (+361/-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/contrib/templating/__init__.py (+15/-0) hooks/charmhelpers/contrib/templating/jinja.py (+25/-9) 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 (+100/-19) hooks/charmhelpers/core/host.py (+127/-37) hooks/charmhelpers/core/services/__init__.py (+18/-0) hooks/charmhelpers/core/services/base.py (+329/-0) hooks/charmhelpers/core/services/helpers.py (+267/-0) hooks/charmhelpers/core/strutils.py (+42/-0) hooks/charmhelpers/core/sysctl.py (+56/-0) hooks/charmhelpers/core/templating.py (+68/-0) hooks/charmhelpers/core/unitdata.py (+477/-0) hooks/charmhelpers/fetch/__init__.py (+61/-18) hooks/charmhelpers/fetch/archiveurl.py (+115/-17) hooks/charmhelpers/fetch/bzrurl.py (+30/-2) hooks/charmhelpers/fetch/giturl.py (+71/-0) hooks/ntp_hooks.py (+39/-0) metadata.yaml (+5/-1) |
To merge this branch: | bzr merge lp://staging/~brad-marshall/charms/trusty/ntp/add-nrpe-checks |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Ceppi (community) | Approve | ||
Review via email: mp+253156@code.staging.launchpad.net |
Description of the change
Adds some basic nrpe checks for ntp.
To post a comment you must log in.
LGTM +1