Charm Helpers

Merge lp://qastaging/~brad-marshall/charm-helpers/add-systemd-nagios-check into lp://qastaging/charm-helpers

add-systemd-nagios-check
Merge into devel

Proposed by Brad Marshall on 2016-05-09

Status:

Needs review

Proposed branch:

lp://qastaging/~brad-marshall/charm-helpers/add-systemd-nagios-check

Merge into:

lp://qastaging/charm-helpers

Diff against target:

36 lines (+19/-0) (has conflicts)

1 file modified

charmhelpers/contrib/charmsupport/nrpe.py (+19/-0)

Text conflict in charmhelpers/contrib/charmsupport/nrpe.py

To merge this branch:

bzr merge lp://qastaging/~brad-marshall/charm-helpers/add-systemd-nagios-check

Undecided

New

Link a bug report

Reviewer	Review Type	Date Requested	Status
Stuart Bishop (community)		2016-05-09	Needs Fixing on 2016-06-20
Review via email: mp+294084@code.qastaging.launchpad.net

Description of the change

Add systemd nagios check support

Revision history for this message

Brad Marshall (brad-marshall) wrote on 2016-05-09:

This needs https://code.launchpad.net/~brad-marshall/charms/precise/nrpe-external-master/add-systemd-nagios-check/+merge/294086 and https://code.launchpad.net/~brad-marshall/charms/trusty/nrpe/add-systemd-nagios-check/+merge/294085 merged to provide the check_systemd.py script.

lp://qastaging/~brad-marshall/charm-helpers/add-systemd-nagios-check updated on 2016-05-10

572. By Brad Marshall on 2016-05-10: [brad-marshall] Handle the services.d and sysvinit script cases

Revision history for this message

Stuart Bishop (stub) wrote on 2016-06-20:

Tests need updating, probably with variations mocked to test the different code paths:

======================================================================
FAIL: tests.contrib.charmsupport.test_nrpe.NRPEMiscTestCase.test_add_init_service_checks
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
File "/home/stub/charms/charm-helpers/trunk/tests/contrib/charmsupport/test_nrpe.py", line 316, in test_add_init_service_checks
self.assertEqual(bill.checks[1].check_cmd, expect_cmds['haproxy'])
MismatchError: !=:
reference = ''
actual = '/usr/lib/nagios/plugins/check_status_file.py -f /var/lib/nagios/service-check-haproxy.txt'

review: Needs Fixing

Revision history for this message

Stuart Bishop (stub) wrote on 2016-06-20:

(otherwise looks good and landable)

lp://qastaging/~brad-marshall/charm-helpers/add-systemd-nagios-check updated on 2016-08-24

573. By Brad Marshall on 2016-08-24: Tweak systemd check, and skip qemu-kvm service as well

Unmerged revisions

573. By Brad Marshall on 2016-08-24: Tweak systemd check, and skip qemu-kvm service as well
572. By Brad Marshall on 2016-05-10: [brad-marshall] Handle the services.d and sysvinit script cases
571. By Brad Marshall on 2016-05-09: [brad-marshall] Add support for systemd checks in add_init_service_checks. LP#1578922