Telegraf Charm

Merge ~telegraf-charmers/charm-telegraf:fix_juju1 into ~telegraf-charmers/charm-telegraf:master

  1. Git
  2. lp:~telegraf-charmers/charm-telegraf
  3. fix_juju1
  4. Merge into master
Proposed by Junien F
Status: Merged
Approved by: Jacek Nykis
Approved revision: f10799ed517db6550ddfc4486d65a86139e776f7
Merged at revision: f15a7eb95c0ad260d3968fc5f33b7f9296220ceb
Proposed branch: ~telegraf-charmers/charm-telegraf:fix_juju1
Merge into: ~telegraf-charmers/charm-telegraf:master
Diff against target: 13 lines (+1/-1)
1 file modified
reactive/telegraf.py (+1/-1)
Reviewer Review Type Date Requested Status
Telegraf Charmers Pending
Review via email: mp+347970@code.launchpad.net

Commit message

fix for juju1 and bare-metal servers

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
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision f15a7eb95c0ad260d3968fc5f33b7f9296220ceb

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/telegraf.py b/reactive/telegraf.py
2index 174c64e..f965205 100644
3--- a/reactive/telegraf.py
4+++ b/reactive/telegraf.py
5@@ -109,7 +109,7 @@ def get_hostname_label():
6
7
8 def get_remote_unit_name():
9- unit = os.environ.get('JUJU_PRINCIPAL_UNIT', None)
10+ unit = hookenv.principal_unit()
11 if unit:
12 # Note(aluria): use Juju env var available since 2017
13 return unit

Subscribers

No one subscribed via source and target branches