lp:~brad-marshall/charms/trusty/hacluster/add-nrpe-checks-update-charmhelpers

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers/charms/trusty/hacluster/next at revision 46

Liam Young (community): Approve on 2015-04-20

Billy Olsen: Needs Information on 2015-04-10

OpenStack Charmers: Pending requested 2015-02-12

Diff: 1577 lines (+1456/-1) (has conflicts)

12 files modified

charm-helpers.yaml (+1/-0)
config.yaml (+16/-0)
files/nrpe/check_corosync_rings (+99/-0)
files/nrpe/check_crm (+201/-0)
files/sudoers/nagios (+5/-0)
hooks/charmhelpers/contrib/charmsupport/__init__.py (+15/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+360/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+175/-0)
hooks/charmhelpers/core/strutils.py (+42/-0)
hooks/charmhelpers/core/unitdata.py (+477/-0)
hooks/hooks.py (+62/-1)
metadata.yaml (+3/-0)

api

Superseded for merging into lp:charms/trusty/hacluster

OpenStack Charmers: Pending requested 2015-02-12

charmers: Pending requested 2015-02-12

Diff: 1667 lines (+1452/-14)

16 files modified

charm-helpers.yaml (+1/-0)
config.yaml (+10/-0)
files/nrpe/check_corosync_rings (+99/-0)
files/nrpe/check_crm (+201/-0)
files/nrpe/check_haproxy.sh (+32/-0)
files/nrpe/check_haproxy_queue_depth.sh (+30/-0)
files/sudoers/nagios (+5/-0)
hooks/charmhelpers/contrib/charmsupport/__init__.py (+15/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+324/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+175/-0)
hooks/charmhelpers/core/host.py (+5/-5)
hooks/charmhelpers/core/sysctl.py (+11/-5)
hooks/charmhelpers/core/templating.py (+3/-3)
hooks/charmhelpers/core/unitdata.py (+477/-0)
hooks/hooks.py (+61/-1)
metadata.yaml (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

55. By Brad Marshall on 2015-04-20

[bradm] Dropped back to just requiring charmhelpers.contrib.openstack.utils, don't need the rest now.

54. By Brad Marshall on 2015-03-05

[bradm] Add process check for corosync and pacemakerd

53. By Brad Marshall on 2015-02-20

[bradm] Handle case of empty nagios_servicegroups setting

52. By Brad Marshall on 2015-02-19

[bradm] Add nagios_servicegroups config option

51. By Brad Marshall on 2015-02-19

[bradm] Sync charmhelpers

50. By Brad Marshall on 2015-02-17

[bradm] Removed haproxy nrpe checks

49. By Brad Marshall on 2015-02-13

[bradm] Removed unneeded import of relations_of_type

48. By Brad Marshall on 2015-02-12

[bradm] Add sudoers files for nagios checks

47. By Brad Marshall on 2015-02-12

[bradm] Import nrpe at the right level to get to the functions required

46. By Brad Marshall on 2015-02-12

[bradm] Fixed order of nrpe variable