Merge "Support file watcher to trigger GMR report"

designate/cmd/api.py

@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 from designate.api import service as api_service
 import designate.conf
@@ -33,7 +34,8 @@ CONF.import_group('keystone_authtoken', 'keystonemiddleware.auth_token')
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = api_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name)

designate/cmd/central.py

@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 from designate.central import service as central_service
 import designate.conf
@@ -32,7 +33,8 @@ CONF = designate.conf.CONF
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = central_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name,

designate/cmd/manage.py

@@ -23,6 +23,7 @@ import eventlet
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 from stevedore.extension import ExtensionManager
 
 import designate.conf
@@ -114,7 +115,8 @@ def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
 
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     try:
         fn = CONF.category.action_fn

designate/cmd/mdns.py

@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 import designate.conf
 from designate import heartbeat_emitter
@@ -32,7 +33,8 @@ CONF = designate.conf.CONF
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = mdns_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name)

designate/cmd/producer.py

@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 import designate.conf
 from designate import heartbeat_emitter
@@ -33,7 +34,8 @@ LOG = logging.getLogger(__name__)
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = producer_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name)

designate/cmd/sink.py

@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 import designate.conf
 from designate import heartbeat_emitter
@@ -32,7 +33,8 @@ CONF = designate.conf.CONF
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = sink_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name)

designate/cmd/worker.py

@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 import designate.conf
 from designate import heartbeat_emitter
@@ -33,7 +34,8 @@ LOG = logging.getLogger(__name__)
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = worker_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name)