Telegraf Charm

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

  1. Git
  2. lp:~paulgear/charm-telegraf
  3. master
  4. Merge into master
Proposed by Paul Gear
Status: Merged
Merged at revision: 3e9ba6cacf618f6d36f33d5c0f7f8ae7218ec38b
Proposed branch: ~paulgear/charm-telegraf:master
Merge into: ~telegraf-charmers/charm-telegraf:master
Diff against target: 11 lines (+1/-0)
1 file modified
reactive/telegraf.py (+1/-0)
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Review via email: mp+324362@code.launchpad.net

Description of the change

Proposed fix for lp:1659375; requires lp:1692178 to be fixed in order to be effective.

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

Looks fine. As mentioned in the description, pointless to land until a corresponding charmhelpers fix has been released. A work around may be desirable if this is too annoying right now.

review: Approve
Revision history for this message
Paul Gear (paulgear) wrote :

This is harmless to land now, and may be effective for any telegraf package which doesn't install in a disabled state.

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 4f09a38..526ae97 100644
3--- a/reactive/telegraf.py
4+++ b/reactive/telegraf.py
5@@ -271,6 +271,7 @@ def configure_telegraf():
6 hookenv.log("Updating main config file")
7 render(source='telegraf.conf.tmpl', templates_dir=get_templates_dir(),
8 target=config_path, context=context)
9+ host.service_resume('telegraf')
10 set_state('telegraf.configured')
11 set_state('telegraf.needs_reload')
12

Subscribers

People subscribed via source and target branches

to all changes: