Prometheus Charm

Merge ~jacekn/prometheus-charm:bugfix into prometheus-charm:master

  1. Git
  2. lp:~jacekn/prometheus-charm
  3. bugfix
  4. Merge into master
Proposed by Jacek Nykis
Status: Merged
Merged at revision: 0b6fc15e5c15d51fb2383c17a926dcece583a4c7
Proposed branch: ~jacekn/prometheus-charm:bugfix
Merge into: prometheus-charm:master
Diff against target: 13 lines (+1/-1)
1 file modified
reactive/prometheus.py (+1/-1)
Reviewer Review Type Date Requested Status
David Lawson (community) Approve
Review via email: mp+313234@code.launchpad.net

Description of the change

Fix bug in handling static-targets string

To post a comment you must log in.
Revision history for this message
David Lawson (deej) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/prometheus.py b/reactive/prometheus.py
2index b8617fd..ae9f053 100644
3--- a/reactive/prometheus.py
4+++ b/reactive/prometheus.py
5@@ -163,7 +163,7 @@ def write_prometheus_config_yml():
6 static_targets = None
7 if config.get('static-targets'):
8 static_targets = [x.strip()
9- for x in config.get('static-targets', '').split(b',')]
10+ for x in config.get('static-targets', '').split(',')]
11 federate_config = None
12 if config.get('federate-config'):
13 federate_config = yaml.safe_load(config.get('federate-config')) or None

Subscribers

People subscribed via source and target branches