[config-ref] Update aodh tables

Change-Id: If0247eda498b0d2db34a4ca2bf7079b08ae7ec58

doc/config-reference/source/tables/aodh-amqp.rst

@@ -21,4 +21,4 @@
    * - ``control_exchange`` = ``openstack``
      - (String) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option.
    * - ``transport_url`` = ``None``
-     - (String) A URL representing the messaging driver to use and its full configuration. If not set, we fall back to the rpc_backend option and driver specific configuration.
+     - (String) A URL representing the messaging driver to use and its full configuration.

doc/config-reference/source/tables/aodh-api.rst

@@ -18,19 +18,25 @@
      - Description
    * - **[api]**
      -
-   * - ``host`` = ``0.0.0.0``
-     - (String) The listen IP for the aodh API server.
+   * - ``alarm_max_actions`` = ``-1``
+     - (Integer) Maximum count of actions for each state of an alarm, non-positive number means no limit.
+   * - ``enable_combination_alarms`` = ``False``
+     - (Boolean) DEPRECATED: Enable deprecated combination alarms. Combination alarms are deprecated. This option and combination alarms will be removed in Aodh 5.0.
    * - ``paste_config`` = ``api_paste.ini``
      - (String) Configuration file for WSGI definition of API.
    * - ``pecan_debug`` = ``False``
      - (Boolean) Toggle Pecan Debug Middleware.
-   * - ``port`` = ``8042``
-     - (Port number) The port for the aodh API server.
+   * - ``project_alarm_quota`` = ``None``
+     - (Integer) Maximum number of alarms defined for a project.
+   * - ``user_alarm_quota`` = ``None``
+     - (Integer) Maximum number of alarms defined for a user.
    * - ``workers`` = ``1``
      - (Integer) Number of workers for aodh API server.
    * - **[oslo_middleware]**
      -
+   * - ``enable_proxy_headers_parsing`` = ``False``
+     - (Boolean) Whether the application is behind a proxy or not. This determines if the middleware should parse the headers or not.
    * - ``max_request_body_size`` = ``114688``
      - (Integer) The maximum body size for each request, in bytes.
    * - ``secure_proxy_ssl_header`` = ``X-Forwarded-Proto``
-     - (String) DEPRECATED: The HTTP Header that will be used to determine what the original request protocol scheme was, even if it was hidden by an SSL termination proxy.
+     - (String) DEPRECATED: The HTTP Header that will be used to determine what the original request protocol scheme was, even if it was hidden by a SSL termination proxy.

doc/config-reference/source/tables/aodh-common.rst

@@ -18,45 +18,63 @@
      - Description
    * - **[DEFAULT]**
      -
-   * - ``alarm_max_actions`` = ``-1``
-     - (Integer) Maximum count of actions for each state of an alarm, non-positive number means no limit.
+   * - ``additional_ingestion_lag`` = ``0``
+     - (Integer) The number of seconds to extend the evaluation windows to compensate the reporting/ingestion lag.
    * - ``evaluation_interval`` = ``60``
      - (Integer) Period of evaluation cycle, should be >= than configured pipeline interval for collection of underlying meters.
    * - ``event_alarm_cache_ttl`` = ``60``
      - (Integer) TTL of event alarm caches, in seconds. Set to 0 to disable caching.
-   * - ``event_alarm_topic`` = ``alarm.all``
-     - (String) The topic that aodh uses for event alarm evaluation.
    * - ``executor_thread_pool_size`` = ``64``
      - (Integer) Size of executor thread pool.
-   * - ``host`` = ``localhost``
-     - (String) 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.
    * - ``http_timeout`` = ``600``
      - (Integer) Timeout seconds for HTTP requests. Set it to None to disable timeout.
-   * - ``memcached_servers`` = ``None``
-     - (List) Memcached servers or None for in process cache.
    * - ``notifier_topic`` = ``alarming``
      - (String) The topic that aodh uses for alarm notifier messages.
