~hloeung/content-cache-charm:metrics

Branch merges

Propose for merging

Merged into content-cache-charm:master at revision 7cdad621afbaf34f094a19243c12b807536e841b

Stuart Bishop (community): Approve on 2021-03-03

Content Cache Charmers: Pending requested 2021-02-25

Diff: 178 lines (+38/-12)

6 files modified

config.yaml (+6/-1)
lib/nginx.py (+7/-2)
reactive/content_cache.py (+4/-3)
templates/nginx_metrics_cfg.tmpl (+6/-2)
tests/unit/test_content_cache.py (+6/-1)
tests/unit/test_nginx.py (+9/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

0e91790... by Haw Loeung on 2021-02-25

Allow overriding listen address used by metrics

d291b25... by Haw Loeung on 2021-02-25

Enable Nginx basic server status metrics - LP:1916078

This lets us enable the telegraf Nginx plugin and scape global server
metrics such as active connections, current server accepts, etc.

Also restrict access to metrics to localhost. Telegraf'
inputs.prometheus can access /metrics.

9e1d668... by Haw Loeung on 2021-02-09

Back to X-Forwarded-For as some things expect it to be this (e.g. Moin

Reviewed-on: https://code.launchpad.net/~hloeung/content-cache-charm/+git/content-cache-charm/+merge/397710
Reviewed-by: Paul Collins <email address hidden>

2b3f15b... by Haw Loeung on 2021-02-09

Back to X-Forwarded-For as some things expect it to be this (e.g. Moin

e96904c... by Haw Loeung on 2021-02-09

Revert "Use 'http-check send hdr' instead of adding headers at end of httpchk version"

Reviewed-on: https://code.launchpad.net/~hloeung/content-cache-charm/+git/content-cache-charm/+merge/397708
Reviewed-by: Paul Collins <email address hidden>

0d24b87... by Haw Loeung on 2021-02-09

Revert "Use 'http-check send hdr' instead of adding headers at end of httpchk version"

This reverts commit 3bd2938698a7bdad5ada38ac84c635108749fc43.

3fcb042... by Haw Loeung on 2021-02-09

Use 'http-check send hdr' instead of adding headers at end of httpchk version

Reviewed-on: https://code.launchpad.net/~hloeung/content-cache-charm/+git/content-cache-charm/+merge/397703
Reviewed-by: Colin Misare <email address hidden>

3bd2938... by Haw Loeung on 2021-02-09

Use 'http-check send hdr' instead of adding headers at end of httpchk version

This fixes the warning about it:

| [WARNING] 038/222205 (17722) : parsing [/etc/haproxy/haproxy.cfg:94]: 'option httpchk' : hiding headers or body at the end of the version string is deprecated. Please, consider to use 'http-check send' directive instead.

ecc5578... by Haw Loeung on 2021-02-08

Introduce new header X-Cache-Request-IP and log that

This prevents spoofing of X-Forward-For or any additional hops from
being logged.

Reviewed-on: https://code.launchpad.net/~hloeung/content-cache-charm/+git/content-cache-charm/+merge/397698
Reviewed-by: Colin Misare <email address hidden>

9e2a612... by Haw Loeung on 2021-02-08

Introduce new header X-Cache-Request-IP and log that

This prevents spoofing of X-Forward-For or any additional hops from
being logged.