Merge lp://staging/~brad-marshall/charms/trusty/mongodb/add-nrpe-checks into lp://staging/charms/trusty/mongodb

Proposed by Brad Marshall
Status: Merged
Merged at revision: 67
Proposed branch: lp://staging/~brad-marshall/charms/trusty/mongodb/add-nrpe-checks
Merge into: lp://staging/charms/trusty/mongodb
Diff against target: 2694 lines (+1553/-357)
33 files modified
charm-helpers-sync.yaml (+1/-0)
config.yaml (+11/-0)
files/nrpe-external-master/check_upstart_job (+72/-0)
hooks/charmhelpers/__init__.py (+16/-0)
hooks/charmhelpers/contrib/__init__.py (+15/-0)
hooks/charmhelpers/contrib/charmsupport/__init__.py (+15/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+358/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+175/-0)
hooks/charmhelpers/contrib/hahelpers/__init__.py (+15/-0)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+0/-248)
hooks/charmhelpers/contrib/python/__init__.py (+15/-0)
hooks/charmhelpers/contrib/python/packages.py (+0/-80)
hooks/charmhelpers/core/__init__.py (+15/-0)
hooks/charmhelpers/core/decorators.py (+16/-0)
hooks/charmhelpers/core/fstab.py (+19/-3)
hooks/charmhelpers/core/hookenv.py (+16/-0)
hooks/charmhelpers/core/host.py (+24/-5)
hooks/charmhelpers/core/services/__init__.py (+16/-0)
hooks/charmhelpers/core/services/base.py (+16/-0)
hooks/charmhelpers/core/services/helpers.py (+16/-0)
hooks/charmhelpers/core/strutils.py (+42/-0)
hooks/charmhelpers/core/sysctl.py (+28/-6)
hooks/charmhelpers/core/templating.py (+19/-3)
hooks/charmhelpers/core/unitdata.py (+477/-0)
hooks/charmhelpers/fetch/__init__.py (+16/-0)
hooks/charmhelpers/fetch/archiveurl.py (+26/-10)
hooks/charmhelpers/fetch/bzrurl.py (+25/-1)
hooks/charmhelpers/fetch/giturl.py (+20/-0)
hooks/charmhelpers/payload/__init__.py (+16/-0)
hooks/charmhelpers/payload/execd.py (+16/-0)
hooks/hooks.py (+33/-0)
metadata.yaml (+3/-0)
tests/03_deploy_replicaset.py (+1/-1)
To merge this branch: bzr merge lp://staging/~brad-marshall/charms/trusty/mongodb/add-nrpe-checks
Reviewer Review Type Date Requested Status
charmers Pending
Adam Israel Pending
Review Queue automated testing Pending
Liam Young Pending
Review via email: mp+253134@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 #999 trusty-mongodb for brad-marshall mp241491
    LINT FAIL: lint-test missing

LINT Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_lint_check
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@flake8']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

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

UOSCI bot says:
charm_unit_test #834 trusty-mongodb for brad-marshall mp241491
    UNIT OK: passed

UNIT Results (max last 5 lines):
INFO:root:command: make -f Makefile unittest
  tests/10-unit.test
  test_success (test_write_log_rotate_config.TestWriteLogrotateConfigFile) ... ok
  Ran 1 test in 0.003s
  OK

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

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

UOSCI bot says:
charm_amulet_test #379 trusty-mongodb for brad-marshall mp241491
    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/8955982/
Build: http://10.98.191.181:8080/job/charm_amulet_test/379/

Revision history for this message
Review Queue (review-queue) wrote : Posted in a previous version of this proposal

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10339-results

review: Needs Fixing (automated testing)
Revision history for this message
Adam Israel (aisrael) wrote : Posted in a previous version of this proposal

Hi Brad,

I had the opportunity to review your merge proposal today. Thanks for all of your work on this so far.

I initially ran into a merge conflict with your branch against trunk, related to charm-helpers-sync.yaml. I resolved those to continue testing.

Of seven unit tests, make lint is failing:

hooks/hooks.py:1123:80: E501 line too long (92 > 79 characters)
hooks/hooks.py:1144:18: E251 unexpected spaces around keyword / parameter equals
hooks/hooks.py:1144:20: E251 unexpected spaces around keyword / parameter equals

Thanks again for your work on this! With those minor fixes, I don't see any other blockers to merging this proposal.

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

charm_unit_test #2065 mongodb for brad-marshall mp241491
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2065/

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

charm_lint_check #2276 mongodb for brad-marshall mp241491
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  unit_tests/test_write_log_rotate_config.py:7:1: E402 module level import not at top of file
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10398703/
Build: http://10.245.162.77:8080/job/charm_lint_check/2276/

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

charm_amulet_test #2181 mongodb for brad-marshall mp241491
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [functional_test] Error 1

Full amulet test output: http://paste.ubuntu.com/10398847/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2181/

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

charm_unit_test #2066 mongodb for brad-marshall mp241491
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
  E: dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to correct the problem.
  make: *** [.venv] Error 100

Full unit test output: http://paste.ubuntu.com/10399876/
Build: http://10.245.162.77:8080/job/charm_unit_test/2066/

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

charm_lint_check #2277 mongodb for brad-marshall mp241491
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
  E: dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to correct the problem.
  make: *** [.venv] Error 100

Full lint test output: http://paste.ubuntu.com/10399877/
Build: http://10.245.162.77:8080/job/charm_lint_check/2277/

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

charm_amulet_test #2182 mongodb for brad-marshall mp241491
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/2182/

Revision history for this message
Brad Marshall (brad-marshall) wrote : Posted in a previous version of this proposal

This should now be ready for a re-review

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

charm_lint_check #2403 mongodb for brad-marshall mp241491
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  unit_tests/test_write_log_rotate_config.py:7:1: E402 module level import not at top of file
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10520959/
Build: http://10.245.162.77:8080/job/charm_lint_check/2403/

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

charm_unit_test #2193 mongodb for brad-marshall mp241491
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2193/

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

charm_amulet_test #2322 mongodb for brad-marshall mp241491
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/2322/

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

charm_lint_check #2701 mongodb for brad-marshall mp253134
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2701/

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

charm_unit_test #2492 mongodb for brad-marshall mp253134
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2492/

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

charm_amulet_test #2541 mongodb for brad-marshall mp253134
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [functional_test] Error 1

Full amulet test output: http://paste.ubuntu.com/10615567/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2541/

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