Juju Charms Collection
heat package

Merge lp://qastaging/~brad-marshall/charms/trusty/heat/fix-nagios into lp://qastaging/~openstack-charmers-archive/charms/trusty/heat/next

  1. Trusty Tahr (14.04)
  2. fix-nagios
  3. Merge into next
Proposed by Brad Marshall
Status: Needs review
Proposed branch: lp://qastaging/~brad-marshall/charms/trusty/heat/fix-nagios
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/heat/next
Diff against target: 2275 lines (+739/-686)
18 files modified
charm-helpers.yaml (+1/-0)
config.yaml (+16/-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/network/ip.py (+84/-1)
hooks/charmhelpers/contrib/openstack/context.py (+29/-10)
hooks/charmhelpers/contrib/openstack/files/__init__.py (+0/-18)
hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+0/-32)
hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+0/-30)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+6/-72)
hooks/charmhelpers/core/services/helpers.py (+12/-4)
hooks/charmhelpers/core/strutils.py (+0/-42)
hooks/charmhelpers/core/unitdata.py (+0/-477)
hooks/heat_relations.py (+17/-0)
hooks/heat_utils.py (+8/-0)
metadata.yaml (+4/-0)
To merge this branch: bzr merge lp://qastaging/~brad-marshall/charms/trusty/heat/fix-nagios
Reviewer Review Type Date Requested Status
Liam Young (community) Needs Fixing
Review via email: mp+250707@code.qastaging.launchpad.net

Description of the change

Synced charmhelpers, added nagios_servicegroup config option

To post a comment you must log in.
lp://qastaging/~brad-marshall/charms/trusty/heat/fix-nagios updated
34. By Edward Hope-Morley

[trivial] charmhelpers sync

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2222 heat-next for brad-marshall mp250707
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2222/

Reply
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #2011 heat-next for brad-marshall mp250707
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2011/

Reply
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #2168 heat-next for brad-marshall mp250707
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10396836/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2168/

Reply
Revision history for this message
Liam Young (gnuoy) wrote :

I don't see any nagios setup in the hooks so the new config options in config.yaml and relation in metadata.yaml won't do anything

review: Needs Fixing
Reply
lp://qastaging/~brad-marshall/charms/trusty/heat/fix-nagios updated
35. By Brad Marshall

[bradm] Add nagios checks and nrpe-external-master support, sync charmhelpers

Revision history for this message
Brad Marshall (brad-marshall) wrote :

Done, this should be ready for a re-review.

Reply
lp://qastaging/~brad-marshall/charms/trusty/heat/fix-nagios updated
36. By Brad Marshall

[bradm] Add nrpe update to config-changed hook

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2391 heat-next for brad-marshall mp250707
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2391/

Reply
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #2181 heat-next for brad-marshall mp250707
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
  FAILED (errors=2)
  make: *** [unit_test] Error 1

Full unit test output: http://paste.ubuntu.com/10520209/
Build: http://10.245.162.77:8080/job/charm_unit_test/2181/

Reply
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #2311 heat-next for brad-marshall mp250707
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10520229/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2311/

Reply

Unmerged revisions

36. By Brad Marshall

[bradm] Add nrpe update to config-changed hook

35. By Brad Marshall

[bradm] Add nagios checks and nrpe-external-master support, sync charmhelpers

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches