~canonical-is-bootstack/charm-grafana:review/dmzoneill/fix-default-dsn

Branch merges

Propose for merging

Merged into charm-grafana:master at revision be37b3a77f68062f8a005877529cbcd6dd408499

Chris Sanders (community): Approve on 2020-10-22

Drew Freiberger (community): Approve on 2020-10-22

Diff: 73 lines (+23/-3)

4 files modified

src/README.md (+13/-0)
src/reactive/grafana.py (+8/-0)
src/tests/functional/tests/bundles/base.yaml (+2/-2)
src/wheelhouse.txt (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

e436566... by Alvaro Uria on 2020-10-22

Revert wheelhouse update and fix func tests

LP#1897843 added setuptools to wheelhouse.txt. However, setuptools is
already added in layer-basic with a limit of <42. This limitation fixes
pip install issues on Ubuntu series older than Focal.

Functional tests now use the -next version of the dependent charms.

5db0aab... by David O Neill on 2020-09-30

Rework values for version 7 of snap and fix linting issues

37c2656... by David O Neill on 2020-09-29

fix missing default

872e3cd... by Drew Freiberger on 2020-10-16

Minor doc strings linting

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

cd329fa... by Drew Freiberger on 2020-10-16

blacken for 20.10 release

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

5cf11c5... by Drew Freiberger on 2020-10-16

minor doc strings linting

8cb42f5... by Drew Freiberger on 2020-10-16

blacken for 20.10 release

534c1f1... by Matthew Ruffell on 2020-10-13

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

Reviewed-on: https://code.launchpad.net/~mruffell/charm-grafana/+git/charm-grafana/+merge/390215
Reviewed-by: James Hebden <email address hidden>
Reviewed-by: Chris Johnston <email address hidden>
Reviewed-by: Drew Freiberger <email address hidden>

c632b1f... by Joe Guo on 2020-10-07

add dashboards-joined hook

when relate an operator based charm, e.g.: cloudstats, to grafana, this hook won't trigger:

    @when("grafana.started", "endpoint.dashboards.has_requests")
    @when_not("grafana.change-block")
    def import_dashboards(dashboards):
        ...

So dashboard will not be imported and there is no error.

Add a normal `joined` hook, query relation data directly with key, so operator based
charm can relate to grafana and import dashboard.

Reviewed-on: https://code.launchpad.net/~llama-charmers/charm-grafana/+git/charm-grafana/+merge/391854
Reviewed-by: James Hebden <email address hidden>
Reviewed-by: Xav Paice <email address hidden>

6ab6bed... by Joe Guo on 2020-10-05

add dashboards-relation-joined hook

when relate an operator based charm, e.g.: cloudstats, to grafana, this hook won't trigger:

 @when("grafana.started", "endpoint.dashboards.has_requests")
 @when_not("grafana.change-block")
 def import_dashboards(dashboards):
     ...

So dashboard will not be imported and there is no error.

Add a normal `dashboards-relation-joined` hook, query relation data directly with key,
so operator based charm can relate to grafana and import dashboard.

Signed-off-by: Joe Guo <email address hidden>