Mojo: Continuous Delivery for Juju

Merge lp:~mthaddon/mojo/fonts-match-nrpe into lp:~sajoupa/mojo/fonts-mojo-spec

  1. fonts-match-nrpe
  2. Merge into fonts-mojo-spec
Proposed by Tom Haddon
Status: Merged
Merged at revision: 15
Proposed branch: lp:~mthaddon/mojo/fonts-match-nrpe
Merge into: lp:~sajoupa/mojo/fonts-mojo-spec
Diff against target: 12 lines (+1/-1)
1 file modified
mojo-spec-helpers/tests/verify-nrpe (+1/-1)
To merge this branch: bzr merge lp:~mthaddon/mojo/fonts-match-nrpe
Reviewer Review Type Date Requested Status
Laurent Sesquès Pending
Review via email: mp+279242@code.launchpad.net

Description of the change

Match a wider range of service names for nagios checks so they are actually run

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mojo-spec-helpers/tests/verify-nrpe'
2--- mojo-spec-helpers/tests/verify-nrpe 2015-09-03 06:32:08 +0000
3+++ mojo-spec-helpers/tests/verify-nrpe 2015-12-02 08:53:19 +0000
4@@ -10,7 +10,7 @@
5 echo MOJO_NAGIOS_FAIL /"|sudo -u nagios -s bash' 2>/dev/null
6 }
7
8-NRPE_UNITS=$(juju status | sed -rn 's/^ *(nrpe\/[0-9]*):$/\1/p')
9+NRPE_UNITS=$(juju status | sed -rn 's/^ *([-a-z0-9]*nrpe[-a-z0-9]*\/[0-9]+):$/\1/p')
10 NAGIOS_OUTPUT=$(
11 for unit in $NRPE_UNITS; do
12 check $unit | sed --e "s#^#$unit: #"

Subscribers

People subscribed via source and target branches

to all changes: