Juju Charms Collection
heat package

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

  1. Trusty Tahr (14.04)
  2. add-nrpe-checks
  3. Merge into trunk
Proposed by Brad Marshall
Status: Merged
Merged at revision: 28
Proposed branch: lp://staging/~brad-marshall/charms/trusty/heat/add-nrpe-checks
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/heat/trunk
Diff against target: 558 lines (+459/-2)
7 files modified
charm-helpers.yaml (+1/-0)
config.yaml (+10/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+222/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0)
hooks/heat_relations.py (+58/-2)
hooks/heat_utils.py (+8/-0)
metadata.yaml (+4/-0)
To merge this branch: bzr merge lp://staging/~brad-marshall/charms/trusty/heat/add-nrpe-checks
Reviewer Review Type Date Requested Status
Liam Young Pending
Review via email: mp+241920@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_amulet_test #368 trusty-heat for brad-marshall mp241493
    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/8955708/
Build: http://10.98.191.181:8080/job/charm_amulet_test/368/

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

UOSCI bot says:
charm_lint_check #988 trusty-heat for brad-marshall mp241493
    LINT FAIL: lint-test failed

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

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

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

UOSCI bot says:
charm_unit_test #823 trusty-heat for brad-marshall mp241493
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  heat_utils 46 6 87% 70-78
  TOTAL 170 42 75%
  Ran 21 tests in 0.504s
  FAILED (errors=2)
  make: *** [test] Error 1

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

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

Thanks again for the sorely needed nagios checks. Just a few comments...

Please steal the services() method from nova-cloud-controller and add it to hooks/heat_utils.py and use that to get a list services rather than defining a new list in update_nagios().

Please can the check_upstart_job go into charmhelpers

There appears to be some lint errors:
Running flake8 tests: hooks/heat_relations.py:163:80: E501 line too long (92 > 79 characters)
hooks/heat_relations.py:190:22: E251 unexpected spaces around keyword / parameter equals
hooks/heat_relations.py:190:24: E251 unexpected spaces around keyword / parameter equals
Makefile:5: recipe for target 'lint' failed
make: *** [lint] Error 1

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 #1091 trusty-heat for brad-marshall mp241493
    LINT OK: passed

LINT Results (max last 5 lines):
INFO:root:Searching for: ['@flake8']
INFO:root:command: make -f Makefile lint
  Running flake8 tests: OK
  Running charm proof: W: metadata name (heat) must match directory name (trusty-heat) exactly for local deployment.
  OK

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

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 #925 trusty-heat for brad-marshall mp241493
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  heat_utils 51 10 80% 70-78, 141-144
  TOTAL 177 49 72%
  Ran 21 tests in 0.492s
  FAILED (errors=2)
  make: *** [test] Error 1

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

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 #433 trusty-heat for brad-marshall mp241493
    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/9052239/
Build: http://10.98.191.181:8080/job/charm_amulet_test/433/

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

UOSCI bot says:
charm_amulet_test #436 trusty-heat for brad-marshall mp241920
    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/9052691/
Build: http://10.98.191.181:8080/job/charm_amulet_test/436/

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

UOSCI bot says:
charm_lint_check #1094 trusty-heat for brad-marshall mp241920
    LINT OK: passed

LINT Results (max last 5 lines):
INFO:root:Searching for: ['@flake8']
INFO:root:command: make -f Makefile lint
  Running flake8 tests: OK
  Running charm proof: W: metadata name (heat) must match directory name (trusty-heat) exactly for local deployment.
  OK

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

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

UOSCI bot says:
charm_unit_test #928 trusty-heat for brad-marshall mp241920
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  heat_utils 51 10 80% 70-78, 141-144
  TOTAL 177 49 72%
  Ran 21 tests in 0.524s
  FAILED (errors=2)
  make: *** [test] Error 1

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

lp://staging/~brad-marshall/charms/trusty/heat/add-nrpe-checks updated
33. By Brad Marshall

[bradm] Removed nagios check files as they're now in n-e-m charm, added support for sysvinit daemon monitoring.

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

UOSCI bot says:
charm_lint_check #1120 trusty-heat for brad-marshall mp241920
    LINT OK: passed

LINT Results (max last 5 lines):
INFO:root:Searching for: ['@flake8']
INFO:root:command: make -f Makefile lint
  Running flake8 tests: OK
  Running charm proof: W: metadata name (heat) must match directory name (trusty-heat) exactly for local deployment.
  OK

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

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

UOSCI bot says:
charm_unit_test #954 trusty-heat for brad-marshall mp241920
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  heat_utils 51 10 80% 70-78, 141-144
  TOTAL 185 57 69%
  Ran 21 tests in 0.472s
  FAILED (errors=2)
  make: *** [test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #462 trusty-heat for brad-marshall mp241920
    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/9064037/
Build: http://10.98.191.181:8080/job/charm_amulet_test/462/

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

UOSCI bot says:
charm_lint_check #1244 trusty-heat for brad-marshall mp241920
    LINT OK: passed

LINT Results (max last 5 lines):
INFO:root:command: make -f Makefile lint
  Running flake8 tests: OK
  Running charm proof: W: metadata name (heat) must match directory name (trusty-heat) exactly for local deployment.
  I: Categories are being deprecated in favor of tags. Please rename the "categories" field to "tags".
  OK

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

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

UOSCI bot says:
charm_unit_test #1078 trusty-heat for brad-marshall mp241920
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  heat_utils 51 10 80% 70-78, 141-144
  TOTAL 185 57 69%
  Ran 21 tests in 0.434s
  FAILED (errors=2)
  make: *** [test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #547 trusty-heat for brad-marshall mp241920
    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/9281355/
Build: http://10.98.191.181:8080/job/charm_amulet_test/547/

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