~aluria/charm-grafana/+git/grafana-charm:snap-support

Branch merges

Propose for merging

Merged into ~prometheus-charmers/charm-grafana:master at revision d7d8337d46360dcd4591adf9f117f84eba6a808e

Prometheus Charmers: Pending requested 2018-02-09

Diff: 12555 lines (+12290/-59)

11 files modified

config.yaml (+13/-0)
layer.yaml (+1/-1)
reactive/grafana.py (+200/-56)
templates/dashboards/prometheus/CephCluster.json.j2 (+2260/-0)
templates/dashboards/prometheus/CephOSD.json.j2 (+990/-0)
templates/dashboards/prometheus/CephPools.json.j2 (+702/-0)
templates/dashboards/prometheus/OpenStackCloud.json.j2 (+3819/-0)
templates/dashboards/prometheus/RabbitMQ.json.j2 (+927/-0)
templates/dashboards/prometheus/Swift.json.j2 (+976/-0)
templates/dashboards/prometheus/Telegraf.json.j2 (+2396/-0)
templates/grafana.ini.j2 (+6/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

f63810a... by Alvaro Uria on 2018-02-08

Add install_method support [apt,snap]

 * install_method and snap_channel support
 * Default is "apt", but "snap" can be used on Xenial and on
 * Automatic import_dashboard if datasource is prometheus and metrics
 are being collected for such dashboards to work
 * grafana.ini template can configure port and debug level
 * On trusty, upgrade-charm fails because layer:snap calls systemctl

7bf2d3d... by Jacek Nykis on 2018-02-07

[trivial] Don't strip dashboard key from backup files to make them compatible with API import

7540bfa... by Jacek Nykis on 2018-02-07

Ignore datasource name when checking if it exists. Allows for human readable names to be configured in web UI

b5f40d0... by Jamon Camisso <email address hidden> on 2018-01-31

[jacekn,r=jamon] Merge branch 'master' of git+ssh://git.launchpad.net/~jacekn/grafana-charm

c523def... by Jacek Nykis on 2018-01-31

Fix dashboard_backup script to write valid JSON. Fixes LP #1718221

12f9a02... by Brad Marshall on 2017-11-21

[brad-marshall, r=tcuthbert] Merge branch 'action-user-mgmt' of git+ssh://git.launchpad.net/~brad-marshall/grafana-charm

2bf4bbf... by Jamon Camisso on 2017-10-18

Merge branch 'add-mysql-datasource' of git+ssh://git.launchpad.net/~rharding/grafana-charm

d78ca59... by Richard Harding on 2017-10-18

Merge branch 'master' of git+ssh://git.launchpad.net/grafana-charm into add-mysql-datasource

e2c9dc0... by Richard Harding on 2017-10-18

Flake8 cleanup per reviewj

4ff589e... by Brad Marshall on 2017-10-18

[brad-marshall, r=hloeung] Fixes race condition with setting user password
(Closes: LP#1684831)