Merge ~xavpaice/charm-nrpe:LP1971156 into charm-nrpe:master

Proposed by Xav Paice
Status: Merged
Approved by: Alvaro Uria
Approved revision: 4d79db406764fbe7a77747ddadda50b3048c2466
Merged at revision: abcd0a1b302bce9463b57aa192e4f8765d103659
Proposed branch: ~xavpaice/charm-nrpe:LP1971156
Merge into: charm-nrpe:master
Diff against target: 15 lines (+2/-2)
1 file modified
actions/run-nrpe-check (+2/-2)
Reviewer Review Type Date Requested Status
Alvaro Uria (community) Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
Review via email: mp+421129@code.launchpad.net

Commit message

update run-nrpe-check action for quoted args

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alvaro Uria (aluria) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision abcd0a1b302bce9463b57aa192e4f8765d103659

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/actions/run-nrpe-check b/actions/run-nrpe-check
index 3113b4a..a953852 100755
--- a/actions/run-nrpe-check
+++ b/actions/run-nrpe-check
@@ -7,9 +7,9 @@ checkfile="$nrpedir/${check}.cfg"
77
8if [ -f $checkfile ]; then8if [ -f $checkfile ]; then
9 command=$(awk -F "=" '{ print $2 }' $checkfile)9 command=$(awk -F "=" '{ print $2 }' $checkfile)
10 output=$(sudo -u nagios $command)10 output=$(echo $command | xargs sudo -u nagios)
11 action-set check-output="$output"11 action-set check-output="$output"
12else12else
13 action-fail "$checkfile does not exist"13 action-fail "$checkfile does not exist or the check failed"
14fi14fi
1515

Subscribers

People subscribed via source and target branches

to all changes: