Merge lp:~jillrouleau/charm-helpers/nagios-status-fix-lp1631170 into lp:charm-helpers

Proposed by Jill Rouleau
Status: Merged
Merge reported by: Stuart Bishop
Merged at revision: not available
Proposed branch: lp:~jillrouleau/charm-helpers/nagios-status-fix-lp1631170
Merge into: lp:charm-helpers
Diff against target: 12 lines (+1/-1)
1 file modified
charmhelpers/contrib/charmsupport/nrpe.py (+1/-1)
To merge this branch: bzr merge lp:~jillrouleau/charm-helpers/nagios-status-fix-lp1631170
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+321345@code.launchpad.net

Description of the change

Testing with percona-cluster, this option gives the expected/desired behaviour on both trusty and xenial.

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
2--- charmhelpers/contrib/charmsupport/nrpe.py 2017-03-08 12:43:42 +0000
3+++ charmhelpers/contrib/charmsupport/nrpe.py 2017-03-29 18:18:43 +0000
4@@ -373,7 +373,7 @@
5 checkpath = '%s/service-check-%s.txt' % (nrpe.homedir, svc)
6 croncmd = (
7 '/usr/local/lib/nagios/plugins/check_exit_status.pl '
8- '-s /etc/init.d/%s status' % svc
9+ '-e -s /etc/init.d/%s status' % svc
10 )
11 cron_file = '*/5 * * * * root %s > %s\n' % (croncmd, checkpath)
12 f = open(cronpath, 'w')

Subscribers

People subscribed via source and target branches