~afreiberger/charm-grafana:lint-20.10

Branch merges

Propose for merging

Merged into charm-grafana:master at revision 872e3cd23c11d2d960edadcd0dc60e5d97292e6e

Alvaro Uria (community): Approve on 2020-10-16

Diff: 43 lines (+4/-3)

2 files modified

src/reactive/grafana.py (+1/-0)
src/tests/functional/tests/test_grafana.py (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

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>

664d960... by Adam Dyess on 2020-10-02

Reinstate service check on grafana charm

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

de15271... by Adam Dyess on 2020-10-02

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

239f891... by Joe Guo on 2020-10-01

Fix LP1897843: support non-wrapped JSON data and keep backward compatibility

Currently this charm requires dashboard JSON data be wrapped like this:

    {
        "dashbaord": {<real dashboard JSON data>},
        "overwrite": true,
        "folderId": 1
    }

Actually this is a misuse of the grafana rest api structure.
Dashboard JSON data should include the real data directly.
Refer to LP1897843 for details.

This patch make the code support both formats.
Since most of our dashboard JSON file followed the wrong pattern, we
have to keep backward compatibility until grafana charm upgraded in all clouds.

LP: #1897843

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

5c5a449... by Joe Guo on 2020-09-30

Fix LP1897843: support non-wrapped JSON data and keep backward compatibility

Currently this charm requires dashboard JSON data be wrapped like this:

    {
        "dashbaord": {<real dashboard JSON data>},
        "overwrite": true,
        "folderId": 1
    }

Actually this is a misuse of the grafana rest api structure.
Dashboard JSON data should include the real data directly.
Refer to LP1897843 for details.

This patch make the code support both formats.
Since most of our dashboard JSON file followed the wrong pattern, we
have to keep backward compatibility until grafana charm upgraded in all clouds.

LP: #1897843

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

c34eb36... by Joe Guo on 2020-09-30

add setuptools to wheelhouse.txt

`make build` failed on focal with:

    ModuleNotFoundError: No module named 'setuptools._distutils'

add setuptools fixed this.

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