openstack/ceilometer
Code Issues Proposed changes

Merge "Deprecate config options of the old alarming functionality"

Browse Source
This commit is contained in:
Jenkins 2015-09-15 02:02:15 +00:00 committed by Gerrit Code Review
commit 15633f0c38
6 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ceilometer/alarm/evaluator/gnocchi.py
View File

@ -41,6 +41,7 @@ COMPARATORS = {
OPTS = [ OPTS = [
cfg.StrOpt('gnocchi_url', cfg.StrOpt('gnocchi_url',
default="http://localhost:8041", default="http://localhost:8041",
deprecated_for_removal=True,
help='URL to Gnocchi.'), help='URL to Gnocchi.'),
] ]

4
ceilometer/alarm/notifier/rest.py
View File

@ -30,19 +30,23 @@ LOG = log.getLogger(__name__)
OPTS = [ OPTS = [
cfg.StrOpt('rest_notifier_certificate_file', cfg.StrOpt('rest_notifier_certificate_file',
default='', default='',
deprecated_for_removal=True,
help='SSL Client certificate for REST notifier.' help='SSL Client certificate for REST notifier.'
), ),
cfg.StrOpt('rest_notifier_certificate_key', cfg.StrOpt('rest_notifier_certificate_key',
default='', default='',
deprecated_for_removal=True,
help='SSL Client private key for REST notifier.' help='SSL Client private key for REST notifier.'
), ),
cfg.BoolOpt('rest_notifier_ssl_verify', cfg.BoolOpt('rest_notifier_ssl_verify',
default=True, default=True,
deprecated_for_removal=True,
help='Whether to verify the SSL Server certificate when ' help='Whether to verify the SSL Server certificate when '
'calling alarm action.' 'calling alarm action.'
), ),
cfg.IntOpt('rest_notifier_max_retries', cfg.IntOpt('rest_notifier_max_retries',
default=0, default=0,
deprecated_for_removal=True,
help='Number of retries for REST notifier', help='Number of retries for REST notifier',
), ),

1
ceilometer/alarm/rpc.py
View File

@ -26,6 +26,7 @@ from ceilometer import messaging
OPTS = [ OPTS = [
cfg.StrOpt('notifier_rpc_topic', cfg.StrOpt('notifier_rpc_topic',
default='alarm_notifier', default='alarm_notifier',
deprecated_for_removal=True,
help='The topic that ceilometer uses for alarm notifier ' help='The topic that ceilometer uses for alarm notifier '
'messages.'), 'messages.'),
] ]

1
ceilometer/alarm/service.py
View File

@ -37,6 +37,7 @@ from ceilometer import messaging
OPTS = [ OPTS = [
cfg.IntOpt('evaluation_interval', cfg.IntOpt('evaluation_interval',
default=60, default=60,
deprecated_for_removal=True,
help='Period of evaluation cycle, should' help='Period of evaluation cycle, should'
' be >= than configured pipeline interval for' ' be >= than configured pipeline interval for'
' collection of underlying meters.', ' collection of underlying meters.',

4
ceilometer/api/controllers/v2/alarms.py
View File

@ -57,18 +57,22 @@ LOG = log.getLogger(__name__)
ALARM_API_OPTS = [ ALARM_API_OPTS = [
cfg.BoolOpt('record_history', cfg.BoolOpt('record_history',
default=True, default=True,
deprecated_for_removal=True,
help='Record alarm change events.' help='Record alarm change events.'
), ),
cfg.IntOpt('user_alarm_quota', cfg.IntOpt('user_alarm_quota',
default=None, default=None,
deprecated_for_removal=True,
help='Maximum number of alarms defined for a user.' help='Maximum number of alarms defined for a user.'
), ),
cfg.IntOpt('project_alarm_quota', cfg.IntOpt('project_alarm_quota',
default=None, default=None,
deprecated_for_removal=True,
help='Maximum number of alarms defined for a project.' help='Maximum number of alarms defined for a project.'
), ),
cfg.IntOpt('alarm_max_actions', cfg.IntOpt('alarm_max_actions',
default=-1, default=-1,
deprecated_for_removal=True,
help='Maximum count of actions for each state of an alarm, ' help='Maximum count of actions for each state of an alarm, '
'non-positive number means no limit.'), 'non-positive number means no limit.'),
] ]

2
ceilometer/storage/__init__.py
View File

@ -57,10 +57,12 @@ OPTS = [
cfg.StrOpt('alarm_connection', cfg.StrOpt('alarm_connection',
secret=True, secret=True,
default=None, default=None,
deprecated_for_removal=True,
help='The connection string used to connect to the alarm ' help='The connection string used to connect to the alarm '
'database. (if unset, connection is used)'), 'database. (if unset, connection is used)'),
cfg.IntOpt('alarm_history_time_to_live', cfg.IntOpt('alarm_history_time_to_live',
default=-1, default=-1,
deprecated_for_removal=True,
help=("Number of seconds that alarm histories are kept " help=("Number of seconds that alarm histories are kept "
"in the database for (<= 0 means forever).")), "in the database for (<= 0 means forever).")),
cfg.StrOpt('event_connection', cfg.StrOpt('event_connection',