lp://staging/~jjo/charms/trusty/prometheus/use-bootstack-ppa-and-other-fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~canonical-bootstack/charms/trusty/prometheus/pre-layer at revision 38

Alvaro Uria (community): Approve on 2016-01-27

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

38. By JuanJo Ciarlante on 2016-01-27

[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)

37. By Alvaro Uria on 2016-01-21

[aluria] allow more than 1 prometheus<->collectd charms relation (ie collectd, collectd-infra services)

36. By Alvaro Uria on 2015-12-10

[aluria,trivial] update_static_targets; targets renamed to static_targets

35. By Alvaro Uria on 2015-10-26

adding unicode strings to be matched when sanitizing targets

34. By Alvaro Uria on 2015-10-23

juju_log on write_conf

33. By Alvaro Uria on 2015-10-21

config-changed did not write_conf when target relation was not applied

32. By Alvaro Uria on 2015-10-21

testing shared data to be applied via template

31. By Alvaro Uria on 2015-10-21

related_targets NoneType validation corrected

30. By Alvaro Uria on 2015-10-21

relation input data validation corrected

29. By Alvaro Uria on 2015-10-21

typo on NoneType condition