Merge ~tcuthbert/charm-telegraf:master into charm-telegraf:master
Status: | Merged |
---|---|
Approved by: | Xav Paice on 2021-01-26 |
Approved revision: | 631a400466a51aa887ee9fe5be9e9171ad2784d7 |
Merged at revision: | bc10de9a5a8c0e07f101bf5664fda6d6b7c076df |
Proposed branch: | ~tcuthbert/charm-telegraf:master |
Merge into: | charm-telegraf:master |
Diff against target: |
35 lines (+10/-4) 2 files modified
src/reactive/telegraf.py (+1/-3) src/tests/unit/test_telegraf.py (+9/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Xav Paice | 2021-01-11 | Approve on 2021-01-26 | |
Peter Sabaini | Approve on 2021-01-18 | ||
Haw Loeung | +1 | 2021-01-11 | Approve on 2021-01-14 |
Review via email:
|
Commit message
Workaround for LP#1910974: telegraf haproxy input broken with Juju >= 2.8.7
Junien Fridrick (axino) wrote : | # |
Some questions inline
Haw Loeung (hloeung) wrote : | # |
I think the best solution here is to update the haproxy[1] and content-cache[2] to pass through the listen address for haproxy statistics, they both already pass through the username, password, and port. Then have the telegraf charm check the presence of this and use it if it's something other than 0.0.0.0. If it doesn't exist, try work it out with the existing code (rel["private-
For the HAProxy charm, it defaults to statistics on 0.0.0.0 so why it doesn't appear broken with the latest Juju version - localhost or private-address, HAProxy statistics will answer on both interfaces. For the Content-cache charm, it configures statistics to listen on 127.0.0.1.
[1]https:/
[2]https:/
Thomas Cuthbert (tcuthbert) wrote : | # |
> I think the best solution here is to update the haproxy[1] and content-
> cache[2] to pass through the listen address for haproxy statistics, they both
> already pass through the username, password, and port. Then have the telegraf
> charm check the presence of this and use it if it's something other than
> 0.0.0.0. If it doesn't exist, try work it out with the existing code (rel
> ["private-address"] and hookenv.
>
> For the HAProxy charm, it defaults to statistics on 0.0.0.0 so why it doesn't
> appear broken with the latest Juju version - localhost or private-address,
> HAProxy statistics will answer on both interfaces. For the Content-cache
> charm, it configures statistics to listen on 127.0.0.1.
>
> [1]https:/
> haproxy/
> [2]https:/
> charm/tree/
okay I've updated, see https:/
Thomas Cuthbert (tcuthbert) wrote : | # |
comment inline
Thomas Cuthbert (tcuthbert) wrote : | # |
comment inline mk2
Haw Loeung (hloeung) wrote : | # |
LGTM, but let's see what BootStack reviewers say.
Change successfully merged at revision bc10de9a5a8c0e0
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.