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

Proposed by Brad Marshall
Status: Merged
Merged at revision: 67
Proposed branch: lp://staging/~brad-marshall/charms/trusty/cinder/add-nrpe-checks
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/cinder/trunk
Diff against target: 537 lines (+448/-0)
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/cinder_hooks.py (+55/-0)
metadata.yaml (+3/-0)
To merge this branch: bzr merge lp://staging/~brad-marshall/charms/trusty/cinder/add-nrpe-checks
Reviewer Review Type Date Requested Status
Liam Young (community) Disapprove
Review via email: mp+241495@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 #990 trusty-cinder for brad-marshall mp241495
    LINT FAIL: lint-test failed

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

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

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

UOSCI bot says:
charm_unit_test #825 trusty-cinder for brad-marshall mp241495
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/cinder_utils 173 14 92% 191, 410-415, 452-464
  TOTAL 439 39 91%
  Ran 86 tests in 6.013s
  FAILED (errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #370 trusty-cinder for brad-marshall mp241495
    AMULET FAIL: amulet-test failed

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

62. By Brad Marshall

[brad] Fixes from pep8 run, change to using services() function for services to monitor, add sysvinit style daemon monitoring

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

UOSCI bot says:
charm_lint_check #1082 trusty-cinder for brad-marshall mp241495
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags 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

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

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

UOSCI bot says:
charm_unit_test #916 trusty-cinder for brad-marshall mp241495
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/cinder_utils 173 14 92% 191, 410-415, 452-464
  TOTAL 450 51 89%
  Ran 86 tests in 6.211s
  FAILED (errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #424 trusty-cinder for brad-marshall mp241495
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Tearing down osci-sv05 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
  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/9051446/
Build: http://10.98.191.181:8080/job/charm_amulet_test/424/

63. By Brad Marshall

[bradm] Add missing nrpe files

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

UOSCI bot says:
charm_lint_check #1102 trusty-cinder for brad-marshall mp241495
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags 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

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

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

UOSCI bot says:
charm_unit_test #936 trusty-cinder for brad-marshall mp241495
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/cinder_utils 173 14 92% 191, 410-415, 452-464
  TOTAL 450 51 89%
  Ran 86 tests in 6.226s
  FAILED (errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #444 trusty-cinder for brad-marshall mp241495
    AMULET FAIL: amulet-test failed

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

64. 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 #1118 trusty-cinder for brad-marshall mp241495
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags 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

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

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

UOSCI bot says:
charm_unit_test #952 trusty-cinder for brad-marshall mp241495
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/cinder_utils 173 14 92% 191, 410-415, 452-464
  TOTAL 449 50 89%
  Ran 86 tests in 5.809s
  FAILED (errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #460 trusty-cinder for brad-marshall mp241495
    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/9064054/
Build: http://10.98.191.181:8080/job/charm_amulet_test/460/

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

UOSCI bot says:
charm_lint_check #1252 trusty-cinder for brad-marshall mp241495
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags 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

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

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

UOSCI bot says:
charm_unit_test #1086 trusty-cinder for brad-marshall mp241495
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/cinder_utils 173 14 92% 191, 410-415, 452-464
  TOTAL 449 50 89%
  Ran 86 tests in 7.340s
  FAILED (errors=5)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #555 trusty-cinder for brad-marshall mp241495
    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/9281433/
Build: http://10.98.191.181:8080/job/charm_amulet_test/555/

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