dashboard-json : lp:charm-grafana : Git : Code : Grafana Charm

Get this branch:: git clone -b dashboard-json https://git.launchpad.net/charm-grafana

Members of Llama (LMA) Charmers can upload to this branch. Log in for directions.

Branch merges

Merged into charm-grafana:master at revision 239f891810ed9f7afee1c28de74967aa1b4c6bd8

Adam Dyess (community): Approve on 2020-10-01

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

Branch information

Name:: dashboard-json

Repository:: lp:charm-grafana

Recent commits

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>

dc55051... by Adam Dyess on 2020-10-01

run make black against master

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

e2bb680... by Adam Dyess on 2020-10-01

run make black against master

3c12d49... by Felipe Reyes on 2020-09-30

Add nagios to functional testing bundles

Reviewed-on: https://code.launchpad.net/~freyes/charm-grafana/+git/charm-grafana/+merge/389877
Reviewed-by: Adam Dyess <email address hidden>
Reviewed-by: Matthew Ruffell <email address hidden>
Reviewed-by: Paul Goins <email address hidden>

3633571... by Felipe Reyes on 2020-08-26

Add nagios to functional testing bundles

nrpe waits for a relation with nagios before switching to ready state and this
blocks the execution of the zaza tests. This patch adds nagios to the base
bundle with an override in the focal overlays to use bionic since nagios is
not available in focal.

Fixes-Bug: #1893137

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