Merge "Add monasca to common and CLI reference"

doc/cli-reference/bk-cli-reference.xml

@@ -78,6 +78,9 @@
     <!-- Key Manager service (barbican) -->
     <xi:include href="generated/ch_cli_barbican_commands.xml"/>
 
+    <!-- Monitoring (monasca) -->
+    <xi:include href="generated/ch_cli_monasca_commands.xml"/>
+
     <!-- Networking (neutron) -->
     <xi:include href="generated/ch_cli_neutron_commands.xml"/>
     <xi:include href="ch_cli_neutron-debug_commands.xml"/>

doc/common-rst/app_support.rst

@@ -181,6 +181,8 @@ The following Launchpad Bugs areas are available:
 
 -  `Bugs: Key Manager Service (barbican) <https://bugs.launchpad.net/barbican>`__
 
+-  `Bugs: Monitoring (monasca) <https://bugs.launchpad.net/monasca>`__
+
 -  `Bugs: Orchestration (heat) <https://bugs.launchpad.net/heat>`__
 
 -  `Bugs: Shared file systems (manila) <https://bugs.launchpad.net/manila>`__

doc/common-rst/cli_install_openstack_command_line_clients.rst

@@ -163,6 +163,8 @@ for each client. The following values are valid:
 
 -  ``mistral`` - Workflow service API
 
+-  ``monasca`` - Monitoring API
+
 -  ``murano`` - Application catalog API
 
 -  ``neutron`` - Networking API

doc/common-rst/cli_overview.rst

@@ -67,6 +67,9 @@ service with its package name and description.
 |Key Manager     |barbican  |python-barbicanclient  |Creates and manages     |
 |service         |          |                       |keys.                   |
 +----------------+----------+-----------------------+------------------------+
+|Monitoring      |monasca   |python-monascaclient   |Monitoring solution.    |
+|                |          |                       |                        |
++----------------+----------+-----------------------+------------------------+
 |Networking      |neutron   |python-neutronclient   |Configures networks for |
 |                |          |                       |guest servers.          |
 +----------------+----------+-----------------------+------------------------+

doc/common/app_support.xml

@@ -312,9 +312,14 @@
             </listitem>
             <listitem>
                 <para><link
-                        xlink:href="https://bugs.launchpad.net/trove"
+                        xlink:href="https://bugs.launchpad.net/barbican"
                         >Bugs: Key Manager service (barbican)</link></para>
             </listitem>
+            <listitem>
+                <para><link
+                        xlink:href="https://bugs.launchpad.net/monasca"
+                        >Bugs: Monitoring (monasca)</link></para>
+            </listitem>
             <listitem>
                 <para><link
                         xlink:href="https://bugs.launchpad.net/heat"

doc/common/section_cli_install.xml

@@ -193,6 +193,10 @@
                 <para><literal>heat</literal> - Orchestration
                     API</para>
             </listitem>
+            <listitem>
+                <para><literal>monasca</literal> - Monitoring
+                    API</para>
+            </listitem>
             <listitem>
                 <para><literal>neutron</literal> - Networking
                     API</para>

doc/common/section_cli_overview.xml

@@ -104,6 +104,12 @@
                 <td><package>python-barbicanclient</package></td>
                 <td>Creates and manages keys.</td>
             </tr>
+            <tr>
+                <td>Monitoring</td>
+                <td><command>monasca</command></td>
+                <td><package>python-monascaclient</package></td>
+                <td>Monitoring solution.</td>
+            </tr>
             <tr>
                 <td>Networking</td>
                 <td><command>neutron</command></td>