Merge "Deprecate the ceilometer collector"

This commit is contained in:
Zuul 2018-01-26 06:30:27 +00:00 committed by Gerrit Code Review
commit 49379ba8f9
2 changed files with 9 additions and 0 deletions

View File

@ -153,6 +153,10 @@ class APIWorker(BaseWorker):
class Worker(BaseWorker): class Worker(BaseWorker):
def __init__(self, collector, storage, tenant_id=None): def __init__(self, collector, storage, tenant_id=None):
self._collector = collector self._collector = collector
if getattr(self._collector, 'collector_name') == 'ceilometer':
LOG.warning('Ceilometer collector is deprecated and will be '
'removed during R cycle. This collector only works '
'with versions prior to Ocata')
self._storage = storage self._storage = storage
self._period = METRICS_CONF['period'] self._period = METRICS_CONF['period']
self._wait_time = METRICS_CONF['wait_periods'] * self._period self._wait_time = METRICS_CONF['wait_periods'] * self._period

View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ceilometer collector has been deprecated. Gnocchi should be used by
default. The collector will be removed during the Rocky development cycle.