diff --git a/doc/common/tables/ceilometer-api.xml b/doc/common/tables/ceilometer-api.xml index c1d81b53fc..cad9e7a830 100644 --- a/doc/common/tables/ceilometer-api.xml +++ b/doc/common/tables/ceilometer-api.xml @@ -21,10 +21,6 @@ = api_paste.ini (StrOpt) Configuration file for WSGI definition of API. - - = 1 - (IntOpt) Number of workers for Ceilometer API server. - = event_pipeline.yaml (StrOpt) Configuration file for event pipeline definition. @@ -57,9 +53,21 @@ [api] - = 1000 + = None + (BoolOpt) Set True to redirect alarms URLs to aodh. Default autodetection by querying keystone. + + + = None + (StrOpt) The endpoint of Aodh to redirect alarms URLs to Aodh API. Default autodetection by querying keystone. + + + = 100 (IntOpt) Default maximum number of items returned by API request. + + = None + (BoolOpt) Set True to disable resource/meter/sample URLs. Default autodetection by querying keystone. + = 0.0.0.0 (StrOpt) The listen IP for the ceilometer API server. @@ -72,6 +80,10 @@ = 8777 (IntOpt) The port for the ceilometer API server. + + = 1 + (IntOpt) Number of workers for api, default value is 1. + [oslo_middleware] diff --git a/doc/common/tables/ceilometer-collector.xml b/doc/common/tables/ceilometer-collector.xml index b740d4ee47..5d364a4e88 100644 --- a/doc/common/tables/ceilometer-collector.xml +++ b/doc/common/tables/ceilometer-collector.xml @@ -14,16 +14,13 @@ - - [DEFAULT] - - - = 1 - (IntOpt) Number of workers for collector service. A single collector is enabled by default. - [collector] + + = False + (BoolOpt) Enable the RPC functionality of collector. This functionality is now deprecated in favour of notifier publisher and queues. + = False (BoolOpt) Requeue the event on the collector event queue when the collector fails to dispatch it. @@ -40,6 +37,10 @@ = 4952 (IntOpt) Port to which the UDP socket is bound. + + = 1 + (IntOpt) Number of workers for collector service. default value is 1. + [dispatcher_file] diff --git a/doc/common/tables/ceilometer-common.xml b/doc/common/tables/ceilometer-common.xml index 455dd0112b..58da25010d 100644 --- a/doc/common/tables/ceilometer-common.xml +++ b/doc/common/tables/ceilometer-common.xml @@ -17,6 +17,14 @@ [DEFAULT] + + = True + (BoolOpt) To reduce polling agent load, samples are sent to the notification agent in a batch. To gain higher throughput at the cost of load set this to False. + + + = 64 + (IntOpt) Size of executor thread pool. + = localhost (StrOpt) Name of this node, which must be valid in an AMQP key. Can be an opaque identifier. For ZeroMQ only, must be a valid host name, FQDN, or IP address. @@ -29,10 +37,6 @@ = None (ListOpt) Memcached servers or None for in process cache. - - = 1 - (IntOpt) Number of workers for notification service. A single notification agent is enabled by default. - = ['compute', 'central'] (MultiChoicesOpt) Polling namespace(s) to be used while resource polling diff --git a/doc/common/tables/ceilometer-database.xml b/doc/common/tables/ceilometer-database.xml index a0d3639086..9013bda927 100644 --- a/doc/common/tables/ceilometer-database.xml +++ b/doc/common/tables/ceilometer-database.xml @@ -106,7 +106,7 @@ = - (StrOpt) The name of the replica set which is used to connect to MongoDB database. If it is set, MongoReplicaSetClient will be used instead of MongoClient. + (StrOpt) The name of the replica set which is used to connect to MongoDB database. Add "?replicaSet=myreplicatset" in your connection URI instead. = TRADITIONAL diff --git a/doc/common/tables/ceilometer-dispatcher_gnocchi.xml b/doc/common/tables/ceilometer-dispatcher_gnocchi.xml index ba649bf0f4..8daeb0b6d8 100644 --- a/doc/common/tables/ceilometer-dispatcher_gnocchi.xml +++ b/doc/common/tables/ceilometer-dispatcher_gnocchi.xml @@ -33,6 +33,10 @@ = True (BoolOpt) Filter out samples generated by Gnocchi service activity + + = gnocchi_resources.yaml + (StrOpt) The Yaml file that defines mapping between samples and gnocchi resources/metrics + = http://localhost:8041 (StrOpt) URL to Gnocchi. diff --git a/doc/common/tables/ceilometer-events.xml b/doc/common/tables/ceilometer-events.xml index 7b5fa1083e..9b3924ebed 100644 --- a/doc/common/tables/ceilometer-events.xml +++ b/doc/common/tables/ceilometer-events.xml @@ -40,6 +40,10 @@ = False (BoolOpt) Save event details. + + = 1 + (IntOpt) Number of workers for notification service, default value is 1. + = False (BoolOpt) Enable workload partitioning, allowing multiple notification agents to be run simultaneously. diff --git a/doc/common/tables/ceilometer-exchange.xml b/doc/common/tables/ceilometer-exchange.xml index 6f67e82535..4a821779f9 100644 --- a/doc/common/tables/ceilometer-exchange.xml +++ b/doc/common/tables/ceilometer-exchange.xml @@ -25,6 +25,10 @@ = cinder (StrOpt) Exchange name for Cinder notifications. + + = central + (StrOpt) Exchange name for DNS notifications. + = glance (StrOpt) Exchange name for Glance notifications. @@ -45,6 +49,10 @@ = keystone (StrOpt) Exchange name for Keystone notifications. + + = magnum + (StrOpt) Exchange name for Magnum notifications. + = neutron (StrOpt) Exchange name for Neutron notifications. diff --git a/doc/common/tables/ceilometer-inspector.xml b/doc/common/tables/ceilometer-inspector.xml index 3307e390a5..fa6beebad8 100644 --- a/doc/common/tables/ceilometer-inspector.xml +++ b/doc/common/tables/ceilometer-inspector.xml @@ -19,7 +19,7 @@ = libvirt - (StrOpt) Inspector to use for inspecting the hypervisor layer. + (StrOpt) Inspector to use for inspecting the hypervisor layer. Known inspectors are libvirt, hyperv, vmware, xenapi and powervm. = kvm diff --git a/doc/common/tables/ceilometer-logging.xml b/doc/common/tables/ceilometer-logging.xml index 77ea94d26f..3049d2c787 100644 --- a/doc/common/tables/ceilometer-logging.xml +++ b/doc/common/tables/ceilometer-logging.xml @@ -19,10 +19,10 @@ = False - (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). + (BoolOpt) Print debugging output (set logging level to DEBUG instead of default INFO level). - = amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN + = amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN (ListOpt) List of logger=LEVEL pairs. @@ -91,11 +91,11 @@ = True - (BoolOpt) (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in K, and will be removed in M, along with this option. + (BoolOpt) (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in Kilo, and will be removed in Mitaka, along with this option. - = False - (BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level). + = True + (BoolOpt) If set to false, will disable INFO logging level, making WARNING the default. diff --git a/doc/common/tables/ceilometer-qpid.xml b/doc/common/tables/ceilometer-qpid.xml index 11db74960e..020125bc05 100644 --- a/doc/common/tables/ceilometer-qpid.xml +++ b/doc/common/tables/ceilometer-qpid.xml @@ -71,7 +71,7 @@ = False - (BoolOpt) Send a single AMQP reply to call message. The current behaviour since oslo-incubator is to send two AMQP replies - first one with the payload, a second one to ensure the other have finish to send the payload. We are going to remove it in the N release, but we must keep backward compatible at the same time. This option provides such compatibility - it defaults to False in Liberty and can be turned on for early adopters with a new installations or for testing. Please note, that this option will be removed in M release. + (BoolOpt) Send a single AMQP reply to call message. The current behaviour since oslo-incubator is to send two AMQP replies - first one with the payload, a second one to ensure the other have finish to send the payload. We are going to remove it in the N release, but we must keep backward compatible at the same time. This option provides such compatibility - it defaults to False in Liberty and can be turned on for early adopters with a new installations or for testing. Please note, that this option will be removed in the Mitaka release. diff --git a/doc/common/tables/ceilometer-rabbitmq.xml b/doc/common/tables/ceilometer-rabbitmq.xml index 3a4dc5fabc..f6a41f2e77 100644 --- a/doc/common/tables/ceilometer-rabbitmq.xml +++ b/doc/common/tables/ceilometer-rabbitmq.xml @@ -111,7 +111,7 @@ = False - (BoolOpt) Send a single AMQP reply to call message. The current behaviour since oslo-incubator is to send two AMQP replies - first one with the payload, a second one to ensure the other have finish to send the payload. We are going to remove it in the N release, but we must keep backward compatible at the same time. This option provides such compatibility - it defaults to False in Liberty and can be turned on for early adopters with a new installations or for testing. Please note, that this option will be removed in M release. + (BoolOpt) Send a single AMQP reply to call message. The current behaviour since oslo-incubator is to send two AMQP replies - first one with the payload, a second one to ensure the other have finish to send the payload. We are going to remove it in the N release, but we must keep backward compatible at the same time. This option provides such compatibility - it defaults to False in Liberty and can be turned on for early adopters with a new installations or for testing. Please note, that this option will be removed in the Mitaka release. diff --git a/doc/common/tables/ceilometer-rpc.xml b/doc/common/tables/ceilometer-rpc.xml index 0b0421106e..308bbb6c57 100644 --- a/doc/common/tables/ceilometer-rpc.xml +++ b/doc/common/tables/ceilometer-rpc.xml @@ -45,10 +45,6 @@ = 60 (IntOpt) Seconds to wait for a response from a call. - - = 64 - (IntOpt) Size of RPC thread pool. - [notification] diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings index 977c1f257c..40b2e9b724 100644 --- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings +++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings @@ -1,14 +1,15 @@ api_paste_config api -api_workers api +batch_polled_samples common ceilometer_control_exchange exchange cinder_control_exchange exchange -collector_workers collector control_exchange amqp database_connection database debug logging default_log_levels logging dispatcher rpc +dns_control_exchange exchange event_pipeline_cfg_file api +executor_thread_pool_size common fatal_deprecations logging glance_control_exchange exchange glance_page_size glance @@ -33,13 +34,13 @@ logging_debug_format_suffix logging logging_default_format_string logging logging_exception_prefix logging magnetodb_control_exchange magnetodb +magnum_control_exchange exchange matchmaker_heartbeat_freq rpc matchmaker_heartbeat_ttl rpc memcached_servers common neutron_control_exchange exchange notification_driver amqp notification_topics amqp -notification_workers common nova_control_exchange exchange nova_http_log_debug debug pipeline_cfg_file api @@ -57,7 +58,6 @@ rpc_backend rpc rpc_cast_timeout rpc rpc_conn_pool_size rpc rpc_response_timeout rpc -rpc_thread_pool_size rpc rpc_zmq_bind_address zeromq rpc_zmq_contexts zeromq rpc_zmq_host zeromq @@ -89,14 +89,20 @@ alarm/rest_notifier_max_retries alarm alarm/rest_notifier_ssl_verify alarm alarm/user_alarm_quota alarm alarms/gnocchi_url alarms +api/aodh_is_enabled api +api/aodh_url api api/default_api_return_limit api +api/gnocchi_is_enabled api api/host api api/pecan_debug api api/port api +api/workers api +collector/enable_rpc collector collector/requeue_event_on_dispatcher_error collector collector/requeue_sample_on_dispatcher_error collector collector/udp_address collector collector/udp_port collector +collector/workers collector compute/workload_partitioning common coordination/backend_url common coordination/check_watchers common @@ -148,6 +154,7 @@ dispatcher_gnocchi/archive_policy dispatcher_gnocchi dispatcher_gnocchi/archive_policy_file dispatcher_gnocchi dispatcher_gnocchi/filter_project dispatcher_gnocchi dispatcher_gnocchi/filter_service_activity dispatcher_gnocchi +dispatcher_gnocchi/resources_definition_file dispatcher_gnocchi dispatcher_gnocchi/url dispatcher_gnocchi dispatcher_http/cadf_only dispatcher_http dispatcher_http/event_target dispatcher_http @@ -207,6 +214,7 @@ notification/ack_on_event_error events notification/disable_non_metric_meters notification notification/messaging_urls rpc notification/store_events events +notification/workers events notification/workload_partitioning events oslo_concurrency/disable_process_locking rpc oslo_concurrency/lock_path rpc