-   * - ``project_alarm_quota`` = ``None``
-     - (Integer) Maximum number of alarms defined for a project.
    * - ``record_history`` = ``True``
      - (Boolean) Record alarm change events.
+   * - ``rest_notifier_ca_bundle_certificate_path`` = ``None``
+     - (String) SSL CA_BUNDLE certificate for REST notifier
    * - ``rest_notifier_certificate_file`` =
-     - (String) SSL Client certificate for REST notifier.
+     - (String) SSL Client certificate file for REST notifier.
    * - ``rest_notifier_certificate_key`` =
-     - (String) SSL Client private key for REST notifier.
+     - (String) SSL Client private key file for REST notifier.
    * - ``rest_notifier_max_retries`` = ``0``
      - (Integer) Number of retries for REST notifier
    * - ``rest_notifier_ssl_verify`` = ``True``
      - (Boolean) Whether to verify the SSL Server certificate when calling alarm action.
-   * - ``user_alarm_quota`` = ``None``
-     - (Integer) Maximum number of alarms defined for a user.
    * - **[database]**
      -
    * - ``alarm_history_time_to_live`` = ``-1``
      - (Integer) Number of seconds that alarm histories are kept in the database for (<= 0 means forever).
+   * - **[evaluator]**
+     -
+   * - ``workers`` = ``1``
+     - (Integer) Number of workers for evaluator service. default value is 1.
+   * - **[listener]**
+     -
+   * - ``batch_size`` = ``1``
+     - (Integer) Number of notification messages to wait before dispatching them.
+   * - ``batch_timeout`` = ``None``
+     - (Integer) Number of seconds to wait before dispatching samples when batch_size is not reached (None means indefinitely).
+   * - ``event_alarm_topic`` = ``alarm.all``
+     - (String) The topic that aodh uses for event alarm evaluation.
+   * - ``workers`` = ``1``
+     - (Integer) Number of workers for listener service. default value is 1.
+   * - **[notifier]**
+     -
+   * - ``batch_size`` = ``1``
+     - (Integer) Number of notification messages to wait before dispatching them.
+   * - ``batch_timeout`` = ``None``
+     - (Integer) Number of seconds to wait before dispatching samples when batch_size is not reached (None means indefinitely).
+   * - ``workers`` = ``1``
+     - (Integer) Number of workers for notifier service. default value is 1.
    * - **[service_credentials]**
      -
    * - ``interface`` = ``public``
      - (String) Type of endpoint in Identity service catalog to use for communication with OpenStack services.
    * - ``region_name`` = ``None``
      - (String) Region name to use for OpenStack service endpoints.
+   * - **[service_types]**
+     -
+   * - ``zaqar`` = ``messaging``
+     - (String) Message queue service type.

doc/config-reference/source/tables/aodh-coordination.rst

@@ -24,3 +24,7 @@
      - (Floating point) Number of seconds between checks to see if group membership has changed
    * - ``heartbeat`` = ``1.0``
      - (Floating point) Number of seconds between heartbeats for distributed coordination.
+   * - ``max_retry_interval`` = ``30``
+     - (Integer) Maximum number of seconds between retry to join partitioning group
+   * - ``retry_backoff`` = ``1``
+     - (Integer) Retry backoff factor when retrying to connect with coordination backend

doc/config-reference/source/tables/aodh-rabbitmq.rst

@@ -24,8 +24,10 @@
      - (Boolean) Use durable queues in AMQP.
    * - ``channel_max`` = ``None``
      - (Integer) Maximum number of channels to allow
+   * - ``connection_factory`` = ``single``
+     - (String) Connection factory implementation
    * - ``default_notification_exchange`` = ``${control_exchange}_notification``
-     - (String) Exchange name for for sending notifications
+     - (String) Exchange name for sending notifications
    * - ``default_notification_retry_attempts`` = ``-1``
      - (Integer) Reconnecting retry count in case of connectivity problem during sending notification, -1 means infinite retry.
    * - ``default_rpc_exchange`` = ``${control_exchange}_rpc``
