Juju Charms Collection
neutron-api package

Merge lp://staging/~brad-marshall/charms/trusty/neutron-api/add-nrpe-checks into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk

  1. Trusty Tahr (14.04)
  2. add-nrpe-checks
  3. Merge into trunk
Proposed by Brad Marshall
Status: Merged
Merged at revision: 70
Proposed branch: lp://staging/~brad-marshall/charms/trusty/neutron-api/add-nrpe-checks
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk
Diff against target: 558 lines (+456/-0)
7 files modified
charm-helpers-sync.yaml (+1/-0)
config.yaml (+10/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+222/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0)
hooks/neutron_api_hooks.py (+56/-0)
hooks/neutron_api_utils.py (+8/-0)
metadata.yaml (+3/-0)
To merge this branch: bzr merge lp://staging/~brad-marshall/charms/trusty/neutron-api/add-nrpe-checks
Reviewer Review Type Date Requested Status
Liam Young (community) Disapprove
Review via email: mp+241921@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-11-12.

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 : Posted in a previous version of this proposal

UOSCI bot says:
charm_lint_check #998 trusty-neutron-api for brad-marshall mp241490
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
ERROR:root:Make target returned non-zero.
  hooks/neutron_api_hooks.py:377:80: E501 line too long (92 > 79 characters)
  hooks/neutron_api_hooks.py:398:18: E251 unexpected spaces around keyword / parameter equals
  hooks/neutron_api_hooks.py:398:20: E251 unexpected spaces around keyword / parameter equals
  make: *** [lint] Error 1

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

Revision history for this message
Ryan Beisner (1chb1n) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_unit_test #833 trusty-neutron-api for brad-marshall mp241490
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/neutron_api_utils 90 7 92% 215-227
  TOTAL 361 48 87%
  Ran 49 tests in 3.083s
  FAILED (errors=1)
  make: *** [unit_test] Error 1

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

Revision history for this message
Ryan Beisner (1chb1n) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_amulet_test #378 trusty-neutron-api for brad-marshall mp241490
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
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/8955978/
Build: http://10.98.191.181:8080/job/charm_amulet_test/378/

Revision history for this message
Liam Young (gnuoy) wrote : Posted in a previous version of this proposal

Also, could you move the check_upstart_job into charmhelpers as it seems to be common across these mps?

Revision history for this message
Liam Young (gnuoy) wrote : Posted in a previous version of this proposal

Other than putting check_upstart_job into charmhelpers this lgtm

review: Approve
Revision history for this message
Liam Young (gnuoy) wrote : Posted in a previous version of this proposal

Sorry, that was approved in error. I'd like to wait on the check_upstart_job move

review: Needs Fixing
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_lint_check #1089 trusty-neutron-api for brad-marshall mp241490
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value
  I: config.yaml: option nsx-tz-uuid has no default value

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_unit_test #923 trusty-neutron-api for brad-marshall mp241490
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/neutron_api_utils 95 11 88% 177-180, 223-235
  TOTAL 380 65 83%
  Ran 49 tests in 2.920s
  FAILED (errors=1)
  make: *** [unit_test] Error 1

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_amulet_test #431 trusty-neutron-api for brad-marshall mp241490
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
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/9052233/
Build: http://10.98.191.181:8080/job/charm_amulet_test/431/

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

UOSCI bot says:
charm_amulet_test #437 trusty-neutron-api for brad-marshall mp241921
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
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/9052697/
Build: http://10.98.191.181:8080/job/charm_amulet_test/437/

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

UOSCI bot says:
charm_lint_check #1095 trusty-neutron-api for brad-marshall mp241921
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value
  I: config.yaml: option nsx-tz-uuid has no default value

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

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

UOSCI bot says:
charm_unit_test #929 trusty-neutron-api for brad-marshall mp241921
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/neutron_api_utils 95 11 88% 177-180, 223-235
  TOTAL 380 65 83%
  Ran 49 tests in 3.249s
  FAILED (errors=1)
  make: *** [unit_test] Error 1

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

lp://staging/~brad-marshall/charms/trusty/neutron-api/add-nrpe-checks updated
69. 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 #1105 trusty-neutron-api for brad-marshall mp241921
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value
  I: config.yaml: option nsx-tz-uuid has no default value

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

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

UOSCI bot says:
charm_unit_test #939 trusty-neutron-api for brad-marshall mp241921
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/neutron_api_utils 95 11 88% 177-180, 223-235
  TOTAL 380 65 83%
  Ran 49 tests in 3.100s
  FAILED (errors=1)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #447 trusty-neutron-api for brad-marshall mp241921
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
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/9053040/
Build: http://10.98.191.181:8080/job/charm_amulet_test/447/

lp://staging/~brad-marshall/charms/trusty/neutron-api/add-nrpe-checks updated
70. 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 #1121 trusty-neutron-api for brad-marshall mp241921
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value
  I: config.yaml: option nsx-tz-uuid has no default value

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

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

UOSCI bot says:
charm_unit_test #955 trusty-neutron-api for brad-marshall mp241921
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/neutron_api_utils 95 11 88% 177-180, 223-235
  TOTAL 379 64 83%
  Ran 49 tests in 2.918s
  FAILED (errors=1)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #463 trusty-neutron-api for brad-marshall mp241921
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
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/9064051/
Build: http://10.98.191.181:8080/job/charm_amulet_test/463/

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

UOSCI bot says:
charm_lint_check #1245 trusty-neutron-api for brad-marshall mp241921
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value
  I: config.yaml: option nsx-tz-uuid has no default value

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

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

UOSCI bot says:
charm_unit_test #1079 trusty-neutron-api for brad-marshall mp241921
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/neutron_api_utils 95 11 88% 177-180, 223-235
  TOTAL 379 64 83%
  Ran 49 tests in 3.055s
  FAILED (errors=1)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #548 trusty-neutron-api for brad-marshall mp241921
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
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/9281362/
Build: http://10.98.191.181:8080/job/charm_amulet_test/548/

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