Merge ~aieri/charm-prometheus-alertmanager:proxy into ~prometheus-charmers/charm-prometheus-alertmanager:master
Proposed by
Andrea Ieri
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Andrea Ieri | ||||
Approved revision: | f5d8bc89834ae61fe1895712318d817c4232dfe1 | ||||
Merged at revision: | 8905bb3a611223f6985ed520231e433a23c5389c | ||||
Proposed branch: | ~aieri/charm-prometheus-alertmanager:proxy | ||||
Merge into: | ~prometheus-charmers/charm-prometheus-alertmanager:master | ||||
Diff against target: |
44 lines (+10/-2) 3 files modified
metadata.yaml (+1/-1) reactive/alertmanager.py (+5/-1) templates/alertmanager.yml.j2 (+4/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Giuseppe Petralia | Approve | ||
Canonical IS Reviewers | Pending | ||
Review via email: mp+372814@code.launchpad.net |
Commit message
Add support for http proxies
To post a comment you must log in.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.