@@ -36,7 +38,7 @@
      - (Boolean) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
    * - ``frame_max`` = ``None``
      - (Integer) The maximum byte size for an AMQP frame
-   * - ``heartbeat_interval`` = ``1``
+   * - ``heartbeat_interval`` = ``3``
      - (Integer) How often to send heartbeats for consumer's connections
    * - ``heartbeat_rate`` = ``2``
      - (Integer) How often times during the heartbeat_timeout_threshold we check the heartbeat.
@@ -45,7 +47,7 @@
    * - ``host_connection_reconnect_delay`` = ``0.25``
      - (Floating point) Set delay for reconnection to some host which has connection error
    * - ``kombu_compression`` = ``None``
-     - (String) EXPERIMENTAL: Possible values are: gzip, bz2. If not set compression will not be used. This option may notbe available in future versions.
+     - (String) EXPERIMENTAL: Possible values are: gzip, bz2. If not set compression will not be used. This option may not be available in future versions.
    * - ``kombu_failover_strategy`` = ``round-robin``
      - (String) Determines how the next RabbitMQ node is chosen in case the one we are currently connected to becomes unavailable. Takes effect only if more than one RabbitMQ node is provided in config.
    * - ``kombu_missing_consumer_retry_timeout`` = ``60``
@@ -68,7 +70,7 @@
      - (Floating point) Reconnecting retry delay in case of connectivity problem during sending notification message
    * - ``pool_max_overflow`` = ``0``
      - (Integer) Maximum number of connections to create above `pool_max_size`.
-   * - ``pool_max_size`` = ``10``
+   * - ``pool_max_size`` = ``30``
      - (Integer) Maximum number of connections to keep queued.
    * - ``pool_recycle`` = ``600``
      - (Integer) Lifetime of a connection (since creation) in seconds or None for no recycling. Expired connections are closed on acquire.
@@ -79,19 +81,19 @@
    * - ``rabbit_ha_queues`` = ``False``
      - (Boolean) Try to use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. In RabbitMQ 3.0, queue mirroring is no longer controlled by the x-ha-policy argument when declaring a queue. If you just want to make sure that all queues (except those with auto-generated names) are mirrored across all nodes, run: "rabbitmqctl set_policy HA '^(?!amq\.).*' '{"ha-mode": "all"}' "
    * - ``rabbit_host`` = ``localhost``
-     - (String) The RabbitMQ broker address where a single node is used.
+     - (String) DEPRECATED: The RabbitMQ broker address where a single node is used. Replaced by [DEFAULT]/transport_url
    * - ``rabbit_hosts`` = ``$rabbit_host:$rabbit_port``
-     - (List) RabbitMQ HA cluster host:port pairs.
+     - (List) DEPRECATED: RabbitMQ HA cluster host:port pairs. Replaced by [DEFAULT]/transport_url
    * - ``rabbit_interval_max`` = ``30``
      - (Integer) Maximum interval of RabbitMQ connection retries. Default is 30 seconds.
    * - ``rabbit_login_method`` = ``AMQPLAIN``
      - (String) The RabbitMQ login method.
    * - ``rabbit_max_retries`` = ``0``
-     - (Integer) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count).
+     - (Integer) DEPRECATED: Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count).
    * - ``rabbit_password`` = ``guest``
-     - (String) The RabbitMQ password.
+     - (String) DEPRECATED: The RabbitMQ password. Replaced by [DEFAULT]/transport_url
    * - ``rabbit_port`` = ``5672``
-     - (Port number) The RabbitMQ broker port where a single node is used.
+     - (Port number) DEPRECATED: The RabbitMQ broker port where a single node is used. Replaced by [DEFAULT]/transport_url
    * - ``rabbit_qos_prefetch_count`` = ``0``
      - (Integer) Specifies the number of messages to prefetch. Setting to zero allows unlimited messages.
    * - ``rabbit_retry_backoff`` = ``2``
@@ -103,6 +105,6 @@
    * - ``rabbit_use_ssl`` = ``False``
      - (Boolean) Connect over SSL for RabbitMQ.
    * - ``rabbit_userid`` = ``guest``
-     - (String) The RabbitMQ userid.
+     - (String) DEPRECATED: The RabbitMQ userid. Replaced by [DEFAULT]/transport_url
    * - ``rabbit_virtual_host`` = ``/``
-     - (String) The RabbitMQ virtual host.
+     - (String) DEPRECATED: The RabbitMQ virtual host. Replaced by [DEFAULT]/transport_url

doc/config-reference/source/tables/aodh-redis.rst

@@ -21,16 +21,16 @@
    * - ``check_timeout`` = ``20000``
      - (Integer) Time in ms to wait before the transaction is killed.
    * - ``host`` = ``127.0.0.1``
-     - (String) Host to locate redis.
+     - (String) DEPRECATED: Host to locate redis. Replaced by [DEFAULT]/transport_url
    * - ``password`` =
-     - (String) Password for Redis server (optional).
+     - (String) DEPRECATED: Password for Redis server (optional). Replaced by [DEFAULT]/transport_url
    * - ``port`` = ``6379``
-     - (Port number) Use this port to connect to redis host.
+     - (Port number) DEPRECATED: Use this port to connect to redis host. Replaced by [DEFAULT]/transport_url
    * - ``sentinel_group_name`` = ``oslo-messaging-zeromq``
      - (String) Redis replica set name.
    * - ``sentinel_hosts`` =
-     - (List) List of Redis Sentinel hosts (fault tolerance mode) e.g. [host:port, host1:port ... ]
-   * - ``socket_timeout`` = ``1000``
+     - (List) DEPRECATED: List of Redis Sentinel hosts (fault tolerance mode) e.g. [host:port, host1:port ... ] Replaced by [DEFAULT]/transport_url
+   * - ``socket_timeout`` = ``10000``
      - (Integer) Timeout in ms on blocking socket operations
-   * - ``wait_timeout`` = ``500``
+   * - ``wait_timeout`` = ``2000``
      - (Integer) Time in ms to wait between connection attempts.

doc/config-reference/source/tables/aodh-rpc.rst

@@ -19,7 +19,7 @@
    * - **[DEFAULT]**
      -
    * - ``rpc_backend`` = ``rabbit``
-     - (String) The messaging driver to use, defaults to rabbit. Other drivers include amqp and zmq.
+     - (String) DEPRECATED: The messaging driver to use, defaults to rabbit. Other drivers include amqp and zmq. Replaced by [DEFAULT]/transport_url
    * - ``rpc_cast_timeout`` = ``-1``
      - (Integer) Seconds to wait before a cast expires (TTL). The default value of -1 specifies an infinite linger period. The value of 0 specifies no linger period. Pending messages shall be discarded immediately when the socket is closed. Only supported by impl_zmq.
    * - ``rpc_conn_pool_size`` = ``30``
@@ -30,18 +30,52 @@
      - (Integer) Seconds to wait for a response from a call.
    * - **[oslo_messaging_amqp]**
      -
+   * - ``addressing_mode`` = ``dynamic``
+     - (String) Indicates the addressing mode used by the driver. Permitted values: 'legacy' - use legacy non-routable addressing 'routable' - use routable addresses 'dynamic' - use legacy addresses if the message bus does not support routing otherwise use routable addressing
    * - ``allow_insecure_clients`` = ``False``
      - (Boolean) Accept clients using either SSL or plain TCP
+   * - ``anycast_address`` = ``anycast``
+     - (String) Appended to the address prefix when sending to a group of consumers. Used by the message bus to identify messages that should be delivered in a round-robin fashion across consumers.
    * - ``broadcast_prefix`` = ``broadcast``
      - (String) address prefix used when broadcasting to all servers
