diff options
| author | Julien Danjou <julien@danjou.info> | 2017-09-04 13:47:58 +0200 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2017-10-13 18:18:07 +0200 |
| commit | 83ffaffcb2cee6a0b19601bc7cefd863685601e2 (patch) | |
| tree | d28beb0e51bb65ee856ce9dcfd28b63c89371745 /ceilometer/opts.py | |
| parent | bca9d45ea439220305539f85a653cb31e501be25 (diff) | |
| download | ceilometer-83ffaffcb2cee6a0b19601bc7cefd863685601e2.tar.gz | |
Replace the Gnocchi dispatcher by a publisher
This removes the deprecated Gnocchi dispatcher and replaces it by its
equivalent publisher.
Change-Id: Ie44baf20ccb8de5794f5f0c3d4717f7e56afa63b
Diffstat (limited to 'ceilometer/opts.py')
| -rw-r--r-- | ceilometer/opts.py | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/ceilometer/opts.py b/ceilometer/opts.py index 8f80c2bc..39a1fea0 100644 --- a/ceilometer/opts.py +++ b/ceilometer/opts.py @@ -27,7 +27,6 @@ import ceilometer.compute.virt.libvirt.utils import ceilometer.compute.virt.vmware.inspector import ceilometer.compute.virt.xenapi.inspector import ceilometer.dispatcher -import ceilometer.dispatcher.gnocchi_opts import ceilometer.event.converter import ceilometer.hardware.discovery import ceilometer.hardware.pollsters.generic @@ -105,8 +104,28 @@ def list_opts(): 'membership has changed'), ]), ('database', ceilometer.storage.OPTS), - ('dispatcher_gnocchi', - ceilometer.dispatcher.gnocchi_opts.dispatcher_opts), + ('dispatcher_gnocchi', ( + cfg.StrOpt( + 'filter_project', + deprecated_for_removal=True, + default='gnocchi', + help='Gnocchi project used to filter out samples ' + 'generated by Gnocchi service activity'), + cfg.StrOpt( + 'archive_policy', + deprecated_for_removal=True, + help='The archive policy to use when the dispatcher ' + 'create a new metric.'), + cfg.StrOpt( + 'resources_definition_file', + deprecated_for_removal=True, + default='gnocchi_resources.yaml', + help=('The Yaml file that defines mapping between samples ' + 'and gnocchi resources/metrics')), + cfg.FloatOpt( + 'request_timeout', default=6.05, min=0.0, + deprecated_for_removal=True, + help='Number of seconds before request to gnocchi times out'))), ('event', ceilometer.event.converter.OPTS), ('hardware', itertools.chain( ceilometer.hardware.discovery.OPTS, |