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

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

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

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

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

UOSCI bot says:
charm_unit_test #824 trusty-glance for brad-marshall mp241494
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/glance_utils 91 8 91% 156, 249-261
  TOTAL 369 39 89%
  Ran 65 tests in 3.551s
  FAILED (errors=3)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #369 trusty-glance for brad-marshall mp241494
    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/8955868/
Build: http://10.98.191.181:8080/job/charm_amulet_test/369/

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

Thanks again for adding the nagios checks.

Please could check_upstart_job go into charm helpers. Also it'd be nice (but I wouldn't block on it) if glance_utils.services was used to get a list of services to add to the nagios check

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 #1081 trusty-glance for brad-marshall mp241494
    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
  OK

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

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 #915 trusty-glance for brad-marshall mp241494
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/glance_utils 91 8 91% 156, 249-261
  TOTAL 382 51 87%
  Ran 65 tests in 3.421s
  FAILED (errors=3)
  make: *** [unit_test] Error 1

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

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 #423 trusty-glance for brad-marshall mp241494
    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/9051445/
Build: http://10.98.191.181:8080/job/charm_amulet_test/423/

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

UOSCI bot says:
charm_lint_check #1093 trusty-glance for brad-marshall mp241918
    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
  OK

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

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

UOSCI bot says:
charm_unit_test #927 trusty-glance for brad-marshall mp241918
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/glance_utils 91 8 91% 156, 249-261
  TOTAL 382 51 87%
  Ran 65 tests in 3.986s
  FAILED (errors=3)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #435 trusty-glance for brad-marshall mp241918
    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/9052736/
Build: http://10.98.191.181:8080/job/charm_amulet_test/435/

85. 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 #1104 trusty-glance for brad-marshall mp241918
    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
  OK

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

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

UOSCI bot says:
charm_unit_test #938 trusty-glance for brad-marshall mp241918
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/glance_utils 91 8 91% 156, 249-261
  TOTAL 382 51 87%
  Ran 65 tests in 3.857s
  FAILED (errors=3)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #446 trusty-glance for brad-marshall mp241918
    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/9053070/
Build: http://10.98.191.181:8080/job/charm_amulet_test/446/

86. 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 #1119 trusty-glance for brad-marshall mp241918
    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
  OK

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

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

UOSCI bot says:
charm_unit_test #953 trusty-glance for brad-marshall mp241918
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/glance_utils 91 8 91% 156, 249-261
  TOTAL 381 50 87%
  Ran 65 tests in 3.830s
  FAILED (errors=3)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #461 trusty-glance for brad-marshall mp241918
    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/9064040/
Build: http://10.98.191.181:8080/job/charm_amulet_test/461/

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

UOSCI bot says:
charm_lint_check #1243 trusty-glance for brad-marshall mp241918
    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
  OK

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

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

UOSCI bot says:
charm_unit_test #1077 trusty-glance for brad-marshall mp241918
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/glance_utils 91 8 91% 156, 249-261
  TOTAL 381 50 87%
  Ran 65 tests in 3.570s
  FAILED (errors=3)
  make: *** [unit_test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #546 trusty-glance for brad-marshall mp241918
    AMULET FAIL: amulet-test failed

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

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