Juju Charms Collection
nova-cloud-controller package

Merge lp://staging/~brad-marshall/charms/trusty/nova-cloud-controller/add-nrpe-checks into lp://staging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk

  1. Trusty Tahr (14.04)
  2. add-nrpe-checks
  3. Merge into trunk
Proposed by Brad Marshall
Status: Merged
Merged at revision: 134
Proposed branch: lp://staging/~brad-marshall/charms/trusty/nova-cloud-controller/add-nrpe-checks
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk
Diff against target: 537 lines (+447/-2)
6 files modified
charm-helpers-hooks.yaml (+1/-0)
config.yaml (+11/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+222/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0)
hooks/nova_cc_hooks.py (+54/-2)
metadata.yaml (+3/-0)
To merge this branch: bzr merge lp://staging/~brad-marshall/charms/trusty/nova-cloud-controller/add-nrpe-checks
Reviewer Review Type Date Requested Status
Liam Young (community) Disapprove
Review via email: mp+241489@code.staging.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 #997 trusty-nova-cloud-controller for brad-marshall mp241489
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
  hooks/nova_cc_hooks.py:857:80: E501 line too long (92 > 79 characters)
  hooks/nova_cc_hooks.py:887:22: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_cc_hooks.py:887:24: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_cc_hooks.py:892:1: E302 expected 2 blank lines, found 1
  make: *** [lint] Error 1

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

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

UOSCI bot says:
charm_unit_test #832 trusty-nova-cloud-controller for brad-marshall mp241489
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  TOTAL 1061 380 64%
  Ran 96 tests in 10.348s
  FAILED (errors=2)
  mERROR:root:Make target returned non-zero.
ake: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #377 trusty-nova-cloud-controller for brad-marshall mp241489
    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/8955994/
Build: http://10.98.191.181:8080/job/charm_amulet_test/377/

lp://staging/~brad-marshall/charms/trusty/nova-cloud-controller/add-nrpe-checks updated
129. By Brad Marshall

[bradm] Add monitoring for sysvinit daemons, use services() instead of hard coded daemon list, pep8 fixes

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

UOSCI bot says:
charm_lint_check #1088 trusty-nova-cloud-controller for brad-marshall mp241489
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
  hooks/nova_cc_hooks.py:896:26: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_cc_hooks.py:896:28: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_cc_hooks.py:896:80: E501 line too long (101 > 79 characters)
  hooks/nova_cc_hooks.py:901:1: E302 expected 2 blank lines, found 1
  make: *** [lint] Error 1

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

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

UOSCI bot says:
charm_unit_test #922 trusty-nova-cloud-controller for brad-marshall mp241489
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  TOTAL 1072 392 63%
  Ran 96 tests in 9.000s
  FAILED (errors=2)
  maERROR:root:Make target returned non-zero.
ke: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #430 trusty-nova-cloud-controller for brad-marshall mp241489
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv11"
  WARNING cannot delete security group "juju-osci-sv11-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/9052240/
Build: http://10.98.191.181:8080/job/charm_amulet_test/430/

lp://staging/~brad-marshall/charms/trusty/nova-cloud-controller/add-nrpe-checks updated
130. By Brad Marshall

[bradm] Removed puppet header from nagios_plugin module

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

UOSCI bot says:
charm_lint_check #1100 trusty-nova-cloud-controller for brad-marshall mp241489
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
  hooks/nova_cc_hooks.py:896:26: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_cc_hooks.py:896:28: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_cc_hooks.py:896:80: E501 line too long (101 > 79 characters)
  hooks/nova_cc_hooks.py:901:1: E302 expected 2 blank lines, found 1
  make: *** [lint] Error 1

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

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

UOSCI bot says:
charm_unit_test #934 trusty-nova-cloud-controller for brad-marshall mp241489
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  TOTAL 1072 392 63%
  Ran 96 tests in 10.146s
  FAILED (errors=2)
  mERROR:root:Make target returned non-zero.
ake: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #442 trusty-nova-cloud-controller for brad-marshall mp241489
    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/9053036/
Build: http://10.98.191.181:8080/job/charm_amulet_test/442/

lp://staging/~brad-marshall/charms/trusty/nova-cloud-controller/add-nrpe-checks updated
131. By Brad Marshall

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

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

UOSCI bot says:
charm_lint_check #1116 trusty-nova-cloud-controller for brad-marshall mp241489
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
INFO:root:command: make -f Makefile lint
ERROR:root:Make target returned non-zero.
  hooks/nova_cc_hooks.py:857:1: E302 expected 2 blank lines, found 1
  hooks/nova_cc_hooks.py:904:1: E302 expected 2 blank lines, found 1
  make: *** [lint] Error 1

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

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

UOSCI bot says:
charm_unit_test #950 trusty-nova-cloud-controller for brad-marshall mp241489
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  TOTAL 1071 391 63%
  Ran 96 tests in 9.558s
  FAILED (errors=2)
  maERROR:root:Make target returned non-zero.
ke: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #458 trusty-nova-cloud-controller for brad-marshall mp241489
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv02"
  WARNING cannot delete security group "juju-osci-sv02-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/9063966/
Build: http://10.98.191.181:8080/job/charm_amulet_test/458/

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

UOSCI bot says:
charm_lint_check #1250 trusty-nova-cloud-controller for brad-marshall mp241489
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
INFO:root:command: make -f Makefile lint
ERROR:root:Make target returned non-zero.
  hooks/nova_cc_hooks.py:857:1: E302 expected 2 blank lines, found 1
  hooks/nova_cc_hooks.py:904:1: E302 expected 2 blank lines, found 1
  make: *** [lint] Error 1

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

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

UOSCI bot says:
charm_unit_test #1084 trusty-nova-cloud-controller for brad-marshall mp241489
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  TOTAL 1071 391 63%
  Ran 96 tests in 10.716s
  FAILED (errors=2)
  mERROR:root:Make target returned non-zero.
ake: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #553 trusty-nova-cloud-controller for brad-marshall mp241489
    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/9281416/
Build: http://10.98.191.181:8080/job/charm_amulet_test/553/

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