diff options
| author | Zuul <zuul@review.openstack.org> | 2018-07-03 14:35:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-07-03 14:35:00 +0000 |
| commit | c721cffb01c3903f20aa7d019e62f932208fbcb3 (patch) | |
| tree | a28205f61e9ad4ae02e46f28d1330a8eb2e35c35 | |
| parent | c97f5958ba6255eb992e73cc27ac5fd9730d830f (diff) | |
| parent | c567258979064d4a6e82057f68587b184ee939aa (diff) | |
| download | ceilometer-c721cffb01c3903f20aa7d019e62f932208fbcb3.tar.gz | |
Merge "Remove deprecated gnocchi_dispatcher option group"
| -rw-r--r-- | ceilometer/opts.py | 22 | ||||
| -rw-r--r-- | ceilometer/publisher/gnocchi.py | 14 | ||||
| -rw-r--r-- | releasenotes/notes/remove-gnocchi-dispatcher-options-4f4ba2a155c1a766.yaml | 4 |
3 files changed, 8 insertions, 32 deletions
diff --git a/ceilometer/opts.py b/ceilometer/opts.py index 837fbd7f..0c129f5e 100644 --- a/ceilometer/opts.py +++ b/ceilometer/opts.py @@ -93,28 +93,6 @@ def list_opts(): help='Number of seconds between checks to see if group ' 'membership has changed'), ]), - ('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, diff --git a/ceilometer/publisher/gnocchi.py b/ceilometer/publisher/gnocchi.py index 1673ee69..289dc338 100644 --- a/ceilometer/publisher/gnocchi.py +++ b/ceilometer/publisher/gnocchi.py @@ -198,25 +198,19 @@ class GnocchiPublisher(publisher.ConfigPublisherBase): # TODO(jd) allow to override Gnocchi endpoint via the host in the URL options = urlparse.parse_qs(parsed_url.query) - self.filter_project = options.get( - 'filter_project', - [conf.dispatcher_gnocchi.filter_project])[-1] + self.filter_project = options.get('filter_project', [True])[-1] resources_definition_file = options.get( - 'resources_definition_file', - [conf.dispatcher_gnocchi.resources_definition_file])[-1] + 'resources_definition_file', ['gnocchi_resources.yaml'])[-1] - archive_policy_override = options.get( - 'archive_policy', - [conf.dispatcher_gnocchi.archive_policy])[-1] + archive_policy_override = options.get('archive_policy', [None])[-1] self.resources_definition, self.archive_policies_definition = ( self._load_definitions(conf, archive_policy_override, resources_definition_file)) self.metric_map = dict((metric, rd) for rd in self.resources_definition for metric in rd.metrics) - timeout = options.get('timeout', - [conf.dispatcher_gnocchi.request_timeout])[-1] + timeout = options.get('timeout', [6.05])[-1] self._ks_client = keystone_client.get_client(conf) self.cache = None diff --git a/releasenotes/notes/remove-gnocchi-dispatcher-options-4f4ba2a155c1a766.yaml b/releasenotes/notes/remove-gnocchi-dispatcher-options-4f4ba2a155c1a766.yaml new file mode 100644 index 00000000..b207b0c3 --- /dev/null +++ b/releasenotes/notes/remove-gnocchi-dispatcher-options-4f4ba2a155c1a766.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The deprecated `gnocchi_dispatcher` option group has been removed. |