diff --git a/doc/cli-ref-rst/source/ceilometer.rst b/doc/cli-ref-rst/source/ceilometer.rst
new file mode 100644
index 0000000000..5f18291b75
--- /dev/null
+++ b/doc/cli-ref-rst/source/ceilometer.rst
@@ -0,0 +1,2217 @@
+.. ## WARNING ######################################
+.. This file is automatically generated, do not edit
+.. #################################################
+
+=====================================
+Telemetry service command-line client
+=====================================
+
+The ceilometer client is the command-line interface (CLI) for
+the Telemetry service API and its extensions.
+
+This chapter documents :command:`ceilometer` version ``2.1.0``.
+
+For help on a specific :command:`ceilometer` command, enter:
+
+.. code-block:: console
+
+   $ ceilometer help COMMAND
+
+.. _ceilometer_command_usage:
+
+ceilometer usage
+~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer [--version] [-d] [-v] [--timeout TIMEOUT]
+                     [--ceilometer-url <CEILOMETER_URL>]
+                     [--ceilometer-api-version CEILOMETER_API_VERSION]
+                     [--os-tenant-id <tenant-id>]
+                     [--os-region-name <region-name>]
+                     [--os-auth-token <auth-token>]
+                     [--os-service-type <service-type>]
+                     [--os-endpoint-type <endpoint-type>] [--os-cacert <cacert>]
+                     [--os-insecure <insecure>] [--os-cert-file <cert-file>]
+                     [--os-key-file <key-file>] [--os-cert <cert>]
+                     [--os-key <key>] [--os-project-name <project-name>]
+                     [--os-project-id <project-id>]
+                     [--os-project-domain-id <project-domain-id>]
+                     [--os-project-domain-name <project-domain-name>]
+                     [--os-user-id <user-id>]
+                     [--os-user-domain-id <user-domain-id>]
+                     [--os-user-domain-name <user-domain-name>]
+                     [--os-endpoint <endpoint>] [--os-auth-system <auth-system>]
+                     [--os-username <username>] [--os-password <password>]
+                     [--os-tenant-name <tenant-name>] [--os-token <token>]
+                     [--os-auth-url <auth-url>]
+                     <subcommand> ...
+
+Subcommands
+-----------
+
+``alarm-combination-create``
+  Create a new alarm based on state of other
+  alarms.
+
+``alarm-combination-update``
+  Update an existing alarm based on state of
+  other alarms.
+
+``alarm-create``
+  Create a new alarm (Deprecated). Use alarm-
+  threshold-create instead.
+
+``alarm-delete``
+  Delete an alarm.
+
+``alarm-event-create``
+  Create a new alarm based on events.
+
+``alarm-event-update``
+  Update an existing alarm based on events.
+
+``alarm-gnocchi-aggregation-by-metrics-threshold-create``
+  Create a new alarm based on computed
+  statistics.
+
+``alarm-gnocchi-aggregation-by-metrics-threshold-update``
+  Update an existing alarm based on computed
+  statistics.
+
+``alarm-gnocchi-aggregation-by-resources-threshold-create``
+  Create a new alarm based on computed
+  statistics.
+
+``alarm-gnocchi-aggregation-by-resources-threshold-update``
+  Update an existing alarm based on computed
+  statistics.
+
+``alarm-gnocchi-resources-threshold-create``
+  Create a new alarm based on computed
+  statistics.
+
+``alarm-gnocchi-resources-threshold-update``
+  Update an existing alarm based on computed
+  statistics.
+
+``alarm-history``
+  Display the change history of an alarm.
+
+``alarm-list``
+  List the user's alarms.
+
+``alarm-show``
+  Show an alarm.
+
+``alarm-state-get``
+  Get the state of an alarm.
+
+``alarm-state-set``
+  Set the state of an alarm.
+
+``alarm-threshold-create``
+  Create a new alarm based on computed
+  statistics.
+
+``alarm-threshold-update``
+  Update an existing alarm based on computed
+  statistics.
+
+``alarm-update``
+  Update an existing alarm (Deprecated).
+
+``capabilities``
+  Print Ceilometer capabilities.
+
+``event-list``
+  List events.
+
+``event-show``
+  Show a particular event.
+
+``event-type-list``
+  List event types.
+
+``meter-list``
+  List the user's meters.
+
+``query-alarm-history``
+  Query Alarm History.
+
+``query-alarms``
+  Query Alarms.
+
+``query-samples``
+  Query samples.
+
+``resource-list``
+  List the resources.
+
+``resource-show``
+  Show the resource.
+
+``sample-create``
+  Create a sample.
+
+``sample-create-list``
+  Create a sample list.
+
+``sample-list``
+  List the samples (return OldSample objects if
+  -m/:option:`--meter` is set).
+
+``sample-show``
+  Show a sample.
+
+``statistics``
+  List the statistics for a meter.
+
+``trait-description-list``
+  List trait info for an event type.
+
+``trait-list``
+  List all traits with name <trait_name> for
+  Event Type <event_type>.
+
+``bash-completion``
+  Prints all of the commands and options to
+  stdout.
+
+``help``
+  Display help about this program or one of its
+  subcommands.
+
+.. _ceilometer_command_options:
+
+ceilometer optional arguments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``--version``
+  show program's version number and exit
+
+``-d, --debug``
+  Defaults to ``env[CEILOMETERCLIENT_DEBUG]``.
+
+``-v, --verbose``
+  Print more verbose output.
+
+``--timeout TIMEOUT``
+  Number of seconds to wait for a response.
+
+``--ceilometer-url <CEILOMETER_URL>``
+  **DEPRECATED**, use :option:`--os-endpoint` instead.
+  Defaults to ``env[CEILOMETER_URL]``.
+
+``--ceilometer-api-version CEILOMETER_API_VERSION``
+  Defaults to ``env[CEILOMETER_API_VERSION]`` or 2.
+
+``--os-tenant-id <tenant-id>``
+  Defaults to ``env[OS_TENANT_ID]``.
+
+``--os-region-name <region-name>``
+  Defaults to ``env[OS_REGION_NAME]``.
+
+``--os-auth-token <auth-token>``
+  Defaults to ``env[OS_AUTH_TOKEN]``.
+
+``--os-service-type <service-type>``
+  Defaults to ``env[OS_SERVICE_TYPE]``.
+
+``--os-endpoint-type <endpoint-type>``
+  Defaults to ``env[OS_ENDPOINT_TYPE]``.
+
+``--os-cacert <cacert>``
+  Defaults to ``env[OS_CACERT]``.
+
+``--os-insecure <insecure>``
+  Defaults to ``env[OS_INSECURE]``.
+
+``--os-cert-file <cert-file>``
+  Defaults to ``env[OS_CERT_FILE]``.
+
+``--os-key-file <key-file>``
+  Defaults to ``env[OS_KEY_FILE]``.
+
+``--os-cert <cert>``
+  Defaults to ``env[OS_CERT]``.
+
+``--os-key <key>``
+  Defaults to ``env[OS_KEY]``.
+
+``--os-project-name <project-name>``
+  Defaults to ``env[OS_PROJECT_NAME]``.
+
+``--os-project-id <project-id>``
+  Defaults to ``env[OS_PROJECT_ID]``.
+
+``--os-project-domain-id <project-domain-id>``
+  Defaults to ``env[OS_PROJECT_DOMAIN_ID]``.
+
+``--os-project-domain-name <project-domain-name>``
+  Defaults to ``env[OS_PROJECT_DOMAIN_NAME]``.
+
+``--os-user-id <user-id>``
+  Defaults to ``env[OS_USER_ID]``.
+
+``--os-user-domain-id <user-domain-id>``
+  Defaults to ``env[OS_USER_DOMAIN_ID]``.
+
+``--os-user-domain-name <user-domain-name>``
+  Defaults to ``env[OS_USER_DOMAIN_NAME]``.
+
+``--os-endpoint <endpoint>``
+  Defaults to ``env[OS_ENDPOINT]``.
+
+``--os-auth-system <auth-system>``
+  Defaults to ``env[OS_AUTH_SYSTEM]``.
+
+``--os-username <username>``
+  Defaults to ``env[OS_USERNAME]``.
+
+``--os-password <password>``
+  Defaults to ``env[OS_PASSWORD]``.
+
+``--os-tenant-name <tenant-name>``
+  Defaults to ``env[OS_TENANT_NAME]``.
+
+``--os-token <token>``
+  Defaults to ``env[OS_TOKEN]``.
+
+``--os-auth-url <auth-url>``
+  Defaults to ``env[OS_AUTH_URL]``.
+
+.. _ceilometer_alarm-combination-create:
+
+ceilometer alarm-combination-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-combination-create --name <NAME>
+                                              [--project-id <ALARM_PROJECT_ID>]
+                                              [--user-id <ALARM_USER_ID>]
+                                              [--description <DESCRIPTION>]
+                                              [--state <STATE>]
+                                              [--severity <SEVERITY>]
+                                              [--enabled {True|False}]
+                                              [--alarm-action <Webhook URL>]
+                                              [--ok-action <Webhook URL>]
+                                              [--insufficient-data-action <Webhook URL>]
+                                              [--time-constraint <Time Constraint>]
+                                              [--repeat-actions {True|False}]
+                                              --alarm_ids <ALARM IDS>
+                                              [--operator <OPERATOR>]
+
+Create a new alarm based on state of other alarms.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+  Required.
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``--alarm_ids <ALARM IDS>``
+  List of alarm IDs. Required.
+
+``--operator <OPERATOR>``
+  Operator to compare with, one of: ['and',
+  'or'].
+
+.. _ceilometer_alarm-combination-update:
+
+ceilometer alarm-combination-update
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-combination-update [--name <NAME>]
+                                              [--project-id <ALARM_PROJECT_ID>]
+                                              [--user-id <ALARM_USER_ID>]
+                                              [--description <DESCRIPTION>]
+                                              [--state <STATE>]
+                                              [--severity <SEVERITY>]
+                                              [--enabled {True|False}]
+                                              [--alarm-action <Webhook URL>]
+                                              [--ok-action <Webhook URL>]
+                                              [--insufficient-data-action <Webhook URL>]
+                                              [--time-constraint <Time Constraint>]
+                                              [--repeat-actions {True|False}]
+                                              [--remove-time-constraint <Constraint names>]
+                                              [--alarm_ids <ALARM IDS>]
+                                              [--operator <OPERATOR>]
+                                              [<ALARM_ID>]
+
+Update an existing alarm based on state of other alarms.
+
+Positional arguments
+--------------------
+
+``<ALARM_ID>``
+  ID of the alarm to update.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``--remove-time-constraint <Constraint names>``
+  Name or list of names of the time constraints
+  to remove.
+
+``--alarm_ids <ALARM IDS>``
+  List of alarm IDs.
+
+``--operator <OPERATOR>``
+  Operator to compare with, one of: ['and',
+  'or'].
+
+.. _ceilometer_alarm-delete:
+
+ceilometer alarm-delete
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-delete [<ALARM_ID>]
+
+Delete an alarm.
+
+Positional arguments
+--------------------
+
+``<ALARM_ID>``
+  ID of the alarm to delete.
+
+.. _ceilometer_alarm-event-create:
+
+ceilometer alarm-event-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-event-create --name <NAME>
+                                        [--project-id <ALARM_PROJECT_ID>]
+                                        [--user-id <ALARM_USER_ID>]
+                                        [--description <DESCRIPTION>]
+                                        [--state <STATE>] [--severity <SEVERITY>]
+                                        [--enabled {True|False}]
+                                        [--alarm-action <Webhook URL>]
+                                        [--ok-action <Webhook URL>]
+                                        [--insufficient-data-action <Webhook URL>]
+                                        [--time-constraint <Time Constraint>]
+                                        [--repeat-actions {True|False}]
+                                        [--event-type <EVENT_TYPE>] [-q <QUERY>]
+
+Create a new alarm based on events.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+  Required.
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``--event-type <EVENT_TYPE>``
+  Event type for event alarm.
+
+``-q <QUERY>, --query <QUERY>``
+  key[op]data_type::value; list for filtering
+  events. data_type is optional, but if supplied
+  must be string, integer, float or datetime.
+
+.. _ceilometer_alarm-event-update:
+
+ceilometer alarm-event-update
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-event-update [--name <NAME>]
+                                        [--project-id <ALARM_PROJECT_ID>]
+                                        [--user-id <ALARM_USER_ID>]
+                                        [--description <DESCRIPTION>]
+                                        [--state <STATE>] [--severity <SEVERITY>]
+                                        [--enabled {True|False}]
+                                        [--alarm-action <Webhook URL>]
+                                        [--ok-action <Webhook URL>]
+                                        [--insufficient-data-action <Webhook URL>]
+                                        [--time-constraint <Time Constraint>]
+                                        [--repeat-actions {True|False}]
+                                        [--event-type <EVENT_TYPE>] [-q <QUERY>]
+                                        [<ALARM_ID>]
+
+Update an existing alarm based on events.
+
+Positional arguments
+--------------------
+
+``<ALARM_ID>``
+  ID of the alarm to update.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``--event-type <EVENT_TYPE>``
+  Event type for event alarm.
+
+``-q <QUERY>, --query <QUERY>``
+  key[op]data_type::value; list for filtering
+  events. data_type is optional, but if supplied
+  must be string, integer, float or datetime.
+
+.. _ceilometer_alarm-gnocchi-aggregation-by-metrics-threshold-create:
+
+ceilometer alarm-gnocchi-aggregation-by-metrics-threshold-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-gnocchi-aggregation-by-metrics-threshold-create
+          --name <NAME> [--project-id <ALARM_PROJECT_ID>]
+          [--user-id <ALARM_USER_ID>] [--description <DESCRIPTION>]
+          [--state <STATE>] [--severity <SEVERITY>] [--enabled {True|False}]
+          [--alarm-action <Webhook URL>] [--ok-action <Webhook URL>]
+          [--insufficient-data-action <Webhook URL>]
+          [--time-constraint <Time Constraint>] [--repeat-actions {True|False}]
+          [--granularity <GRANULARITY>] [--evaluation-periods <COUNT>]
+          [--aggregation-method <AGGREATION>] [--comparison-operator <OPERATOR>]
+          --threshold <THRESHOLD> -m <METRICS>
+
+Create a new alarm based on computed statistics.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+  Required.
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``--granularity <GRANULARITY>``
+  Length of each period (seconds) to evaluate
+  over.
+
+``--evaluation-periods <COUNT>``
+  Number of periods to evaluate over.
+
+``--aggregation-method <AGGREATION>``
+  Aggregation method to use, one of: ['last',
+  'min', 'median', 'sum', 'std', 'first',
+  'mean', 'count', 'moving-average', 'max',
+  '1pct', '2pct', '3pct', '4pct', '5pct',
+  '6pct', '7pct', '8pct', '9pct', '10pct',
+  '11pct', '12pct', '13pct', '14pct', '15pct',
+  '16pct', '17pct', '18pct', '19pct', '20pct',
+  '21pct', '22pct', '23pct', '24pct', '25pct',
+  '26pct', '27pct', '28pct', '29pct', '30pct',
+  '31pct', '32pct', '33pct', '34pct', '35pct',
+  '36pct', '37pct', '38pct', '39pct', '40pct',
+  '41pct', '42pct', '43pct', '44pct', '45pct',
+  '46pct', '47pct', '48pct', '49pct', '50pct',
+  '51pct', '52pct', '53pct', '54pct', '55pct',
+  '56pct', '57pct', '58pct', '59pct', '60pct',
+  '61pct', '62pct', '63pct', '64pct', '65pct',
+  '66pct', '67pct', '68pct', '69pct', '70pct',
+  '71pct', '72pct', '73pct', '74pct', '75pct',
+  '76pct', '77pct', '78pct', '79pct', '80pct',
+  '81pct', '82pct', '83pct', '84pct', '85pct',
+  '86pct', '87pct', '88pct', '89pct', '90pct',
+  '91pct', '92pct', '93pct', '94pct', '95pct',
+  '96pct', '97pct', '98pct', '99pct'].
+
+``--comparison-operator <OPERATOR>``
+  Operator to compare with, one of: ['lt', 'le',
+  'eq', 'ne', 'ge', 'gt'].
+
+``--threshold <THRESHOLD>``
+  Threshold to evaluate against. Required.
+
+``-m <METRICS>, --metrics <METRICS>``
+  Metric to evaluate against. Required.
+
+.. _ceilometer_alarm-gnocchi-aggregation-by-metrics-threshold-update:
+
+ceilometer alarm-gnocchi-aggregation-by-metrics-threshold-update
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-gnocchi-aggregation-by-metrics-threshold-update
+          [--name <NAME>] [--project-id <ALARM_PROJECT_ID>]
+          [--user-id <ALARM_USER_ID>] [--description <DESCRIPTION>]
+          [--state <STATE>] [--severity <SEVERITY>] [--enabled {True|False}]
+          [--alarm-action <Webhook URL>] [--ok-action <Webhook URL>]
+          [--insufficient-data-action <Webhook URL>]
+          [--time-constraint <Time Constraint>] [--repeat-actions {True|False}]
+          [--granularity <GRANULARITY>] [--evaluation-periods <COUNT>]
+          [--aggregation-method <AGGREATION>] [--comparison-operator <OPERATOR>]
+          [--threshold <THRESHOLD>] [-m <METRICS>]
+          [--remove-time-constraint <Constraint names>]
+          [<ALARM_ID>]
+
+Update an existing alarm based on computed statistics.
+
+Positional arguments
+--------------------
+
+``<ALARM_ID>``
+  ID of the alarm to update.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``--granularity <GRANULARITY>``
+  Length of each period (seconds) to evaluate
+  over.
+
+``--evaluation-periods <COUNT>``
+  Number of periods to evaluate over.
+
+``--aggregation-method <AGGREATION>``
+  Aggregation method to use, one of: ['last',
+  'min', 'median', 'sum', 'std', 'first',
+  'mean', 'count', 'moving-average', 'max',
+  '1pct', '2pct', '3pct', '4pct', '5pct',
+  '6pct', '7pct', '8pct', '9pct', '10pct',
+  '11pct', '12pct', '13pct', '14pct', '15pct',
+  '16pct', '17pct', '18pct', '19pct', '20pct',
+  '21pct', '22pct', '23pct', '24pct', '25pct',
+  '26pct', '27pct', '28pct', '29pct', '30pct',
+  '31pct', '32pct', '33pct', '34pct', '35pct',
+  '36pct', '37pct', '38pct', '39pct', '40pct',
+  '41pct', '42pct', '43pct', '44pct', '45pct',
+  '46pct', '47pct', '48pct', '49pct', '50pct',
+  '51pct', '52pct', '53pct', '54pct', '55pct',
+  '56pct', '57pct', '58pct', '59pct', '60pct',
+  '61pct', '62pct', '63pct', '64pct', '65pct',
+  '66pct', '67pct', '68pct', '69pct', '70pct',
+  '71pct', '72pct', '73pct', '74pct', '75pct',
+  '76pct', '77pct', '78pct', '79pct', '80pct',
+  '81pct', '82pct', '83pct', '84pct', '85pct',
+  '86pct', '87pct', '88pct', '89pct', '90pct',
+  '91pct', '92pct', '93pct', '94pct', '95pct',
+  '96pct', '97pct', '98pct', '99pct'].
+
+``--comparison-operator <OPERATOR>``
+  Operator to compare with, one of: ['lt', 'le',
+  'eq', 'ne', 'ge', 'gt'].
+
+``--threshold <THRESHOLD>``
+  Threshold to evaluate against.
+
+``-m <METRICS>, --metrics <METRICS>``
+  Metric to evaluate against.
+
+``--remove-time-constraint <Constraint names>``
+  Name or list of names of the time constraints
+  to remove.
+
+.. _ceilometer_alarm-gnocchi-aggregation-by-resources-threshold-create:
+
+ceilometer alarm-gnocchi-aggregation-by-resources-threshold-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-gnocchi-aggregation-by-resources-threshold-create
+          --name <NAME> [--project-id <ALARM_PROJECT_ID>]
+          [--user-id <ALARM_USER_ID>] [--description <DESCRIPTION>]
+          [--state <STATE>] [--severity <SEVERITY>] [--enabled {True|False}]
+          [--alarm-action <Webhook URL>] [--ok-action <Webhook URL>]
+          [--insufficient-data-action <Webhook URL>]
+          [--time-constraint <Time Constraint>] [--repeat-actions {True|False}]
+          [--granularity <GRANULARITY>] [--evaluation-periods <COUNT>]
+          [--aggregation-method <AGGREATION>] [--comparison-operator <OPERATOR>]
+          --threshold <THRESHOLD> -m <METRIC> --resource-type <RESOURCE_TYPE>
+          --query <QUERY>
+
+Create a new alarm based on computed statistics.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+  Required.
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``--granularity <GRANULARITY>``
+  Length of each period (seconds) to evaluate
+  over.
+
+``--evaluation-periods <COUNT>``
+  Number of periods to evaluate over.
+
+``--aggregation-method <AGGREATION>``
+  Aggregation method to use, one of: ['last',
+  'min', 'median', 'sum', 'std', 'first',
+  'mean', 'count', 'moving-average', 'max',
+  '1pct', '2pct', '3pct', '4pct', '5pct',
+  '6pct', '7pct', '8pct', '9pct', '10pct',
+  '11pct', '12pct', '13pct', '14pct', '15pct',
+  '16pct', '17pct', '18pct', '19pct', '20pct',
+  '21pct', '22pct', '23pct', '24pct', '25pct',
+  '26pct', '27pct', '28pct', '29pct', '30pct',
+  '31pct', '32pct', '33pct', '34pct', '35pct',
+  '36pct', '37pct', '38pct', '39pct', '40pct',
+  '41pct', '42pct', '43pct', '44pct', '45pct',
+  '46pct', '47pct', '48pct', '49pct', '50pct',
+  '51pct', '52pct', '53pct', '54pct', '55pct',
+  '56pct', '57pct', '58pct', '59pct', '60pct',
+  '61pct', '62pct', '63pct', '64pct', '65pct',
+  '66pct', '67pct', '68pct', '69pct', '70pct',
+  '71pct', '72pct', '73pct', '74pct', '75pct',
+  '76pct', '77pct', '78pct', '79pct', '80pct',
+  '81pct', '82pct', '83pct', '84pct', '85pct',
+  '86pct', '87pct', '88pct', '89pct', '90pct',
+  '91pct', '92pct', '93pct', '94pct', '95pct',
+  '96pct', '97pct', '98pct', '99pct'].
+
+``--comparison-operator <OPERATOR>``
+  Operator to compare with, one of: ['lt', 'le',
+  'eq', 'ne', 'ge', 'gt'].
+
+``--threshold <THRESHOLD>``
+  Threshold to evaluate against. Required.
+
+``-m <METRIC>, --metric <METRIC>``
+  Metric to evaluate against. Required.
+
+``--resource-type <RESOURCE_TYPE>``
+  Resource_type to evaluate against. Required.
+
+``--query <QUERY>``
+  Gnocchi resources search query filter
+  Required.
+
+.. _ceilometer_alarm-gnocchi-aggregation-by-resources-threshold-update:
+
+ceilometer alarm-gnocchi-aggregation-by-resources-threshold-update
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-gnocchi-aggregation-by-resources-threshold-update
+          [--name <NAME>] [--project-id <ALARM_PROJECT_ID>]
+          [--user-id <ALARM_USER_ID>] [--description <DESCRIPTION>]
+          [--state <STATE>] [--severity <SEVERITY>] [--enabled {True|False}]
+          [--alarm-action <Webhook URL>] [--ok-action <Webhook URL>]
+          [--insufficient-data-action <Webhook URL>]
+          [--time-constraint <Time Constraint>] [--repeat-actions {True|False}]
+          [--granularity <GRANULARITY>] [--evaluation-periods <COUNT>]
+          [--aggregation-method <AGGREATION>] [--comparison-operator <OPERATOR>]
+          [--threshold <THRESHOLD>] [-m <METRIC>]
+          [--resource-type <RESOURCE_TYPE>] [--query <QUERY>]
+          [--remove-time-constraint <Constraint names>]
+          [<ALARM_ID>]
+
+Update an existing alarm based on computed statistics.
+
+Positional arguments
+--------------------
+
+``<ALARM_ID>``
+  ID of the alarm to update.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``--granularity <GRANULARITY>``
+  Length of each period (seconds) to evaluate
+  over.
+
+``--evaluation-periods <COUNT>``
+  Number of periods to evaluate over.
+
+``--aggregation-method <AGGREATION>``
+  Aggregation method to use, one of: ['last',
+  'min', 'median', 'sum', 'std', 'first',
+  'mean', 'count', 'moving-average', 'max',
+  '1pct', '2pct', '3pct', '4pct', '5pct',
+  '6pct', '7pct', '8pct', '9pct', '10pct',
+  '11pct', '12pct', '13pct', '14pct', '15pct',
+  '16pct', '17pct', '18pct', '19pct', '20pct',
+  '21pct', '22pct', '23pct', '24pct', '25pct',
+  '26pct', '27pct', '28pct', '29pct', '30pct',
+  '31pct', '32pct', '33pct', '34pct', '35pct',
+  '36pct', '37pct', '38pct', '39pct', '40pct',
+  '41pct', '42pct', '43pct', '44pct', '45pct',
+  '46pct', '47pct', '48pct', '49pct', '50pct',
+  '51pct', '52pct', '53pct', '54pct', '55pct',
+  '56pct', '57pct', '58pct', '59pct', '60pct',
+  '61pct', '62pct', '63pct', '64pct', '65pct',
+  '66pct', '67pct', '68pct', '69pct', '70pct',
+  '71pct', '72pct', '73pct', '74pct', '75pct',
+  '76pct', '77pct', '78pct', '79pct', '80pct',
+  '81pct', '82pct', '83pct', '84pct', '85pct',
+  '86pct', '87pct', '88pct', '89pct', '90pct',
+  '91pct', '92pct', '93pct', '94pct', '95pct',
+  '96pct', '97pct', '98pct', '99pct'].
+
+``--comparison-operator <OPERATOR>``
+  Operator to compare with, one of: ['lt', 'le',
+  'eq', 'ne', 'ge', 'gt'].
+
+``--threshold <THRESHOLD>``
+  Threshold to evaluate against.
+
+``-m <METRIC>, --metric <METRIC>``
+  Metric to evaluate against.
+
+``--resource-type <RESOURCE_TYPE>``
+  Resource_type to evaluate against.
+
+``--query <QUERY>``
+  Gnocchi resources search query filter
+
+``--remove-time-constraint <Constraint names>``
+  Name or list of names of the time constraints
+  to remove.
+
+.. _ceilometer_alarm-gnocchi-resources-threshold-create:
+
+ceilometer alarm-gnocchi-resources-threshold-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-gnocchi-resources-threshold-create --name <NAME>
+                                                              [--project-id <ALARM_PROJECT_ID>]
+                                                              [--user-id <ALARM_USER_ID>]
+                                                              [--description <DESCRIPTION>]
+                                                              [--state <STATE>]
+                                                              [--severity <SEVERITY>]
+                                                              [--enabled {True|False}]
+                                                              [--alarm-action <Webhook URL>]
+                                                              [--ok-action <Webhook URL>]
+                                                              [--insufficient-data-action <Webhook URL>]
+                                                              [--time-constraint <Time Constraint>]
+                                                              [--repeat-actions {True|False}]
+                                                              [--granularity <GRANULARITY>]
+                                                              [--evaluation-periods <COUNT>]
+                                                              [--aggregation-method <AGGREATION>]
+                                                              [--comparison-operator <OPERATOR>]
+                                                              --threshold
+                                                              <THRESHOLD> -m
+                                                              <METRIC>
+                                                              --resource-type
+                                                              <RESOURCE_TYPE>
+                                                              --resource-id
+                                                              <RESOURCE_ID>
+
+Create a new alarm based on computed statistics.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+  Required.
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``--granularity <GRANULARITY>``
+  Length of each period (seconds) to evaluate
+  over.
+
+``--evaluation-periods <COUNT>``
+  Number of periods to evaluate over.
+
+``--aggregation-method <AGGREATION>``
+  Aggregation method to use, one of: ['last',
+  'min', 'median', 'sum', 'std', 'first',
+  'mean', 'count', 'moving-average', 'max',
+  '1pct', '2pct', '3pct', '4pct', '5pct',
+  '6pct', '7pct', '8pct', '9pct', '10pct',
+  '11pct', '12pct', '13pct', '14pct', '15pct',
+  '16pct', '17pct', '18pct', '19pct', '20pct',
+  '21pct', '22pct', '23pct', '24pct', '25pct',
+  '26pct', '27pct', '28pct', '29pct', '30pct',
+  '31pct', '32pct', '33pct', '34pct', '35pct',
+  '36pct', '37pct', '38pct', '39pct', '40pct',
+  '41pct', '42pct', '43pct', '44pct', '45pct',
+  '46pct', '47pct', '48pct', '49pct', '50pct',
+  '51pct', '52pct', '53pct', '54pct', '55pct',
+  '56pct', '57pct', '58pct', '59pct', '60pct',
+  '61pct', '62pct', '63pct', '64pct', '65pct',
+  '66pct', '67pct', '68pct', '69pct', '70pct',
+  '71pct', '72pct', '73pct', '74pct', '75pct',
+  '76pct', '77pct', '78pct', '79pct', '80pct',
+  '81pct', '82pct', '83pct', '84pct', '85pct',
+  '86pct', '87pct', '88pct', '89pct', '90pct',
+  '91pct', '92pct', '93pct', '94pct', '95pct',
+  '96pct', '97pct', '98pct', '99pct'].
+
+``--comparison-operator <OPERATOR>``
+  Operator to compare with, one of: ['lt', 'le',
+  'eq', 'ne', 'ge', 'gt'].
+
+``--threshold <THRESHOLD>``
+  Threshold to evaluate against. Required.
+
+``-m <METRIC>, --metric <METRIC>``
+  Metric to evaluate against. Required.
+
+``--resource-type <RESOURCE_TYPE>``
+  Resource_type to evaluate against. Required.
+
+``--resource-id <RESOURCE_ID>``
+  Resource id to evaluate against Required.
+
+.. _ceilometer_alarm-gnocchi-resources-threshold-update:
+
+ceilometer alarm-gnocchi-resources-threshold-update
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-gnocchi-resources-threshold-update [--name <NAME>]
+                                                              [--project-id <ALARM_PROJECT_ID>]
+                                                              [--user-id <ALARM_USER_ID>]
+                                                              [--description <DESCRIPTION>]
+                                                              [--state <STATE>]
+                                                              [--severity <SEVERITY>]
+                                                              [--enabled {True|False}]
+                                                              [--alarm-action <Webhook URL>]
+                                                              [--ok-action <Webhook URL>]
+                                                              [--insufficient-data-action <Webhook URL>]
+                                                              [--time-constraint <Time Constraint>]
+                                                              [--repeat-actions {True|False}]
+                                                              [--granularity <GRANULARITY>]
+                                                              [--evaluation-periods <COUNT>]
+                                                              [--aggregation-method <AGGREATION>]
+                                                              [--comparison-operator <OPERATOR>]
+                                                              [--threshold <THRESHOLD>]
+                                                              [-m <METRIC>]
+                                                              [--resource-type <RESOURCE_TYPE>]
+                                                              [--resource-id <RESOURCE_ID>]
+                                                              [--remove-time-constraint <Constraint names>]
+                                                              [<ALARM_ID>]
+
+Update an existing alarm based on computed statistics.
+
+Positional arguments
+--------------------
+
+``<ALARM_ID>``
+  ID of the alarm to update.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``--granularity <GRANULARITY>``
+  Length of each period (seconds) to evaluate
+  over.
+
+``--evaluation-periods <COUNT>``
+  Number of periods to evaluate over.
+
+``--aggregation-method <AGGREATION>``
+  Aggregation method to use, one of: ['last',
+  'min', 'median', 'sum', 'std', 'first',
+  'mean', 'count', 'moving-average', 'max',
+  '1pct', '2pct', '3pct', '4pct', '5pct',
+  '6pct', '7pct', '8pct', '9pct', '10pct',
+  '11pct', '12pct', '13pct', '14pct', '15pct',
+  '16pct', '17pct', '18pct', '19pct', '20pct',
+  '21pct', '22pct', '23pct', '24pct', '25pct',
+  '26pct', '27pct', '28pct', '29pct', '30pct',
+  '31pct', '32pct', '33pct', '34pct', '35pct',
+  '36pct', '37pct', '38pct', '39pct', '40pct',
+  '41pct', '42pct', '43pct', '44pct', '45pct',
+  '46pct', '47pct', '48pct', '49pct', '50pct',
+  '51pct', '52pct', '53pct', '54pct', '55pct',
+  '56pct', '57pct', '58pct', '59pct', '60pct',
+  '61pct', '62pct', '63pct', '64pct', '65pct',
+  '66pct', '67pct', '68pct', '69pct', '70pct',
+  '71pct', '72pct', '73pct', '74pct', '75pct',
+  '76pct', '77pct', '78pct', '79pct', '80pct',
+  '81pct', '82pct', '83pct', '84pct', '85pct',
+  '86pct', '87pct', '88pct', '89pct', '90pct',
+  '91pct', '92pct', '93pct', '94pct', '95pct',
+  '96pct', '97pct', '98pct', '99pct'].
+
+``--comparison-operator <OPERATOR>``
+  Operator to compare with, one of: ['lt', 'le',
+  'eq', 'ne', 'ge', 'gt'].
+
+``--threshold <THRESHOLD>``
+  Threshold to evaluate against.
+
+``-m <METRIC>, --metric <METRIC>``
+  Metric to evaluate against.
+
+``--resource-type <RESOURCE_TYPE>``
+  Resource_type to evaluate against.
+
+``--resource-id <RESOURCE_ID>``
+  Resource id to evaluate against
+
+``--remove-time-constraint <Constraint names>``
+  Name or list of names of the time constraints
+  to remove.
+
+.. _ceilometer_alarm-history:
+
+ceilometer alarm-history
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-history [-q <QUERY>] [<ALARM_ID>]
+
+Display the change history of an alarm.
+
+Positional arguments
+--------------------
+
+``<ALARM_ID>``
+  ID of the alarm for which history is shown.
+
+Optional arguments
+------------------
+
+``-q <QUERY>, --query <QUERY>``
+  key[op]data_type::value; list. data_type is
+  optional, but if supplied must be string,
+  integer, float, or boolean.
+
+.. _ceilometer_alarm-list:
+
+ceilometer alarm-list
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-list [-q <QUERY>]
+
+List the user's alarms.
+
+Optional arguments
+------------------
+
+``-q <QUERY>, --query <QUERY>``
+  key[op]data_type::value; list. data_type is
+  optional, but if supplied must be string,
+  integer, float, or boolean.
+
+.. _ceilometer_alarm-show:
+
+ceilometer alarm-show
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-show [<ALARM_ID>]
+
+Show an alarm.
+
+Positional arguments
+--------------------
+
+``<ALARM_ID>``
+  ID of the alarm to show.
+
+.. _ceilometer_alarm-state-get:
+
+ceilometer alarm-state-get
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-state-get [<ALARM_ID>]
+
+Get the state of an alarm.
+
+Positional arguments
+--------------------
+
+``<ALARM_ID>``
+  ID of the alarm state to show.
+
+.. _ceilometer_alarm-state-set:
+
+ceilometer alarm-state-set
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-state-set --state <STATE> [<ALARM_ID>]
+
+Set the state of an alarm.
+
+Positional arguments
+--------------------
+
+``<ALARM_ID>``
+  ID of the alarm state to set.
+
+Optional arguments
+------------------
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm', 'insufficient
+  data']. Required.
+
+.. _ceilometer_alarm-threshold-create:
+
+ceilometer alarm-threshold-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-threshold-create --name <NAME>
+                                            [--project-id <ALARM_PROJECT_ID>]
+                                            [--user-id <ALARM_USER_ID>]
+                                            [--description <DESCRIPTION>]
+                                            [--state <STATE>]
+                                            [--severity <SEVERITY>]
+                                            [--enabled {True|False}]
+                                            [--alarm-action <Webhook URL>]
+                                            [--ok-action <Webhook URL>]
+                                            [--insufficient-data-action <Webhook URL>]
+                                            [--time-constraint <Time Constraint>]
+                                            [--repeat-actions {True|False}] -m
+                                            <METRIC> [--period <PERIOD>]
+                                            [--evaluation-periods <COUNT>]
+                                            [--statistic <STATISTIC>]
+                                            [--comparison-operator <OPERATOR>]
+                                            --threshold <THRESHOLD> [-q <QUERY>]
+
+Create a new alarm based on computed statistics.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+  Required.
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``-m <METRIC>, --meter-name <METRIC>``
+  Metric to evaluate against. Required.
+
+``--period <PERIOD>``
+  Length of each period (seconds) to evaluate
+  over.
+
+``--evaluation-periods <COUNT>``
+  Number of periods to evaluate over.
+
+``--statistic <STATISTIC>``
+  Statistic to evaluate, one of: ['max', 'min',
+  'avg', 'sum', 'count'].
+
+``--comparison-operator <OPERATOR>``
+  Operator to compare with, one of: ['lt', 'le',
+  'eq', 'ne', 'ge', 'gt'].
+
+``--threshold <THRESHOLD>``
+  Threshold to evaluate against. Required.
+
+``-q <QUERY>, --query <QUERY>``
+  key[op]data_type::value; list. data_type is
+  optional, but if supplied must be string,
+  integer, float, or boolean.
+
+.. _ceilometer_alarm-threshold-update:
+
+ceilometer alarm-threshold-update
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer alarm-threshold-update [--name <NAME>]
+                                            [--project-id <ALARM_PROJECT_ID>]
+                                            [--user-id <ALARM_USER_ID>]
+                                            [--description <DESCRIPTION>]
+                                            [--state <STATE>]
+                                            [--severity <SEVERITY>]
+                                            [--enabled {True|False}]
+                                            [--alarm-action <Webhook URL>]
+                                            [--ok-action <Webhook URL>]
+                                            [--insufficient-data-action <Webhook URL>]
+                                            [--time-constraint <Time Constraint>]
+                                            [--repeat-actions {True|False}]
+                                            [--remove-time-constraint <Constraint names>]
+                                            [-m <METRIC>] [--period <PERIOD>]
+                                            [--evaluation-periods <COUNT>]
+                                            [--statistic <STATISTIC>]
+                                            [--comparison-operator <OPERATOR>]
+                                            [--threshold <THRESHOLD>]
+                                            [-q <QUERY>]
+                                            [<ALARM_ID>]
+
+Update an existing alarm based on computed statistics.
+
+Positional arguments
+--------------------
+
+``<ALARM_ID>``
+  ID of the alarm to update.
+
+Optional arguments
+------------------
+
+``--name <NAME>``
+  Name of the alarm (must be unique per tenant).
+
+``--project-id <ALARM_PROJECT_ID>``
+  Tenant to associate with alarm (configurable
+  by admin users only).
+
+``--user-id <ALARM_USER_ID>``
+  User to associate with alarm (configurable by
+  admin users only).
+
+``--description <DESCRIPTION>``
+  Free text description of the alarm.
+
+``--state <STATE>``
+  State of the alarm, one of: ['ok', 'alarm',
+  'insufficient data']
+
+``--severity <SEVERITY>``
+  Severity of the alarm, one of: ['low',
+  'moderate', 'critical']
+
+``--enabled {True|False}``
+  True if alarm evaluation/actioning is enabled.
+
+``--alarm-action <Webhook URL>``
+  URL to invoke when state transitions to alarm.
+  May be used multiple times. Defaults to None.
+
+``--ok-action <Webhook URL>``
+  URL to invoke when state transitions to OK.
+  May be used multiple times. Defaults to None.
+
+``--insufficient-data-action <Webhook URL>``
+  URL to invoke when state transitions to
+  insufficient data. May be used multiple times.
+  Defaults to None.
+
+``--time-constraint <Time Constraint>``
+  Only evaluate the alarm if the time at
+  evaluation is within this time constraint.
+  Start point(s) of the constraint are specified
+  with a cron expression, whereas its duration
+  is given in seconds. Can be specified multiple
+  times for multiple time constraints, format
+  is: name=<CONSTRAINT_NAME>;start=<CRON>;durati
+  on=<SECONDS>;[description=<DESCRIPTION>;[timez
+  one=<IANA Timezone>]] Defaults to None.
+
+``--repeat-actions {True|False}``
+  True if actions should be repeatedly notified
+  while alarm remains in target state. Defaults
+  to False.
+
+``--remove-time-constraint <Constraint names>``
+  Name or list of names of the time constraints
+  to remove.
+
+``-m <METRIC>, --meter-name <METRIC>``
+  Metric to evaluate against.
+
+``--period <PERIOD>``
+  Length of each period (seconds) to evaluate
+  over.
+
+``--evaluation-periods <COUNT>``
+  Number of periods to evaluate over.
+
+``--statistic <STATISTIC>``
+  Statistic to evaluate, one of: ['max', 'min',
+  'avg', 'sum', 'count'].
+
+``--comparison-operator <OPERATOR>``
+  Operator to compare with, one of: ['lt', 'le',
+  'eq', 'ne', 'ge', 'gt'].
+
+``--threshold <THRESHOLD>``
+  Threshold to evaluate against.
+
+``-q <QUERY>, --query <QUERY>``
+  key[op]data_type::value; list. data_type is
+  optional, but if supplied must be string,
+  integer, float, or boolean.
+
+.. _ceilometer_capabilities:
+
+ceilometer capabilities
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer capabilities
+
+Print Ceilometer capabilities.
+
+.. _ceilometer_event-list:
+
+ceilometer event-list
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer event-list [-q <QUERY>] [--no-traits] [-l <NUMBER>]
+
+List events.
+
+Optional arguments
+------------------
+
+``-q <QUERY>, --query <QUERY>``
+  key[op]data_type::value; list. data_type is
+  optional, but if supplied must be string,
+  integer, floator datetime.
+
+``--no-traits``
+  If specified, traits will not be printed.
+
+``-l <NUMBER>, --limit <NUMBER>``
+  Maximum number of events to return.
+
+.. _ceilometer_event-show:
+
+ceilometer event-show
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer event-show <message_id>
+
+Show a particular event.
+
+Positional arguments
+--------------------
+
+``<message_id>``
+  The ID of the event. Should be a UUID.
+
+.. _ceilometer_event-type-list:
+
+ceilometer event-type-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer event-type-list
+
+List event types.
+
+.. _ceilometer_meter-list:
+
+ceilometer meter-list
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer meter-list [-q <QUERY>] [-l <NUMBER>]
+
+List the user's meters.
+
+Optional arguments
+------------------
+
+``-q <QUERY>, --query <QUERY>``
+  key[op]data_type::value; list. data_type is
+  optional, but if supplied must be string,
+  integer, float, or boolean.
+
+``-l <NUMBER>, --limit <NUMBER>``
+  Maximum number of meters to return.
+
+.. _ceilometer_query-alarm-history:
+
+ceilometer query-alarm-history
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer query-alarm-history [-f <FILTER>] [-o <ORDERBY>]
+                                         [-l <LIMIT>]
+
+Query Alarm History.
+
+Optional arguments
+------------------
+
+``-f <FILTER>, --filter <FILTER>``
+  {complex_op: [{simple_op: {field_name:
+  value}}]} The complex_op is one of: ['and',
+  'or'], simple_op is one of: ['=', '!=', '<',
+  '<=', '>', '>='].
+
+``-o <ORDERBY>, --orderby <ORDERBY>``
+  [{field_name: direction}, {field_name:
+  direction}] The direction is one of: ['asc',
+  'desc'].
+
+``-l <LIMIT>, --limit <LIMIT>``
+  Maximum number of alarm history items to
+  return.
+
+.. _ceilometer_query-alarms:
+
+ceilometer query-alarms
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer query-alarms [-f <FILTER>] [-o <ORDERBY>] [-l <LIMIT>]
+
+Query Alarms.
+
+Optional arguments
+------------------
+
+``-f <FILTER>, --filter <FILTER>``
+  {complex_op: [{simple_op: {field_name:
+  value}}]} The complex_op is one of: ['and',
+  'or'], simple_op is one of: ['=', '!=', '<',
+  '<=', '>', '>='].
+
+``-o <ORDERBY>, --orderby <ORDERBY>``
+  [{field_name: direction}, {field_name:
+  direction}] The direction is one of: ['asc',
+  'desc'].
+
+``-l <LIMIT>, --limit <LIMIT>``
+  Maximum number of alarms to return.
+
+.. _ceilometer_query-samples:
+
+ceilometer query-samples
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer query-samples [-f <FILTER>] [-o <ORDERBY>] [-l <LIMIT>]
+
+Query samples.
+
+Optional arguments
+------------------
+
+``-f <FILTER>, --filter <FILTER>``
+  {complex_op: [{simple_op: {field_name:
+  value}}]} The complex_op is one of: ['and',
+  'or'], simple_op is one of: ['=', '!=', '<',
+  '<=', '>', '>='].
+
+``-o <ORDERBY>, --orderby <ORDERBY>``
+  [{field_name: direction}, {field_name:
+  direction}] The direction is one of: ['asc',
+  'desc'].
+
+``-l <LIMIT>, --limit <LIMIT>``
+  Maximum number of samples to return.
+
+.. _ceilometer_resource-list:
+
+ceilometer resource-list
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer resource-list [-q <QUERY>] [--meter-links] [-l <NUMBER>]
+
+List the resources.
+
+Optional arguments
+------------------
+
+``-q <QUERY>, --query <QUERY>``
+  key[op]data_type::value; list. data_type is
+  optional, but if supplied must be string,
+  integer, float, or boolean.
+
+``--meter-links``
+  If specified, meter links will be generated.
+
+``-l <NUMBER>, --limit <NUMBER>``
+  Maximum number of resources to return.
+
+.. _ceilometer_resource-show:
+
+ceilometer resource-show
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer resource-show <RESOURCE_ID>
+
+Show the resource.
+
+Positional arguments
+--------------------
+
+``<RESOURCE_ID>``
+  ID of the resource to show.
+
+.. _ceilometer_sample-create:
+
+ceilometer sample-create
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer sample-create [--project-id <SAMPLE_PROJECT_ID>]
+                                   [--user-id <SAMPLE_USER_ID>] -r <RESOURCE_ID>
+                                   -m <METER_NAME> --meter-type <METER_TYPE>
+                                   --meter-unit <METER_UNIT> --sample-volume
+                                   <SAMPLE_VOLUME>
+                                   [--resource-metadata <RESOURCE_METADATA>]
+                                   [--timestamp <TIMESTAMP>] [--direct <DIRECT>]
+
+Create a sample.
+
+Optional arguments
+------------------
+
+``--project-id <SAMPLE_PROJECT_ID>``
+  Tenant to associate with sample (configurable
+  by admin users only).
+
+``--user-id <SAMPLE_USER_ID>``
+  User to associate with sample (configurable by
+  admin users only).
+
+``-r <RESOURCE_ID>, --resource-id <RESOURCE_ID>``
+  ID of the resource. Required.
+
+``-m <METER_NAME>, --meter-name <METER_NAME>``
+  The meter name. Required.
+
+``--meter-type <METER_TYPE>``
+  The meter type. Required.
+
+``--meter-unit <METER_UNIT>``
+  The meter unit. Required.
+
+``--sample-volume <SAMPLE_VOLUME>``
+  The sample volume. Required.
+
+``--resource-metadata <RESOURCE_METADATA>``
+  Resource metadata. Provided value should be a
+  set of key-value pairs e.g. {"key":"value"}.
+
+``--timestamp <TIMESTAMP>``
+  The sample timestamp.
+
+``--direct <DIRECT>``
+  Post sample to storage directly. Defaults to
+  False.
+
+.. _ceilometer_sample-create-list:
+
+ceilometer sample-create-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer sample-create-list [--direct <DIRECT>] <SAMPLES_LIST>
+
+Create a sample list.
+
+Positional arguments
+--------------------
+
+``<SAMPLES_LIST>``
+  Json array with samples to create.
+
+Optional arguments
+------------------
+
+``--direct <DIRECT>``
+  Post samples to storage directly. Defaults to False.
+
+.. _ceilometer_sample-list:
+
+ceilometer sample-list
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer sample-list [-q <QUERY>] [-m <NAME>] [-l <NUMBER>]
+
+List the samples (return OldSample objects if -m/:option:`--meter` is set).
+
+Optional arguments
+------------------
+
+``-q <QUERY>, --query <QUERY>``
+  key[op]data_type::value; list. data_type is
+  optional, but if supplied must be string,
+  integer, float, or boolean.
+
+``-m <NAME>, --meter <NAME>``
+  Name of meter to show samples for.
+
+``-l <NUMBER>, --limit <NUMBER>``
+  Maximum number of samples to return.
+
+.. _ceilometer_sample-show:
+
+ceilometer sample-show
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer sample-show <SAMPLE_ID>
+
+Show a sample.
+
+Positional arguments
+--------------------
+
+``<SAMPLE_ID>``
+  ID (aka message ID) of the sample to show.
+
+.. _ceilometer_statistics:
+
+ceilometer statistics
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer statistics [-q <QUERY>] -m <NAME> [-p <PERIOD>] [-g <FIELD>]
+                                [-a <FUNC>[<-<PARAM>]]
+
+List the statistics for a meter.
+
+Optional arguments
+------------------
+
+``-q <QUERY>, --query <QUERY>``
+  key[op]data_type::value; list. data_type is
+  optional, but if supplied must be string,
+  integer, float, or boolean.
+
+``-m <NAME>, --meter <NAME>``
+  Name of meter to list statistics for.
+  Required.
+
+``-p <PERIOD>, --period <PERIOD>``
+  Period in seconds over which to group samples.
+
+``-g <FIELD>, --groupby <FIELD>``
+  Field for group by.
+
+``-a <FUNC>[<-<PARAM>], --aggregate <FUNC>[<-<PARAM>]``
+  Function for data aggregation. Available
+  aggregates are: count, cardinality, min, max,
+  sum, stddev, avg. Defaults to [].
+
+.. _ceilometer_trait-description-list:
+
+ceilometer trait-description-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer trait-description-list -e <EVENT_TYPE>
+
+List trait info for an event type.
+
+Optional arguments
+------------------
+
+``-e <EVENT_TYPE>, --event_type <EVENT_TYPE>``
+  Type of the event for which traits will be
+  shown. Required.
+
+.. _ceilometer_trait-list:
+
+ceilometer trait-list
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: ceilometer trait-list -e <EVENT_TYPE> -t <TRAIT_NAME>
+
+List all traits with name <trait_name> for Event Type <event_type>.
+
+Optional arguments
+------------------
+
+``-e <EVENT_TYPE>, --event_type <EVENT_TYPE>``
+  Type of the event for which traits will
+  listed. Required.
+
+``-t <TRAIT_NAME>, --trait_name <TRAIT_NAME>``
+  The name of the trait to list. Required.
+
diff --git a/doc/cli-ref-rst/source/cloudkitty.rst b/doc/cli-ref-rst/source/cloudkitty.rst
new file mode 100644
index 0000000000..9aa24e033d
--- /dev/null
+++ b/doc/cli-ref-rst/source/cloudkitty.rst
@@ -0,0 +1,852 @@
+.. ## WARNING ######################################
+.. This file is automatically generated, do not edit
+.. #################################################
+
+==================================
+Rating service command-line client
+==================================
+
+The cloudkitty client is the command-line interface (CLI) for
+the Rating service API and its extensions.
+
+This chapter documents :command:`cloudkitty` version ``0.4.1``.
+
+For help on a specific :command:`cloudkitty` command, enter:
+
+.. code-block:: console
+
+   $ cloudkitty help COMMAND
+
+.. _cloudkitty_command_usage:
+
+cloudkitty usage
+~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty [--version] [-d] [-v] [--timeout TIMEOUT]
+                     [--cloudkitty-url <CLOUDKITTY_URL>]
+                     [--cloudkitty-api-version CLOUDKITTY_API_VERSION]
+                     [--os-tenant-id <tenant-id>]
+                     [--os-region-name <region-name>]
+                     [--os-auth-token <auth-token>]
+                     [--os-service-type <service-type>]
+                     [--os-endpoint-type <endpoint-type>] [--os-cacert <cacert>]
+                     [--os-insecure <insecure>] [--os-cert-file <cert-file>]
+                     [--os-key-file <key-file>] [--os-cert <cert>]
+                     [--os-key <key>] [--os-project-name <project-name>]
+                     [--os-project-id <project-id>]
+                     [--os-user-domain-id <user-domain-id>]
+                     [--os-user-domain-name <user-domain-name>]
+                     [--os-endpoint <endpoint>] [--os-auth-system <auth-system>]
+                     [--os-username <username>] [--os-password <password>]
+                     [--os-tenant-name <tenant-name>] [--os-token <token>]
+                     [--os-auth-url <auth-url>]
+                     <subcommand> ...
+
+Subcommands
+-----------
+
+``module-disable``
+  Disable a module.
+
+``module-enable``
+  Enable a module.
+
+``module-list``
+  List the samples for this meters.
+
+``collector-mapping-create``
+
+``collector-mapping-delete``
+
+``collector-mapping-get``
+
+``collector-mapping-list``
+
+``collector-state-disable``
+
+``collector-state-enable``
+
+``collector-state-get``
+
+``report-tenant-list``
+
+``total-get``
+
+``storage-dataframe-list``
+
+``hashmap-field-create``
+  Create a field.
+
+``hashmap-field-delete``
+  Delete a field.
+
+``hashmap-field-list``
+  Create a field.
+
+``hashmap-group-create``
+  Create a group.
+
+``hashmap-group-delete``
+  Delete a group.
+
+``hashmap-group-list``
+  List groups.
+
+``hashmap-mapping-create``
+  Create a mapping.
+
+``hashmap-mapping-delete``
+  Delete a mapping.
+
+``hashmap-mapping-list``
+  List mappings.
+
+``hashmap-mapping-update``
+  Update a mapping.
+
+``hashmap-service-create``
+  Create a service.
+
+``hashmap-service-delete``
+  Delete a service.
+
+``hashmap-service-list``
+  List services.
+
+``hashmap-threshold-create``
+  Create a mapping.
+
+``hashmap-threshold-delete``
+  Delete a threshold.
+
+``hashmap-threshold-get``
+  Get a threshold.
+
+``hashmap-threshold-group``
+  Get a threshold group.
+
+``hashmap-threshold-list``
+  List thresholds.
+
+``hashmap-threshold-update``
+  Update a threshold.
+
+``bash-completion``
+  Prints all of the commands and options to
+  stdout.
+
+``help``
+  Display help about this program or one of its
+  subcommands.
+
+.. _cloudkitty_command_options:
+
+cloudkitty optional arguments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``--version``
+  show program's version number and exit
+
+``-d, --debug``
+  Defaults to ``env[CLOUDKITTYCLIENT_DEBUG]``.
+
+``-v, --verbose``
+  Print more verbose output.
+
+``--timeout TIMEOUT``
+  Number of seconds to wait for a response.
+
+``--cloudkitty-url <CLOUDKITTY_URL>``
+  **DEPRECATED**, use :option:`--os-endpoint` instead.
+  Defaults to ``env[CLOUDKITTY_URL]``.
+
+``--cloudkitty-api-version CLOUDKITTY_API_VERSION``
+  Defaults to ``env[CLOUDKITTY_API_VERSION]`` or 1.
+
+``--os-tenant-id <tenant-id>``
+  Defaults to ``env[OS_TENANT_ID]``.
+
+``--os-region-name <region-name>``
+  Defaults to ``env[OS_REGION_NAME]``.
+
+``--os-auth-token <auth-token>``
+  Defaults to ``env[OS_AUTH_TOKEN]``.
+
+``--os-service-type <service-type>``
+  Defaults to ``env[OS_SERVICE_TYPE]``.
+
+``--os-endpoint-type <endpoint-type>``
+  Defaults to ``env[OS_ENDPOINT_TYPE]``.
+
+``--os-cacert <cacert>``
+  Defaults to ``env[OS_CACERT]``.
+
+``--os-insecure <insecure>``
+  Defaults to ``env[OS_INSECURE]``.
+
+``--os-cert-file <cert-file>``
+  Defaults to ``env[OS_CERT_FILE]``.
+
+``--os-key-file <key-file>``
+  Defaults to ``env[OS_KEY_FILE]``.
+
+``--os-cert <cert>``
+  Defaults to ``env[OS_CERT]``.
+
+``--os-key <key>``
+  Defaults to ``env[OS_KEY]``.
+
+``--os-project-name <project-name>``
+  Defaults to ``env[OS_PROJECT_NAME]``.
+
+``--os-project-id <project-id>``
+  Defaults to ``env[OS_PROJECT_ID]``.
+
+``--os-user-domain-id <user-domain-id>``
+  Defaults to ``env[OS_USER_DOMAIN_ID]``.
+
+``--os-user-domain-name <user-domain-name>``
+  Defaults to ``env[OS_USER_DOMAIN_NAME]``.
+
+``--os-endpoint <endpoint>``
+  Defaults to ``env[OS_ENDPOINT]``.
+
+``--os-auth-system <auth-system>``
+  Defaults to ``env[OS_AUTH_SYSTEM]``.
+
+``--os-username <username>``
+  Defaults to ``env[OS_USERNAME]``.
+
+``--os-password <password>``
+  Defaults to ``env[OS_PASSWORD]``.
+
+``--os-tenant-name <tenant-name>``
+  Defaults to ``env[OS_TENANT_NAME]``.
+
+``--os-token <token>``
+  Defaults to ``env[OS_TOKEN]``.
+
+``--os-auth-url <auth-url>``
+  Defaults to ``env[OS_AUTH_URL]``.
+
+.. _cloudkitty_collector-mapping-create:
+
+cloudkitty collector-mapping-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty collector-mapping-create --collector COLLECTOR --service
+                                              SERVICE
+
+
+Optional arguments
+------------------
+
+``--collector COLLECTOR``
+  Map a service to this collector. Required.
+
+``--service SERVICE``
+  Map a collector to this service. Required.
+
+.. _cloudkitty_collector-mapping-delete:
+
+cloudkitty collector-mapping-delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty collector-mapping-delete --service SERVICE
+
+
+Optional arguments
+------------------
+
+``--service SERVICE``
+  Filter on this service. Required.
+
+.. _cloudkitty_collector-mapping-get:
+
+cloudkitty collector-mapping-get
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty collector-mapping-get --service SERVICE
+
+
+Optional arguments
+------------------
+
+``--service SERVICE``
+  Which service to get the mapping for. Required.
+
+.. _cloudkitty_collector-mapping-list:
+
+cloudkitty collector-mapping-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty collector-mapping-list [--collector COLLECTOR]
+
+
+Optional arguments
+------------------
+
+``--collector COLLECTOR``
+  Collector name to filter on. Defaults to None.
+
+.. _cloudkitty_collector-state-disable:
+
+cloudkitty collector-state-disable
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty collector-state-disable --name NAME
+
+
+Optional arguments
+------------------
+
+``--name NAME``
+  Name of the collector. Required.
+
+.. _cloudkitty_collector-state-enable:
+
+cloudkitty collector-state-enable
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty collector-state-enable --name NAME
+
+
+Optional arguments
+------------------
+
+``--name NAME``
+  Name of the collector. Required.
+
+.. _cloudkitty_collector-state-get:
+
+cloudkitty collector-state-get
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty collector-state-get --name NAME
+
+
+Optional arguments
+------------------
+
+``--name NAME``
+  Name of the collector. Required.
+
+.. _cloudkitty_hashmap-field-create:
+
+cloudkitty hashmap-field-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-field-create -n NAME -s SERVICE_ID
+
+Create a field.
+
+Optional arguments
+------------------
+
+``-n NAME, --name NAME``
+  Field name Required.
+
+``-s SERVICE_ID, --service-id SERVICE_ID``
+  Service id Required.
+
+.. _cloudkitty_hashmap-field-delete:
+
+cloudkitty hashmap-field-delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-field-delete -f FIELD_ID
+
+Delete a field.
+
+Optional arguments
+------------------
+
+``-f FIELD_ID, --field-id FIELD_ID``
+  Field uuid Required.
+
+.. _cloudkitty_hashmap-field-list:
+
+cloudkitty hashmap-field-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-field-list -s SERVICE_ID
+
+Create a field.
+
+Optional arguments
+------------------
+
+``-s SERVICE_ID, --service-id SERVICE_ID``
+  Service id Required.
+
+.. _cloudkitty_hashmap-group-create:
+
+cloudkitty hashmap-group-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-group-create -n NAME
+
+Create a group.
+
+Optional arguments
+------------------
+
+``-n NAME, --name NAME``
+  Group name Required.
+
+.. _cloudkitty_hashmap-group-delete:
+
+cloudkitty hashmap-group-delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-group-delete -g GROUP_ID [-r RECURSIVE]
+
+Delete a group.
+
+Optional arguments
+------------------
+
+``-g GROUP_ID, --group-id GROUP_ID``
+  Group uuid Required.
+
+``-r RECURSIVE, --recursive RECURSIVE``
+  Delete the group's mappings Defaults to False.
+
+.. _cloudkitty_hashmap-group-list:
+
+cloudkitty hashmap-group-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-group-list
+
+List groups.
+
+.. _cloudkitty_hashmap-mapping-create:
+
+cloudkitty hashmap-mapping-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-mapping-create -c COST [-v VALUE] [-t TYPE]
+                                            [-s SERVICE_ID] [-f FIELD_ID]
+                                            [-g GROUP_ID]
+
+Create a mapping.
+
+Optional arguments
+------------------
+
+``-c COST, --cost COST``
+  Mapping cost Required.
+
+``-v VALUE, --value VALUE``
+  Mapping value
+
+``-t TYPE, --type TYPE``
+  Mapping type (flat, rate)
+
+``-s SERVICE_ID, --service-id SERVICE_ID``
+  Service id
+
+``-f FIELD_ID, --field-id FIELD_ID``
+  Field id
+
+``-g GROUP_ID, --group-id GROUP_ID``
+  Group id
+
+.. _cloudkitty_hashmap-mapping-delete:
+
+cloudkitty hashmap-mapping-delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-mapping-delete -m MAPPING_ID
+
+Delete a mapping.
+
+Optional arguments
+------------------
+
+``-m MAPPING_ID, --mapping-id MAPPING_ID``
+  Mapping uuid Required.
+
+.. _cloudkitty_hashmap-mapping-list:
+
+cloudkitty hashmap-mapping-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-mapping-list [-s SERVICE_ID] [-f FIELD_ID]
+                                          [-g GROUP_ID]
+
+List mappings.
+
+Optional arguments
+------------------
+
+``-s SERVICE_ID, --service-id SERVICE_ID``
+  Service id
+
+``-f FIELD_ID, --field-id FIELD_ID``
+  Field id
+
+``-g GROUP_ID, --group-id GROUP_ID``
+  Group id
+
+.. _cloudkitty_hashmap-mapping-update:
+
+cloudkitty hashmap-mapping-update
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-mapping-update -m MAPPING_ID [-c COST] [-v VALUE]
+                                            [-t TYPE] [-g GROUP_ID]
+
+Update a mapping.
+
+Optional arguments
+------------------
+
+``-m MAPPING_ID, --mapping-id MAPPING_ID``
+  Mapping id Required.
+
+``-c COST, --cost COST``
+  Mapping cost
+
+``-v VALUE, --value VALUE``
+  Mapping value
+
+``-t TYPE, --type TYPE``
+  Mapping type (flat, rate)
+
+``-g GROUP_ID, --group-id GROUP_ID``
+  Group id
+
+.. _cloudkitty_hashmap-service-create:
+
+cloudkitty hashmap-service-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-service-create -n NAME
+
+Create a service.
+
+Optional arguments
+------------------
+
+``-n NAME, --name NAME``
+  Service name Required.
+
+.. _cloudkitty_hashmap-service-delete:
+
+cloudkitty hashmap-service-delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-service-delete -s SERVICE_ID
+
+Delete a service.
+
+Optional arguments
+------------------
+
+``-s SERVICE_ID, --service-id SERVICE_ID``
+  Service uuid Required.
+
+.. _cloudkitty_hashmap-service-list:
+
+cloudkitty hashmap-service-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-service-list
+
+List services.
+
+.. _cloudkitty_hashmap-threshold-create:
+
+cloudkitty hashmap-threshold-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-threshold-create -l LEVEL -c COST [-m MAP_TYPE]
+                                              [-s SERVICE_ID] [-f FIELD_ID]
+                                              [-g GROUP_ID]
+
+Create a mapping.
+
+Optional arguments
+------------------
+
+``-l LEVEL, --level LEVEL``
+  Threshold level Required.
+
+``-c COST, --cost COST``
+  Threshold cost Required.
+
+``-m MAP_TYPE, --map-type MAP_TYPE``
+  Threshold type (flat, rate)
+
+``-s SERVICE_ID, --service-id SERVICE_ID``
+  Service id
+
+``-f FIELD_ID, --field-id FIELD_ID``
+  Field id
+
+``-g GROUP_ID, --group-id GROUP_ID``
+  Group id
+
+.. _cloudkitty_hashmap-threshold-delete:
+
+cloudkitty hashmap-threshold-delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-threshold-delete -t THRESHOLD_ID
+
+Delete a threshold.
+
+Optional arguments
+------------------
+
+``-t THRESHOLD_ID, --threshold-id THRESHOLD_ID``
+  Threshold uuid Required.
+
+.. _cloudkitty_hashmap-threshold-get:
+
+cloudkitty hashmap-threshold-get
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-threshold-get -t THRESHOLD_ID
+
+Get a threshold.
+
+Optional arguments
+------------------
+
+``-t THRESHOLD_ID, --threshold-id THRESHOLD_ID``
+  Threshold uuid Required.
+
+.. _cloudkitty_hashmap-threshold-group:
+
+cloudkitty hashmap-threshold-group
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-threshold-group -t THRESHOLD_ID
+
+Get a threshold group.
+
+Optional arguments
+------------------
+
+``-t THRESHOLD_ID, --threshold-id THRESHOLD_ID``
+  Threshold uuid Required.
+
+.. _cloudkitty_hashmap-threshold-list:
+
+cloudkitty hashmap-threshold-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-threshold-list [-s SERVICE_ID] [-f FIELD_ID]
+                                            [-g GROUP_ID]
+                                            [--no-group {True,False}]
+
+List thresholds.
+
+Optional arguments
+------------------
+
+``-s SERVICE_ID, --service-id SERVICE_ID``
+  Service id
+
+``-f FIELD_ID, --field-id FIELD_ID``
+  Field id
+
+``-g GROUP_ID, --group-id GROUP_ID``
+  Group id
+
+``--no-group {True,False}``
+  If True, list only orhpaned thresholds
+
+.. _cloudkitty_hashmap-threshold-update:
+
+cloudkitty hashmap-threshold-update
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty hashmap-threshold-update -t THRESHOLD_ID [-l LEVEL]
+                                              [-c COST] [-m MAP_TYPE]
+                                              [-g GROUP_ID]
+
+Update a threshold.
+
+Optional arguments
+------------------
+
+``-t THRESHOLD_ID, --threshold-id THRESHOLD_ID``
+  Threshold id Required.
+
+``-l LEVEL, --level LEVEL``
+  Threshold level
+
+``-c COST, --cost COST``
+  Threshold cost
+
+``-m MAP_TYPE, --map-type MAP_TYPE``
+  Threshold type (flat, rate)
+
+``-g GROUP_ID, --group-id GROUP_ID``
+  Group id
+
+.. _cloudkitty_module-disable:
+
+cloudkitty module-disable
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty module-disable -n NAME
+
+Disable a module.
+
+Optional arguments
+------------------
+
+``-n NAME, --name NAME``
+  Module name Required.
+
+.. _cloudkitty_module-enable:
+
+cloudkitty module-enable
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty module-enable -n NAME
+
+Enable a module.
+
+Optional arguments
+------------------
+
+``-n NAME, --name NAME``
+  Module name Required.
+
+.. _cloudkitty_module-list:
+
+cloudkitty module-list
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty module-list
+
+List the samples for this meters.
+
+.. _cloudkitty_report-tenant-list:
+
+cloudkitty report-tenant-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty report-tenant-list
+
+
+.. _cloudkitty_storage-dataframe-list:
+
+cloudkitty storage-dataframe-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty storage-dataframe-list --begin BEGIN --end END
+                                            [--tenant TENANT]
+                                            [--resource-type RESOURCE_TYPE]
+
+
+Optional arguments
+------------------
+
+``--begin BEGIN``
+  Starting date/time (YYYY-MM-ddThh:mm:ss)
+  Required.
+
+``--end END``
+  Ending date/time (YYYY-MM-ddThh:mm:ss)
+  Required.
+
+``--tenant TENANT``
+  Tenant ID Defaults to None.
+
+``--resource-type RESOURCE_TYPE``
+  Resource type (compute, image, ...) Defaults
+  to None.
+
+.. _cloudkitty_total-get:
+
+cloudkitty total-get
+~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: cloudkitty total-get [-t TOTAL_TENANT_ID] [-b BEGIN] [-e END]
+
+
+Optional arguments
+------------------
+
+``-t TOTAL_TENANT_ID, --tenant-id TOTAL_TENANT_ID``
+  Tenant id
+
+``-b BEGIN, --begin BEGIN``
+  Begin timestamp
+
+``-e END, --end END``
+  End timestamp
+
diff --git a/doc/cli-ref-rst/source/gnocchi.rst b/doc/cli-ref-rst/source/gnocchi.rst
new file mode 100644
index 0000000000..32ca1727f9
--- /dev/null
+++ b/doc/cli-ref-rst/source/gnocchi.rst
@@ -0,0 +1,1060 @@
+.. ## WARNING ######################################
+.. This file is automatically generated, do not edit
+.. #################################################
+
+=====================================================================
+A time series storage and resources index service command-line client
+=====================================================================
+
+The gnocchi client is the command-line interface (CLI) for
+the A time series storage and resources index service API and its extensions.
+
+This chapter documents :command:`gnocchi` version ``2.1.0``.
+
+For help on a specific :command:`gnocchi` command, enter:
+
+.. code-block:: console
+
+   $ gnocchi help COMMAND
+
+.. _gnocchi_command_usage:
+
+gnocchi usage
+~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi [--version] [-v] [--log-file LOG_FILE] [-q] [-h] [--debug]
+                  [--os-region-name <auth-region-name>]
+                  [--os-interface <interface>]
+                  [--gnocchi-api-version GNOCCHI_API_VERSION] [--insecure]
+                  [--os-cacert <ca-certificate>] [--os-cert <certificate>]
+                  [--os-key <key>] [--timeout <seconds>] [--os-auth-type <name>]
+                  [--os-auth-url OS_AUTH_URL] [--os-domain-id OS_DOMAIN_ID]
+                  [--os-domain-name OS_DOMAIN_NAME]
+                  [--os-project-id OS_PROJECT_ID]
+                  [--os-project-name OS_PROJECT_NAME]
+                  [--os-project-domain-id OS_PROJECT_DOMAIN_ID]
+                  [--os-project-domain-name OS_PROJECT_DOMAIN_NAME]
+                  [--os-trust-id OS_TRUST_ID]
+                  [--os-default-domain-id OS_DEFAULT_DOMAIN_ID]
+                  [--os-default-domain-name OS_DEFAULT_DOMAIN_NAME]
+                  [--os-user-id OS_USER_ID] [--os-user-name OS_USERNAME]
+                  [--os-user-domain-id OS_USER_DOMAIN_ID]
+                  [--os-user-domain-name OS_USER_DOMAIN_NAME]
+                  [--os-password OS_PASSWORD] [--gnocchi-endpoint <endpoint>]
+
+.. _gnocchi_command_options:
+
+gnocchi optional arguments
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``--version``
+  show program's version number and exit
+
+``-v, --verbose``
+  Increase verbosity of output. Can be repeated.
+
+``--log-file LOG_FILE``
+  Specify a file to log output. Disabled by default.
+
+``-q, --quiet``
+  Suppress output except warnings and errors.
+
+``-h, --help``
+  Show help message and exit.
+
+``--debug``
+  Show tracebacks on errors.
+
+``--os-region-name <auth-region-name>``
+  Authentication region name (Env: OS_REGION_NAME)
+
+``--os-interface <interface>``
+  Select an interface type. Valid interface types:
+  [admin, public, internal]. (Env: OS_INTERFACE)
+
+``--gnocchi-api-version GNOCCHI_API_VERSION``
+  Defaults to ``env[GNOCCHI_API_VERSION]`` or 1.
+
+``--os-auth-type <name>, --os-auth-plugin <name>``
+  Authentication type to use
+
+``--gnocchi-endpoint <endpoint>``
+  Gnocchi endpoint (Env: GNOCCHI_ENDPOINT)
+
+.. _gnocchi_archive-policy:
+
+gnocchi archive-policy
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   Command "archive-policy" matches:
+  archive-policy create
+  archive-policy delete
+  archive-policy list
+  archive-policy show
+  archive-policy-rule create
+  archive-policy-rule delete
+  archive-policy-rule list
+  archive-policy-rule show
+
+
+.. _gnocchi_archive-policy_create:
+
+gnocchi archive-policy create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi archive-policy create [-h]
+                                        [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                        [-c COLUMN] [--max-width <integer>]
+                                        [--noindent] [--prefix PREFIX]
+                                        [-b BACK_WINDOW] [-m AGGREGATION_METHODS]
+                                        -d <DEFINITION>
+                                        name
+
+Create an archive policy
+
+Positional arguments
+--------------------
+
+``name``
+  name of the archive policy
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``-b BACK_WINDOW, --back-window BACK_WINDOW``
+  back window of the archive policy
+
+``-m AGGREGATION_METHODS, --aggregation-method AGGREGATION_METHODS``
+  aggregation method of the archive policy
+
+``-d <DEFINITION>, --definition <DEFINITION>``
+  two attributes (separated by ',') of an archive policy
+  definition with its name and value separated with a
+  ':'
+
+.. _gnocchi_archive-policy_delete:
+
+gnocchi archive-policy delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi archive-policy delete [-h] name
+
+Delete an archive policy
+
+Positional arguments
+--------------------
+
+``name``
+  Name of the archive policy
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _gnocchi_archive-policy_list:
+
+gnocchi archive-policy list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi archive-policy list [-h]
+                                      [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                      [-c COLUMN] [--max-width <integer>]
+                                      [--noindent]
+                                      [--quote {all,minimal,none,nonnumeric}]
+
+List archive policies
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _gnocchi_archive-policy_show:
+
+gnocchi archive-policy show
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi archive-policy show [-h]
+                                      [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                      [-c COLUMN] [--max-width <integer>]
+                                      [--noindent] [--prefix PREFIX]
+                                      name
+
+Show an archive policy
+
+Positional arguments
+--------------------
+
+``name``
+  Name of the archive policy
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _gnocchi_archive-policy-rule:
+
+gnocchi archive-policy-rule
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   Command "archive-policy-rule" matches:
+  archive-policy-rule create
+  archive-policy-rule delete
+  archive-policy-rule list
+  archive-policy-rule show
+
+
+.. _gnocchi_archive-policy-rule_create:
+
+gnocchi archive-policy-rule create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi archive-policy-rule create [-h]
+                                             [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                             [-c COLUMN] [--max-width <integer>]
+                                             [--noindent] [--prefix PREFIX] -a
+                                             ARCHIVE_POLICY_NAME -m
+                                             METRIC_PATTERN
+                                             name
+
+Create an archive policy rule
+
+Positional arguments
+--------------------
+
+``name``
+  Rule name
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``-a ARCHIVE_POLICY_NAME, --archive-policy-name ARCHIVE_POLICY_NAME``
+  Archive policy name
+
+``-m METRIC_PATTERN, --metric-pattern METRIC_PATTERN``
+  Wildcard of metric name to match
+
+.. _gnocchi_archive-policy-rule_delete:
+
+gnocchi archive-policy-rule delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi archive-policy-rule delete [-h] name
+
+Delete an archive policy rule
+
+Positional arguments
+--------------------
+
+``name``
+  Name of the archive policy rule
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _gnocchi_archive-policy-rule_list:
+
+gnocchi archive-policy-rule list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi archive-policy-rule list [-h]
+                                           [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                           [-c COLUMN] [--max-width <integer>]
+                                           [--noindent]
+                                           [--quote {all,minimal,none,nonnumeric}]
+
+List archive policy rules
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _gnocchi_archive-policy-rule_show:
+
+gnocchi archive-policy-rule show
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi archive-policy-rule show [-h]
+                                           [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                           [-c COLUMN] [--max-width <integer>]
+                                           [--noindent] [--prefix PREFIX]
+                                           name
+
+Show an archive policy rule
+
+Positional arguments
+--------------------
+
+``name``
+  Name of the archive policy rule
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _gnocchi_benchmark_measures_add:
+
+gnocchi benchmark measures add
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi benchmark measures add [-h] [--resource-id RESOURCE_ID]
+                                         [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                         [-c COLUMN] [--max-width <integer>]
+                                         [--noindent] [--prefix PREFIX]
+                                         [--workers WORKERS] --count COUNT
+                                         [--batch BATCH]
+                                         [--timestamp-start TIMESTAMP_START]
+                                         [--timestamp-end TIMESTAMP_END]
+                                         metric
+
+Do benchmark testing of adding measurements
+
+Positional arguments
+--------------------
+
+``metric``
+  ID or name of the metric
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--resource-id RESOURCE_ID, -r RESOURCE_ID``
+  ID of the resource
+
+``--workers WORKERS, -w WORKERS``
+  Number of workers to use
+
+``--count COUNT, -n COUNT``
+  Number of total measures to send
+
+``--batch BATCH, -b BATCH``
+  Number of measures to send in each batch
+
+``--timestamp-start TIMESTAMP_START, -s TIMESTAMP_START``
+  First timestamp to use
+
+``--timestamp-end TIMESTAMP_END, -e TIMESTAMP_END``
+  Last timestamp to use
+
+.. _gnocchi_benchmark_measures_show:
+
+gnocchi benchmark measures show
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi benchmark measures show [-h]
+                                          [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                          [-c COLUMN] [--max-width <integer>]
+                                          [--noindent] [--prefix PREFIX]
+                                          [--resource-id RESOURCE_ID]
+                                          [--aggregation AGGREGATION]
+                                          [--start START] [--stop STOP]
+                                          [--workers WORKERS] --count COUNT
+                                          metric
+
+Do benchmark testing of measurements show
+
+Positional arguments
+--------------------
+
+``metric``
+  ID or name of the metric
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--resource-id RESOURCE_ID, -r RESOURCE_ID``
+  ID of the resource
+
+``--aggregation AGGREGATION``
+  aggregation to retrieve
+
+``--start START``
+  beginning of the period
+
+``--stop STOP``
+  end of the period
+
+``--workers WORKERS, -w WORKERS``
+  Number of workers to use
+
+``--count COUNT, -n COUNT``
+  Number of total measures to send
+
+.. _gnocchi_benchmark_metric_create:
+
+gnocchi benchmark metric create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi benchmark metric create [-h] [--resource-id RESOURCE_ID]
+                                          [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                          [-c COLUMN] [--max-width <integer>]
+                                          [--noindent] [--prefix PREFIX]
+                                          [--archive-policy-name ARCHIVE_POLICY_NAME]
+                                          [--workers WORKERS] --count COUNT
+                                          [--keep]
+
+Do benchmark testing of metric creation
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--resource-id RESOURCE_ID, -r RESOURCE_ID``
+  ID of the resource
+
+``--archive-policy-name ARCHIVE_POLICY_NAME, -a ARCHIVE_POLICY_NAME``
+  name of the archive policy
+
+``--workers WORKERS, -w WORKERS``
+  Number of workers to use
+
+``--count COUNT, -n COUNT``
+  Number of metrics to create
+
+``--keep, -k``
+  Keep created metrics
+
+.. _gnocchi_benchmark_metric_show:
+
+gnocchi benchmark metric show
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi benchmark metric show [-h] [--resource-id RESOURCE_ID]
+                                        [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                        [-c COLUMN] [--max-width <integer>]
+                                        [--noindent] [--prefix PREFIX]
+                                        [--workers WORKERS] --count COUNT
+                                        metric [metric ...]
+
+Do benchmark testing of metric show
+
+Positional arguments
+--------------------
+
+``metric``
+  ID or name of the metrics
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--resource-id RESOURCE_ID, -r RESOURCE_ID``
+  ID of the resource
+
+``--workers WORKERS, -w WORKERS``
+  Number of workers to use
+
+``--count COUNT, -n COUNT``
+  Number of metrics to get
+
+.. _gnocchi_capabilities_list:
+
+gnocchi capabilities list
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi capabilities list [-h]
+                                    [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                    [-c COLUMN] [--max-width <integer>]
+                                    [--noindent] [--prefix PREFIX]
+
+List capabilities
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _gnocchi_measures_add:
+
+gnocchi measures add
+~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi measures add [-h] [--resource-id RESOURCE_ID] -m MEASURE metric
+
+Add measurements to a metric
+
+Positional arguments
+--------------------
+
+``metric``
+  ID or name of the metric
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--resource-id RESOURCE_ID, -r RESOURCE_ID``
+  ID of the resource
+
+``-m MEASURE, --measure MEASURE``
+  timestamp and value of a measure separated with a '@'
+
+.. _gnocchi_measures_aggregation:
+
+gnocchi measures aggregation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi measures aggregation [-h]
+                                       [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                       [-c COLUMN] [--max-width <integer>]
+                                       [--noindent]
+                                       [--quote {all,minimal,none,nonnumeric}] -m
+                                       METRIC [METRIC ...]
+                                       [--aggregation AGGREGATION]
+                                       [--start START] [--stop STOP]
+                                       [--needed-overlap NEEDED_OVERLAP]
+                                       [--query QUERY]
+                                       [--resource-type RESOURCE_TYPE]
+
+Get measurements of aggregated metrics
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``-m METRIC [METRIC ...], --metric METRIC [METRIC ...]``
+  metrics IDs or metric name
+
+``--aggregation AGGREGATION``
+  aggregation to retrieve
+
+``--start START``
+  beginning of the period
+
+``--stop STOP``
+  end of the period
+
+``--needed-overlap NEEDED_OVERLAP``
+  percent of datapoints in each metrics required
+
+``--query QUERY``
+  Query
+
+``--resource-type RESOURCE_TYPE``
+  Resource type to query
+
+.. _gnocchi_measures_show:
+
+gnocchi measures show
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi measures show [-h]
+                                [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                [-c COLUMN] [--max-width <integer>] [--noindent]
+                                [--quote {all,minimal,none,nonnumeric}]
+                                [--resource-id RESOURCE_ID]
+                                [--aggregation AGGREGATION] [--start START]
+                                [--stop STOP]
+                                metric
+
+Get measurements of a metric
+
+Positional arguments
+--------------------
+
+``metric``
+  ID or name of the metric
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--resource-id RESOURCE_ID, -r RESOURCE_ID``
+  ID of the resource
+
+``--aggregation AGGREGATION``
+  aggregation to retrieve
+
+``--start START``
+  beginning of the period
+
+``--stop STOP``
+  end of the period
+
+.. _gnocchi_metric_create:
+
+gnocchi metric create
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi metric create [-h] [--resource-id RESOURCE_ID]
+                                [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                [-c COLUMN] [--max-width <integer>] [--noindent]
+                                [--prefix PREFIX]
+                                [--archive-policy-name ARCHIVE_POLICY_NAME]
+                                [METRIC_NAME]
+
+Create a metric
+
+Positional arguments
+--------------------
+
+``METRIC_NAME``
+  Name of the metric
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--resource-id RESOURCE_ID, -r RESOURCE_ID``
+  ID of the resource
+
+``--archive-policy-name ARCHIVE_POLICY_NAME, -a ARCHIVE_POLICY_NAME``
+  name of the archive policy
+
+.. _gnocchi_metric_delete:
+
+gnocchi metric delete
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi metric delete [-h] [--resource-id RESOURCE_ID]
+                                metric [metric ...]
+
+Delete a metric
+
+Positional arguments
+--------------------
+
+``metric``
+  IDs or names of the metric
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--resource-id RESOURCE_ID, -r RESOURCE_ID``
+  ID of the resource
+
+.. _gnocchi_metric_list:
+
+gnocchi metric list
+~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi metric list [-h]
+                              [-f {csv,html,json,json,table,value,yaml,yaml}]
+                              [-c COLUMN] [--max-width <integer>] [--noindent]
+                              [--quote {all,minimal,none,nonnumeric}]
+
+List metrics
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _gnocchi_metric_show:
+
+gnocchi metric show
+~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi metric show [-h]
+                              [-f {html,json,json,shell,table,value,yaml,yaml}]
+                              [-c COLUMN] [--max-width <integer>] [--noindent]
+                              [--prefix PREFIX] [--resource-id RESOURCE_ID]
+                              metric
+
+Show a metric
+
+Positional arguments
+--------------------
+
+``metric``
+  ID or name of the metric
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--resource-id RESOURCE_ID, -r RESOURCE_ID``
+  ID of the resource
+
+.. _gnocchi_resource_create:
+
+gnocchi resource create
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi resource create [-h]
+                                  [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                  [-c COLUMN] [--max-width <integer>]
+                                  [--noindent] [--prefix PREFIX]
+                                  [--type RESOURCE_TYPE] [-a ATTRIBUTE]
+                                  [-m ADD_METRIC] [-n CREATE_METRIC]
+                                  [-d DELETE_METRIC]
+                                  resource_id
+
+Create a resource
+
+Positional arguments
+--------------------
+
+``resource_id``
+  ID of the resource
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--type RESOURCE_TYPE, -t RESOURCE_TYPE``
+  Type of resource
+
+``-a ATTRIBUTE, --attribute ATTRIBUTE``
+  name and value of a attribute separated with a ':'
+
+``-m ADD_METRIC, --add-metric ADD_METRIC``
+  name:id of a metric to add
+
+``-n CREATE_METRIC, --create-metric CREATE_METRIC``
+  name:archive_policy_name of a metric to create
+
+``-d DELETE_METRIC, --delete-metric DELETE_METRIC``
+  Name of a metric to delete
+
+.. _gnocchi_resource_delete:
+
+gnocchi resource delete
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi resource delete [-h] resource_id
+
+Delete a resource
+
+Positional arguments
+--------------------
+
+``resource_id``
+  ID of the resource
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _gnocchi_resource_history:
+
+gnocchi resource history
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi resource history [-h]
+                                   [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                   [-c COLUMN] [--max-width <integer>]
+                                   [--noindent]
+                                   [--quote {all,minimal,none,nonnumeric}]
+                                   [--details] [--limit <LIMIT>]
+                                   [--marker <MARKER>] [--sort <SORT>]
+                                   [--type RESOURCE_TYPE]
+                                   resource_id
+
+Show the history of a resource
+
+Positional arguments
+--------------------
+
+``resource_id``
+  ID of a resource
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--details``
+  Show all attributes of generic resources
+
+``--limit <LIMIT>``
+  Number of resources to return (Default is server
+  default)
+
+``--marker <MARKER>``
+  Last item of the previous listing. Return the next
+  results after this value
+
+``--sort <SORT>``
+  Sort of resource attribute (example: user_id:desc-
+  nullslast
+
+``--type RESOURCE_TYPE, -t RESOURCE_TYPE``
+  Type of resource
+
+.. _gnocchi_resource_list:
+
+gnocchi resource list
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi resource list [-h]
+                                [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                [-c COLUMN] [--max-width <integer>] [--noindent]
+                                [--quote {all,minimal,none,nonnumeric}]
+                                [--details] [--history] [--limit <LIMIT>]
+                                [--marker <MARKER>] [--sort <SORT>]
+                                [--type RESOURCE_TYPE]
+
+List resources
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--details``
+  Show all attributes of generic resources
+
+``--history``
+  Show history of the resources
+
+``--limit <LIMIT>``
+  Number of resources to return (Default is server
+  default)
+
+``--marker <MARKER>``
+  Last item of the previous listing. Return the next
+  results after this value
+
+``--sort <SORT>``
+  Sort of resource attribute (example: user_id:desc-
+  nullslast
+
+``--type RESOURCE_TYPE, -t RESOURCE_TYPE``
+  Type of resource
+
+.. _gnocchi_resource_search:
+
+gnocchi resource search
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi resource search [-h]
+                                  [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                  [-c COLUMN] [--max-width <integer>]
+                                  [--noindent]
+                                  [--quote {all,minimal,none,nonnumeric}]
+                                  [--details] [--history] [--limit <LIMIT>]
+                                  [--marker <MARKER>] [--sort <SORT>]
+                                  [--type RESOURCE_TYPE] [--query QUERY]
+
+Search resources with specified query rules
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--details``
+  Show all attributes of generic resources
+
+``--history``
+  Show history of the resources
+
+``--limit <LIMIT>``
+  Number of resources to return (Default is server
+  default)
+
+``--marker <MARKER>``
+  Last item of the previous listing. Return the next
+  results after this value
+
+``--sort <SORT>``
+  Sort of resource attribute (example: user_id:desc-
+  nullslast
+
+``--type RESOURCE_TYPE, -t RESOURCE_TYPE``
+  Type of resource
+
+``--query QUERY``
+  Query
+
+.. _gnocchi_resource_show:
+
+gnocchi resource show
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi resource show [-h]
+                                [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                [-c COLUMN] [--max-width <integer>] [--noindent]
+                                [--prefix PREFIX] [--type RESOURCE_TYPE]
+                                resource_id
+
+Show a resource
+
+Positional arguments
+--------------------
+
+``resource_id``
+  ID of a resource
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--type RESOURCE_TYPE, -t RESOURCE_TYPE``
+  Type of resource
+
+.. _gnocchi_resource_update:
+
+gnocchi resource update
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi resource update [-h]
+                                  [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                  [-c COLUMN] [--max-width <integer>]
+                                  [--noindent] [--prefix PREFIX]
+                                  [--type RESOURCE_TYPE] [-a ATTRIBUTE]
+                                  [-m ADD_METRIC] [-n CREATE_METRIC]
+                                  [-d DELETE_METRIC]
+                                  resource_id
+
+Update a resource
+
+Positional arguments
+--------------------
+
+``resource_id``
+  ID of the resource
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--type RESOURCE_TYPE, -t RESOURCE_TYPE``
+  Type of resource
+
+``-a ATTRIBUTE, --attribute ATTRIBUTE``
+  name and value of a attribute separated with a ':'
+
+``-m ADD_METRIC, --add-metric ADD_METRIC``
+  name:id of a metric to add
+
+``-n CREATE_METRIC, --create-metric CREATE_METRIC``
+  name:archive_policy_name of a metric to create
+
+``-d DELETE_METRIC, --delete-metric DELETE_METRIC``
+  Name of a metric to delete
+
+.. _gnocchi_status:
+
+gnocchi status
+~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: gnocchi status [-h] [-f {html,json,json,shell,table,value,yaml,yaml}]
+                         [-c COLUMN] [--max-width <integer>] [--noindent]
+                         [--prefix PREFIX]
+
+Show the status of measurements processing
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
diff --git a/doc/cli-ref-rst/source/heat.rst b/doc/cli-ref-rst/source/heat.rst
new file mode 100644
index 0000000000..4414be8874
--- /dev/null
+++ b/doc/cli-ref-rst/source/heat.rst
@@ -0,0 +1,1549 @@
+.. ## WARNING ######################################
+.. This file is automatically generated, do not edit
+.. #################################################
+
+=========================================
+Orchestration service command-line client
+=========================================
+
+The heat client is the command-line interface (CLI) for
+the Orchestration service API and its extensions.
+
+This chapter documents :command:`heat` version ``0.8.0``.
+
+For help on a specific :command:`heat` command, enter:
+
+.. code-block:: console
+
+   $ heat help COMMAND
+
+.. _heat_command_usage:
+
+heat usage
+~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat [--version] [-d] [-v] [--api-timeout API_TIMEOUT]
+               [--os-no-client-auth] [--heat-url HEAT_URL]
+               [--heat-api-version HEAT_API_VERSION] [--include-password] [-k]
+               [--os-cert OS_CERT] [--cert-file OS_CERT] [--os-key OS_KEY]
+               [--key-file OS_KEY] [--os-cacert <ca-certificate-file>]
+               [--ca-file OS_CACERT] [--os-username OS_USERNAME]
+               [--os-user-id OS_USER_ID] [--os-user-domain-id OS_USER_DOMAIN_ID]
+               [--os-user-domain-name OS_USER_DOMAIN_NAME]
+               [--os-project-id OS_PROJECT_ID]
+               [--os-project-name OS_PROJECT_NAME]
+               [--os-project-domain-id OS_PROJECT_DOMAIN_ID]
+               [--os-project-domain-name OS_PROJECT_DOMAIN_NAME]
+               [--os-password OS_PASSWORD] [--os-tenant-id OS_TENANT_ID]
+               [--os-tenant-name OS_TENANT_NAME] [--os-auth-url OS_AUTH_URL]
+               [--os-region-name OS_REGION_NAME] [--os-auth-token OS_AUTH_TOKEN]
+               [--os-service-type OS_SERVICE_TYPE]
+               [--os-endpoint-type OS_ENDPOINT_TYPE]
+               <subcommand> ...
+
+Subcommands
+-----------
+
+``action-check``
+  Check that stack resources are in expected states.
+
+``action-resume``
+  Resume the stack.
+
+``action-suspend``
+  Suspend the stack.
+
+``build-info``
+  Retrieve build information.
+
+``config-create``
+  Create a software configuration.
+
+``config-delete``
+  Delete a software configuration.
+
+``config-show``
+  View details of a software configuration.
+
+``deployment-create``
+  Create a software deployment.
+
+``deployment-delete``
+  Delete a software deployment.
+
+``deployment-list``
+  List software deployments.
+
+``deployment-metadata-show``
+  Get deployment configuration metadata for the
+  specified server.
+
+``deployment-output-show``
+  Show a specific deployment output.
+
+``deployment-show``
+  Show the details of a software deployment.
+
+``event``
+  **DEPRECATED!** Use event-show instead.
+
+``event-list``
+  List events for a stack.
+
+``event-show``
+  Describe the event.
+
+``hook-clear``
+  Clear hooks on a given stack.
+
+``hook-poll``
+  List resources with pending hook for a stack.
+
+``output-list``
+  Show available outputs.
+
+``output-show``
+  Show a specific stack output.
+
+``resource-list``
+  Show list of resources belonging to a stack.
+
+``resource-metadata``
+  List resource metadata.
+
+``resource-show``
+  Describe the resource.
+
+``resource-signal``
+  Send a signal to a resource.
+
+``resource-template``
+  **DEPRECATED!** Use resource-type-template instead.
+
+``resource-type-list``
+  List the available resource types.
+
+``resource-type-show``
+  Show the resource type.
+
+``resource-type-template``
+  Generate a template based on a resource type.
+
+``service-list``
+  List the Heat engines.
+
+``snapshot-delete``
+  Delete a snapshot of a stack.
+
+``snapshot-list``
+  List the snapshots of a stack.
+
+``snapshot-show``
+  Show a snapshot of a stack.
+
+``stack-abandon``
+  Abandon the stack.
+
+``stack-adopt``
+  Adopt a stack.
+
+``stack-cancel-update``
+  Cancel currently running update of the stack.
+
+``stack-create``
+  Create the stack.
+
+``stack-delete``
+  Delete the stack(s).
+
+``stack-list``
+  List the user's stacks.
+
+``stack-preview``
+  Preview the stack.
+
+``stack-restore``
+  Restore a snapshot of a stack.
+
+``stack-show``
+  Describe the stack.
+
+``stack-snapshot``
+  Make a snapshot of a stack.
+
+``stack-update``
+  Update the stack.
+
+``template-function-list``
+  List the available functions.
+
+``template-show``
+  Get the template for the specified stack.
+
+``template-validate``
+  Validate a template with parameters.
+
+``template-version-list``
+  List the available template versions.
+
+``bash-completion``
+  Prints all of the commands and options to stdout.
+
+``help``
+  Display help about this program or one of its
+  subcommands.
+
+.. _heat_command_options:
+
+heat optional arguments
+~~~~~~~~~~~~~~~~~~~~~~~
+
+``--version``
+  Shows the client version and exits.
+
+``-d, --debug``
+  Defaults to ``env[HEATCLIENT_DEBUG]``.
+
+``-v, --verbose``
+  Print more verbose output.
+
+``--api-timeout API_TIMEOUT``
+  Number of seconds to wait for an API response,
+  defaults to system socket timeout
+
+``--os-no-client-auth``
+  Do not contact keystone for a token. Defaults to
+  ``env[OS_NO_CLIENT_AUTH]``.
+
+``--heat-url HEAT_URL``
+  Defaults to ``env[HEAT_URL]``.
+
+``--heat-api-version HEAT_API_VERSION``
+  Defaults to ``env[HEAT_API_VERSION]`` or 1.
+
+``--include-password``
+  Send os-username and os-password to heat.
+
+``-k, --insecure``
+  Explicitly allow heatclient to perform "insecure SSL"
+  (https) requests. The server's certificate will not be
+  verified against any certificate authorities. This
+  option should be used with caution.
+
+``--os-cert OS_CERT``
+  Path of certificate file to use in SSL connection.
+  This file can optionally be prepended with the private
+  key.
+
+``--cert-file OS_CERT``
+  **DEPRECATED!** Use :option:`--os-cert`.
+
+``--os-key OS_KEY``
+  Path of client key to use in SSL connection. This
+  option is not necessary if your key is prepended to
+  your cert file.
+
+``--key-file OS_KEY``
+  **DEPRECATED!** Use :option:`--os-key`.
+
+``--os-cacert <ca-certificate-file>``
+  Path of CA TLS certificate(s) used to verify the
+  remote server's certificate. Without this option
+  glance looks for the default system CA certificates.
+
+``--ca-file OS_CACERT``
+  **DEPRECATED!** Use :option:`--os-cacert`.
+
+``--os-username OS_USERNAME``
+  Defaults to ``env[OS_USERNAME]``.
+
+``--os-user-id OS_USER_ID``
+  Defaults to ``env[OS_USER_ID]``.
+
+``--os-user-domain-id OS_USER_DOMAIN_ID``
+  Defaults to ``env[OS_USER_DOMAIN_ID]``.
+
+``--os-user-domain-name OS_USER_DOMAIN_NAME``
+  Defaults to ``env[OS_USER_DOMAIN_NAME]``.
+
+``--os-project-id OS_PROJECT_ID``
+  Another way to specify tenant ID. This option is
+  mutually exclusive with :option:`--os-tenant-id`. Defaults to
+  ``env[OS_PROJECT_ID]``.
+
+``--os-project-name OS_PROJECT_NAME``
+  Another way to specify tenant name. This option is
+  mutually exclusive with :option:`--os-tenant-name`. Defaults to
+  ``env[OS_PROJECT_NAME]``.
+
+``--os-project-domain-id OS_PROJECT_DOMAIN_ID``
+  Defaults to ``env[OS_PROJECT_DOMAIN_ID]``.
+
+``--os-project-domain-name OS_PROJECT_DOMAIN_NAME``
+  Defaults to ``env[OS_PROJECT_DOMAIN_NAME]``.
+
+``--os-password OS_PASSWORD``
+  Defaults to ``env[OS_PASSWORD]``.
+
+``--os-tenant-id OS_TENANT_ID``
+  Defaults to ``env[OS_TENANT_ID]``.
+
+``--os-tenant-name OS_TENANT_NAME``
+  Defaults to ``env[OS_TENANT_NAME]``.
+
+``--os-auth-url OS_AUTH_URL``
+  Defaults to ``env[OS_AUTH_URL]``.
+
+``--os-region-name OS_REGION_NAME``
+  Defaults to ``env[OS_REGION_NAME]``.
+
+``--os-auth-token OS_AUTH_TOKEN``
+  Defaults to ``env[OS_AUTH_TOKEN]``.
+
+``--os-service-type OS_SERVICE_TYPE``
+  Defaults to ``env[OS_SERVICE_TYPE]``.
+
+``--os-endpoint-type OS_ENDPOINT_TYPE``
+  Defaults to ``env[OS_ENDPOINT_TYPE]``.
+
+.. _heat_action-check:
+
+heat action-check
+~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat action-check <NAME or ID>
+
+Check that stack resources are in expected states.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to check.
+
+.. _heat_action-resume:
+
+heat action-resume
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat action-resume <NAME or ID>
+
+Resume the stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to resume.
+
+.. _heat_action-suspend:
+
+heat action-suspend
+~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat action-suspend <NAME or ID>
+
+Suspend the stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to suspend.
+
+.. _heat_build-info:
+
+heat build-info
+~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat build-info
+
+Retrieve build information.
+
+.. _heat_config-create:
+
+heat config-create
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat config-create [-f <FILE or URL>] [-c <FILE or URL>]
+                             [-g <GROUP_NAME>]
+                             <CONFIG_NAME>
+
+Create a software configuration.
+
+Positional arguments
+--------------------
+
+``<CONFIG_NAME>``
+  Name of the configuration to create.
+
+Optional arguments
+------------------
+
+``-f <FILE or URL>, --definition-file <FILE or URL>``
+  Path to JSON/YAML containing map defining <inputs>,
+  <outputs>, and <options>.
+
+``-c <FILE or URL>, --config-file <FILE or URL>``
+  Path to configuration script/data.
+
+``-g <GROUP_NAME>, --group <GROUP_NAME>``
+  Group name of configuration tool expected by the
+  config.
+
+.. _heat_config-delete:
+
+heat config-delete
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat config-delete <ID> [<ID> ...]
+
+Delete a software configuration.
+
+Positional arguments
+--------------------
+
+``<ID>``
+  IDs of the configurations to delete.
+
+.. _heat_config-show:
+
+heat config-show
+~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat config-show [-c] <ID>
+
+View details of a software configuration.
+
+Positional arguments
+--------------------
+
+``<ID>``
+  ID of the config.
+
+Optional arguments
+------------------
+
+``-c, --config-only``
+  Only display the value of the <config> property.
+
+.. _heat_deployment-create:
+
+heat deployment-create
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat deployment-create [-i <KEY=VALUE>] [-a <ACTION>] [-c <CONFIG>] -s
+                                 <SERVER> [-t <TRANSPORT>]
+                                 [--container <CONTAINER_NAME>]
+                                 [--timeout <TIMEOUT>]
+                                 <DEPLOY_NAME>
+
+Create a software deployment.
+
+Positional arguments
+--------------------
+
+``<DEPLOY_NAME>``
+  Name of the derived config associated with this
+  deployment. This is used to apply a sort order to the
+  list of configurations currently deployed to the
+  server.
+
+Optional arguments
+------------------
+
+``-i <KEY=VALUE>, --input-value <KEY=VALUE>``
+  Input value to set on the deployment. This can be
+  specified multiple times.
+
+``-a <ACTION>, --action <ACTION>``
+  Name of action for this deployment. Can be a custom
+  action, or one of: CREATE, UPDATE, DELETE, SUSPEND,
+  RESUME
+
+``-c <CONFIG>, --config <CONFIG>``
+  ID of the configuration to deploy.
+
+``-s <SERVER>, --server <SERVER>``
+  ID of the server being deployed to.
+
+``-t <TRANSPORT>, --signal-transport <TRANSPORT>``
+  How the server should signal to heat with the
+  deployment output values. TEMP_URL_SIGNAL will create
+  a Swift TempURL to be signaled via HTTP PUT. NO_SIGNAL
+  will result in the resource going to the COMPLETE
+  state without waiting for any signal.
+
+``--container <CONTAINER_NAME>``
+  Optional name of container to store TEMP_URL_SIGNAL
+  objects in. If not specified a container will be
+  created with a name derived from the DEPLOY_NAME
+
+``--timeout <TIMEOUT>``
+  Deployment timeout in minutes.
+
+.. _heat_deployment-delete:
+
+heat deployment-delete
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat deployment-delete <ID> [<ID> ...]
+
+Delete a software deployment.
+
+Positional arguments
+--------------------
+
+``<ID>``
+  IDs of the deployments to delete.
+
+.. _heat_deployment-list:
+
+heat deployment-list
+~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat deployment-list [-s <SERVER>]
+
+List software deployments.
+
+Optional arguments
+------------------
+
+``-s <SERVER>, --server <SERVER>``
+  ID of the server to fetch deployments for.
+
+.. _heat_deployment-metadata-show:
+
+heat deployment-metadata-show
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat deployment-metadata-show <ID>
+
+Get deployment configuration metadata for the specified server.
+
+Positional arguments
+--------------------
+
+``<ID>``
+  ID of the server to fetch deployments for.
+
+.. _heat_deployment-output-show:
+
+heat deployment-output-show
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat deployment-output-show [-a] [-F <FORMAT>] <ID> [<OUTPUT NAME>]
+
+Show a specific deployment output.
+
+Positional arguments
+--------------------
+
+``<ID>``
+  ID deployment to show the output for.
+
+``<OUTPUT NAME>``
+  Name of an output to display.
+
+Optional arguments
+------------------
+
+``-a, --all``
+  Display all deployment outputs.
+
+``-F <FORMAT>, --format <FORMAT>``
+  The output value format, one of: raw, json
+
+.. _heat_deployment-show:
+
+heat deployment-show
+~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat deployment-show <ID>
+
+Show the details of a software deployment.
+
+Positional arguments
+--------------------
+
+``<ID>``
+  ID of the deployment.
+
+.. _heat_event-list:
+
+heat event-list
+~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat event-list [-r <RESOURCE>] [-f <KEY1=VALUE1;KEY2=VALUE2...>]
+                          [-l <LIMIT>] [-m <ID>] [-n <DEPTH>] [-F <FORMAT>]
+                          <NAME or ID>
+
+List events for a stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to show the events for.
+
+Optional arguments
+------------------
+
+``-r <RESOURCE>, --resource <RESOURCE>``
+  Name of the resource to filter events by.
+
+``-f <KEY1=VALUE1;KEY2=VALUE2...>, --filters <KEY1=VALUE1;KEY2=VALUE2...>``
+  Filter parameters to apply on returned events. This
+  can be specified multiple times, or once with
+  parameters separated by a semicolon.
+
+``-l <LIMIT>, --limit <LIMIT>``
+  Limit the number of events returned.
+
+``-m <ID>, --marker <ID>``
+  Only return events that appear after the given event
+  ID.
+
+``-n <DEPTH>, --nested-depth <DEPTH>``
+  Depth of nested stacks from which to display events.
+  Note this cannot be specified with :option:`--resource`.
+
+``-F <FORMAT>, --format <FORMAT>``
+  The output value format, one of: log, table
+
+.. _heat_event-show:
+
+heat event-show
+~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat event-show <NAME or ID> <RESOURCE> <EVENT>
+
+Describe the event.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to show the events for.
+
+``<RESOURCE>``
+  Name of the resource the event belongs to.
+
+``<EVENT>``
+  ID of event to display details for.
+
+.. _heat_hook-clear:
+
+heat hook-clear
+~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat hook-clear [--pre-create] [--pre-update]
+                          <NAME or ID> <RESOURCE> [<RESOURCE> ...]
+
+Clear hooks on a given stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of the stack these resources belong to.
+
+``<RESOURCE>``
+  Resource names with hooks to clear. Resources in nested stacks
+  can be set using slash as a separator:
+  nested_stack/another/my_resource. You can use wildcards to
+  match multiple stacks or resources:
+  nested_stack/an\*/\*_resource
+
+Optional arguments
+------------------
+
+``--pre-create``
+  Clear the pre-create hooks (optional)
+
+``--pre-update``
+  Clear the pre-update hooks (optional)
+
+.. _heat_hook-poll:
+
+heat hook-poll
+~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat hook-poll [-n <DEPTH>] <NAME or ID>
+
+List resources with pending hook for a stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to show the pending hooks for.
+
+Optional arguments
+------------------
+
+``-n <DEPTH>, --nested-depth <DEPTH>``
+  Depth of nested stacks from which to display hooks.
+
+.. _heat_output-list:
+
+heat output-list
+~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat output-list <NAME or ID>
+
+Show available outputs.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to query.
+
+.. _heat_output-show:
+
+heat output-show
+~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat output-show [-a] [-F <FORMAT>] <NAME or ID> [<OUTPUT NAME>]
+
+Show a specific stack output.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to query.
+
+``<OUTPUT NAME>``
+  Name of an output to display.
+
+Optional arguments
+------------------
+
+``-a, --all``
+  Display all stack outputs.
+
+``-F <FORMAT>, --format <FORMAT>``
+  The output value format, one of: json, raw
+
+.. _heat_resource-list:
+
+heat resource-list
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat resource-list [-n <DEPTH>] [--with-detail] <NAME or ID>
+
+Show list of resources belonging to a stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to show the resources for.
+
+Optional arguments
+------------------
+
+``-n <DEPTH>, --nested-depth <DEPTH>``
+  Depth of nested stacks from which to display
+  resources.
+
+``--with-detail``
+  Enable detail information presented for each resource
+  in resources list.
+
+.. _heat_resource-metadata:
+
+heat resource-metadata
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat resource-metadata <NAME or ID> <RESOURCE>
+
+List resource metadata.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to show the resource metadata for.
+
+``<RESOURCE>``
+  Name of the resource to show the metadata for.
+
+.. _heat_resource-show:
+
+heat resource-show
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat resource-show [-a <ATTRIBUTE>] <NAME or ID> <RESOURCE>
+
+Describe the resource.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to show the resource for.
+
+``<RESOURCE>``
+  Name of the resource to show the details for.
+
+Optional arguments
+------------------
+
+``-a <ATTRIBUTE>, --with-attr <ATTRIBUTE>``
+  Attribute to show, it can be specified multiple times.
+
+.. _heat_resource-signal:
+
+heat resource-signal
+~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat resource-signal [-D <DATA>] [-f <FILE>] <NAME or ID> <RESOURCE>
+
+Send a signal to a resource.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack the resource belongs to.
+
+``<RESOURCE>``
+  Name of the resource to signal.
+
+Optional arguments
+------------------
+
+``-D <DATA>, --data <DATA>``
+  JSON Data to send to the signal handler.
+
+``-f <FILE>, --data-file <FILE>``
+  File containing JSON data to send to the signal
+  handler.
+
+.. _heat_resource-type-list:
+
+heat resource-type-list
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat resource-type-list [-f <KEY1=VALUE1;KEY2=VALUE2...>]
+
+List the available resource types.
+
+Optional arguments
+------------------
+
+``-f <KEY1=VALUE1;KEY2=VALUE2...>, --filters <KEY1=VALUE1;KEY2=VALUE2...>``
+  Filter parameters to apply on returned resource types.
+  This can be specified multiple times, or once with
+  parameters separated by a semicolon. It can be any of
+  name, version and support_status
+
+.. _heat_resource-type-show:
+
+heat resource-type-show
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat resource-type-show <RESOURCE_TYPE>
+
+Show the resource type.
+
+Positional arguments
+--------------------
+
+``<RESOURCE_TYPE>``
+  Resource type to get the details for.
+
+.. _heat_resource-type-template:
+
+heat resource-type-template
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat resource-type-template [-t <TEMPLATE_TYPE>] [-F <FORMAT>]
+                                      <RESOURCE_TYPE>
+
+Generate a template based on a resource type.
+
+Positional arguments
+--------------------
+
+``<RESOURCE_TYPE>``
+  Resource type to generate a template for.
+
+Optional arguments
+------------------
+
+``-t <TEMPLATE_TYPE>, --template-type <TEMPLATE_TYPE>``
+  Template type to generate, hot or cfn.
+
+``-F <FORMAT>, --format <FORMAT>``
+  The template output format, one of: yaml, json.
+
+.. _heat_service-list:
+
+heat service-list
+~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat service-list
+
+List the Heat engines.
+
+.. _heat_snapshot-delete:
+
+heat snapshot-delete
+~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat snapshot-delete <NAME or ID> <SNAPSHOT>
+
+Delete a snapshot of a stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of the stack containing the snapshot.
+
+``<SNAPSHOT>``
+  The ID of the snapshot to delete.
+
+.. _heat_snapshot-list:
+
+heat snapshot-list
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat snapshot-list <NAME or ID>
+
+List the snapshots of a stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of the stack containing the snapshots.
+
+.. _heat_snapshot-show:
+
+heat snapshot-show
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat snapshot-show <NAME or ID> <SNAPSHOT>
+
+Show a snapshot of a stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of the stack containing the snapshot.
+
+``<SNAPSHOT>``
+  The ID of the snapshot to show.
+
+.. _heat_stack-abandon:
+
+heat stack-abandon
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat stack-abandon [-O <FILE>] <NAME or ID>
+
+Abandon the stack. This will delete the record of the stack from Heat, but
+will not delete any of the underlying resources. Prints an adoptable JSON
+representation of the stack to stdout or a file on success.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to abandon.
+
+Optional arguments
+------------------
+
+``-O <FILE>, --output-file <FILE>``
+  file to output abandon result. If the option is
+  specified, the result will be output into <FILE>.
+
+.. _heat_stack-adopt:
+
+heat stack-adopt
+~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat stack-adopt [-e <FILE or URL>] [-c <TIMEOUT>] [-t <TIMEOUT>]
+                           [-a <FILE or URL>] [-r]
+                           [-P <KEY1=VALUE1;KEY2=VALUE2...>]
+                           <STACK_NAME>
+
+Adopt a stack.
+
+Positional arguments
+--------------------
+
+``<STACK_NAME>``
+  Name of the stack to adopt.
+
+Optional arguments
+------------------
+
+``-e <FILE or URL>, --environment-file <FILE or URL>``
+  Path to the environment, it can be specified multiple
+  times.
+
+``-c <TIMEOUT>, --create-timeout <TIMEOUT>``
+  Stack creation timeout in minutes. **DEPRECATED** use
+  :option:`--timeout` instead.
+
+``-t <TIMEOUT>, --timeout <TIMEOUT>``
+  Stack creation timeout in minutes.
+
+``-a <FILE or URL>, --adopt-file <FILE or URL>``
+  Path to adopt stack data file.
+
+``-r, --enable-rollback``
+  Enable rollback on create/update failure.
+
+``-P <KEY1=VALUE1;KEY2=VALUE2...>, --parameters <KEY1=VALUE1;KEY2=VALUE2...>``
+  Parameter values used to create the stack. This can be
+  specified multiple times, or once with parameters
+  separated by a semicolon.
+
+.. _heat_stack-cancel-update:
+
+heat stack-cancel-update
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat stack-cancel-update <NAME or ID>
+
+Cancel currently running update of the stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to cancel update for.
+
+.. _heat_stack-create:
+
+heat stack-create
+~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat stack-create [-f <FILE>] [-e <FILE or URL>]
+                            [--pre-create <RESOURCE>] [-u <URL>] [-o <URL>]
+                            [-c <TIMEOUT>] [-t <TIMEOUT>] [-r]
+                            [-P <KEY1=VALUE1;KEY2=VALUE2...>] [-Pf <KEY=FILE>]
+                            [--poll [SECONDS]] [--tags <TAG1,TAG2>]
+                            <STACK_NAME>
+
+Create the stack.
+
+Positional arguments
+--------------------
+
+``<STACK_NAME>``
+  Name of the stack to create.
+
+Optional arguments
+------------------
+
+``-f <FILE>, --template-file <FILE>``
+  Path to the template.
+
+``-e <FILE or URL>, --environment-file <FILE or URL>``
+  Path to the environment, it can be specified multiple
+  times.
+
+``--pre-create <RESOURCE>``
+  Name of a resource to set a pre-create hook to.
+  Resources in nested stacks can be set using slash as a
+  separator: nested_stack/another/my_resource. You can
+  use wildcards to match multiple stacks or resources:
+  nested_stack/an\*/\*_resource. This can be specified
+  multiple times
+
+``-u <URL>, --template-url <URL>``
+  URL of template.
+
+``-o <URL>, --template-object <URL>``
+  URL to retrieve template object (e.g. from swift).
+
+``-c <TIMEOUT>, --create-timeout <TIMEOUT>``
+  Stack creation timeout in minutes. **DEPRECATED** use
+  :option:`--timeout` instead.
+
+``-t <TIMEOUT>, --timeout <TIMEOUT>``
+  Stack creation timeout in minutes.
+
+``-r, --enable-rollback``
+  Enable rollback on create/update failure.
+
+``-P <KEY1=VALUE1;KEY2=VALUE2...>, --parameters <KEY1=VALUE1;KEY2=VALUE2...>``
+  Parameter values used to create the stack. This can be
+  specified multiple times, or once with parameters
+  separated by a semicolon.
+
+``-Pf <KEY=FILE>, --parameter-file <KEY=FILE>``
+  Parameter values from file used to create the stack.
+  This can be specified multiple times. Parameter value
+  would be the content of the file
+
+``--poll [SECONDS]``
+  Poll and report events until stack completes. Optional
+  poll interval in seconds can be provided as argument,
+  default 5.
+
+``--tags <TAG1,TAG2>``
+  A list of tags to associate with the stack.
+
+.. _heat_stack-delete:
+
+heat stack-delete
+~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat stack-delete <NAME or ID> [<NAME or ID> ...]
+
+Delete the stack(s).
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack(s) to delete.
+
+.. _heat_stack-list:
+
+heat stack-list
+~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat stack-list [-s] [-n] [-a] [-f <KEY1=VALUE1;KEY2=VALUE2...>]
+                          [-t <TAG1,TAG2...>] [--tags-any <TAG1,TAG2...>]
+                          [--not-tags <TAG1,TAG2...>]
+                          [--not-tags-any <TAG1,TAG2...>] [-l <LIMIT>] [-m <ID>]
+                          [-k <KEY1,KEY2...>] [-d [asc|desc]] [-g] [-o]
+
+List the user's stacks.
+
+Optional arguments
+------------------
+
+``-s, --show-deleted``
+  Include soft-deleted stacks in the stack listing.
+
+``-n, --show-nested``
+  Include nested stacks in the stack listing.
+
+``-a, --show-hidden``
+  Include hidden stacks in the stack listing.
+
+``-f <KEY1=VALUE1;KEY2=VALUE2...>, --filters <KEY1=VALUE1;KEY2=VALUE2...>``
+  Filter parameters to apply on returned stacks. This
+  can be specified multiple times, or once with
+  parameters separated by a semicolon.
+
+``-t <TAG1,TAG2...>, --tags <TAG1,TAG2...>``
+  Show stacks containing these tags, combine multiple
+  tags using the boolean AND expression
+
+``--tags-any <TAG1,TAG2...>``
+  Show stacks containing these tags, combine multiple
+  tags using the boolean OR expression
+
+``--not-tags <TAG1,TAG2...>``
+  Show stacks not containing these tags, combine
+  multiple tags using the boolean AND expression
+
+``--not-tags-any <TAG1,TAG2...>``
+  Show stacks not containing these tags, combine
+  multiple tags using the boolean OR expression
+
+``-l <LIMIT>, --limit <LIMIT>``
+  Limit the number of stacks returned.
+
+``-m <ID>, --marker <ID>``
+  Only return stacks that appear after the given stack
+  ID.
+
+``-k <KEY1,KEY2...>, --sort-keys <KEY1,KEY2...>``
+  List of keys for sorting the returned stacks. This can
+  be specified multiple times or once with keys
+  separated by semicolons. Valid sorting keys include
+  "stack_name", "stack_status", "creation_time" and
+  "updated_time".
+
+``-d [asc|desc], --sort-dir [asc|desc]``
+  Sorting direction (either "asc" or "desc") for the
+  sorting keys.
+
+``-g, --global-tenant``
+  Display stacks from all tenants. Operation only
+  authorized for users who match the policy in heat's
+  policy.json.
+
+``-o, --show-owner``
+  Display stack owner information. This is automatically
+  enabled when using :option:`--global-tenant`.
+
+.. _heat_stack-preview:
+
+heat stack-preview
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat stack-preview [-f <FILE>] [-e <FILE or URL>] [-u <URL>] [-o <URL>]
+                             [-t <TIMEOUT>] [-r]
+                             [-P <KEY1=VALUE1;KEY2=VALUE2...>] [-Pf <KEY=FILE>]
+                             [--tags <TAG1,TAG2>]
+                             <STACK_NAME>
+
+Preview the stack.
+
+Positional arguments
+--------------------
+
+``<STACK_NAME>``
+  Name of the stack to preview.
+
+Optional arguments
+------------------
+
+``-f <FILE>, --template-file <FILE>``
+  Path to the template.
+
+``-e <FILE or URL>, --environment-file <FILE or URL>``
+  Path to the environment, it can be specified multiple
+  times.
+
+``-u <URL>, --template-url <URL>``
+  URL of template.
+
+``-o <URL>, --template-object <URL>``
+  URL to retrieve template object (e.g. from swift)
+
+``-t <TIMEOUT>, --timeout <TIMEOUT>``
+  Stack creation timeout in minutes. This is only used
+  duringvalidation in preview.
+
+``-r, --enable-rollback``
+  Enable rollback on failure. This option is not used
+  duringpreview and exists only for symmetry with stack-
+  create.
+
+``-P <KEY1=VALUE1;KEY2=VALUE2...>, --parameters <KEY1=VALUE1;KEY2=VALUE2...>``
+  Parameter values used to preview the stack. This can
+  be specified multiple times, or once with parameters
+  separated by semicolon.
+
+``-Pf <KEY=FILE>, --parameter-file <KEY=FILE>``
+  Parameter values from file used to create the stack.
+  This can be specified multiple times. Parameter value
+  would be the content of the file
+
+``--tags <TAG1,TAG2>``
+  A list of tags to associate with the stack.
+
+.. _heat_stack-restore:
+
+heat stack-restore
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat stack-restore <NAME or ID> <SNAPSHOT>
+
+Restore a snapshot of a stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of the stack containing the snapshot.
+
+``<SNAPSHOT>``
+  The ID of the snapshot to restore.
+
+.. _heat_stack-show:
+
+heat stack-show
+~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat stack-show <NAME or ID>
+
+Describe the stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to describe.
+
+.. _heat_stack-snapshot:
+
+heat stack-snapshot
+~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat stack-snapshot [-n <NAME>] <NAME or ID>
+
+Make a snapshot of a stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to snapshot.
+
+Optional arguments
+------------------
+
+``-n <NAME>, --name <NAME>``
+  If specified, the name given to the snapshot.
+
+.. _heat_stack-update:
+
+heat stack-update
+~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat stack-update [-f <FILE>] [-e <FILE or URL>]
+                            [--pre-update <RESOURCE>] [-u <URL>] [-o <URL>]
+                            [-t <TIMEOUT>] [-r] [--rollback <VALUE>] [-y]
+                            [-P <KEY1=VALUE1;KEY2=VALUE2...>] [-Pf <KEY=FILE>]
+                            [-x] [-c <PARAMETER>] [--tags <TAG1,TAG2>]
+                            <NAME or ID>
+
+Update the stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to update.
+
+Optional arguments
+------------------
+
+``-f <FILE>, --template-file <FILE>``
+  Path to the template.
+
+``-e <FILE or URL>, --environment-file <FILE or URL>``
+  Path to the environment, it can be specified multiple
+  times.
+
+``--pre-update <RESOURCE>``
+  Name of a resource to set a pre-update hook to.
+  Resources in nested stacks can be set using slash as a
+  separator: nested_stack/another/my_resource. You can
+  use wildcards to match multiple stacks or resources:
+  nested_stack/an\*/\*_resource. This can be specified
+  multiple times
+
+``-u <URL>, --template-url <URL>``
+  URL of template.
+
+``-o <URL>, --template-object <URL>``
+  URL to retrieve template object (e.g. from swift).
+
+``-t <TIMEOUT>, --timeout <TIMEOUT>``
+  Stack update timeout in minutes.
+
+``-r, --enable-rollback``
+  **DEPRECATED!** Use :option:`--rollback` argument instead. Enable
+  rollback on stack update failure. NOTE: default
+  behavior is now to use the rollback value of existing
+  stack.
+
+``--rollback <VALUE>``
+  Set rollback on update failure. Values ('1', 't',
+  'true', 'on', 'y', 'yes') set rollback to enabled.
+  Values ('0', 'f', 'false', 'off', 'n', 'no') set
+  rollback to disabled. Default is to use the value of
+  existing stack to be updated.
+
+``-y, --dry-run``
+  Do not actually perform the stack update, but show
+  what would be changed
+
+``-P <KEY1=VALUE1;KEY2=VALUE2...>, --parameters <KEY1=VALUE1;KEY2=VALUE2...>``
+  Parameter values used to create the stack. This can be
+  specified multiple times, or once with parameters
+  separated by a semicolon.
+
+``-Pf <KEY=FILE>, --parameter-file <KEY=FILE>``
+  Parameter values from file used to create the stack.
+  This can be specified multiple times. Parameter value
+  would be the content of the file
+
+``-x, --existing``
+  Re-use the template, parameters and environment of the
+  current stack. If the template argument is omitted
+  then the existing template is used. If no
+  :option:`--environment-file` is specified then the existing
+  environment is used. Parameters specified in
+  :option:`--parameters` will patch over the existing values in
+  the current stack. Parameters omitted will keep the
+  existing values.
+
+``-c <PARAMETER>, --clear-parameter <PARAMETER>``
+  Remove the parameters from the set of parameters of
+  current stack for the stack-update. The default value
+  in the template will be used. This can be specified
+  multiple times.
+
+``--tags <TAG1,TAG2>``
+  An updated list of tags to associate with the stack.
+
+.. _heat_template-function-list:
+
+heat template-function-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat template-function-list <TEMPLATE_VERSION>
+
+List the available functions.
+
+Positional arguments
+--------------------
+
+``<TEMPLATE_VERSION>``
+  Template version to get the functions for.
+
+.. _heat_template-show:
+
+heat template-show
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat template-show <NAME or ID>
+
+Get the template for the specified stack.
+
+Positional arguments
+--------------------
+
+``<NAME or ID>``
+  Name or ID of stack to get the template for.
+
+.. _heat_template-validate:
+
+heat template-validate
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat template-validate [-u <URL>] [-f <FILE>] [-e <FILE or URL>]
+                                 [-o <URL>] [-n]
+
+Validate a template with parameters.
+
+Optional arguments
+------------------
+
+``-u <URL>, --template-url <URL>``
+  URL of template.
+
+``-f <FILE>, --template-file <FILE>``
+  Path to the template.
+
+``-e <FILE or URL>, --environment-file <FILE or URL>``
+  Path to the environment, it can be specified multiple
+  times.
+
+``-o <URL>, --template-object <URL>``
+  URL to retrieve template object (e.g. from swift).
+
+``-n, --show-nested``
+  Resolve parameters from nested templates as well.
+
+.. _heat_template-version-list:
+
+heat template-version-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: heat template-version-list
+
+List the available template versions.
+
diff --git a/doc/cli-ref-rst/source/index.rst b/doc/cli-ref-rst/source/index.rst
index e7038ad34d..366f2376f8 100644
--- a/doc/cli-ref-rst/source/index.rst
+++ b/doc/cli-ref-rst/source/index.rst
@@ -23,6 +23,11 @@ Contents
    trove
    trove-misc
    neutron-misc
+   heat
+   cloudkitty
+   ceilometer
+   gnocchi
+   mistral
 
    common/app_support
 
diff --git a/doc/cli-ref-rst/source/mistral.rst b/doc/cli-ref-rst/source/mistral.rst
new file mode 100644
index 0000000000..c55c40ed34
--- /dev/null
+++ b/doc/cli-ref-rst/source/mistral.rst
@@ -0,0 +1,1413 @@
+.. ## WARNING ######################################
+.. This file is automatically generated, do not edit
+.. #################################################
+
+====================================
+Workflow service command-line client
+====================================
+
+The mistral client is the command-line interface (CLI) for
+the Workflow service API and its extensions.
+
+This chapter documents :command:`mistral` version ``1.2.0``.
+
+For help on a specific :command:`mistral` command, enter:
+
+.. code-block:: console
+
+   $ mistral help COMMAND
+
+.. _mistral_command_usage:
+
+mistral usage
+~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral [--version] [-v] [--log-file LOG_FILE] [-q] [-h] [--debug]
+                  [--os-mistral-url MISTRAL_URL]
+                  [--os-mistral-version MISTRAL_VERSION]
+                  [--os-mistral-service-type SERVICE_TYPE]
+                  [--os-mistral-endpoint-type ENDPOINT_TYPE]
+                  [--os-username USERNAME] [--os-password PASSWORD]
+                  [--os-tenant-id TENANT_ID] [--os-tenant-name TENANT_NAME]
+                  [--os-auth-token TOKEN] [--os-auth-url AUTH_URL]
+                  [--os-cacert CACERT] [--insecure]
+
+.. _mistral_command_options:
+
+mistral optional arguments
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``--version``
+  Show program's version number and exit.
+
+``-v, --verbose``
+  Increase verbosity of output. Can be repeated.
+
+``--log-file LOG_FILE``
+  Specify a file to log output. Disabled by
+  default.
+
+``-q, --quiet``
+  Suppress output except warnings and errors.
+
+``-h, --help``
+  Show this help message and exit.
+
+``--debug``
+  Show tracebacks on errors.
+
+``--os-mistral-url MISTRAL_URL``
+  Mistral API host (Env: OS_MISTRAL_URL)
+
+``--os-mistral-version MISTRAL_VERSION``
+  Mistral API version (default = v2) (Env:
+  OS_MISTRAL_VERSION)
+
+``--os-mistral-service-type SERVICE_TYPE``
+  Mistral service-type (should be the same name
+  as in keystone-endpoint) (default =
+  workflowv2) (Env: OS_MISTRAL_SERVICE_TYPE)
+
+``--os-mistral-endpoint-type ENDPOINT_TYPE``
+  Mistral endpoint-type (should be the same name
+  as in keystone-endpoint) (default = publicURL)
+  (Env: OS_MISTRAL_ENDPOINT_TYPE)
+
+``--os-username USERNAME``
+  Authentication username (Env: OS_USERNAME)
+
+``--os-password PASSWORD``
+  Authentication password (Env: OS_PASSWORD)
+
+``--os-tenant-id TENANT_ID``
+  Authentication tenant identifier (Env:
+  OS_TENANT_ID)
+
+``--os-tenant-name TENANT_NAME``
+  Authentication tenant name (Env:
+  OS_TENANT_NAME)
+
+``--os-auth-token TOKEN``
+  Authentication token (Env: OS_AUTH_TOKEN)
+
+``--os-auth-url AUTH_URL``
+  Authentication URL (Env: OS_AUTH_URL)
+
+``--os-cacert CACERT``
+  Authentication CA Certificate (Env: OS_CACERT)
+
+``--insecure``
+  Disables SSL/TLS certificate verification
+  (Env: MISTRALCLIENT_INSECURE)
+
+.. _mistral_action-create:
+
+mistral action-create
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-create [-h]
+                                [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                [-c COLUMN] [--max-width <integer>] [--noindent]
+                                [--quote {all,minimal,none,nonnumeric}]
+                                [--public]
+                                definition
+
+Create new action.
+
+Positional arguments
+--------------------
+
+``definition``
+  Action definition file
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--public``
+  With this flag action will be marked as "public".
+
+.. _mistral_action-delete:
+
+mistral action-delete
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-delete [-h] name [name ...]
+
+Delete action.
+
+Positional arguments
+--------------------
+
+``name``
+  Name of action(s).
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_action-execution-delete:
+
+mistral action-execution-delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-execution-delete [-h] id [id ...]
+
+Delete action execution.
+
+Positional arguments
+--------------------
+
+``id``
+  Id of action execution identifier(s).
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_action-execution-get:
+
+mistral action-execution-get
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-execution-get [-h]
+                                       [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                       [-c COLUMN] [--max-width <integer>]
+                                       [--noindent] [--prefix PREFIX]
+                                       id
+
+Show specific Action execution.
+
+Positional arguments
+--------------------
+
+``id``
+  Action execution ID.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_action-execution-get-input:
+
+mistral action-execution-get-input
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-execution-get-input [-h] id
+
+Show Action execution input data.
+
+Positional arguments
+--------------------
+
+``id``
+  Action execution ID.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_action-execution-get-output:
+
+mistral action-execution-get-output
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-execution-get-output [-h] id
+
+Show Action execution output data.
+
+Positional arguments
+--------------------
+
+``id``
+  Action execution ID.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_action-execution-list:
+
+mistral action-execution-list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-execution-list [-h]
+                                        [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                        [-c COLUMN] [--max-width <integer>]
+                                        [--noindent]
+                                        [--quote {all,minimal,none,nonnumeric}]
+                                        [task_execution_id]
+
+List all Action executions.
+
+Positional arguments
+--------------------
+
+``task_execution_id``
+  Task execution ID.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_action-execution-update:
+
+mistral action-execution-update
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-execution-update [-h]
+                                          [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                          [-c COLUMN] [--max-width <integer>]
+                                          [--noindent] [--prefix PREFIX]
+                                          [--state {IDLE,RUNNING,SUCCESS,ERROR}]
+                                          [--output OUTPUT]
+                                          id
+
+Update specific Action execution.
+
+Positional arguments
+--------------------
+
+``id``
+  Action execution ID.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--state {IDLE,RUNNING,SUCCESS,ERROR}``
+  Action execution state
+
+``--output OUTPUT``
+  Action execution output
+
+.. _mistral_action-get:
+
+mistral action-get
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-get [-h]
+                             [-f {html,json,json,shell,table,value,yaml,yaml}]
+                             [-c COLUMN] [--max-width <integer>] [--noindent]
+                             [--prefix PREFIX]
+                             name
+
+Show specific action.
+
+Positional arguments
+--------------------
+
+``name``
+  Action name
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_action-get-definition:
+
+mistral action-get-definition
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-get-definition [-h] name
+
+Show action definition.
+
+Positional arguments
+--------------------
+
+``name``
+  Action name
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_action-list:
+
+mistral action-list
+~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-list [-h]
+                              [-f {csv,html,json,json,table,value,yaml,yaml}]
+                              [-c COLUMN] [--max-width <integer>] [--noindent]
+                              [--quote {all,minimal,none,nonnumeric}]
+
+List all actions.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_action-update:
+
+mistral action-update
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral action-update [-h]
+                                [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                [-c COLUMN] [--max-width <integer>] [--noindent]
+                                [--quote {all,minimal,none,nonnumeric}]
+                                [--public]
+                                definition
+
+Update action.
+
+Positional arguments
+--------------------
+
+``definition``
+  Action definition file
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--public``
+  With this flag action will be marked as "public".
+
+.. _mistral_cron-trigger-create:
+
+mistral cron-trigger-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral cron-trigger-create [-h]
+                                      [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                      [-c COLUMN] [--max-width <integer>]
+                                      [--noindent] [--prefix PREFIX]
+                                      [--params PARAMS] [--pattern <* * * * *>]
+                                      [--first-time <YYYY-MM-DD HH:MM>]
+                                      [--count <integer>]
+                                      name workflow_name [workflow_input]
+
+Create new trigger.
+
+Positional arguments
+--------------------
+
+``name``
+  Cron trigger name
+
+``workflow_name``
+  Workflow name
+
+``workflow_input``
+  Workflow input
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--params PARAMS``
+  Workflow params
+
+``--pattern <* * * * *>``
+  Cron trigger pattern
+
+``--first-time <YYYY-MM-DD HH:MM>``
+  Date and time of the first execution
+
+``--count <integer>``
+  Number of wanted executions
+
+.. _mistral_cron-trigger-delete:
+
+mistral cron-trigger-delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral cron-trigger-delete [-h] name [name ...]
+
+Delete trigger.
+
+Positional arguments
+--------------------
+
+``name``
+  Name of cron trigger(s).
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_cron-trigger-get:
+
+mistral cron-trigger-get
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral cron-trigger-get [-h]
+                                   [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                   [-c COLUMN] [--max-width <integer>]
+                                   [--noindent] [--prefix PREFIX]
+                                   name
+
+Show specific cron trigger.
+
+Positional arguments
+--------------------
+
+``name``
+  Cron trigger name
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_cron-trigger-list:
+
+mistral cron-trigger-list
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral cron-trigger-list [-h]
+                                    [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                    [-c COLUMN] [--max-width <integer>]
+                                    [--noindent]
+                                    [--quote {all,minimal,none,nonnumeric}]
+
+List all cron triggers.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_environment-create:
+
+mistral environment-create
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral environment-create [-h]
+                                     [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                     [-c COLUMN] [--max-width <integer>]
+                                     [--noindent] [--prefix PREFIX]
+                                     file
+
+Create new environment.
+
+Positional arguments
+--------------------
+
+``file``
+  Environment configuration file in JSON or YAML
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_environment-delete:
+
+mistral environment-delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral environment-delete [-h] name [name ...]
+
+Delete environment.
+
+Positional arguments
+--------------------
+
+``name``
+  Name of environment(s).
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_environment-get:
+
+mistral environment-get
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral environment-get [-h]
+                                  [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                  [-c COLUMN] [--max-width <integer>]
+                                  [--noindent] [--prefix PREFIX]
+                                  name
+
+Show specific environment.
+
+Positional arguments
+--------------------
+
+``name``
+  Environment name
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_environment-list:
+
+mistral environment-list
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral environment-list [-h]
+                                   [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                   [-c COLUMN] [--max-width <integer>]
+                                   [--noindent]
+                                   [--quote {all,minimal,none,nonnumeric}]
+
+List all environments.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_environment-update:
+
+mistral environment-update
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral environment-update [-h]
+                                     [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                     [-c COLUMN] [--max-width <integer>]
+                                     [--noindent] [--prefix PREFIX]
+                                     file
+
+Update environment.
+
+Positional arguments
+--------------------
+
+``file``
+  Environment configuration file in JSON or YAML
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_execution-create:
+
+mistral execution-create
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral execution-create [-h]
+                                   [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                   [-c COLUMN] [--max-width <integer>]
+                                   [--noindent] [--prefix PREFIX]
+                                   [-d DESCRIPTION]
+                                   workflow_name [workflow_input] [params]
+
+Create new execution.
+
+Positional arguments
+--------------------
+
+``workflow_name``
+  Workflow name
+
+``workflow_input``
+  Workflow input
+
+``params``
+  Workflow additional parameters
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``-d DESCRIPTION, --description DESCRIPTION``
+  Execution description
+
+.. _mistral_execution-delete:
+
+mistral execution-delete
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral execution-delete [-h] id [id ...]
+
+Delete execution.
+
+Positional arguments
+--------------------
+
+``id``
+  Id of execution identifier(s).
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_execution-get:
+
+mistral execution-get
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral execution-get [-h]
+                                [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                [-c COLUMN] [--max-width <integer>] [--noindent]
+                                [--prefix PREFIX]
+                                id
+
+Show specific execution.
+
+Positional arguments
+--------------------
+
+``id``
+  Execution identifier
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_execution-get-input:
+
+mistral execution-get-input
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral execution-get-input [-h] id
+
+Show execution input data.
+
+Positional arguments
+--------------------
+
+``id``
+  Execution ID
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_execution-get-output:
+
+mistral execution-get-output
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral execution-get-output [-h] id
+
+Show execution output data.
+
+Positional arguments
+--------------------
+
+``id``
+  Execution ID
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_execution-list:
+
+mistral execution-list
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral execution-list [-h]
+                                 [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                 [-c COLUMN] [--max-width <integer>] [--noindent]
+                                 [--quote {all,minimal,none,nonnumeric}]
+                                 [--marker [MARKER]] [--limit [LIMIT]]
+                                 [--sort_keys [SORT_KEYS]]
+                                 [--sort_dirs [SORT_DIRS]]
+
+List all executions.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--marker [MARKER]``
+  The last execution uuid of the previous page, displays
+  list of executions after "marker".
+
+``--limit [LIMIT]``
+  Maximum number of executions to return in a single
+  result.
+
+``--sort_keys [SORT_KEYS]``
+  Comma-separated list of sort keys to sort results by.
+  Default: created_at. Example: mistral execution-list
+  :option:`--sort_keys=id,description`
+
+``--sort_dirs [SORT_DIRS]``
+  Comma-separated list of sort directions. Default: asc.
+  Example: mistral execution-list
+  :option:`--sort_keys=id,description` :option:`--sort_dirs=asc,desc`
+
+.. _mistral_execution-update:
+
+mistral execution-update
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral execution-update [-h]
+                                   [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                   [-c COLUMN] [--max-width <integer>]
+                                   [--noindent] [--prefix PREFIX]
+                                   (-s {RUNNING,PAUSED,SUCCESS,ERROR} | -d DESCRIPTION)
+                                   id
+
+Update execution.
+
+Positional arguments
+--------------------
+
+``id``
+  Execution identifier
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``-s {RUNNING,PAUSED,SUCCESS,ERROR}, --state {RUNNING,PAUSED,SUCCESS,ERROR}``
+  Execution state
+
+``-d DESCRIPTION, --description DESCRIPTION``
+  Execution description
+
+.. _mistral_run-action:
+
+mistral run-action
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral run-action [-h]
+                             [-f {html,json,json,shell,table,value,yaml,yaml}]
+                             [-c COLUMN] [--max-width <integer>] [--noindent]
+                             [--prefix PREFIX] [-s] [-t TARGET]
+                             name [input]
+
+Create new Action execution or just run specific action.
+
+Positional arguments
+--------------------
+
+``name``
+  Action name to execute.
+
+``input``
+  Action input.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``-s, --save-result``
+  Save the result into DB.
+
+``-t TARGET, --target TARGET``
+  Action will be executed on <target> executor.
+
+.. _mistral_service-list:
+
+mistral service-list
+~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral service-list [-h]
+                               [-f {csv,html,json,json,table,value,yaml,yaml}]
+                               [-c COLUMN] [--max-width <integer>] [--noindent]
+                               [--quote {all,minimal,none,nonnumeric}]
+
+List all services.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_task-get:
+
+mistral task-get
+~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral task-get [-h] [-f {html,json,json,shell,table,value,yaml,yaml}]
+                           [-c COLUMN] [--max-width <integer>] [--noindent]
+                           [--prefix PREFIX]
+                           id
+
+Show specific task.
+
+Positional arguments
+--------------------
+
+``id``
+  Task identifier
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_task-get-published:
+
+mistral task-get-published
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral task-get-published [-h] id
+
+Show task published variables.
+
+Positional arguments
+--------------------
+
+``id``
+  Task ID
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_task-get-result:
+
+mistral task-get-result
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral task-get-result [-h] id
+
+Show task output data.
+
+Positional arguments
+--------------------
+
+``id``
+  Task ID
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_task-list:
+
+mistral task-list
+~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral task-list [-h] [-f {csv,html,json,json,table,value,yaml,yaml}]
+                            [-c COLUMN] [--max-width <integer>] [--noindent]
+                            [--quote {all,minimal,none,nonnumeric}]
+                            [workflow_execution]
+
+List all tasks.
+
+Positional arguments
+--------------------
+
+``workflow_execution``
+  Workflow execution ID associated with list of Tasks.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_task-rerun:
+
+mistral task-rerun
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral task-rerun [-h]
+                             [-f {html,json,json,shell,table,value,yaml,yaml}]
+                             [-c COLUMN] [--max-width <integer>] [--noindent]
+                             [--prefix PREFIX] [--resume]
+                             id
+
+Rerun an existing task.
+
+Positional arguments
+--------------------
+
+``id``
+  Task identifier
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--resume``
+  rerun only failed or unstarted action executions for
+  with-items task
+
+.. _mistral_workbook-create:
+
+mistral workbook-create
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workbook-create [-h]
+                                  [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                  [-c COLUMN] [--max-width <integer>]
+                                  [--noindent] [--prefix PREFIX]
+                                  definition
+
+Create new workbook.
+
+Positional arguments
+--------------------
+
+``definition``
+  Workbook definition file
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_workbook-delete:
+
+mistral workbook-delete
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workbook-delete [-h] name [name ...]
+
+Delete workbook.
+
+Positional arguments
+--------------------
+
+``name``
+  Name of workbook(s).
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_workbook-get:
+
+mistral workbook-get
+~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workbook-get [-h]
+                               [-f {html,json,json,shell,table,value,yaml,yaml}]
+                               [-c COLUMN] [--max-width <integer>] [--noindent]
+                               [--prefix PREFIX]
+                               name
+
+Show specific workbook.
+
+Positional arguments
+--------------------
+
+``name``
+  Workbook name
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_workbook-get-definition:
+
+mistral workbook-get-definition
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workbook-get-definition [-h] name
+
+Show workbook definition.
+
+Positional arguments
+--------------------
+
+``name``
+  Workbook name
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_workbook-list:
+
+mistral workbook-list
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workbook-list [-h]
+                                [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                [-c COLUMN] [--max-width <integer>] [--noindent]
+                                [--quote {all,minimal,none,nonnumeric}]
+
+List all workbooks.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_workbook-update:
+
+mistral workbook-update
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workbook-update [-h]
+                                  [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                  [-c COLUMN] [--max-width <integer>]
+                                  [--noindent] [--prefix PREFIX]
+                                  definition
+
+Update workbook.
+
+Positional arguments
+--------------------
+
+``definition``
+  Workbook definition file
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_workbook-validate:
+
+mistral workbook-validate
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workbook-validate [-h]
+                                    [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                    [-c COLUMN] [--max-width <integer>]
+                                    [--noindent] [--prefix PREFIX]
+                                    definition
+
+Validate workbook.
+
+Positional arguments
+--------------------
+
+``definition``
+  Workbook definition file
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_workflow-create:
+
+mistral workflow-create
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workflow-create [-h]
+                                  [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                  [-c COLUMN] [--max-width <integer>]
+                                  [--noindent]
+                                  [--quote {all,minimal,none,nonnumeric}]
+                                  [--public]
+                                  definition
+
+Create new workflow.
+
+Positional arguments
+--------------------
+
+``definition``
+  Workflow definition file
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--public``
+  With this flag workflow will be marked as "public".
+
+.. _mistral_workflow-delete:
+
+mistral workflow-delete
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workflow-delete [-h] name [name ...]
+
+Delete workflow.
+
+Positional arguments
+--------------------
+
+``name``
+  Name of workflow(s).
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_workflow-get:
+
+mistral workflow-get
+~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workflow-get [-h]
+                               [-f {html,json,json,shell,table,value,yaml,yaml}]
+                               [-c COLUMN] [--max-width <integer>] [--noindent]
+                               [--prefix PREFIX]
+                               name
+
+Show specific workflow.
+
+Positional arguments
+--------------------
+
+``name``
+  Workflow name
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_workflow-get-definition:
+
+mistral workflow-get-definition
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workflow-get-definition [-h] name
+
+Show workflow definition.
+
+Positional arguments
+--------------------
+
+``name``
+  Workflow name
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_workflow-list:
+
+mistral workflow-list
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workflow-list [-h]
+                                [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                [-c COLUMN] [--max-width <integer>] [--noindent]
+                                [--quote {all,minimal,none,nonnumeric}]
+
+List all workflows.
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+.. _mistral_workflow-update:
+
+mistral workflow-update
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workflow-update [-h]
+                                  [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                  [-c COLUMN] [--max-width <integer>]
+                                  [--noindent]
+                                  [--quote {all,minimal,none,nonnumeric}]
+                                  [--public]
+                                  definition
+
+Update workflow.
+
+Positional arguments
+--------------------
+
+``definition``
+  Workflow definition
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+
+``--public``
+  With this flag workflow will be marked as "public".
+
+.. _mistral_workflow-validate:
+
+mistral workflow-validate
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: console
+
+   usage: mistral workflow-validate [-h]
+                                    [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                    [-c COLUMN] [--max-width <integer>]
+                                    [--noindent] [--prefix PREFIX]
+                                    definition
+
+Validate workflow.
+
+Positional arguments
+--------------------
+
+``definition``
+  Workflow definition file
+
+Optional arguments
+------------------
+
+``-h, --help``
+  show this help message and exit
+