~mruffell/charm-grafana:lp1894011

Branch merges

Propose for merging

Merged into charm-grafana:master at revision 534c1f1c9e05e02e66cd55087d29a360c4f6b83c

James Hebden (community): Approve on 2020-10-13

Chris Johnston (community): Approve on 2020-09-21

Drew Freiberger (community): Approve on 2020-09-18

Paul Goins: Needs Fixing on 2020-09-12

Diff: 145 lines (+71/-4)

4 files modified

src/files/dashboards_backup (+2/-1)
src/reactive/grafana.py (+5/-2)
src/templates/juju-dashboards-backup.j2 (+1/-1)
src/tests/functional/tests/test_grafana.py (+63/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

5f1843b... by Matthew Ruffell on 2020-09-03

Enable support for custom ports for dashboard backup

Currently dashboard backup uses a hardcoded base_url of localhost:3000,
which breaks the backup script if the user changes the port to anything
else.

Add some logic to fetch the port config and pass it into the dashboard
backup script. Also make sure dashboard backups are kept in sync with
any port changes.

LP: #1894011

ddc2493... by Alvaro Uria on 2020-08-14

Update license, charm proof built code

Reviewed-on: https://code.launchpad.net/~canonical-is-bootstack/charm-grafana/+git/charm-grafana/+merge/389265
Reviewed-by: Giuseppe Petralia <email address hidden>
Reviewed-by: Xav Paice <email address hidden>

5d0d08a... by Alvaro Uria on 2020-08-13

Update license, charm proof built code

26fcde9... by Xav Paice on 2020-08-06

Update README.md for 20.08

Reviewed-on: https://code.launchpad.net/~xavpaice/charm-grafana/+git/grafana-charm/+merge/388783
Reviewed-by: James Troup <email address hidden>

3ecce8c... by Xav Paice on 2020-08-05

Update README.md for 20.08

a115b08... by Giuseppe Petralia on 2020-08-04

Refactor charm to use src folder. Standardize makefile and fix linting.

Reviewed-on: https://code.launchpad.net/~peppepetra86/charm-grafana/+git/charm-grafana/+merge/388471
Reviewed-by: Alvaro Uria <email address hidden>

2fefd68... by Giuseppe Petralia on 2020-08-04

Address review comments

9302200... by Giuseppe Petralia on 2020-08-03

Update makefile and tox.ini

1aae8ec... by Giuseppe Petralia on 2020-07-31

Refactor charm to use src folder. Standardize makefile and fix linting.

6d41371... by Giuseppe Petralia on 2020-07-29

Dashboard titling and folders

Title updates for dashboards coming in via the dashboards relation. The following rules are applied:

- Ensure dashboard titles are tagged with "[juju-{provider}]"

- If the dashboard provider resides on a remote model (i.e. related via CMR), ensure dashboard is placed in a folder "[juju-{modelname}]"

As grafana has no way of detecting a CMR the latter functionality depends on the provider placing an attribute "provider_model={modelname}" onto the payload.

Reviewed-on: https://code.launchpad.net/~peppepetra86/charm-grafana/+git/charm-grafana/+merge/388216
Reviewed-by: Xav Paice <email address hidden>