Merge lp://qastaging/~brad-marshall/charms/trusty/ceph/add-nrpe-checks into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/trunk

Proposed by Brad Marshall
Status: Merged
Merged at revision: 93
Proposed branch: lp://qastaging/~brad-marshall/charms/trusty/ceph/add-nrpe-checks
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/trunk
Diff against target: 608 lines (+510/-1)
8 files modified
charm-helpers-hooks.yaml (+1/-0)
config.yaml (+11/-0)
files/nagios/check_ceph_status.py (+44/-0)
files/nagios/collect_ceph_status.sh (+18/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+219/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0)
hooks/hooks.py (+54/-1)
metadata.yaml (+7/-0)
To merge this branch: bzr merge lp://qastaging/~brad-marshall/charms/trusty/ceph/add-nrpe-checks
Reviewer Review Type Date Requested Status
Liam Young (community) Disapprove
Review via email: mp+241497@code.qastaging.launchpad.net

Description of the change

Adds nrpe-external-master interface and adds basic nrpe checks.

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

UOSCI bot says:
charm_lint_check #991 trusty-ceph for brad-marshall mp241497
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option key has no default value
  I: config.yaml: option fsid has no default value
  I: config.yaml: option osd-journal has no default value
  I: config.yaml: option osd-reformat has no default value
  I: config.yaml: option source has no default value

Full lint test output: http://paste.ubuntu.com/8955749/
Build: http://10.98.191.181:8080/job/charm_lint_check/991/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

UOSCI bot says:
charm_unit_test #826 trusty-ceph for brad-marshall mp241497
    UNIT FAIL: unit-test missing

UNIT Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_unit_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['nosetest', 'unit.test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/8955752/
Build: http://10.98.191.181:8080/job/charm_unit_test/826/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

UOSCI bot says:
charm_amulet_test #371 trusty-ceph for brad-marshall mp241497
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/8955967/
Build: http://10.98.191.181:8080/job/charm_amulet_test/371/

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

UOSCI bot says:
charm_lint_check #1253 trusty-ceph for brad-marshall mp241497
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option key has no default value
  I: config.yaml: option fsid has no default value
  I: config.yaml: option osd-journal has no default value
  I: config.yaml: option osd-reformat has no default value
  I: config.yaml: option source has no default value

Full lint test output: http://paste.ubuntu.com/9281318/
Build: http://10.98.191.181:8080/job/charm_lint_check/1253/

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

UOSCI bot says:
charm_unit_test #1087 trusty-ceph for brad-marshall mp241497
    UNIT FAIL: unit-test missing

UNIT Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_unit_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['nosetest', 'unit.test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/9281320/
Build: http://10.98.191.181:8080/job/charm_unit_test/1087/

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

UOSCI bot says:
charm_amulet_test #556 trusty-ceph for brad-marshall mp241497
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv04"
  WARNING cannot delete security group "juju-osci-sv04-0". Used by another environment?
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/9281441/
Build: http://10.98.191.181:8080/job/charm_amulet_test/556/

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

Thank for the mp. The new nrpe support is very gratefully received !

I've taken this branch and centralised the common code between this and the other nrpe branches and moved it to charm-helpers. To land it I created a new branch from this one which has now been merged into the 'next' charm. The 'next' charms will overwrite the stable ones in a couple of weeks.

review: Disapprove

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