~lihuiguo/charm-grafana:stable/20.10

Last commit made on 2020-10-22
Get this branch:
git clone -b stable/20.10 https://git.launchpad.net/~lihuiguo/charm-grafana
Only Linda Guo can upload to this branch. If you are Linda Guo please log in for upload directions.

Branch merges

Branch information

Name:
stable/20.10
Repository:
lp:~lihuiguo/charm-grafana

Recent commits

be37b3a... by Alvaro Uria

Update data source relation to inject default values to support grafana 7 snap revision.

Additional fixes for functional testing and documentation of known issues in README.

Reviewed-on: https://code.launchpad.net/~canonical-is-bootstack/charm-grafana/+git/charm-grafana/+merge/392669
Reviewed-by: Chris Sanders <email address hidden>
Reviewed-by: Drew Freiberger <email address hidden>

e436566... by Alvaro Uria

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

Rework values for version 7 of snap and fix linting issues

37c2656... by David O Neill

fix missing default

872e3cd... by Drew Freiberger

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

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

minor doc strings linting

8cb42f5... by Drew Freiberger

blacken for 20.10 release

534c1f1... by Matthew Ruffell

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

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>