Merge lp:~whitmo/charms/trusty/cloudfoundry/add-collector into lp:~cf-charmers/charms/trusty/cloudfoundry/trunk
Proposed by
Whit Morriss
| Status: | Superseded |
|---|---|
| Proposed branch: | lp:~whitmo/charms/trusty/cloudfoundry/add-collector |
| Merge into: | lp:~cf-charmers/charms/trusty/cloudfoundry/trunk |
| Diff against target: |
200 lines (+63/-6) 9 files modified
Makefile (+1/-0) charmgen/placements.yaml (+1/-1) cloudfoundry/contexts.py (+24/-0) cloudfoundry/releases.py (+1/-0) cloudfoundry/services.py (+16/-1) docs/debugging.rst (+8/-0) hooks/common.py (+2/-1) reconciler/app.py (+6/-2) tests/test_contexts.py (+4/-1) |
| To merge this branch: | bzr merge lp:~whitmo/charms/trusty/cloudfoundry/add-collector |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cory Johns | Pending | ||
|
Review via email:
|
|||
Commit message
Adding collector
Description of the change
Add the collector as a service
- add service block for collector job
- GraphiteContext for creating relationships to graphite
- update dependencies (esp. raindance)
- minor tweaks to support subordinates
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
