~ballot/content-cache-charm/+git/content-cache-charm:fix_expose

Branch merges

Propose for merging

Merged into content-cache-charm:master at revision d5fecba1f8d981e21e559bb5ea1e31eddcabdd5b

Stuart Bishop (community): Approve on 2019-09-12

Canonical IS Reviewers: Pending requested 2019-09-11

Diff: 55 lines (+28/-1)

2 files modified

reactive/content_cache.py (+3/-1)
tests/unit/test_content_cache.py (+25/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

3f2b37c... by Benjamin Allot on 2019-09-11

Keep the nginx metrics port exposed in configure_haproxy hook

Also add a tests to check the ports management in the configure_haproxy

94af719... by Benjamin Allot on 2019-09-11

Add a counter for requests unrelated to healthchecks

To calculate the cache hit ratio, having a separate counter for all the
requests that are not target location /check/ is better.

Reviewed-on: https://code.launchpad.net/~ballot/content-cache-charm/+git/content-cache-charm/+merge/372559
Reviewed-by: Joel Sing <email address hidden>

46da77f... by Benjamin Allot on 2019-09-10

Black formatting

d9c217b... by Benjamin Allot on 2019-09-10

Add a counter for requests unrelated to healthchecks

To calculate the cache hit ratio, having a separate counter for all the
requests that are not target location /check/ is better.

49168b8... by Haw Loeung on 2019-09-10

Clean up unused output for unit tests (also in wrong directory) and reformatted files by 'black'

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

3b126c4... by Haw Loeung on 2019-09-10

Reformatted by black

2e24f82... by Haw Loeung on 2019-09-10

Cleanup unused unit test output, seems merged in with basics and also in the wrong directory

df3ac8c... by Benjamin Allot on 2019-09-06

Update README.md with the new feature exposing nginx metrics

Reviewed-on: https://code.launchpad.net/~ballot/content-cache-charm/+git/content-cache-charm/+merge/372365
Reviewed-by: Tom Haddon <email address hidden>

65e7ce7... by Benjamin Allot on 2019-09-05

Update README.md with the new feature exposing nginx metrics

3fa2dbc... by Benjamin Allot on 2019-09-05

Add nginx metrics for cache hits

A new option `enable_prometheus_metrics` can be set to True to expose nginx metrics about cache hits and HTTP requests in prometheus format.
This metrics are available on port 9145.

Update tests

All the tests have been adapted with the new bits of configuration and
new tests have been developed for the new feature.

Reviewed-on: https://code.launchpad.net/~ballot/content-cache-charm/+git/content-cache-charm/+merge/372309
Reviewed-by: Joel Sing <email address hidden>