Merge lp://staging/~jjo/charms/trusty/prometheus/use-bootstack-ppa-and-other-fixes into lp://staging/~canonical-bootstack/charms/trusty/prometheus/pre-layer

Proposed by JuanJo Ciarlante
Status: Merged
Merged at revision: 38
Proposed branch: lp://staging/~jjo/charms/trusty/prometheus/use-bootstack-ppa-and-other-fixes
Merge into: lp://staging/~canonical-bootstack/charms/trusty/prometheus/pre-layer
Diff against target: 117 lines (+20/-13)
6 files modified
config.yaml (+1/-1)
hooks/prometheus_hooks.py (+9/-3)
hooks/prometheus_utils.py (+1/-1)
metadata.yaml (+3/-0)
tests/00-setup (+2/-3)
unit_tests/test_prometheus_hooks.py (+4/-5)
To merge this branch: bzr merge lp://staging/~jjo/charms/trusty/prometheus/use-bootstack-ppa-and-other-fixes
Reviewer Review Type Date Requested Status
Alvaro Uria (community) Approve
Review via email: mp+284132@code.staging.launchpad.net

Commit message

[jjo, r=] use ppa:bootstack-canonical/prometheus as default, "prometheus" as pkg name
- new install_pachages() function
- add install_packages() function, called also at config_changed time to support eg changed ppa
- add nrpe-external-master to metadata.yaml (no actual hooks yet)

To post a comment you must log in.
Revision history for this message
Alvaro Uria (aluria) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches