Telegraf Charm

Merge ~hloeung/charm-telegraf:fixes into charm-telegraf:master

  1. Git
  2. lp:~hloeung/charm-telegraf
  3. fixes
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Approved by: Eric Chen
Approved revision: bb3fba296226964ac310e3e84543b278e56ce904
Merged at revision: 26af3f25c7ac2a9fcf35288a89585bd957c3dfda
Proposed branch: ~hloeung/charm-telegraf:fixes
Merge into: charm-telegraf:master
Diff against target: 12 lines (+1/-0)
1 file modified
src/reactive/telegraf.py (+1/-0)
Reviewer Review Type Date Requested Status
Tianqi Xiao (community) Approve
Robert Gildein Pending
BootStack Reviewers Pending
BootStack Reviewers Pending
Review via email: mp+428004@code.launchpad.net

Commit message

Fix race with snap install method and creation of prometheus_client.conf

To post a comment you must log in.
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
Tianqi Xiao (txiao) wrote :

LGTM

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

Change successfully merged at revision 26af3f25c7ac2a9fcf35288a89585bd957c3dfda

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/reactive/telegraf.py b/src/reactive/telegraf.py
2index 00051ca..5548956 100644
3--- a/src/reactive/telegraf.py
4+++ b/src/reactive/telegraf.py
5@@ -1718,6 +1718,7 @@ def configure_prometheus_client_with_relation(prometheus):
6 clear_flag("endpoint.prometheus-client.changed") # not automatic
7
8
9+@when("telegraf.configured")
10 @when_not("plugins.prometheus-client.configured")
11 def configure_prometheus_client():
12 hookenv.log("Configuring prometheus_client output plugin", level=hookenv.DEBUG)

Subscribers

People subscribed via source and target branches

to all changes: