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

Proposed by Brad Marshall
Status: Merged
Merged at revision: 48
Proposed branch: lp://qastaging/~brad-marshall/charms/trusty/openstack-dashboard/add-nrpe-checks
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/trunk
Diff against target: 575 lines (+468/-0)
7 files modified
charm-helpers.yaml (+1/-0)
config.yaml (+15/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+222/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0)
hooks/horizon_hooks.py (+63/-0)
hooks/horizon_utils.py (+8/-0)
metadata.yaml (+3/-0)
To merge this branch: bzr merge lp://qastaging/~brad-marshall/charms/trusty/openstack-dashboard/add-nrpe-checks
Reviewer Review Type Date Requested Status
Liam Young (community) Disapprove
Review via email: mp+241487@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 #995 trusty-openstack-dashboard for brad-marshall mp241487
    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/horizon_hooks.py:196:80: E501 line too long (92 > 79 characters)
  hooks/horizon_hooks.py:223:1: E302 expected 2 blank lines, found 1
  make: *** [lint] Error 1

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

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

UOSCI bot says:
charm_unit_test #830 trusty-openstack-dashboard for brad-marshall mp241487
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/horizon_utils 73 8 89% 135, 190-202
  TOTAL 241 34 86%
  Ran 39 tests in 1.637s
  FAILED (errors=3)
  make: *** [test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #375 trusty-openstack-dashboard for brad-marshall mp241487
    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/8955884/
Build: http://10.98.191.181:8080/job/charm_amulet_test/375/

47. By Brad Marshall

[bradm] Add 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_amulet_test #428 trusty-openstack-dashboard for brad-marshall mp241487
    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/9052129/
Build: http://10.98.191.181:8080/job/charm_amulet_test/428/

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

UOSCI bot says:
charm_lint_check #1086 trusty-openstack-dashboard for brad-marshall mp241487
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option profile has no default value
  I: config.yaml: option ssl_key has no default value
  I: config.yaml: option vip has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option secret has no default value

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

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

UOSCI bot says:
charm_unit_test #920 trusty-openstack-dashboard for brad-marshall mp241487
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/horizon_utils 78 12 85% 135, 160-163, 198-210
  TOTAL 261 52 80%
  Ran 39 tests in 1.768s
  FAILED (errors=3)
  make: *** [test] Error 1

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

48. 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 #1098 trusty-openstack-dashboard for brad-marshall mp241487
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option profile has no default value
  I: config.yaml: option ssl_key has no default value
  I: config.yaml: option vip has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option secret has no default value

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

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

UOSCI bot says:
charm_amulet_test #440 trusty-openstack-dashboard for brad-marshall mp241487
    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/9052974/
Build: http://10.98.191.181:8080/job/charm_amulet_test/440/

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

UOSCI bot says:
charm_unit_test #932 trusty-openstack-dashboard for brad-marshall mp241487
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/horizon_utils 78 12 85% 135, 160-163, 198-210
  TOTAL 261 52 80%
  Ran 39 tests in 1.783s
  FAILED (errors=3)
  make: *** [test] Error 1

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

49. 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_amulet_test #456 trusty-openstack-dashboard for brad-marshall mp241487
    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/9063867/
Build: http://10.98.191.181:8080/job/charm_amulet_test/456/

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

UOSCI bot says:
charm_lint_check #1114 trusty-openstack-dashboard for brad-marshall mp241487
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option profile has no default value
  I: config.yaml: option ssl_key has no default value
  I: config.yaml: option vip has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option secret has no default value

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

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

UOSCI bot says:
charm_unit_test #948 trusty-openstack-dashboard for brad-marshall mp241487
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/horizon_utils 78 12 85% 135, 160-163, 198-210
  TOTAL 260 51 80%
  Ran 39 tests in 1.647s
  FAILED (errors=3)
  make: *** [test] Error 1

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

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

UOSCI bot says:
charm_lint_check #1248 trusty-openstack-dashboard for brad-marshall mp241487
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option profile has no default value
  I: config.yaml: option ssl_key has no default value
  I: config.yaml: option vip has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option secret has no default value

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

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

UOSCI bot says:
charm_unit_test #1082 trusty-openstack-dashboard for brad-marshall mp241487
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/horizon_utils 78 12 85% 135, 160-163, 198-210
  TOTAL 260 51 80%
  Ran 39 tests in 2.030s
  FAILED (errors=3)
  make: *** [test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #551 trusty-openstack-dashboard for brad-marshall mp241487
    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/9281369/
Build: http://10.98.191.181:8080/job/charm_amulet_test/551/

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