openstack/openstack-manuals
Code Issues Proposed changes

Merge "Rename Metering to Telemetry in common guide."

Browse Source
This commit is contained in:
Jenkins 2013-11-29 13:55:53 +00:00 committed by Gerrit Code Review
commit f5352c7e2b
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/common/app_support.xml
View File

@ -283,7 +283,7 @@ xlink:href="https://bugs.launchpad.net/heat"
<listitem> <listitem>
<para><link <para><link
xlink:href="https://bugs.launchpad.net/ceilometer" xlink:href="https://bugs.launchpad.net/ceilometer"
>Bugs : OpenStack Metering (ceilometer)</link></para> >Bugs : OpenStack Telemetry (ceilometer)</link></para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>

4
doc/common/ch_getstart.xml
View File

@ -112,7 +112,7 @@
<tr> <tr>
<td><link <td><link
xlink:href="http://www.openstack.org/software/openstack-shared-services/" xlink:href="http://www.openstack.org/software/openstack-shared-services/"
>Metering/Monitoring Service</link></td> >Telemetry Service</link></td>
<td><link <td><link
xlink:href="http://docs.openstack.org/developer/ceilometer/" xlink:href="http://docs.openstack.org/developer/ceilometer/"
>Ceilometer</link></td> >Ceilometer</link></td>
@ -155,7 +155,7 @@
<xi:include href="section_keystone-concepts.xml"/> <xi:include href="section_keystone-concepts.xml"/>
<?hard-pagebreak?> <?hard-pagebreak?>
<xi:include href="section_getstart_image.xml"/> <xi:include href="section_getstart_image.xml"/>
<xi:include href="section_getstart_metering.xml"/> <xi:include href="section_getstart_telemetry.xml"/>
<xi:include href="section_getstart_orchestration.xml"/> <xi:include href="section_getstart_orchestration.xml"/>
</section> </section>
<section xml:id="feedback"> <section xml:id="feedback">

2
doc/common/section_ceilometer_cli_commands.xml
View File

@ -5,7 +5,7 @@
xml:id="ceilometer_client_commands"> xml:id="ceilometer_client_commands">
<title>ceilometer commands</title> <title>ceilometer commands</title>
<para>The ceilometer client is the command-line interface for the <para>The ceilometer client is the command-line interface for the
OpenStack Metering API.</para> OpenStack Telemetry API.</para>
<para>For help on a specific ceilometer command, enter:</para> <para>For help on a specific ceilometer command, enter:</para>
<screen><prompt>$</prompt> <userinput><command>ceilometer</command> <option>help</option> <replaceable>COMMAND</replaceable></userinput></screen> <screen><prompt>$</prompt> <userinput><command>ceilometer</command> <option>help</option> <replaceable>COMMAND</replaceable></userinput></screen>
<example> <example>

2
doc/common/section_cli_install.xml
View File

@ -181,7 +181,7 @@
</listitem> </listitem>
<listitem> <listitem>
<para><literal>ceilometer</literal>. <para><literal>ceilometer</literal>.
Monitoring/Metering API.</para> Telemetry API.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>For example, to install the nova client, run <para>For example, to install the nova client, run

2
doc/common/section_cli_overview.xml
View File

@ -35,7 +35,7 @@
<listitem> <listitem>
<para><command>ceilometer</command> <para><command>ceilometer</command>
(<package>python-ceilometerclient</package>). (<package>python-ceilometerclient</package>).
Client for the Metering API that lets you create and Client for the Telemetry API that lets you create and
collect measurements across OpenStack.</para> collect measurements across OpenStack.</para>
</listitem> </listitem>
<listitem> <listitem>

2
doc/common/section_cli_version.xml
View File

@ -45,7 +45,7 @@
</listitem> </listitem>
<listitem> <listitem>
<para><literal>ceilometer</literal>. <para><literal>ceilometer</literal>.
Metering/Monitoring API.</para> Telemetry API.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>For example, to see the version of the <para>For example, to see the version of the

6
doc/common/section_getstart_metering.xml → doc/common/section_getstart_telemetry.xml
View File

@ -2,8 +2,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
xml:id="metering-service"> xml:id="metering-service">
<title>The Metering service</title> <title>The Telemetry Service</title>
<para>The Metering service:</para> <para>The OpenStack Telemetry service:</para>
<para> <para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
@ -55,7 +55,7 @@
and for metering data coming from the agent). Notification and for metering data coming from the agent). Notification
messages are processed and turned into metering messages messages are processed and turned into metering messages
and sent back out onto the message bus using the and sent back out onto the message bus using the
appropriate topic. Metering messages are written to the appropriate topic. Telemetry messages are written to the
data store without modification.</para> data store without modification.</para>
</listitem> </listitem>
<listitem> <listitem>

2
doc/install-guide/ch_ceilometer.xml
View File

@ -8,7 +8,7 @@
<para>The OpenStack Telemetry service provides a framework for <para>The OpenStack Telemetry service provides a framework for
monitoring and metering the OpenStack cloud. It is also known monitoring and metering the OpenStack cloud. It is also known
as the Ceilometer project.</para> as the Ceilometer project.</para>
<xi:include href="../common/section_getstart_metering.xml"/> <xi:include href="../common/section_getstart_telemetry.xml"/>
<xi:include href="section_ceilometer-install.xml"/> <xi:include href="section_ceilometer-install.xml"/>
<xi:include href="section_ceilometer-nova.xml"/> <xi:include href="section_ceilometer-nova.xml"/>
<xi:include href="section_ceilometer-glance.xml"/> <xi:include href="section_ceilometer-glance.xml"/>