Merge lp://staging/~martin-hilton/charm-haproxy/000-check_haproxy-https-services into lp://staging/charm-haproxy

Proposed by Martin Hilton
Status: Merged
Approved by: Adam Collard
Approved revision: 109
Merged at revision: 106
Proposed branch: lp://staging/~martin-hilton/charm-haproxy/000-check_haproxy-https-services
Merge into: lp://staging/charm-haproxy
Diff against target: 59 lines (+21/-26)
1 file modified
files/nrpe/check_haproxy.sh (+21/-26)
To merge this branch: bzr merge lp://staging/~martin-hilton/charm-haproxy/000-check_haproxy-https-services
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Adam Collard (community) Approve
Free Ekanayaka (community) Needs Information
Review via email: mp+308041@code.staging.launchpad.net

Commit message

Update NRPE check to support Xenial.

Parse CSV from haproxy's HTTP stats interface

Description of the change

This adds support for HTTPS services in the check_haproxy script. The script is courtesy of Canonical IS.

To post a comment you must log in.
Revision history for this message
Free Ekanayaka (free.ekanayaka) wrote :

A couple of remarks below.

review: Needs Information
107. By Martin Hilton

check_haproxy: Get the "stats socket" from the configuration

Revision history for this message
Adam Collard (adam-collard) wrote :

This will only work if global_stats_socket config option is turned on, which is not true for all deployments.

I think we can keep the CSV parsing but grab it over HTTP.

e.g.

$ curl 'http://localhost:10000/;csv' -u haproxy:haproxy

review: Needs Fixing
108. By Martin Hilton

return to using http, but get csv in stead of html

Revision history for this message
Adam Collard (adam-collard) :
Revision history for this message
Martin Hilton (martin-hilton) :
109. By Martin Hilton

more review updates

Revision history for this message
Adam Collard (adam-collard) wrote :

Looks good, +1

Thanks for the re-work, think it's good to land.

review: Approve
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: