Merge ~vlgrevtsev/charm-prometheus-ceph-exporter:lp1807282 into ~prometheus-charmers/charm-prometheus-ceph-exporter/+git/prometheus-ceph-exporter-charm:master

[Vladimir Grevtsev]

Moving config render under the separate flag and function to ensure the changes in the relation (like monitor IP) will be propagated properly.

LP: #1807282

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Joel Sing (jsing)]

review: Needs Fixing

[Drew Freiberger (afreiberger)]

this is going to need a refactor, as much of this configuration has moved. Not sure if still an issue or not after the Q2/Q3 updates to the charm.

Unmerged commits

3f5db43... by Vladimir Grevtsev on 2019-12-13

Moving config render under the separate flag and function
to ensure the changes in the relation (like monitor IP) will
be propagated properly.

LP: #1807282

diff --git a/reactive/prometheus-ceph-exporter.py b/reactive/prometheus-ceph-exporter.py
index c0b6db7..63336a3 100644
--- a/reactive/prometheus-ceph-exporter.py
+++ b/reactive/prometheus-ceph-exporter.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Canonical Ltd
+# Copyright 2017-2019 Canonical Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -62,12 +62,9 @@ def open_port():
     hookenv.open_port(PORT_DEF)
     set_state('ports-open')
 
-
 @when('ceph.available')
-@when_not('exporter.started')
-def configure_exporter(ceph_client):
+def write_ceph_conf(ceph_client):
     service_name = hookenv.service_name()
-    daemon_conf = os.path.join(os.sep, SNAP_DATA, 'daemon_arguments')
     charm_ceph_conf = os.path.join(os.sep, SNAP_DATA, 'ceph.conf')
     cephx_key = os.path.join(os.sep, SNAP_DATA, 'ceph.client.%s.keyring' %
                              (service_name))
@@ -89,7 +86,14 @@ def configure_exporter(ceph_client):
 
     # Write out the cephx_key also
     render('ceph.keyring', cephx_key, ceph_key_context)
+    hookenv.log("Ceph config saved")
+    set_state('exporter.ready')
 
+@when('exporter.ready')
+@when_not('exporter.started')
+def configure_exporter():
+    service_name = hookenv.service_name()
+    daemon_conf = os.path.join(os.sep, SNAP_DATA, 'daemon_arguments')
     daemon_context = {
         'daemon_arguments': hookenv.config('daemon_arguments'),
         'service_name': service_name,
@@ -108,7 +112,6 @@ def configure_exporter(ceph_client):
         raise ServiceError("Service didn't start: {}".format(SVC_NAME))
     set_state('exporter.started')
 
-
 def get_exporter_host(interface='ceph-exporter'):
     """Get address of local ceph-exporter host for use by http clients