Merge lp://staging/~bloodearnest/charms/precise/squid-reverseproxy/metrics into lp://staging/charms/squid-reverseproxy
Proposed by
Simon Davy
| Status: | Merged |
|---|---|
| Merged at revision: | 46 |
| Proposed branch: | lp://staging/~bloodearnest/charms/precise/squid-reverseproxy/metrics |
| Merge into: | lp://staging/charms/squid-reverseproxy |
| Diff against target: |
626 lines (+444/-17) 10 files modified
.bzrignore (+1/-1) Makefile (+4/-0) config.yaml (+61/-5) files/squid_metrics.py (+99/-0) hooks/hooks.py (+76/-9) hooks/tests/test_config_changed_hooks.py (+1/-0) hooks/tests/test_metrics.py (+191/-0) templates/main_config.template (+2/-2) templates/metrics_cronjob.template (+3/-0) templates/squid_metrics_ini.template (+6/-0) |
| To merge this branch: | bzr merge lp://staging/~bloodearnest/charms/precise/squid-reverseproxy/metrics |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tom Haddon (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add support for sending cache metrics to statsd
Description of the change
Add support for sending cache metrics to statsd.
Sets up a configurable cron job to gather metrics from squid via snmp and pipe them to statsd.
The snmp names of exported metrics can be set in the 'metrics' config, which has a set of defaults.
Also does a small refactor if jinja templating code as it's used in multiple places now.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This looks good to me, and has been tested in a staging environment.