lp:~gnuoy/charms/trusty/ceilometer/add-nrpe-checks

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/ceilometer/next at revision 64

Liam Young (community): Approve on 2015-01-12

Diff: 769 lines (+546/-6)

13 files modified

charm-helpers.yaml (+1/-0)
config.yaml (+10/-0)
hooks/ceilometer_hooks.py (+18/-1)
hooks/ceilometer_utils.py (+19/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+308/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+159/-0)
hooks/charmhelpers/contrib/openstack/context.py (+1/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+8/-2)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+4/-2)
hooks/charmhelpers/contrib/openstack/utils.py (+6/-0)
hooks/charmhelpers/fetch/__init__.py (+8/-1)
metadata.yaml (+3/-0)
unit_tests/test_ceilometer_hooks.py (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

68. By Liam Young on 2015-01-12

Use rnpe functions from charmhelpers

67. By Liam Young on 2015-01-12

Sync charmhelpers

66. By Liam Young on 2015-01-09

Fix lint and unit tests

65. By Liam Young on 2015-01-09

Merged next in and resolved conflicts

64. By Brad Marshall on 2014-11-18

[bradm] Removed nagios check files that were moved to nrpe-external-master charm

63. By Brad Marshall on 2014-11-17

[bradm] Removed puppet header from nagios_plugin module

62. By Brad Marshall on 2014-11-17

[bradm] Tweaked nagios checks to use functions to pull out services, added checks for sysv init style daemons, added in icehouse daemons, ran pep8 over the whole thing

61. By Brad Marshall on 2014-11-06

[bradm] Check if host_context is defined before using it

60. By Brad Marshall on 2014-11-04

[bradm] Tweaked check to include host context and unit name

59. By Brad Marshall on 2014-10-31

[bradm] Added support to get nagios hostname from nrpe relation