Juju Charms Collection
ceilometer package

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

  1. Trusty Tahr (14.04)
  2. add-nrpe-checks
  3. Merge into trunk
Proposed by Brad Marshall
Status: Merged
Merged at revision: 64
Proposed branch: lp://qastaging/~brad-marshall/charms/trusty/ceilometer/add-nrpe-checks
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceilometer/trunk
Diff against target: 596 lines (+466/-1)
7 files modified
charm-helpers.yaml (+1/-0)
config.yaml (+10/-1)
hooks/ceilometer_hooks.py (+55/-0)
hooks/ceilometer_utils.py (+19/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+222/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0)
metadata.yaml (+3/-0)
To merge this branch: bzr merge lp://qastaging/~brad-marshall/charms/trusty/ceilometer/add-nrpe-checks
Reviewer Review Type Date Requested Status
Liam Young (community) Disapprove
Review via email: mp+241917@code.qastaging.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 #992 trusty-ceilometer for brad-marshall mp241498
    LINT FAIL: lint-test failed

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

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

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

UOSCI bot says:
charm_unit_test #827 trusty-ceilometer for brad-marshall mp241498
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/ceilometer_utils 58 1 98% 100
  TOTAL 180 24 87%
  Ran 25 tests in 0.729s
  FAILED (errors=3)
  make: *** [test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #372 trusty-ceilometer for brad-marshall mp241498
    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/8955875/
Build: http://10.98.191.181:8080/job/charm_amulet_test/372/

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

Thank you for the mp, the nagios checks are sorely needed. It looks fine, there just a few things it would be good to get fixed up.

The list of services that comprise a ceilometer deployment are already compiled as part of the service context in ceilometer_utils.py. This includes logic to adjust the list depending on what Openstack release is being deployed. I think this mechanism should be used rather than defining a new list directly in update_nrpe_config()

That being said, it looks like the existing charm has a list of new icehouse packages which are being added to the package list in ceilometer_utils.py but the corresponding services are not being added to the CONFIG_FILES OrderedDict. This means that the ceilometer-alarm* and ceilometer-agent-notification services are not going to be restarted on changes to ceilometer.conf

So, what I think is needed is:
1) Steal the services() method from nova-cloud-controller and use that to get a list of services in update_nrpe_config()
2) Define a list of ICEHOUSE_SERVICES (probably exactly the same as ICEHOUSE_PACKAGES) and conditionally add (depending on ostack release) to the CEILOMETER_CONF service in register_configs():
    if (get_os_codename_install_source(config('openstack-origin'))
            >= 'icehouse'):
        CONFIG_FILES[CEILOMETER_CONF]['services'] = CONFIG_FILES[CEILOMETER_CONF]['services'] + ICEHOUSE_SERVICES

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

Also, could you move the check_upstart_job into charmhelpers as it seems to be common across these mps?

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 #917 trusty-ceilometer for brad-marshall mp241498
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/ceilometer_utils 66 6 91% 101, 111, 136-139
  TOTAL 200 41 80%
  Ran 25 tests in 0.747s
  FAILED (errors=3)
  make: *** [test] Error 1

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

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 #425 trusty-ceilometer for brad-marshall mp241498
    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/9051426/
Build: http://10.98.191.181:8080/job/charm_amulet_test/425/

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 #1083 trusty-ceilometer for brad-marshall mp241498
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-admin-network has no default value
  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-public-network has no default value

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

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

UOSCI bot says:
charm_amulet_test #434 trusty-ceilometer for brad-marshall mp241917
    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/9052684/
Build: http://10.98.191.181:8080/job/charm_amulet_test/434/

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

UOSCI bot says:
charm_unit_test #926 trusty-ceilometer for brad-marshall mp241917
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/ceilometer_utils 66 6 91% 101, 111, 136-139
  TOTAL 200 41 80%
  Ran 25 tests in 0.836s
  FAILED (errors=3)
  make: *** [test] Error 1

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

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

UOSCI bot says:
charm_lint_check #1092 trusty-ceilometer for brad-marshall mp241917
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-admin-network has no default value
  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-public-network has no default value

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

lp://qastaging/~brad-marshall/charms/trusty/ceilometer/add-nrpe-checks updated
63. 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 #1103 trusty-ceilometer for brad-marshall mp241917
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-admin-network has no default value
  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-public-network has no default value

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

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

UOSCI bot says:
charm_unit_test #937 trusty-ceilometer for brad-marshall mp241917
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/ceilometer_utils 66 6 91% 101, 111, 136-139
  TOTAL 200 41 80%
  Ran 25 tests in 0.751s
  FAILED (errors=3)
  make: *** [test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #445 trusty-ceilometer for brad-marshall mp241917
    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/9053034/
Build: http://10.98.191.181:8080/job/charm_amulet_test/445/

lp://qastaging/~brad-marshall/charms/trusty/ceilometer/add-nrpe-checks updated
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_amulet_test #453 trusty-ceilometer for brad-marshall mp241917
    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/9063500/
Build: http://10.98.191.181:8080/job/charm_amulet_test/453/

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

UOSCI bot says:
charm_lint_check #1111 trusty-ceilometer for brad-marshall mp241917
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-admin-network has no default value
  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-public-network has no default value

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

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

UOSCI bot says:
charm_unit_test #945 trusty-ceilometer for brad-marshall mp241917
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/ceilometer_utils 66 6 91% 101, 111, 136-139
  TOTAL 199 40 80%
  Ran 25 tests in 0.731s
  FAILED (errors=3)
  make: *** [test] Error 1

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

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

UOSCI bot says:
charm_lint_check #1254 trusty-ceilometer for brad-marshall mp241917
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-admin-network has no default value
  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-public-network has no default value

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

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

UOSCI bot says:
charm_unit_test #1088 trusty-ceilometer for brad-marshall mp241917
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/ceilometer_utils 66 6 91% 101, 111, 136-139
  TOTAL 199 40 80%
  Ran 25 tests in 0.833s
  FAILED (errors=3)
  make: *** [test] Error 1

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

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

UOSCI bot says:
charm_amulet_test #557 trusty-ceilometer for brad-marshall mp241917
    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/9281434/
Build: http://10.98.191.181:8080/job/charm_amulet_test/557/

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