Juju Charms Collection
nova-compute package

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

  1. Trusty Tahr (14.04)
  2. add-nrpe-checks
  3. Merge into trunk
Proposed by Brad Marshall
Status: Merged
Merged at revision: 97
Proposed branch: lp://qastaging/~brad-marshall/charms/trusty/nova-compute/add-nrpe-checks
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/trunk
Diff against target: 547 lines (+447/-3) (has conflicts)
5 files modified
charm-helpers-hooks.yaml (+1/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+222/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0)
hooks/nova_compute_hooks.py (+58/-0)
metadata.yaml (+10/-3)
Text conflict in metadata.yaml
To merge this branch: bzr merge lp://qastaging/~brad-marshall/charms/trusty/nova-compute/add-nrpe-checks
Reviewer Review Type Date Requested Status
Liam Young (community) Disapprove
Review via email: mp+241488@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 #996 trusty-nova-compute for brad-marshall mp241488
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
  hooks/nova_compute_hooks.py:291:18: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_compute_hooks.py:291:20: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_compute_hooks.py:296:18: E251 unexpected spaces around keyword / parameter equals
  hooks/nova_compute_hooks.py:296:20: E251 unexpected spaces around keyword / parameter equals
  make: *** [lint] Error 1

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

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

UOSCI bot says:
charm_unit_test #831 trusty-nova-compute for brad-marshall mp241488
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  nova_compute_utils 228 110 52% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 380-381, 385-386, 405-426, 443-453, 467-468, 473-474
  TOTAL 583 206 65%
  Ran 56 tests in 2.909s
  FAILED (SKIP=5, errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #376 trusty-nova-compute for brad-marshall mp241488
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  WARNING cannot delete security group "juju-osci-sv11". Used by another environment?
  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/8955983/
Build: http://10.98.191.181:8080/job/charm_amulet_test/376/

lp://qastaging/~brad-marshall/charms/trusty/nova-compute/add-nrpe-checks updated
91. By Brad Marshall

[bradm] Added sysvinit daemon monitoring, 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 #1087 trusty-nova-compute for brad-marshall mp241488
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

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

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

UOSCI bot says:
charm_unit_test #921 trusty-nova-compute for brad-marshall mp241488
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  nova_compute_utils 228 110 52% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 380-381, 385-386, 405-426, 443-453, 467-468, 473-474
  TOTAL 596 218 63%
  Ran 56 tests in 3.173s
  FAILED (SKIP=5, errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #429 trusty-nova-compute for brad-marshall mp241488
    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/9052236/
Build: http://10.98.191.181:8080/job/charm_amulet_test/429/

lp://qastaging/~brad-marshall/charms/trusty/nova-compute/add-nrpe-checks updated
92. 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 #1099 trusty-nova-compute for brad-marshall mp241488
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

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

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

UOSCI bot says:
charm_unit_test #933 trusty-nova-compute for brad-marshall mp241488
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  nova_compute_utils 228 110 52% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 380-381, 385-386, 405-426, 443-453, 467-468, 473-474
  TOTAL 596 218 63%
  Ran 56 tests in 3.357s
  FAILED (SKIP=5, errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #441 trusty-nova-compute for brad-marshall mp241488
    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/9053033/
Build: http://10.98.191.181:8080/job/charm_amulet_test/441/

lp://qastaging/~brad-marshall/charms/trusty/nova-compute/add-nrpe-checks updated
93. 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 #1115 trusty-nova-compute for brad-marshall mp241488
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

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

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

UOSCI bot says:
charm_unit_test #949 trusty-nova-compute for brad-marshall mp241488
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  nova_compute_utils 228 110 52% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 380-381, 385-386, 405-426, 443-453, 467-468, 473-474
  TOTAL 595 217 64%
  Ran 56 tests in 3.232s
  FAILED (SKIP=5, errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #457 trusty-nova-compute for brad-marshall mp241488
    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/9063967/
Build: http://10.98.191.181:8080/job/charm_amulet_test/457/

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

UOSCI bot says:
charm_lint_check #1249 trusty-nova-compute for brad-marshall mp241488
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

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

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

UOSCI bot says:
charm_unit_test #1083 trusty-nova-compute for brad-marshall mp241488
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  nova_compute_utils 228 110 52% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 380-381, 385-386, 405-426, 443-453, 467-468, 473-474
  TOTAL 595 217 64%
  Ran 56 tests in 3.575s
  FAILED (SKIP=5, errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #552 trusty-nova-compute for brad-marshall mp241488
    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/9281402/
Build: http://10.98.191.181:8080/job/charm_amulet_test/552/

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