+   * - ``connection_retry_backoff`` = ``2``
+     - (Integer) Increase the connection_retry_interval by this many seconds after each unsuccessful failover attempt.
+   * - ``connection_retry_interval`` = ``1``
+     - (Integer) Seconds to pause before attempting to re-connect.
+   * - ``connection_retry_interval_max`` = ``30``
+     - (Integer) Maximum limit for connection_retry_interval + connection_retry_backoff
    * - ``container_name`` = ``None``
-     - (String) Name for the AMQP container
+     - (String) Name for the AMQP container. must be globally unique. Defaults to a generated UUID
+   * - ``default_notification_exchange`` = ``None``
+     - (String) Exchange name used in notification addresses. Exchange name resolution precedence: Target.exchange if set else default_notification_exchange if set else control_exchange if set else 'notify'
+   * - ``default_notify_timeout`` = ``30``
+     - (Integer) The deadline for a sent notification message delivery. Only used when caller does not provide a timeout expiry.
+   * - ``default_reply_timeout`` = ``30``
+     - (Integer) The deadline for an rpc reply message delivery. Only used when caller does not provide a timeout expiry.
+   * - ``default_rpc_exchange`` = ``None``
+     - (String) Exchange name used in RPC addresses. Exchange name resolution precedence: Target.exchange if set else default_rpc_exchange if set else control_exchange if set else 'rpc'
+   * - ``default_send_timeout`` = ``30``
+     - (Integer) The deadline for an rpc cast or call message delivery. Only used when caller does not provide a timeout expiry.
    * - ``group_request_prefix`` = ``unicast``
      - (String) address prefix when sending to any server in group
    * - ``idle_timeout`` = ``0``
      - (Integer) Timeout for inactive connections (in seconds)
+   * - ``link_retry_delay`` = ``10``
+     - (Integer) Time to pause between re-connecting an AMQP 1.0 link that failed due to a recoverable error.
+   * - ``multicast_address`` = ``multicast``
+     - (String) Appended to the address prefix when sending a fanout message. Used by the message bus to identify fanout messages.
+   * - ``notify_address_prefix`` = ``openstack.org/om/notify``
+     - (String) Address prefix for all generated Notification addresses
+   * - ``notify_server_credit`` = ``100``
+     - (Integer) Window size for incoming Notification messages
    * - ``password`` =
      - (String) Password for message broker authentication
+   * - ``reply_link_credit`` = ``200``
+     - (Integer) Window size for incoming RPC Reply messages.
+   * - ``rpc_address_prefix`` = ``openstack.org/om/rpc``
+     - (String) Address prefix for all generated RPC addresses
+   * - ``rpc_server_credit`` = ``100``
+     - (Integer) Window size for incoming RPC Request messages
    * - ``sasl_config_dir`` =
      - (String) Path to directory that contains the SASL configuration
    * - ``sasl_config_name`` =
@@ -60,6 +94,8 @@
      - (String) Password for decrypting ssl_key_file (if encrypted)
    * - ``trace`` = ``False``
      - (Boolean) Debug: dump AMQP frames to stdout
+   * - ``unicast_address`` = ``unicast``
+     - (String) Appended to the address prefix when sending to a particular RPC/Notification server. Used by the message bus to identify messages sent to a single destination.
    * - ``username`` =
      - (String) User name for message broker authentication
    * - **[oslo_messaging_notifications]**

doc/config-reference/source/tables/aodh-zeromq.rst

@@ -22,8 +22,6 @@
      - (String) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address.
    * - ``rpc_zmq_bind_port_retries`` = ``100``
      - (Integer) Number of retries to find free port number before fail with ZMQBindError.
-   * - ``rpc_zmq_concurrency`` = ``eventlet``
-     - (String) Type of concurrency used. Either "native" or "eventlet"
    * - ``rpc_zmq_contexts`` = ``1``
      - (Integer) Number of ZeroMQ contexts, defaults to 1.
    * - ``rpc_zmq_host`` = ``localhost``
@@ -34,11 +32,53 @@
      - (String) MatchMaker driver.
    * - ``rpc_zmq_max_port`` = ``65536``
      - (Integer) Maximal port number for random ports range.
-   * - ``rpc_zmq_min_port`` = ``49152``
+   * - ``rpc_zmq_min_port`` = ``49153``
      - (Port number) Minimal port number for random ports range.
+   * - ``rpc_zmq_serialization`` = ``json``
+     - (String) Default serialization mechanism for serializing/deserializing outgoing/incoming messages
    * - ``rpc_zmq_topic_backlog`` = ``None``
      - (Integer) Maximum number of ingress messages to locally buffer per topic. Default is unlimited.
    * - ``use_pub_sub`` = ``True``
      - (Boolean) Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy.
-   * - ``zmq_target_expire`` = ``120``
+   * - ``zmq_immediate`` = ``False``
+     - (Boolean) This option configures round-robin mode in zmq socket. True means not keeping a queue when server side disconnects. False means to keep queue and messages even if server is disconnected, when the server appears we send all accumulated messages to it.
+   * - ``zmq_target_expire`` = ``300``
      - (Integer) Expiration timeout in seconds of a name service record about existing target ( < 0 means no timeout).
+   * - ``zmq_target_update`` = ``180``
+     - (Integer) Update period in seconds of a name service record about existing target.
+   * - **[oslo_messaging_zmq]**
+     -
+   * - ``rpc_cast_timeout`` = ``-1``
+     - (Integer) Seconds to wait before a cast expires (TTL). The default value of -1 specifies an infinite linger period. The value of 0 specifies no linger period. Pending messages shall be discarded immediately when the socket is closed. Only supported by impl_zmq.
+   * - ``rpc_poll_timeout`` = ``1``
+     - (Integer) The default number of seconds that poll should wait. Poll raises timeout exception when timeout expired.
+   * - ``rpc_zmq_bind_address`` = ``*``
+     - (String) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address.
+   * - ``rpc_zmq_bind_port_retries`` = ``100``
+     - (Integer) Number of retries to find free port number before fail with ZMQBindError.
+   * - ``rpc_zmq_contexts`` = ``1``
+     - (Integer) Number of ZeroMQ contexts, defaults to 1.
+   * - ``rpc_zmq_host`` = ``localhost``
+     - (String) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova.
+   * - ``rpc_zmq_ipc_dir`` = ``/var/run/openstack``
+     - (String) Directory for holding IPC sockets.
+   * - ``rpc_zmq_matchmaker`` = ``redis``
+     - (String) MatchMaker driver.
+   * - ``rpc_zmq_max_port`` = ``65536``
+     - (Integer) Maximal port number for random ports range.
+   * - ``rpc_zmq_min_port`` = ``49153``
+     - (Port number) Minimal port number for random ports range.
+   * - ``rpc_zmq_serialization`` = ``json``
+     - (String) Default serialization mechanism for serializing/deserializing outgoing/incoming messages
+   * - ``rpc_zmq_topic_backlog`` = ``None``
+     - (Integer) Maximum number of ingress messages to locally buffer per topic. Default is unlimited.
+   * - ``use_pub_sub`` = ``True``
+     - (Boolean) Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy.
+   * - ``use_router_proxy`` = ``True``
+     - (Boolean) Use ROUTER remote proxy.
+   * - ``zmq_immediate`` = ``False``
+     - (Boolean) This option configures round-robin mode in zmq socket. True means not keeping a queue when server side disconnects. False means to keep queue and messages even if server is disconnected, when the server appears we send all accumulated messages to it.
+   * - ``zmq_target_expire`` = ``300``
+     - (Integer) Expiration timeout in seconds of a name service record about existing target ( < 0 means no timeout).
+   * - ``zmq_target_update`` = ``180``
+     - (Integer) Update period in seconds of a name service record about existing target.

tools/autogenerate-config-flagmappings/aodh.flagmappings

@@ -1,13 +1,13 @@
-alarm_max_actions common
+additional_ingestion_lag common
+conn_pool_min_size disable
+conn_pool_ttl disable
 control_exchange amqp
 debug disable
 default_log_levels disable
 evaluation_interval common
 event_alarm_cache_ttl common
-event_alarm_topic common
 executor_thread_pool_size common
 fatal_deprecations disable
-host common
 http_timeout common
 instance_format disable
 instance_uuid_format disable
@@ -20,11 +20,10 @@ logging_debug_format_suffix disable
 logging_default_format_string disable
 logging_exception_prefix disable
 logging_user_identity_format disable
-memcached_servers common
 notifier_topic common
-project_alarm_quota common
 publish_errors disable
 record_history common
+rest_notifier_ca_bundle_certificate_path common
 rest_notifier_certificate_file common
 rest_notifier_certificate_key common
 rest_notifier_max_retries common
@@ -36,31 +35,37 @@ rpc_poll_timeout rpc
 rpc_response_timeout rpc
 rpc_zmq_bind_address zeromq
 rpc_zmq_bind_port_retries zeromq
-rpc_zmq_concurrency zeromq
 rpc_zmq_contexts zeromq
 rpc_zmq_host zeromq
 rpc_zmq_ipc_dir zeromq
 rpc_zmq_matchmaker zeromq
 rpc_zmq_max_port zeromq
 rpc_zmq_min_port zeromq
+rpc_zmq_serialization zeromq
 rpc_zmq_topic_backlog zeromq
 syslog_log_facility disable
 transport_url amqp
 use_pub_sub zeromq
+use_router_proxy disable
 use_stderr disable
 use_syslog disable
-user_alarm_quota common
 verbose disable
 watch_log_file disable
+zmq_immediate zeromq
 zmq_target_expire zeromq
-api/host api
+zmq_target_update zeromq
+api/alarm_max_actions api
+api/enable_combination_alarms api
 api/paste_config api
 api/pecan_debug api
-api/port api
+api/project_alarm_quota api
+api/user_alarm_quota api
 api/workers api
 coordination/backend_url coordination
 coordination/check_watchers coordination
 coordination/heartbeat coordination
+coordination/max_retry_interval coordination
+coordination/retry_backoff coordination
 cors/allow_credentials disable
 cors/allow_headers disable
 cors/allow_methods disable
@@ -94,6 +99,7 @@ database/slave_connection disable
 database/sqlite_db disable
 database/sqlite_synchronous disable
 database/use_db_reconnect disable
+evaluator/workers common
 keystone_authtoken/admin_password disable
 keystone_authtoken/admin_tenant_name disable
 keystone_authtoken/admin_token disable
@@ -132,6 +138,10 @@ keystone_authtoken/region_name disable
 keystone_authtoken/revocation_cache_time disable
 keystone_authtoken/signing_dir disable
 keystone_authtoken/token_cache_time disable
+listener/batch_size common
+listener/batch_timeout common
+listener/event_alarm_topic common
+listener/workers common
 matchmaker_redis/check_timeout redis
 matchmaker_redis/host redis
 matchmaker_redis/password redis
@@ -140,12 +150,32 @@ matchmaker_redis/sentinel_group_name redis
 matchmaker_redis/sentinel_hosts redis
 matchmaker_redis/socket_timeout redis
 matchmaker_redis/wait_timeout redis
+notifier/batch_size common
+notifier/batch_timeout common
+notifier/workers common
+oslo_messaging_amqp/addressing_mode rpc
 oslo_messaging_amqp/allow_insecure_clients rpc
+oslo_messaging_amqp/anycast_address rpc
 oslo_messaging_amqp/broadcast_prefix rpc
+oslo_messaging_amqp/connection_retry_backoff rpc
+oslo_messaging_amqp/connection_retry_interval rpc
+oslo_messaging_amqp/connection_retry_interval_max rpc
 oslo_messaging_amqp/container_name rpc
+oslo_messaging_amqp/default_notification_exchange rpc
+oslo_messaging_amqp/default_notify_timeout rpc
+oslo_messaging_amqp/default_reply_timeout rpc
+oslo_messaging_amqp/default_rpc_exchange rpc
+oslo_messaging_amqp/default_send_timeout rpc
 oslo_messaging_amqp/group_request_prefix rpc
 oslo_messaging_amqp/idle_timeout rpc
+oslo_messaging_amqp/link_retry_delay rpc
+oslo_messaging_amqp/multicast_address rpc
+oslo_messaging_amqp/notify_address_prefix rpc
+oslo_messaging_amqp/notify_server_credit rpc
 oslo_messaging_amqp/password rpc
+oslo_messaging_amqp/reply_link_credit rpc
+oslo_messaging_amqp/rpc_address_prefix rpc
+oslo_messaging_amqp/rpc_server_credit rpc
 oslo_messaging_amqp/sasl_config_dir rpc
 oslo_messaging_amqp/sasl_config_name rpc
 oslo_messaging_amqp/sasl_mechanisms rpc
@@ -155,6 +185,7 @@ oslo_messaging_amqp/ssl_cert_file rpc
 oslo_messaging_amqp/ssl_key_file rpc
 oslo_messaging_amqp/ssl_key_password rpc
 oslo_messaging_amqp/trace rpc
+oslo_messaging_amqp/unicast_address rpc
 oslo_messaging_amqp/username rpc
 oslo_messaging_notifications/driver rpc
 oslo_messaging_notifications/topics rpc
@@ -162,6 +193,7 @@ oslo_messaging_notifications/transport_url rpc
 oslo_messaging_rabbit/amqp_auto_delete rabbitmq
 oslo_messaging_rabbit/amqp_durable_queues rabbitmq
 oslo_messaging_rabbit/channel_max rabbitmq
+oslo_messaging_rabbit/connection_factory rabbitmq
 oslo_messaging_rabbit/default_notification_exchange rabbitmq
 oslo_messaging_rabbit/default_notification_retry_attempts rabbitmq
 oslo_messaging_rabbit/default_rpc_exchange rabbitmq
@@ -214,6 +246,24 @@ oslo_messaging_rabbit/socket_timeout rpc
 oslo_messaging_rabbit/ssl rpc
 oslo_messaging_rabbit/ssl_options rpc
 oslo_messaging_rabbit/tcp_user_timeout rpc
+oslo_messaging_zmq/rpc_cast_timeout zeromq
+oslo_messaging_zmq/rpc_poll_timeout zeromq
+oslo_messaging_zmq/rpc_zmq_bind_address zeromq
+oslo_messaging_zmq/rpc_zmq_bind_port_retries zeromq
+oslo_messaging_zmq/rpc_zmq_contexts zeromq
+oslo_messaging_zmq/rpc_zmq_host zeromq
+oslo_messaging_zmq/rpc_zmq_ipc_dir zeromq
+oslo_messaging_zmq/rpc_zmq_matchmaker zeromq
+oslo_messaging_zmq/rpc_zmq_max_port zeromq
+oslo_messaging_zmq/rpc_zmq_min_port zeromq
+oslo_messaging_zmq/rpc_zmq_serialization zeromq
+oslo_messaging_zmq/rpc_zmq_topic_backlog zeromq
+oslo_messaging_zmq/use_pub_sub zeromq
+oslo_messaging_zmq/use_router_proxy zeromq
+oslo_messaging_zmq/zmq_immediate zeromq
+oslo_messaging_zmq/zmq_target_expire zeromq
+oslo_messaging_zmq/zmq_target_update zeromq
+oslo_middleware/enable_proxy_headers_parsing api
 oslo_middleware/max_request_body_size api
 oslo_middleware/secure_proxy_ssl_header api
 oslo_policy/policy_default_rule disable
@@ -221,3 +271,4 @@ oslo_policy/policy_dirs disable
 oslo_policy/policy_file disable
 service_credentials/interface common
 service_credentials/region_name common
+service_types/zaqar common