Merge ~brad-marshall/charm-prometheus-ceph-exporter/+git/prometheus-ceph-exporter-charm:fix-prometheus-target-relation into ~prometheus-charmers/charm-prometheus-ceph-exporter/+git/prometheus-ceph-exporter-charm:master

Proposed by Brad Marshall
Status: Merged
Approved by: James Hebden
Approved revision: 1f03753be0bdb2ef3ef6e58b457bd157be8e774a
Merged at revision: 1f03753be0bdb2ef3ef6e58b457bd157be8e774a
Proposed branch: ~brad-marshall/charm-prometheus-ceph-exporter/+git/prometheus-ceph-exporter-charm:fix-prometheus-target-relation
Merge into: ~prometheus-charmers/charm-prometheus-ceph-exporter/+git/prometheus-ceph-exporter-charm:master
Diff against target: 24 lines (+3/-3)
1 file modified
reactive/prometheus-ceph-exporter.py (+3/-3)
Reviewer Review Type Date Requested Status
James Hebden (community) Approve
Review via email: mp+328290@code.launchpad.net

Description of the change

Fixed prometheus target relation

To post a comment you must log in.
Revision history for this message
James Hebden (ec0) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/prometheus-ceph-exporter.py b/reactive/prometheus-ceph-exporter.py
2index 41e9e69..9d6fb73 100644
3--- a/reactive/prometheus-ceph-exporter.py
4+++ b/reactive/prometheus-ceph-exporter.py
5@@ -18,7 +18,7 @@ import os
6 from charmhelpers.core import host, hookenv
7 from charmhelpers.core.templating import render
8 from charms.reactive import (
9- when, when_not, set_state, remove_state
10+ when, when_any, set_state, remove_state
11 )
12 from charms.reactive.helpers import any_file_changed, data_changed
13 # from charms.layer import snap
14@@ -41,8 +41,8 @@ def validate_config(filename):
15 return yaml.safe_load(open(filename))
16
17
18-@when('snap.installed.prometheus-ceph-exporter')
19-@when('ceph-exporter.do-reconfig-yaml')
20+@when_any('snap.installed.prometheus-ceph-exporter',
21+ 'ceph-exporter.do-reconfig-yaml')
22 def write_ceph_exporter_config_yaml():
23 # config = hookenv.config()
24 hookenv.open_port(PORT_DEF)

Subscribers

People subscribed via source and target branches