Grafana Charm

Merge ~lihuiguo/charm-grafana:bug/1935574 into charm-grafana:master

  1. Git
  2. lp:~lihuiguo/charm-grafana
  3. bug/1935574
  4. Merge into master
Proposed by Linda Guo
Status: Merged
Approved by: James Troup
Approved revision: f2779675462ce02a207c2a2a65f11d9ee3df223f
Merged at revision: 9d00792c7a93d89291b59cd36e78ff204a12254b
Proposed branch: ~lihuiguo/charm-grafana:bug/1935574
Merge into: charm-grafana:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/reactive/grafana.py (+1/-1)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Joe Guo (community) Approve
BootStack Reviewers Pending
Review via email: mp+405430@code.launchpad.net

Commit message

added dashboards-relation-changed hook

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:359bfd0677107aa4075c85de385c159c94ac979e
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/24/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/89/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/290/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/24//rebuild

review: Approve (continuous-integration)
Revision history for this message
James Troup (elmo) wrote :

LGTM, just one minor comment inline.

Revision history for this message
Linda Guo (lihuiguo) wrote :

Fixed elmo's comment

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
Joe Guo (guoqiao) wrote :

I have verified that is working, +1.

review: Approve
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:f2779675462ce02a207c2a2a65f11d9ee3df223f
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/25/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/90/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/296/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/25//rebuild

review: Approve (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 9d00792c7a93d89291b59cd36e78ff204a12254b

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/reactive/grafana.py b/src/reactive/grafana.py
2index 1f3788b..1a77fd1 100644
3--- a/src/reactive/grafana.py
4+++ b/src/reactive/grafana.py
5@@ -1182,7 +1182,7 @@ def ensure_dash_deserialized(dash):
6 return dash
7
8
9-@hook("dashboards-relation-joined")
10+@hook("dashboards-relation-joined", "dashboards-relation-changed")
11 def dashboards_joined(dashboards):
12 """Process dashboards from related charms."""
13 hookenv.log("hook %s triggered" % hookenv.hook_name(), "INFO")

Subscribers

People subscribed via source and target branches

to all changes: