Merge ~tcuthbert/content-cache-charm:master into content-cache-charm:master

Proposed by Thomas Cuthbert
Status: Merged
Approved by: Haw Loeung
Approved revision: b8620715276ad1776c49ecdb6871f0aa3a3a806c
Merged at revision: 3ecd7146c13d23cbf38b4911a50a207baef2f652
Proposed branch: ~tcuthbert/content-cache-charm:master
Merge into: content-cache-charm:master
Diff against target: 12 lines (+1/-0)
1 file modified
reactive/content_cache.py (+1/-0)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+396233@code.launchpad.net

Commit message

content-cache uses localhost for stats monitoring, tell telegraf that

To post a comment you must log in.
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)

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

Change successfully merged at revision 3ecd7146c13d23cbf38b4911a50a207baef2f652

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/reactive/content_cache.py b/reactive/content_cache.py
index f9f2d62..e2e881c 100644
--- a/reactive/content_cache.py
+++ b/reactive/content_cache.py
@@ -488,6 +488,7 @@ def advertise_stats_endpoint():
488488
489 for rel in rels['haproxy-statistics'].values():489 for rel in rels['haproxy-statistics'].values():
490 rel.local['enabled'] = "True"490 rel.local['enabled'] = "True"
491 rel.local['listener_address'] = "127.0.0.1"
491 rel.local['port'] = "10000"492 rel.local['port'] = "10000"
492 rel.local['user'] = "haproxy"493 rel.local['user'] = "haproxy"
493 rel.local['password'] = password494 rel.local['password'] = password

Subscribers

People subscribed via source and target branches