charm-grafana:candidate/21.04

Last commit made on 2021-02-18
Get this branch:
git clone -b candidate/21.04 https://git.launchpad.net/charm-grafana
Members of Llama (LMA) Charmers can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
candidate/21.04
Repository:
lp:charm-grafana

Recent commits

93f9566... by Tom Haddon

Fix icon aspect ratio

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

8e649ec... by Tom Haddon <email address hidden>

Fix icon aspect ratio

288a04e... by Drew Freiberger

Resolve race between port change and dashboard ingestion

Reviewed-on: https://code.launchpad.net/~afreiberger/charm-grafana/+git/grafana-charm-1/+merge/397120
Reviewed-by: Peter Sabaini <email address hidden>
Reviewed-by: Xiyue Wang <email address hidden>

836056e... by Drew Freiberger

Resolve race between port change and dashboard ingestion

d732550... by Xav Paice

Reformat to pass lint

Reviewed-on: https://code.launchpad.net/~xavpaice/charm-grafana/+git/grafana-charm/+merge/397055
Reviewed-by: Drew Freiberger <email address hidden>

289866e... by Xav Paice

Reformat to pass lint

Reformatted recent changes to pass lint tests.

7929c5b... by Brett Milford

Catch ConnectionError and update constraints

Reviewed-on: https://code.launchpad.net/~brettmilford/charm-grafana/+git/charm-grafana/+merge/393348
Reviewed-by: Drew Freiberger <email address hidden>
Reviewed-by: Paul Goins <email address hidden>

872692b... by Brett Milford

Added comments on test

d7a68c3... by Brett Milford

Adds blocked status for failed dashboard updates

9ed3c3c... by Brett Milford

Catch ConnectionError and update constraints

This change a) catches ConnectionError class exceptions which occur in
generate_prometheus_dashboards() when a related datasource changes its
listening port and the local datastore has not yet been updated to
reference to the new port. b) Compares the service_name to ensure
existing sources are updated.

Note this solution reverts 7540bfadb1cd717ad1c3b44872aa142e97e8308a

LP: #1893320