Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ceilometer datasource

Browse Source 
This datasource requires Ceilometer API which was already removed some
years ago. The implementation should have been removed when dependency
on ceilometerclient was removed by [1].

Also remove some job definitions which are not actually used.

[1] 01d74d0a87

Change-Id: I29c3865dc1207f1bbbb266e4217cf8888afebfb6
This commit is contained in:
Takashi Kajinami
2024-12-12 23:15:53 +09:00
parent 811a704f80
commit da23fdc621
21 changed files with 26 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/conf/__init__.py
View File

@@ -21,7 +21,6 @@ from oslo_config import cfg
from watcher.conf import api
from watcher.conf import applier
from watcher.conf import ceilometer_client
from watcher.conf import cinder_client
from watcher.conf import clients_auth
from watcher.conf import collector
@@ -64,7 +63,6 @@ keystone_client.register_opts(CONF)
grafana_client.register_opts(CONF)
grafana_translators.register_opts(CONF)
cinder_client.register_opts(CONF)
ceilometer_client.register_opts(CONF)
neutron_client.register_opts(CONF)
clients_auth.register_opts(CONF)
ironic_client.register_opts(CONF)

63
watcher/conf/ceilometer_client.py
View File

@@ -1,63 +0,0 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp
#
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from oslo_config import cfg
ceilometer_client = cfg.OptGroup(name='ceilometer_client',
title='Configuration Options for Ceilometer')
CEILOMETER_CLIENT_OPTS = [
cfg.StrOpt('api_version',
default='2',
deprecated_for_removal=True,
deprecated_since="1.13.0",
deprecated_reason="""
Ceilometer API is deprecated since Ocata release.
Any related configuration options are deprecated too.
""",
help='Version of Ceilometer API to use in '
'ceilometerclient.'),
cfg.StrOpt('endpoint_type',
default='internalURL',
deprecated_for_removal=True,
deprecated_since="1.13.0",
deprecated_reason="""
Ceilometer API is deprecated since Ocata release.
Any related configuration options are deprecated too.
""",
help='Type of endpoint to use in ceilometerclient. '
'Supported values: internalURL, publicURL, adminURL. '
'The default is internalURL.'),
cfg.StrOpt('region_name',
deprecated_for_removal=True,
deprecated_since="1.13.0",
deprecated_reason="""
Ceilometer API is deprecated since Ocata release.
Any related configuration options are deprecated too.
""",
help='Region in Identity service catalog to use for '
'communication with the OpenStack service.')]
def register_opts(conf):
conf.register_group(ceilometer_client)
conf.register_opts(CEILOMETER_CLIENT_OPTS, group=ceilometer_client)
def list_opts():
return [(ceilometer_client, CEILOMETER_CLIENT_OPTS)]