charm-haproxy

Merge lp:~axino/charm-haproxy/trunk into lp:charm-haproxy

  1. trunk
  2. Merge into trunk
Proposed by Junien F
Status: Merged
Approved by: Junien F
Approved revision: no longer in the source branch.
Merged at revision: 132
Proposed branch: lp:~axino/charm-haproxy/trunk
Merge into: lp:charm-haproxy
Diff against target: 26 lines (+4/-2)
2 files modified
files/nrpe/check_haproxy.sh (+2/-1)
files/nrpe/check_haproxy_queue_depth.sh (+2/-1)
To merge this branch: bzr merge lp:~axino/charm-haproxy/trunk
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Laurent Sesquès Approve
Review via email: mp+368440@code.launchpad.net

Commit message

fixes bug: https://launchpad.net/bugs/1828529

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
Laurent Sesquès (sajoupa) :
review: Approve
Revision history for this message
Stuart Bishop (stub) wrote :

Yup

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

Change successfully merged at revision 132

lp:~axino/charm-haproxy/trunk updated
132. By Junien F

fixes bug: https://launchpad.net/bugs/1828529

Reviewed-on: https://code.launchpad.net/~axino/charm-haproxy/trunk/+merge/368440
Reviewed-by: Laurent Sesques <email address hidden>
Reviewed-by: Stuart Bishop <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'files/nrpe/check_haproxy.sh'
2--- files/nrpe/check_haproxy.sh 2016-10-25 11:30:56 +0000
3+++ files/nrpe/check_haproxy.sh 2019-06-06 09:41:15 +0000
4@@ -10,7 +10,8 @@
5 set -o pipefail
6
7 export LOGFILE=/var/log/nagios/check_haproxy.log
8-AUTH=$(grep -r "stats auth" /etc/haproxy | head -1 | awk '{print $4}')
9+# Exclude files starting with a dot - LP#1828529
10+AUTH=$(grep -r --exclude ".*" "stats auth" /etc/haproxy | head -1 | awk '{print $4}')
11
12 NOTACTIVE=$(curl -s -f -u ${AUTH} "http://localhost:10000/;csv"|awk -F, -v SVNAME=2 -v STATUS=18 '
13 $1 ~ "^#" { next }
14
15=== modified file 'files/nrpe/check_haproxy_queue_depth.sh'
16--- files/nrpe/check_haproxy_queue_depth.sh 2015-05-12 15:10:44 +0000
17+++ files/nrpe/check_haproxy_queue_depth.sh 2019-06-06 09:41:15 +0000
18@@ -10,7 +10,8 @@
19 CURRQthrsh=0
20 MAXQthrsh=100
21
22-AUTH=$(grep -r "stats auth" /etc/haproxy | head -1 | awk '{print $4}')
23+# Exclude files starting with a dot - LP#1828529
24+AUTH=$(grep -r --exclude ".*" "stats auth" /etc/haproxy | head -1 | awk '{print $4}')
25
26 HAPROXYSTATS=$(/usr/lib/nagios/plugins/check_http -a ${AUTH} -I 127.0.0.1 -p 10000 -u '/;csv' -v)
27

Subscribers

People subscribed via source and target branches

to all changes: