~freyes/charm-grafana:bug/1893137

Branch merges

Propose for merging

Merged into charm-grafana:master at revision 3c12d49a9a02a49e7b820b332e339081b18aeb83

Paul Goins: Approve on 2020-09-12

Matthew Ruffell (community): Approve on 2020-09-09

Diff: 43 lines (+9/-1)

3 files modified

src/tests/functional/tests/bundles/base.yaml (+5/-1)
src/tests/functional/tests/bundles/overlays/focal-snap.yaml.j2 (+2/-0)
src/tests/functional/tests/bundles/overlays/focal.yaml.j2 (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

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

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>