diff --git a/doc/admin-guide-cloud/source/locale/admin-guide-cloud.pot b/doc/admin-guide-cloud/source/locale/admin-guide-cloud.pot
index 9fe60da6ca..80c30cc18b 100644
--- a/doc/admin-guide-cloud/source/locale/admin-guide-cloud.pot
+++ b/doc/admin-guide-cloud/source/locale/admin-guide-cloud.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cloud Administrator Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-08 06:14+0000\n"
+"POT-Creation-Date: 2015-09-09 06:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -281,7 +281,7 @@ msgid ""
 "contains the list of objects in that container."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:751
+#: ../telemetry-data-collection.rst:760
 msgid "**Accumulator transformer**"
 msgstr ""
 
@@ -308,7 +308,7 @@ msgstr ""
 msgid "**Advanced VM creation operations**"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:714
+#: ../telemetry-data-collection.rst:723
 msgid "**Aggregator transformer**"
 msgstr ""
 
@@ -706,7 +706,7 @@ msgstr ""
 msgid "**Monitors**"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:761
+#: ../telemetry-data-collection.rst:770
 msgid "**Muli meter arithmetic transformer**"
 msgstr ""
 
@@ -1050,7 +1050,7 @@ msgstr ""
 msgid "**Trustor**"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:684
+#: ../telemetry-data-collection.rst:693
 msgid "**Unit conversion transformer**"
 msgstr ""
 
@@ -1493,7 +1493,7 @@ msgid ""
 "services in her OpenStack installation."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:285
+#: ../telemetry-data-collection.rst:294
 msgid ""
 "A compute agent instance has to be installed on each and every compute node, "
 "installation instructions can be found in the `Install the Compute agent for "
@@ -1628,7 +1628,7 @@ msgid ""
 "be strings, integers, floats, or datetimes."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:60
+#: ../objectstorage_ringbuilder.rst:98
 msgid ""
 "A fractional replica count is for the whole ring and not for individual "
 "partitions. It indicates the average number of replicas for each partition. "
@@ -1717,7 +1717,7 @@ msgid ""
 "This disk is destroyed when you delete the instance."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:768
+#: ../telemetry-data-collection.rst:777
 msgid ""
 "A new sample is created with the properties described in the ``target`` "
 "section of the transformer's configuration. The sample's volume is the "
@@ -1725,7 +1725,7 @@ msgid ""
 "from the same resource."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:850
+#: ../telemetry-data-collection.rst:859
 msgid ""
 "A notification message may contain multiple meters. You can use ``*`` in the "
 "meter definition to capture all the meters and generate samples "
@@ -1891,7 +1891,7 @@ msgid ""
 "let you define the output levels and formats."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:501
+#: ../telemetry-data-collection.rst:510
 msgid ""
 "A sink, on the other hand, is a consumer of data, providing logic for the "
 "transformation and publication of data emitted from related sources."
@@ -1903,7 +1903,7 @@ msgid ""
 "to look."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:480
+#: ../telemetry-data-collection.rst:489
 msgid ""
 "A source is a producer of data: samples or events. In effect, it is a set of "
 "pollsters or notification handlers emitting datapoints for a set of matching "
@@ -1917,7 +1917,7 @@ msgid ""
 "file:`heat.conf`."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:823
+#: ../telemetry-data-collection.rst:832
 msgid "A standard meter definition looks like the following::"
 msgstr ""
 
@@ -1936,7 +1936,7 @@ msgid ""
 "A storage area network (SAN) used by OpenStack Block Storage (cinder-volumes)"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:167
+#: ../telemetry-data-collection.rst:176
 msgid ""
 "A subset of Object Store statistics requires additional middleware to be "
 "installed behind the proxy of Object Store. This additional component emits "
@@ -1958,7 +1958,7 @@ msgstr ""
 msgid "A timestamp of when the event occurred in the system."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:716
+#: ../telemetry-data-collection.rst:725
 msgid ""
 "A transformer that sums up the incoming samples until enough samples have "
 "come in or a timeout has been reached."
@@ -2176,7 +2176,7 @@ msgstr ""
 msgid "Accounts and containers"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:602
+#: ../telemetry-data-collection.rst:611
 msgid "Accumulator"
 msgstr ""
 
@@ -2254,7 +2254,7 @@ msgstr ""
 msgid "Add the following function to your :file:`.bashrc` file:"
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:95
+#: ../objectstorage_ringbuilder.rst:133
 msgid ""
 "Additionally, the ``swift-ring-builder X.builder create`` command can now "
 "take a decimal argument for the number of replicas."
@@ -2410,7 +2410,7 @@ msgstr ""
 msgid "Aggregated numb\\ er of blocks se\\ nt to block dev\\ ice"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:604
+#: ../telemetry-data-collection.rst:613
 msgid "Aggregator"
 msgstr ""
 
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Amount of energy"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:391
+#: ../telemetry-data-collection.rst:400
 msgid ""
 "An IPMI agent instance could be installed on each and every compute node "
 "with IPMI support, except when the node is managed by the Bare metal service "
@@ -2884,7 +2884,7 @@ msgstr ""
 msgid "Argument"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:606
+#: ../telemetry-data-collection.rst:615
 msgid "Arithmetic"
 msgstr ""
 
@@ -2960,7 +2960,7 @@ msgid ""
 "read.bytes`` meters, the following command should be invoked::"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:248
+#: ../telemetry-data-collection.rst:257
 msgid ""
 "As the name of this agent shows, it is a central component in the Telemetry "
 "architecture. This agent is responsible for polling public REST APIs to "
@@ -3008,7 +3008,7 @@ msgstr ""
 msgid "Assuming you have the following already:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:588
+#: ../telemetry-data-collection.rst:597
 msgid ""
 "At least one of the above variations should be included in the meters "
 "section. Included and excluded meters cannot co-exist in the same pipeline. "
@@ -3439,7 +3439,7 @@ msgstr ""
 msgid "Block Storage"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:905
+#: ../telemetry-data-collection.rst:914
 msgid "Block Storage audit script setup to get notifications"
 msgstr ""
 
@@ -3532,7 +3532,7 @@ msgid ""
 "implementations:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:312
+#: ../telemetry-data-collection.rst:321
 msgid ""
 "Both the central and the compute agent can run in an HA deployment, which "
 "means that multiple instances of these services can run in parallel with "
@@ -3545,7 +3545,7 @@ msgid ""
 "network where VNC servers live."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:114
+#: ../objectstorage_ringbuilder.rst:152
 msgid "Build the ring"
 msgstr ""
 
@@ -3851,7 +3851,7 @@ msgstr ""
 msgid "CentOS"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:247
+#: ../telemetry-data-collection.rst:256
 msgid "Central agent"
 msgstr ""
 
@@ -3869,7 +3869,7 @@ msgid ""
 "conf` file on compute nodes."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:976
+#: ../telemetry-data-collection.rst:985
 msgid ""
 "Certain databases support native TTL expiration. In cases where this is not "
 "possible, a command-line script, which you can use for this purpose is "
@@ -3941,7 +3941,7 @@ msgid ""
 "the IP addresses of ``HostB`` and ``HostC``. Then restart the NFS server:"
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:91
+#: ../objectstorage_ringbuilder.rst:129
 msgid ""
 "Changes take effect after the ring is rebalanced. Therefore, if you intend "
 "to change from 3 replicas to 3.01 but you accidentally type 2.01, no data is "
@@ -4123,7 +4123,7 @@ msgid ""
 "Networking API to plug each virtual NIC on the VM into a particular network."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:277
+#: ../telemetry-data-collection.rst:286
 msgid "Compute agent"
 msgstr ""
 
@@ -5087,7 +5087,7 @@ msgstr ""
 
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-measurements.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../telemetry-data-collection.rst:444 ../telemetry-measurements.rst:33
+#: ../telemetry-data-collection.rst:453 ../telemetry-measurements.rst:33
 #: ../telemetry-measurements.rst:1320
 msgid "Cumulative"
 msgstr ""
@@ -5166,11 +5166,11 @@ msgid ""
 "datastore. This is typically either ``mysql`` or ``percona``."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:998
+#: ../telemetry-data-collection.rst:1007
 msgid "DB2 NoSQL"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:998
+#: ../telemetry-data-collection.rst:1007
 msgid "DB2 NoSQL does not have native TTL nor ceilometer-expirer support."
 msgstr ""
 
@@ -5203,7 +5203,7 @@ msgstr ""
 msgid "Data collection"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:474
+#: ../telemetry-data-collection.rst:483
 msgid "Data collection and processing"
 msgstr ""
 
@@ -5211,7 +5211,7 @@ msgstr ""
 msgid "Data doesn't have to be migrate to an entirely new storage system."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:488
+#: ../telemetry-data-collection.rst:497
 msgid ""
 "Data gathered can be used for different purposes, which can impact how "
 "frequently it needs to be published. Typically, a meter published for "
@@ -5254,7 +5254,7 @@ msgstr ""
 
 # #-#-#-#-#  database.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../database.rst:8 ../telemetry-data-collection.rst:984
+#: ../database.rst:8 ../telemetry-data-collection.rst:993
 msgid "Database"
 msgstr ""
 
@@ -5262,7 +5262,7 @@ msgstr ""
 msgid "Database ServiceGroup driver"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:963
+#: ../telemetry-data-collection.rst:972
 msgid "Database dispatcher"
 msgstr ""
 
@@ -5442,7 +5442,7 @@ msgstr ""
 
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-measurements.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../telemetry-data-collection.rst:442 ../telemetry-measurements.rst:35
+#: ../telemetry-data-collection.rst:451 ../telemetry-measurements.rst:35
 #: ../telemetry-measurements.rst:670 ../telemetry-measurements.rst:673
 #: ../telemetry-measurements.rst:676 ../telemetry-measurements.rst:679
 #: ../telemetry-measurements.rst:682 ../telemetry-measurements.rst:711
@@ -5673,7 +5673,7 @@ msgid ""
 "architectures do not use."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:408
+#: ../telemetry-data-collection.rst:417
 msgid ""
 "Do not deploy both the IPMI agent and the Bare metal service on one compute "
 "node. If ``conductor.send_sensor_data`` is set, this misconfiguration causes "
@@ -5801,7 +5801,7 @@ msgstr ""
 msgid "Each component of a match statement uses this format:"
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:126
+#: ../objectstorage_ringbuilder.rst:164
 msgid ""
 "Each device is also assigned a random tiebreaker value that is used when two "
 "devices desire the same number of partitions. This tiebreaker is not stored "
@@ -5827,7 +5827,7 @@ msgid ""
 "DHCP servers:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:484
+#: ../telemetry-data-collection.rst:493
 msgid ""
 "Each source configuration encapsulates name matching, polling interval "
 "determination, optional resource enumeration or discovery, and mapping to "
@@ -6129,7 +6129,7 @@ msgstr ""
 msgid "Energy"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:264
+#: ../telemetry-data-collection.rst:273
 msgid ""
 "Energy consumption meters via `Kwapi <https://launchpad.net/kwapi>`__ "
 "framework"
@@ -6341,7 +6341,7 @@ msgstr ""
 msgid "Example Compute installation environment"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:777
+#: ../telemetry-data-collection.rst:786
 msgid "Example configuration::"
 msgstr ""
 
@@ -6361,7 +6361,8 @@ msgstr ""
 
 # #-#-#-#-#  database.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  objectstorage_ringbuilder.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../database.rst:128 ../database.rst:197 ../objectstorage_ringbuilder.rst:67
+#: ../database.rst:128 ../database.rst:197
+#: ../objectstorage_ringbuilder.rst:105
 msgid "Example::"
 msgstr ""
 
@@ -6489,7 +6490,7 @@ msgid ""
 "volumes."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:802
+#: ../telemetry-data-collection.rst:811
 msgid ""
 "Expression evaluation gracefully handles NaNs and exceptions. In such a case "
 "it does not create a new sample but only logs a warning."
@@ -6613,7 +6614,7 @@ msgstr ""
 msgid "Fedora"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1013
+#: ../telemetry-data-collection.rst:1022
 msgid "File dispatcher"
 msgstr ""
 
@@ -6894,7 +6895,7 @@ msgid ""
 "SystemUsageData>`__."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:110
+#: ../objectstorage_ringbuilder.rst:148
 msgid ""
 "For a ring generated with part\\_power P, the partition shift value is ``32 "
 "- P``."
@@ -6922,7 +6923,7 @@ msgid ""
 "ref:`OpenStack Identity documentation <identity_management>` for more info)."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:359
+#: ../telemetry-data-collection.rst:368
 msgid ""
 "For backward compatibility and supporting existing deployments, the central "
 "agent configuration also supports using different configuration files for "
@@ -7005,7 +7006,7 @@ msgid ""
 "example::"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:369
+#: ../telemetry-data-collection.rst:378
 msgid ""
 "For each sub-group of the central agent pool with the same "
 "``partitioning_group_prefix`` a disjoint subset of meters must be polled, "
@@ -7025,6 +7026,13 @@ msgstr ""
 msgid "For every node running a ``nova-*`` service, install python-netaddr:"
 msgstr ""
 
+#: ../objectstorage_ringbuilder.rst:74
+msgid ""
+"For example, consider a 3-node cluster of machines with equal-size disks; "
+"node A has 12 disks, node B has 12 disks, and node C has 11 disks. The ring "
+"has an overload factor of 0.1 (10%)."
+msgstr ""
+
 #: ../compute_arch.rst:154
 msgid ""
 "For example, the ``cloud-init`` package included into an Ubuntu's stock "
@@ -7039,7 +7047,7 @@ msgid ""
 "does not restrict which users can create volumes:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:886
+#: ../telemetry-data-collection.rst:895
 msgid "For example, the meter definition for existence meters is as follows::"
 msgstr ""
 
@@ -7078,7 +7086,7 @@ msgstr ""
 # #-#-#-#-#  keystone_certificates_for_pki.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  objectstorage_ringbuilder.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 #: ../keystone_certificates_for_pki.rst:158
-#: ../objectstorage_ringbuilder.rst:81
+#: ../objectstorage_ringbuilder.rst:119
 msgid "For example::"
 msgstr ""
 
@@ -7137,7 +7145,7 @@ msgid ""
 "index.html>`__."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:336
+#: ../telemetry-data-collection.rst:345
 msgid ""
 "For information about the required configuration options that have to be set "
 "in the :file:`ceilometer.conf` configuration file for both the central and "
@@ -7170,7 +7178,7 @@ msgid ""
 "file:`/etc/neutron/l3_agent.ini` respectively."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:565
+#: ../telemetry-data-collection.rst:574
 msgid ""
 "For meters, which have variants identified by a complex name field, use the "
 "wildcard symbol to select all, e.g. for \"instance:m1.tiny\", use \"instance:"
@@ -7496,7 +7504,7 @@ msgstr ""
 
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-measurements.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../telemetry-data-collection.rst:440 ../telemetry-measurements.rst:37
+#: ../telemetry-data-collection.rst:449 ../telemetry-measurements.rst:37
 #: ../telemetry-measurements.rst:101 ../telemetry-measurements.rst:105
 #: ../telemetry-measurements.rst:109 ../telemetry-measurements.rst:113
 #: ../telemetry-measurements.rst:122 ../telemetry-measurements.rst:126
@@ -7619,11 +7627,11 @@ msgstr ""
 msgid "Groups"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:239
+#: ../telemetry-data-collection.rst:248
 msgid "HA deployment is NOT supported if the ``pollster-list`` option is used."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:994
+#: ../telemetry-data-collection.rst:1003
 msgid "HBase"
 msgstr ""
 
@@ -7651,7 +7659,7 @@ msgstr ""
 msgid "HTTP bad request in cinder volume log"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1003
+#: ../telemetry-data-collection.rst:1012
 msgid "HTTP dispatcher"
 msgstr ""
 
@@ -7663,7 +7671,7 @@ msgstr ""
 msgid "Handle many small, random reads and writes efficiently."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:262
+#: ../telemetry-data-collection.rst:271
 msgid "Hardware resources via SNMP"
 msgstr ""
 
@@ -7780,6 +7788,14 @@ msgid ""
 "Storage services are restarted."
 msgstr ""
 
+#: ../objectstorage_ringbuilder.rst:86
+msgid ""
+"However, this does mean that the disks in node C have more data than the "
+"disks in nodes A and B. If 80% full is the warning threshold for the "
+"cluster, node C's disks reach 80% full while A and B's disks are only 72.7% "
+"full."
+msgstr ""
+
 #: ../compute_arch.rst:216
 msgid "Hybridfox"
 msgstr ""
@@ -7801,7 +7817,7 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:432
+#: ../telemetry-data-collection.rst:441
 msgid "ID of the corresponding resource. (``--resource-id``)"
 msgstr ""
 
@@ -7822,7 +7838,7 @@ msgid ""
 "use ``multi_host`` mode."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:385
+#: ../telemetry-data-collection.rst:394
 msgid "IPMI agent"
 msgstr ""
 
@@ -8132,7 +8148,7 @@ msgid ""
 "as sudo, and is a Kilo release feature."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:426
+#: ../telemetry-data-collection.rst:435
 msgid ""
 "If the sample corresponds to an existing meter, then the fields like ``meter-"
 "type`` and meter name should be matched accordingly."
@@ -8426,7 +8442,7 @@ msgid ""
 "service does not start."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:840
+#: ../telemetry-data-collection.rst:849
 msgid ""
 "If you take a look at the :file:`meter.yaml` file, it contains the sample "
 "definitions for all the meters that Telemetry is collecting from "
@@ -8475,7 +8491,7 @@ msgid ""
 "each node."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:906
+#: ../telemetry-data-collection.rst:915
 msgid ""
 "If you want to collect OpenStack Block Storage notification on demand, you "
 "can use ``cinder-volume-usage-audit`` from OpenStack Block Storage. This "
@@ -8649,7 +8665,7 @@ msgid ""
 "debugging output from the log."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:230
+#: ../telemetry-data-collection.rst:239
 msgid ""
 "In addition to loading all the polling plug-ins registered in the specified "
 "namespaces, the ceilometer-polling agent can also specify the polling plug-"
@@ -8732,7 +8748,7 @@ msgstr ""
 msgid "In each configuration file, add these lines:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:504
+#: ../telemetry-data-collection.rst:513
 msgid ""
 "In effect, a sink describes a chain of handlers. The chain starts with zero "
 "or more transformers and ends with one or more publishers. The first "
@@ -8945,7 +8961,7 @@ msgstr ""
 msgid "In the ``[serial_console]`` section, enable the serial console:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:865
+#: ../telemetry-data-collection.rst:874
 msgid ""
 "In the above example, the ``name`` field is a json path with matching a list "
 "of meter names defined in the notification message."
@@ -8970,7 +8986,7 @@ msgid ""
 "used as before."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:649
+#: ../telemetry-data-collection.rst:658
 msgid ""
 "In the case of the transformer that creates the ``cpu_util`` meter, the "
 "definition looks like the following::"
@@ -9436,7 +9452,7 @@ msgid ""
 "configuration to allow block storage traffic to reach the Compute node."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:186
+#: ../telemetry-data-collection.rst:195
 msgid ""
 "It is recommended that these notifications be consumed as events rather than "
 "samples to better index the appropriate values and avoid massive load on the "
@@ -9473,13 +9489,13 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:291
+#: ../telemetry-data-collection.rst:300
 msgid ""
 "Just like the central agent, this component also does not need a direct "
 "database connection. The samples are sent via AMQP to the collector."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:400
+#: ../telemetry-data-collection.rst:409
 msgid ""
 "Just like the central agent, this component also does not need direct "
 "database access. The samples are sent via AMQP to the collector."
@@ -10131,7 +10147,7 @@ msgstr ""
 msgid "Metadata service"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:808
+#: ../telemetry-data-collection.rst:817
 msgid "Meter definitions"
 msgstr ""
 
@@ -10139,7 +10155,7 @@ msgstr ""
 msgid "Meters renamed in the Kilo release"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:166
+#: ../telemetry-data-collection.rst:175
 msgid "Middleware for the OpenStack Object Storage service"
 msgstr ""
 
@@ -10204,11 +10220,11 @@ msgstr ""
 msgid "Modify the ``width`` and ``height`` options, as follows:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:986
+#: ../telemetry-data-collection.rst:995
 msgid "MongoDB"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:986
+#: ../telemetry-data-collection.rst:995
 msgid ""
 "MongoDB has native TTL support for deleting samples that are older than the "
 "configured ttl value."
@@ -10268,7 +10284,7 @@ msgstr ""
 msgid "Multiple RPC topics"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:949
+#: ../telemetry-data-collection.rst:958
 msgid ""
 "Multiple ``ceilometer-collector`` processes can be run at a time. It is also "
 "supported to start multiple worker threads per collector process. The "
@@ -10292,7 +10308,7 @@ msgid ""
 "samples and alarms separately."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:947
+#: ../telemetry-data-collection.rst:956
 msgid "Multiple dispatchers can be configured for Telemetry at one time."
 msgstr ""
 
@@ -10339,15 +10355,15 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:434
+#: ../telemetry-data-collection.rst:443
 msgid "Name of meter. (``--meter-name``)"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:640
+#: ../telemetry-data-collection.rst:649
 msgid "Name of the transformer."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:600
+#: ../telemetry-data-collection.rst:609
 msgid "Name of transformer"
 msgstr ""
 
@@ -10482,8 +10498,8 @@ msgstr ""
 
 # #-#-#-#-#  networking_adv-features.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../networking_adv-features.rst:710 ../telemetry-data-collection.rst:994
-#: ../telemetry-data-collection.rst:998
+#: ../networking_adv-features.rst:710 ../telemetry-data-collection.rst:1003
+#: ../telemetry-data-collection.rst:1007
 msgid "No"
 msgstr ""
 
@@ -10532,7 +10548,7 @@ msgstr ""
 
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-measurements.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../telemetry-data-collection.rst:59 ../telemetry-data-collection.rst:984
+#: ../telemetry-data-collection.rst:59 ../telemetry-data-collection.rst:993
 #: ../telemetry-measurements.rst:97 ../telemetry-measurements.rst:424
 #: ../telemetry-measurements.rst:478 ../telemetry-measurements.rst:522
 #: ../telemetry-measurements.rst:583 ../telemetry-measurements.rst:658
@@ -11161,7 +11177,7 @@ msgstr ""
 
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-measurements.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../telemetry-data-collection.rst:129 ../telemetry-data-collection.rst:260
+#: ../telemetry-data-collection.rst:129 ../telemetry-data-collection.rst:269
 #: ../telemetry-measurements.rst:687
 msgid "OpenStack Block Storage"
 msgstr ""
@@ -11336,7 +11352,7 @@ msgstr ""
 
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-measurements.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../telemetry-data-collection.rst:82 ../telemetry-data-collection.rst:256
+#: ../telemetry-data-collection.rst:82 ../telemetry-data-collection.rst:265
 #: ../telemetry-measurements.rst:900
 msgid "OpenStack Networking"
 msgstr ""
@@ -11362,7 +11378,7 @@ msgstr ""
 
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-measurements.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../telemetry-data-collection.rst:258 ../telemetry-measurements.rst:742
+#: ../telemetry-data-collection.rst:267 ../telemetry-measurements.rst:742
 msgid "OpenStack Object Storage"
 msgstr ""
 
@@ -11668,6 +11684,10 @@ msgid ""
 "can follow the history of an alarm over its lifecycle via the audit API:"
 msgstr ""
 
+#: ../objectstorage_ringbuilder.rst:55
+msgid "Overload"
+msgstr ""
+
 #: ../networking_adv-features.rst:713
 msgid ""
 "Overrides the default virtual router used to handle traffic for packets that "
@@ -11736,7 +11756,7 @@ msgstr ""
 msgid "Packets transmi\\ tted on port"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:643
+#: ../telemetry-data-collection.rst:652
 msgid "Parameters of the transformer."
 msgstr ""
 
@@ -11744,7 +11764,7 @@ msgstr ""
 msgid "Partition assignment list"
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:99
+#: ../objectstorage_ringbuilder.rst:137
 msgid "Partition shift value"
 msgstr ""
 
@@ -11803,11 +11823,11 @@ msgstr ""
 msgid "Physical memory buffer size"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:514
+#: ../telemetry-data-collection.rst:523
 msgid "Pipeline configuration"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:515
+#: ../telemetry-data-collection.rst:524
 msgid ""
 "Pipeline configuration by default, is stored in separate configuration "
 "files, called :file:`pipeline.yaml` and :file:`event_pipeline.yaml`, next to "
@@ -11820,7 +11840,7 @@ msgid ""
 "defined in one pipeline configuration file."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:571
+#: ../telemetry-data-collection.rst:580
 msgid ""
 "Please be aware that we do not have any duplication check between pipelines "
 "and if you add a meter to multiple pipelines then it is assumed the "
@@ -11859,7 +11879,7 @@ msgid ""
 "defined by the Provider Network extensions are specified in an API request."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:32 ../telemetry-data-collection.rst:193
+#: ../telemetry-data-collection.rst:32 ../telemetry-data-collection.rst:202
 msgid "Polling"
 msgstr ""
 
@@ -11956,7 +11976,7 @@ msgstr ""
 msgid "Power consumption"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:438
+#: ../telemetry-data-collection.rst:447
 msgid "Predefined meter types:"
 msgstr ""
 
@@ -11984,7 +12004,7 @@ msgid ""
 "service."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:958
+#: ../telemetry-data-collection.rst:967
 msgid ""
 "Prior to the Juno release, it is not recommended to use multiple workers per "
 "collector process when using PostgreSQL as the database back end."
@@ -12241,7 +12261,7 @@ msgstr ""
 msgid "Random-number generator"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:495
+#: ../telemetry-data-collection.rst:504
 msgid ""
 "Rapid polling cadences should be avoided, as it results in a huge amount of "
 "data in a short time frame, which may negatively affect the performance of "
@@ -12249,7 +12269,7 @@ msgid ""
 "recommend you do not use small granularity values like 10 seconds."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:608
+#: ../telemetry-data-collection.rst:617
 msgid "Rate of change"
 msgstr ""
 
@@ -12322,7 +12342,7 @@ msgstr ""
 msgid "Redis service running and accessible."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:600
+#: ../telemetry-data-collection.rst:609
 msgid "Reference name for configuration"
 msgstr ""
 
@@ -12423,7 +12443,7 @@ msgid ""
 "certificate above the old certificate in the ``signing_cert`` file."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:55
+#: ../objectstorage_ringbuilder.rst:93
 msgid "Replica counts"
 msgstr ""
 
@@ -12752,15 +12772,15 @@ msgid ""
 "parameters. To get help for a subcommand, run:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:220
+#: ../telemetry-data-collection.rst:229
 msgid "Running ceilometer-agent-central is exactly the same as::"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:215
+#: ../telemetry-data-collection.rst:224
 msgid "Running ceilometer-agent-compute is exactly the same as::"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:225
+#: ../telemetry-data-collection.rst:234
 msgid "Running ceilometer-agent-ipmi is exactly the same as::"
 msgstr ""
 
@@ -12825,7 +12845,7 @@ msgid ""
 "communicates directly with the hypervisor process by using SPICE."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:990
+#: ../telemetry-data-collection.rst:999
 msgid "SQL-based back ends"
 msgstr ""
 
@@ -12849,7 +12869,7 @@ msgstr ""
 msgid "Same as HostA"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:690
+#: ../telemetry-data-collection.rst:699
 msgid "Sample configuration::"
 msgstr ""
 
@@ -12993,7 +13013,7 @@ msgstr ""
 msgid "Self-healing, reliable, data redundancy protects from failures."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:413
+#: ../telemetry-data-collection.rst:422
 msgid "Send samples to Telemetry"
 msgstr ""
 
@@ -13265,7 +13285,7 @@ msgid ""
 "environment variables."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:616
+#: ../telemetry-data-collection.rst:625
 msgid "Similarly, the event pipeline definition looks like the following::"
 msgstr ""
 
@@ -13403,6 +13423,17 @@ msgstr ""
 msgid "Source the :file:`.bashrc` file:"
 msgstr ""
 
+#: ../telemetry-data-collection.rst:159
+msgid ""
+"Specific notifications from the Compute service are important for "
+"administrators and users. Configuring nova_notifications in the :file:`nova."
+"conf` file allows administrators to respond to events rapidly. For more "
+"information on configuring notifications for the compute service, see "
+"`Chapter 11 on Telemetry services <http://docs.openstack.org/ kilo/install-"
+"guide/install/apt/content/ceilometer-nova.html>`__ in the OpenStack "
+"Installation Guide."
+msgstr ""
+
 #: ../networking_use.rst:149
 msgid "Specified set of host routes."
 msgstr ""
@@ -13606,7 +13637,7 @@ msgstr ""
 msgid "Stores images using MongoDB."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:931
+#: ../telemetry-data-collection.rst:940
 msgid "Storing samples"
 msgstr ""
 
@@ -13622,7 +13653,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:311
+#: ../telemetry-data-collection.rst:320
 msgid "Support for HA deployment of the central and compute agent services"
 msgstr ""
 
@@ -13720,7 +13751,7 @@ msgid ""
 "number of partitions is a fixed number."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:984
+#: ../telemetry-data-collection.rst:993
 msgid "TTL value support"
 msgstr ""
 
@@ -13773,11 +13804,11 @@ msgid ""
 "external networking services:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:180
+#: ../telemetry-data-collection.rst:189
 msgid "Telemetry middleware"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:181
+#: ../telemetry-data-collection.rst:190
 msgid ""
 "Telemetry provides the capability of counting the HTTP requests and "
 "responses for each API endpoint in OpenStack. This is achieved by storing a "
@@ -13795,7 +13826,7 @@ msgstr ""
 msgid "Telemetry python bindings"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:306
+#: ../telemetry-data-collection.rst:315
 msgid "Telemetry supports Libvirt, which hides the hypervisor under it."
 msgstr ""
 
@@ -13817,7 +13848,7 @@ msgstr ""
 msgid "Telemetry v2 API"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:994
+#: ../telemetry-data-collection.rst:1003
 msgid ""
 "Telemetry's HBase support does not include native TTL nor ceilometer-expirer "
 "support."
@@ -13937,7 +13968,7 @@ msgid ""
 "access policy for the Identity service."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:818
+#: ../telemetry-data-collection.rst:827
 msgid ""
 "The :file:`meter.yaml` file should be modified with care. Unless intended do "
 "not remove any existing meter definitions from the file. Also, the collected "
@@ -14488,7 +14519,7 @@ msgid ""
 "the data will be relevant for a cloud administrator to monitor."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:809
+#: ../telemetry-data-collection.rst:818
 msgid ""
 "The Telemetry module collects a subset of the meters by filtering "
 "notifications emitted by other OpenStack services. Starting with the Liberty "
@@ -14519,7 +14550,7 @@ msgid ""
 "events and measurement samples."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:932
+#: ../telemetry-data-collection.rst:941
 msgid ""
 "The Telemetry module has a separate service that is responsible for "
 "persisting the data that comes from the pollsters or is received as "
@@ -14540,7 +14571,7 @@ msgstr ""
 msgid "The Telemetry module is built from the following agents and services:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:194
+#: ../telemetry-data-collection.rst:203
 msgid ""
 "The Telemetry module is intended to store a complex picture of the "
 "infrastructure. This goal requires additional information than what is "
@@ -14582,7 +14613,7 @@ msgid ""
 "of both kind of systems, as it is described below."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1004
+#: ../telemetry-data-collection.rst:1013
 msgid ""
 "The Telemetry module supports sending samples to an external HTTP target. "
 "The samples are sent without any modification. To set this option as the "
@@ -14695,7 +14726,7 @@ msgid ""
 "performance inter-instance communications."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:316
+#: ../telemetry-data-collection.rst:325
 msgid ""
 "The `Tooz <https://pypi.python.org/pypi/tooz>`__ library provides the "
 "coordination within the groups of service instances. It provides an API "
@@ -14726,7 +14757,7 @@ msgid ""
 "This command accepts the following parameters:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:939
+#: ../telemetry-data-collection.rst:948
 msgid ""
 "The ``ceilometer-collector`` service receives the data as messages from the "
 "message bus of the configured AMQP service. It sends these datapoints "
@@ -14948,7 +14979,7 @@ msgid ""
 "in the source group have floating IPs."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:576
+#: ../telemetry-data-collection.rst:585
 msgid "The above definition methods can be used in the following combinations:"
 msgstr ""
 
@@ -15096,7 +15127,7 @@ msgstr ""
 msgid "The attestation service's URL path"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:348
+#: ../telemetry-data-collection.rst:357
 msgid ""
 "The availability check of the instances is provided by heartbeat messages. "
 "When the connection with an instance is lost, the workload will be "
@@ -15157,15 +15188,15 @@ msgstr ""
 msgid "The browser or client connects to the proxy."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:775
+#: ../telemetry-data-collection.rst:784
 msgid "The calculation is limited to meters with the same interval."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:244
+#: ../telemetry-data-collection.rst:253
 msgid "The ceilometer-polling service is available since Kilo release."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:271
+#: ../telemetry-data-collection.rst:280
 msgid ""
 "The central agent does not need direct database connection. The samples "
 "collected by this agent are sent via AMQP to the collector service or any "
@@ -15455,6 +15486,11 @@ msgid ""
 "``iscsi_helper=lioadm`` in the :file:`cinder.conf` file."
 msgstr ""
 
+#: ../objectstorage_ringbuilder.rst:67
+msgid ""
+"The default overload factor is 0, so device weights are strictly followed."
+msgstr ""
+
 #: ../networking_auth.rst:127
 msgid ""
 "The default policy that is always evaluated if an API operation does not "
@@ -15475,7 +15511,7 @@ msgid ""
 "the metadata APIs exposed by nova-api."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:835
+#: ../telemetry-data-collection.rst:844
 msgid ""
 "The definition above shows a simple meter definition with some fields, from "
 "which ``name``, ``event_type``, ``type``, ``unit``, and ``volume`` are "
@@ -15483,7 +15519,7 @@ msgid ""
 "the meter."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:668
+#: ../telemetry-data-collection.rst:677
 msgid ""
 "The definition for the disk I/O rate, which is also generated by the rate of "
 "change transformer::"
@@ -15496,7 +15532,7 @@ msgid ""
 "these rules depend on the alarm type."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:637
+#: ../telemetry-data-collection.rst:646
 msgid "The definition of transformers can contain the following fields:"
 msgstr ""
 
@@ -15630,7 +15666,7 @@ msgid ""
 "definitions afterwards that have all of the above traits, plus a few more."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:630
+#: ../telemetry-data-collection.rst:639
 msgid "The event filter uses the same filtering logic as the meter pipeline."
 msgstr ""
 
@@ -15889,7 +15925,7 @@ msgid ""
 "introduce the components."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:254
+#: ../telemetry-data-collection.rst:263
 msgid "The following services can be polled with this agent:"
 msgstr ""
 
@@ -15967,7 +16003,7 @@ msgid ""
 "formerly known as Nicira NVP."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:174
+#: ../telemetry-data-collection.rst:183
 msgid ""
 "The instructions on how to install this middleware can be found in "
 "`Configure the Object Storage service for Telemetry <http://docs.openstack."
@@ -15985,7 +16021,7 @@ msgid ""
 "address is the guest VM, not the host."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:543
+#: ../telemetry-data-collection.rst:552
 msgid ""
 "The interval parameter in the sources section should be defined in seconds. "
 "It determines the polling cadence of sample injection into the pipeline, "
@@ -16002,17 +16038,17 @@ msgstr ""
 msgid "The key characteristics of Object Storage are that:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:981
+#: ../telemetry-data-collection.rst:990
 msgid "The level of support differs in case of the configured back end:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:403
+#: ../telemetry-data-collection.rst:412
 msgid ""
 "The list of collected meters can be found in :ref:`telemetry-bare-metal-"
 "service`."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:300
+#: ../telemetry-data-collection.rst:309
 msgid ""
 "The list of collected meters can be found in :ref:`telemetry-compute-"
 "meters`. The support column provides the information that which meter is "
@@ -16031,7 +16067,7 @@ msgstr ""
 msgid "The list of supported database back ends:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:294
+#: ../telemetry-data-collection.rst:303
 msgid ""
 "The list of supported hypervisors can be found in :ref:`telemetry-supported-"
 "hypervisors`. The compute agent uses the API of the hypervisor installed on "
@@ -16096,7 +16132,7 @@ msgid ""
 "the notification exist and are non-null."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:475
+#: ../telemetry-data-collection.rst:484
 msgid ""
 "The mechanism by which data is collected and processed is called a pipeline. "
 "Pipelines, at the configuration level, describe a coupling between sources "
@@ -16137,7 +16173,7 @@ msgid ""
 "should not need to modify it."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:525
+#: ../telemetry-data-collection.rst:534
 msgid "The meter pipeline definition looks like the following::"
 msgstr ""
 
@@ -16315,7 +16351,7 @@ msgid ""
 "in order to enable incremental backup capability."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:593
+#: ../telemetry-data-collection.rst:602
 msgid ""
 "The optional resources section of a pipeline source allows a static list of "
 "resource URLs to be configured for polling."
@@ -16376,6 +16412,12 @@ msgid ""
 "``alive`` is ``xxx``."
 msgstr ""
 
+#: ../objectstorage_ringbuilder.rst:64
+msgid ""
+"The overload factor lets the operator trade off replica dispersion "
+"(durability) against data dispersion (uniform disk usage)."
+msgstr ""
+
 #: ../blockstorage-consistency-groups.rst:293
 msgid ""
 "The parameter ``CGSNAPSHOT`` is a name or UUID of a snapshot of a "
@@ -16398,14 +16440,14 @@ msgid ""
 "example, ``volumetype1,volumetype2,volumetype3.``."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:645
+#: ../telemetry-data-collection.rst:654
 msgid ""
 "The parameters section can contain transformer specific fields, like source "
 "and target fields with different subfields in case of the rate of change, "
 "which depends on the implementation of the transformer."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:100
+#: ../objectstorage_ringbuilder.rst:138
 msgid ""
 "The partition shift value is known internally to the Ring class as "
 "``_part_shift``. This value is used to shift an MD5 hash to calculate the "
@@ -16562,7 +16604,7 @@ msgid ""
 "chain can contain multiple publishers."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:613
+#: ../telemetry-data-collection.rst:622
 msgid ""
 "The publishers section contains the list of publishers, where the samples "
 "data should be sent after the possible transformations."
@@ -16576,7 +16618,7 @@ msgid ""
 "convenience), for the ability to administer the cloud from the command line."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:661
+#: ../telemetry-data-collection.rst:670
 msgid ""
 "The rate of change the transformer generates is the ``cpu_util`` meter from "
 "the sample values of the ``cpu`` counter, which represents cumulative CPU "
@@ -16596,7 +16638,7 @@ msgstr ""
 msgid "The remote attestation server performs node verification like this:"
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:65
+#: ../objectstorage_ringbuilder.rst:103
 msgid "The replica count is adjustable."
 msgstr ""
 
@@ -16632,7 +16674,7 @@ msgid ""
 "OpenStack Installation Guide."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:429
+#: ../telemetry-data-collection.rst:438
 msgid ""
 "The required fields for sending a sample using the command line client are:"
 msgstr ""
@@ -16647,7 +16689,7 @@ msgid ""
 "ordered by the timestamp field in the default descending order."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:134
+#: ../objectstorage_ringbuilder.rst:172
 msgid ""
 "The ring builder assigns each partition replica to the device that requires "
 "most partitions at that point while keeping it as far away as possible from "
@@ -16659,41 +16701,50 @@ msgid ""
 "the replica to the device that has the fewest replicas already assigned."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:146
+#: ../objectstorage_ringbuilder.rst:184
 msgid ""
 "The ring builder assigns multiple replicas to one device only if the ring "
 "has fewer devices than it has replicas."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:115
+#: ../objectstorage_ringbuilder.rst:153
 msgid "The ring builder process includes these high-level steps:"
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:164
+#: ../objectstorage_ringbuilder.rst:202
 msgid ""
 "The ring builder reassigns the gathered partitions to devices by using a "
 "similar method to the one described previously."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:155
+#: ../objectstorage_ringbuilder.rst:57
+msgid ""
+"The ring builder tries to keep replicas as far apart as possible while still "
+"respecting device weights. When it can not do both, the overload factor "
+"determines what happens. Each device takes an extra fraction of its desired "
+"partitions to allow for replica dispersion; after that extra fraction is "
+"exhausted, replicas are placed closer together than optimal."
+msgstr ""
+
+#: ../objectstorage_ringbuilder.rst:193
 msgid ""
 "The ring builder unassigns any assigned partitions from any removed devices "
 "and adds these partitions to the gathered list."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:157
+#: ../objectstorage_ringbuilder.rst:195
 msgid ""
 "The ring builder unassigns any partition replicas that can be spread out for "
 "better durability and adds these partitions to the gathered list."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:152
+#: ../objectstorage_ringbuilder.rst:190
 msgid ""
 "The ring builder unassigns partitions and gathers these partitions for "
 "reassignment, as follows:"
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:160
+#: ../objectstorage_ringbuilder.rst:198
 msgid ""
 "The ring builder unassigns random partitions from any devices that have more "
 "partitions than they need and adds these partitions to the gathered list."
@@ -16791,7 +16842,7 @@ msgid ""
 "coding."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:421
+#: ../telemetry-data-collection.rst:430
 msgid ""
 "The samples that can be sent to Telemetry are not limited to the actual "
 "existing meters. There is a possibility to provide data for any new, "
@@ -16966,7 +17017,7 @@ msgstr ""
 msgid "The tenant who owns the image"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:969
+#: ../telemetry-data-collection.rst:978
 msgid ""
 "The time to live value is specified in seconds. Each sample has a time "
 "stamp, and the ``ttl`` value indicates that a sample will be deleted from "
@@ -17004,7 +17055,7 @@ msgstr ""
 msgid "The total capacity in GB"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:596
+#: ../telemetry-data-collection.rst:605
 msgid ""
 "The transformers section of a pipeline sink provides the possibility to add "
 "a list of transformer definitions. The available transformers are:"
@@ -17067,7 +17118,7 @@ msgid ""
 "package instead."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:117
+#: ../objectstorage_ringbuilder.rst:155
 msgid ""
 "The utility calculates the number of partitions to assign to each device "
 "based on the weight of the device. For example, for a partition at the power "
@@ -17122,7 +17173,7 @@ msgstr ""
 msgid "The volume back end name"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:723
+#: ../telemetry-data-collection.rst:732
 msgid ""
 "The volume of the created sample is the sum of the volumes of samples that "
 "came into the transformer. Samples can be aggregated by the attributes "
@@ -17233,7 +17284,7 @@ msgid ""
 "appropriate for your environment:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:548
+#: ../telemetry-data-collection.rst:557
 msgid ""
 "There are several ways to define the list of meters for a pipeline source. "
 "The list of valid meters can be found in :ref:`telemetry-measurements`. "
@@ -17252,7 +17303,7 @@ msgid ""
 "to Swift Recon or collect the meters directly."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:207
+#: ../telemetry-data-collection.rst:216
 msgid ""
 "There are three types of agents supporting the polling mechanism, the "
 "compute agent, the central agent, and the IPMI agent. Under the hood, all "
@@ -17303,7 +17354,7 @@ msgstr ""
 msgid "There will be three hosts in the setup."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:200
+#: ../telemetry-data-collection.rst:209
 msgid ""
 "Therefore Telemetry uses another method to gather this data by polling the "
 "infrastructure including the APIs of the different OpenStack services and "
@@ -17397,7 +17448,7 @@ msgid ""
 "these meters, each driver needs to be properly configured."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:900
+#: ../telemetry-data-collection.rst:909
 msgid ""
 "These meters are not loaded by default. To load these meters, flip the "
 "`disable_non_metric_meters` option in the :file:`ceilometer.conf` file."
@@ -17460,7 +17511,7 @@ msgstr ""
 msgid "These sections explain NSX plug-in extensions."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:176
+#: ../objectstorage_ringbuilder.rst:214
 msgid ""
 "These steps do not always perfectly rebalance a ring due to the random "
 "nature of gathering partitions for reassignment. To help reach a more "
@@ -17495,7 +17546,7 @@ msgid ""
 "throughout the system."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:386
+#: ../telemetry-data-collection.rst:395
 msgid ""
 "This agent is responsible for collecting IPMI sensor data and Intel Node "
 "Manager data on individual compute nodes within an OpenStack deployment. "
@@ -17504,7 +17555,7 @@ msgid ""
 "distributions."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:278
+#: ../telemetry-data-collection.rst:287
 msgid ""
 "This agent is responsible for collecting resource usage data of VM instances "
 "on individual compute nodes within an OpenStack deployment. This mechanism "
@@ -17902,7 +17953,7 @@ msgid ""
 "Reference*."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:418
+#: ../telemetry-data-collection.rst:427
 msgid ""
 "This option makes it possible to send any kind of samples without the need "
 "of writing extra code lines or making configuration changes."
@@ -17998,7 +18049,7 @@ msgid ""
 "operating systems in production."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:916
+#: ../telemetry-data-collection.rst:925
 msgid ""
 "This script outputs what volumes or snapshots were created, deleted, or "
 "exists in a given period of time and some information about these volumes or "
@@ -18165,13 +18216,13 @@ msgid ""
 "basic operations on agents:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:763
+#: ../telemetry-data-collection.rst:772
 msgid ""
 "This transformer enables us to perform arithmetic calculations over one or "
 "more meters and/or their metadata, for example::"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:753
+#: ../telemetry-data-collection.rst:762
 msgid ""
 "This transformer simply caches the samples until enough samples have arrived "
 "and then flushes them all down the pipeline at once::"
@@ -18198,7 +18249,7 @@ msgstr ""
 msgid "Threshold rule alarms"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:719
+#: ../telemetry-data-collection.rst:728
 msgid ""
 "Timeout can be specified with the ``retention_time`` option. If we want to "
 "flush the aggregation after a set number of samples have been aggregated, we "
@@ -18250,13 +18301,13 @@ msgid ""
 "Guide`_."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:731
+#: ../telemetry-data-collection.rst:740
 msgid ""
 "To aggregate 60s worth of samples by ``resource_metadata`` and keep the "
 "``resource_metadata`` of the latest received sample::"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:740
+#: ../telemetry-data-collection.rst:749
 msgid ""
 "To aggregate each 15 samples by ``user_id`` and ``resource_metadata`` and "
 "keep the ``user_id`` of the first received sample and drop the "
@@ -18425,19 +18476,19 @@ msgid ""
 "settings:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:562
+#: ../telemetry-data-collection.rst:571
 msgid "To define the list of excluded meters, use the ``!meter_name`` syntax."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:559
+#: ../telemetry-data-collection.rst:568
 msgid "To define the list of included meters, use the ``meter_name`` syntax."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:557
+#: ../telemetry-data-collection.rst:566
 msgid "To define the list of meters, use either of the following:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:788
+#: ../telemetry-data-collection.rst:797
 msgid ""
 "To demonstrate the use of metadata, here is the implementation of a silly "
 "meter that shows average CPU time per core::"
@@ -18505,7 +18556,7 @@ msgid ""
 "``[neutron]`` section in :file:`nova.conf`."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:376
+#: ../telemetry-data-collection.rst:385
 msgid ""
 "To enable the compute agent to run multiple instances simultaneously with "
 "workload partitioning, the ``workload_partitioning`` option has to be set to "
@@ -18609,14 +18660,14 @@ msgid ""
 "``admin``::"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:553
+#: ../telemetry-data-collection.rst:562
 msgid ""
 "To include all meters, use the ``*`` wildcard symbol. It is highly advisable "
 "to select only the meters that you intend on using to avoid flooding the "
 "metering database with unused data."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:267
+#: ../telemetry-data-collection.rst:276
 msgid ""
 "To install and configure this service use the `Install the Telemetry module "
 "<http://docs.openstack.org/kilo/install-guide/install/apt/content/"
@@ -18798,7 +18849,7 @@ msgstr ""
 msgid "To run the following commands, you must stop the DHCP agent on HostA."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:450
+#: ../telemetry-data-collection.rst:459
 msgid ""
 "To send samples to Telemetry using the command line client, the following "
 "command should be invoked::"
@@ -18867,7 +18918,7 @@ msgid ""
 "instead."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:56
+#: ../objectstorage_ringbuilder.rst:94
 msgid ""
 "To support the gradual change in replica counts, a ring can have a real "
 "number of replicas and is not restricted to an integer number of replicas."
@@ -19009,7 +19060,7 @@ msgid ""
 "``TokenNotFound`` flag when expired."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:321
+#: ../telemetry-data-collection.rst:330
 msgid ""
 "Tooz supports `various drivers <http://docs.openstack.org/developer/tooz/"
 "drivers.html>`__ including the following back end solutions:"
@@ -19043,14 +19094,14 @@ msgstr ""
 msgid "Total swap space size"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:686
+#: ../telemetry-data-collection.rst:695
 msgid ""
 "Transformer to apply a unit conversion. It takes the volume of the meter and "
 "multiplies it with the given ``scale`` expression. Also supports "
 "``map_from`` and ``map_to`` like the rate of change transformer."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:635
+#: ../telemetry-data-collection.rst:644
 msgid "Transformers"
 msgstr ""
 
@@ -19155,7 +19206,7 @@ msgstr ""
 msgid "Type and constraints"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:436
+#: ../telemetry-data-collection.rst:445
 msgid "Type of meter. (``--meter-type``)"
 msgstr ""
 
@@ -19236,11 +19287,11 @@ msgstr ""
 msgid "Unit"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:610
+#: ../telemetry-data-collection.rst:619
 msgid "Unit conversion"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:446
+#: ../telemetry-data-collection.rst:455
 msgid "Unit of meter. (``--meter-unit``)"
 msgstr ""
 
@@ -19532,7 +19583,7 @@ msgstr ""
 msgid "Use filters to control the scope of data presented through LDAP."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:578
+#: ../telemetry-data-collection.rst:587
 msgid "Use only the wildcard symbol."
 msgstr ""
 
@@ -19608,11 +19659,11 @@ msgid ""
 "Compute:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:582
+#: ../telemetry-data-collection.rst:591
 msgid "Use the list of excluded meters."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:580
+#: ../telemetry-data-collection.rst:589
 msgid "Use the list of included meters."
 msgstr ""
 
@@ -19657,7 +19708,7 @@ msgstr ""
 msgid "Use trusts"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:584
+#: ../telemetry-data-collection.rst:593
 msgid "Use wildcard symbol with the list of excluded meters."
 msgstr ""
 
@@ -19787,7 +19838,7 @@ msgid ""
 "is granted access to the admin role on the admin tenant."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:923
+#: ../telemetry-data-collection.rst:932
 msgid ""
 "Using this script via cron you can get notifications periodically, for "
 "example, every 5 minutes::"
@@ -19986,7 +20037,7 @@ msgstr ""
 msgid "Volume of reads"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:448
+#: ../telemetry-data-collection.rst:457
 msgid "Volume of sample. (``--sample-volume``)"
 msgstr ""
 
@@ -20142,7 +20193,7 @@ msgid ""
 "all egress. Rules can be added to this group in order to change the behavior."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:149
+#: ../objectstorage_ringbuilder.rst:187
 msgid ""
 "When building a new ring from an old ring, the ring builder recalculates the "
 "desired number of partitions that each device wants."
@@ -20218,7 +20269,7 @@ msgid ""
 "(using the *assignment* feature)."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:161
+#: ../telemetry-data-collection.rst:170
 msgid ""
 "When the ``store_events`` option is set to True in :file:`ceilometer.conf`, "
 "the notification agent needs database access in order to work properly."
@@ -20230,7 +20281,7 @@ msgid ""
 "is sent to the attestation server."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:964
+#: ../telemetry-data-collection.rst:973
 msgid ""
 "When the database dispatcher is configured as data store, you have the "
 "option to set a ``time_to_live`` option (ttl) for samples. By default the "
@@ -20245,7 +20296,7 @@ msgid ""
 "resources are released. The image remains unchanged throughout this process."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:167
+#: ../objectstorage_ringbuilder.rst:205
 msgid ""
 "When the ring builder reassigns a replica to a partition, the ring builder "
 "records the time of the reassignment. The ring builder uses this value when "
@@ -20533,7 +20584,7 @@ msgid ""
 "openstack.org/kilo/config-reference/content/>`__ for more details."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:414
+#: ../telemetry-data-collection.rst:423
 msgid ""
 "While most parts of the data collection in the Telemetry module are "
 "automated, Telemetry provides the possibility to submit samples via the REST "
@@ -20572,10 +20623,16 @@ msgid ""
 "linux-kvm.org/page/VhostNet>`__ on KVM. To load the kernel module:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:700
+#: ../telemetry-data-collection.rst:709
 msgid "With ``map_from`` and ``map_to`` ::"
 msgstr ""
 
+#: ../objectstorage_ringbuilder.rst:70
+msgid ""
+"With an overload factor of 0.1, each device accepts 10% more partitions than "
+"it otherwise would, but only if it needs to maintain partition dispersion."
+msgstr ""
+
 #: ../objectstorage_tenant_specific_image_storage.rst:30
 msgid ""
 "With this configuration, images are stored in an Object Storage service "
@@ -20583,7 +20640,7 @@ msgid ""
 "authenticated user."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:344
+#: ../telemetry-data-collection.rst:353
 msgid ""
 "Without the ``backend_url`` option being set only one instance of both the "
 "central and compute agent service is able to run and function correctly."
@@ -20595,6 +20652,16 @@ msgid ""
 "the ``incremental`` flag, an incremental backup is created."
 msgstr ""
 
+#: ../objectstorage_ringbuilder.rst:78
+msgid ""
+"Without the overload, some partitions would end up with replicas only on "
+"nodes A and B. However, with the overload, every device can accept up to 10% "
+"more partitions for the sake of dispersion. The missing disk in C means "
+"there is one disk's worth of partitions to spread across the remaining 11 "
+"disks, which gives each disk in C an extra 9.09% load. Since this is less "
+"than the 10% overload, there is one replica of each partition on each node."
+msgstr ""
+
 #: ../telemetry-alarms.rst:106
 msgid "Workload partitioning"
 msgstr ""
@@ -20606,8 +20673,8 @@ msgstr ""
 # #-#-#-#-#  networking_adv-features.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 #: ../networking_adv-features.rst:695 ../networking_adv-features.rst:700
-#: ../networking_adv-features.rst:705 ../telemetry-data-collection.rst:986
-#: ../telemetry-data-collection.rst:990
+#: ../networking_adv-features.rst:705 ../telemetry-data-collection.rst:995
+#: ../telemetry-data-collection.rst:999
 msgid "Yes"
 msgstr ""
 
@@ -20756,14 +20823,14 @@ msgid ""
 "brevity):"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:868
+#: ../telemetry-data-collection.rst:877
 msgid ""
 "You can even use complex operations on json paths. In the following example, "
 "``volume`` and ``resource_id`` fields perform an arithmetic and string "
 "concatenation::"
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:78
+#: ../objectstorage_ringbuilder.rst:116
 msgid ""
 "You can gradually increase the replica count at a rate that does not "
 "adversely affect cluster performance."
@@ -20834,7 +20901,7 @@ msgid ""
 "You can see the ``cinder--volumes-volume--00000001--snapshot1`` partition."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1014
+#: ../telemetry-data-collection.rst:1023
 msgid ""
 "You can store samples in a file by setting the ``dispatcher`` option in the :"
 "file:`ceilometer.conf` file. For the list of configuration options, see the "
@@ -20978,7 +21045,7 @@ msgid ""
 "service. The driver adds metering to the routing interface."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:333
+#: ../telemetry-data-collection.rst:342
 msgid ""
 "You must configure a supported Tooz driver for the HA deployment of the "
 "Telemetry services."
@@ -21034,7 +21101,7 @@ msgid ""
 "``admin`` role to this role."
 msgstr ""
 
-#: ../objectstorage_ringbuilder.rst:72
+#: ../objectstorage_ringbuilder.rst:110
 msgid ""
 "You must rebalance the replica ring in globally distributed clusters. "
 "Operators of these clusters generally want an equal number of replicas and "
@@ -21126,7 +21193,7 @@ msgid ""
 "shape."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:882
+#: ../telemetry-data-collection.rst:891
 msgid ""
 "You will find some existence meters in the :file:`meter.yaml`. These meters "
 "have a ``volume`` as ``1`` and are at the bottom of the yaml file with a "
@@ -21234,7 +21301,7 @@ msgstr ""
 msgid "`Linux Containers (LXC) <https://linuxcontainers.org/>`__"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:331
+#: ../telemetry-data-collection.rst:340
 msgid "`Memcached <http://memcached.org/>`__. Recommended for testing."
 msgstr ""
 
@@ -21266,7 +21333,7 @@ msgstr ""
 msgid "`Quick Emulator (QEMU) <http://wiki.qemu.org/Manual>`__"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:328
+#: ../telemetry-data-collection.rst:337
 msgid "`Redis <http://redis.io/>`__. Recommended solution by the Tooz project."
 msgstr ""
 
@@ -21298,7 +21365,7 @@ msgstr ""
 msgid "`Xen <http://www.xen.org/support/documentation.html>`__"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:325
+#: ../telemetry-data-collection.rst:334
 msgid ""
 "`Zookeeper <http://zookeeper.apache.org/>`__. Recommended solution by the "
 "Tooz project."
@@ -21534,7 +21601,7 @@ msgid ""
 "entities of the API call in question. For example:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:355
+#: ../telemetry-data-collection.rst:364
 msgid ""
 "``Memcached`` uses a ``timeout`` value, which should always be set to a "
 "value that is higher than the ``heartbeat`` value set for Telemetry."
@@ -22278,7 +22345,7 @@ msgstr ""
 msgid "abs(x), max(x, y), min(x, y)"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:602
+#: ../telemetry-data-collection.rst:611
 msgid "accumulator"
 msgstr ""
 
@@ -22296,7 +22363,7 @@ msgstr ""
 msgid "admin users see *all* alarms, regardless of the owner"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:604
+#: ../telemetry-data-collection.rst:613
 msgid "aggregator"
 msgstr ""
 
@@ -22312,7 +22379,7 @@ msgstr ""
 msgid "api_url"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:606
+#: ../telemetry-data-collection.rst:615
 msgid "arithmetic"
 msgstr ""
 
@@ -22377,7 +22444,7 @@ msgid "boto"
 msgstr ""
 
 #: ../compute-flavors.rst:198 ../compute-flavors.rst:206
-msgid "burst: 100 ms"
+msgid "burst: 65536 kilobytes"
 msgstr ""
 
 #: ../keystone_configure_with_SSL.rst:13
@@ -22424,7 +22491,7 @@ msgstr ""
 msgid "ceilometer-collector"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:990
+#: ../telemetry-data-collection.rst:999
 msgid ""
 "ceilometer-expirer has to be used for deleting samples and its related data "
 "from the database."
@@ -23553,7 +23620,7 @@ msgstr ""
 # #-#-#-#-#  database.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 #: ../compute-live-migration-usage.rst:71 ../database.rst:112
-#: ../telemetry-data-collection.rst:640
+#: ../telemetry-data-collection.rst:649
 msgid "name"
 msgstr ""
 
@@ -23968,7 +24035,7 @@ msgstr ""
 msgid "packet"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:643
+#: ../telemetry-data-collection.rst:652
 msgid "parameters"
 msgstr ""
 
@@ -24124,7 +24191,7 @@ msgstr ""
 msgid "radosgw.objects.\\ size"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:608
+#: ../telemetry-data-collection.rst:617
 msgid "rate\\_of\\_change"
 msgstr ""
 
@@ -24647,7 +24714,7 @@ msgstr ""
 msgid "udp"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:610
+#: ../telemetry-data-collection.rst:619
 msgid "unit\\_conversion"
 msgstr ""
 
diff --git a/doc/config-reference/locale/config-reference.pot b/doc/config-reference/locale/config-reference.pot
index d0b111a688..19845d1f10 100644
--- a/doc/config-reference/locale/config-reference.pot
+++ b/doc/config-reference/locale/config-reference.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-08 06:15+0000\n"
+"POT-Creation-Date: 2015-09-09 06:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1105,59 +1105,59 @@ msgstr ""
 msgid "This document is for system administrators who want to look up configuration options. It contains lists of configuration options available with OpenStack and uses auto-generation to generate options and the descriptions from the code for each project. It includes sample configuration files."
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:50(date)
+#: ./doc/config-reference/bk-config-ref.xml:51(date)
 msgid "2014-10-15"
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:54(para)
+#: ./doc/config-reference/bk-config-ref.xml:55(para)
 msgid "Updates for Juno: updated all configuration tables, include sample configuration files, add chapter for Data processing service, update and enhance driver configuration."
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:65(date)
+#: ./doc/config-reference/bk-config-ref.xml:66(date)
 msgid "2014-04-16"
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:69(para)
+#: ./doc/config-reference/bk-config-ref.xml:70(para)
 msgid "Update for Icehouse: Updated all configuration tables, include sample configuration files, add chapters for Database service, Orchestration, and Telemetry."
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:80(date)
+#: ./doc/config-reference/bk-config-ref.xml:81(date)
 msgid "2014-03-11"
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:84(para)
+#: ./doc/config-reference/bk-config-ref.xml:85(para)
 msgid "Sorted component listing. Moved procedures to the <link xlink:href=\"http://docs.openstack.org/admin-guide-cloud/\"><citetitle>Cloud Administrator Guide</citetitle></link>"
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:93(date)
+#: ./doc/config-reference/bk-config-ref.xml:94(date)
 msgid "2014-01-09"
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:97(para)
+#: ./doc/config-reference/bk-config-ref.xml:98(para)
 msgid "Removes content addressed in installation, merges duplicated content, and revises legacy references."
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:106(date)
+#: ./doc/config-reference/bk-config-ref.xml:107(date)
 msgid "2013-10-17"
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:110(para)
+#: ./doc/config-reference/bk-config-ref.xml:111(para)
 msgid "Havana release."
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:116(date)
+#: ./doc/config-reference/bk-config-ref.xml:117(date)
 msgid "2013-08-16"
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:120(para)
+#: ./doc/config-reference/bk-config-ref.xml:121(para)
 msgid "Moves Block Storage driver configuration information from the <citetitle>Block Storage Administration Guide</citetitle> to this reference."
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:130(date)
+#: ./doc/config-reference/bk-config-ref.xml:131(date)
 msgid "2013-06-10"
 msgstr ""
 
-#: ./doc/config-reference/bk-config-ref.xml:134(para)
+#: ./doc/config-reference/bk-config-ref.xml:135(para)
 msgid "Initial creation of Configuration Reference."
 msgstr ""
 
@@ -14618,7 +14618,7 @@ msgid "(StrOpt) The endpoint of Aodh to redirect alarms URLs to Aodh API. Defaul
 msgstr ""
 
 #: ./doc/config-reference/conf-changes/ceilometer.xml:56(td)
-msgid "[api] default_api_return_limit = 1000"
+msgid "[api] default_api_return_limit = 100"
 msgstr ""
 
 #: ./doc/config-reference/conf-changes/ceilometer.xml:57(td)
diff --git a/doc/glossary/locale/ko_KR.po b/doc/glossary/locale/ko_KR.po
index 9b6a67ef52..30de27b128 100644
--- a/doc/glossary/locale/ko_KR.po
+++ b/doc/glossary/locale/ko_KR.po
@@ -5,12 +5,13 @@
 # Ian Y. Choi <ianyrchoi@gmail.com>, 2015
 # Sungjin Kang <potopro@gmail.com>, 2013
 # Sungjin Kang <potopro@gmail.com>, 2014-2015
+# Ying Chun Guo <daisy.ycguo@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2015-08-21 03:09+0000\n"
-"PO-Revision-Date: 2015-08-20 13:49+0000\n"
-"Last-Translator: Ian Y. Choi <ianyrchoi@gmail.com>\n"
+"POT-Creation-Date: 2015-09-09 00:43+0000\n"
+"PO-Revision-Date: 2015-09-09 02:37+0000\n"
+"Last-Translator: Ying Chun Guo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/openstack/openstack-"
 "manuals-i18n/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
@@ -135,7 +136,7 @@ msgid ""
 "Storage account auditor, container auditor, and object auditor."
 msgstr ""
 "오프젝트 스토리지 오브젝트, 컨테이너, 계정의 무결성을 검사하는 프로세스입니"
-"다. Auditors는 오브젝트 스토리지 계정 auditor, 컨테이너 auditor, 오브젝트 "
+"다. Auditors 는 오브젝트 스토리지 계정 auditor, 컨테이너 auditor, 오브젝트 "
 "auditor에 대한 전체를 다 말합니다."
 
 msgid "ACL"
diff --git a/doc/install-guide/source/locale/install-guide.pot b/doc/install-guide/source/locale/install-guide.pot
index 906825f9a5..2cc2e9e401 100644
--- a/doc/install-guide/source/locale/install-guide.pot
+++ b/doc/install-guide/source/locale/install-guide.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-08 06:15+0000\n"
+"POT-Creation-Date: 2015-09-09 06:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -553,6 +553,13 @@ msgstr ""
 msgid "Adjust ownership and permissions on this directory and the files in it:"
 msgstr ""
 
+#: ../ceilometer-nova.rst:146
+msgid ""
+"Administrators can also restrict notification delivery to certain tenant "
+"groups. Users can view notifications through a web browser, without using a "
+"specific interface."
+msgstr ""
+
 #: ../basics-networking.rst:39
 msgid ""
 "After installing the operating system on each node for the architecture that "
@@ -3470,6 +3477,15 @@ msgstr ""
 msgid "Message queue"
 msgstr ""
 
+#: ../ceilometer-nova.rst:150
+msgid ""
+"Messages arrive in a specific format which includes: Message ID, Publisher "
+"ID, Event type, Timestamp, Priority, and Payload. See the `Notification "
+"System information <https://wiki.openstack.org/wiki/ "
+"NotificationSystem#General_Notification_Message_Format>`__ for an example "
+"message format."
+msgstr ""
+
 #: ../networking-neutron.rst:39
 msgid "Messaging queue"
 msgstr ""
@@ -3595,6 +3611,18 @@ msgstr ""
 msgid "Next steps"
 msgstr ""
 
+#: ../ceilometer-nova.rst:156
+msgid ""
+"Notification messages are placed on the OpenStack messaging system, which "
+"recruits AMQP to send information when an event triggers alerts."
+msgstr ""
+
+#: ../ceilometer-nova.rst:143
+msgid ""
+"Notifications in real-time allow administrars to observe and resolve "
+"emergencies when the cloud environment experiences errors or faults."
+msgstr ""
+
 #: ../swift-initial-rings.rst:175
 msgid "Object ring"
 msgstr ""
@@ -4721,7 +4749,7 @@ msgstr ""
 # #-#-#-#-#  ceilometer-nova.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  neutron-compute-node.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../ceilometer-nova.rst:163 ../ceilometer-nova.rst:177
+#: ../ceilometer-nova.rst:194 ../ceilometer-nova.rst:208
 #: ../neutron-compute-node.rst:314 ../neutron-compute-node.rst:339
 #: ../neutron-compute-node.rst:355 ../nova-compute-install.rst:271
 msgid "Restart the Compute service:"
@@ -4778,7 +4806,7 @@ msgstr ""
 msgid "Restart the Telemetry services:"
 msgstr ""
 
-#: ../ceilometer-nova.rst:171
+#: ../ceilometer-nova.rst:202
 msgid "Restart the agent:"
 msgstr ""
 
@@ -5111,7 +5139,7 @@ msgid ""
 "boots:"
 msgstr ""
 
-#: ../ceilometer-nova.rst:143 ../ceilometer-nova.rst:153
+#: ../ceilometer-nova.rst:174 ../ceilometer-nova.rst:184
 msgid ""
 "Start the Telemetry agent and configure it to start when the system boots:"
 msgstr ""
@@ -5198,6 +5226,11 @@ msgid ""
 "instructions for attaching this volume to an instance."
 msgstr ""
 
+#: ../ceilometer-nova.rst:159
+msgid ""
+"The :file:`nova.conf` file uses the nova_notification driver by defualt."
+msgstr ""
+
 #: ../neutron-network-node.rst:270
 msgid "The :term:`DHCP agent` provides DHCP services for virtual networks."
 msgstr ""
@@ -5418,6 +5451,13 @@ msgid ""
 "neutron` file and add the following:"
 msgstr ""
 
+#: ../ceilometer-nova.rst:138
+msgid ""
+"The Nova notification_driver creates alerts and sends system state updates "
+"to administrators and users. The notification_driver sends this information "
+"to users in a manner as close to real-time as possible."
+msgstr ""
+
 #: ../neutron-compute-node.rst:226
 msgid ""
 "The OVS service provides the underlying virtual networking framework for "
@@ -6343,7 +6383,7 @@ msgstr ""
 # #-#-#-#-#  heat-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../ceilometer-controller-install.rst:468 ../ceilometer-nova.rst:139
+#: ../ceilometer-controller-install.rst:468 ../ceilometer-nova.rst:170
 #: ../cinder-controller-node.rst:298 ../cinder-storage-node.rst:350
 #: ../dashboard-install.rst:138 ../glance-install.rst:349
 #: ../heat-install.rst:391 ../nova-compute-install.rst:218
@@ -6718,6 +6758,14 @@ msgid ""
 "configuration file."
 msgstr ""
 
+#: ../ceilometer-nova.rst:163
+msgid ""
+"While you can use a customised notification_driver, we recommend using the "
+"default settings. Using stable web hooks for events, such as creating new "
+"instances, and using custom notification drivers are not guaranteed to "
+"deliver notifications in real-time."
+msgstr ""
+
 #: ../debconf/debconf-api-endpoints.rst:33
 msgid ""
 "You are prompted for the Identity service ``admin_token`` value. The "
diff --git a/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po b/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
index f62bcd17ce..5e846835b9 100644
--- a/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
+++ b/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-08 02:56+0000\n"
-"PO-Revision-Date: 2015-09-07 14:49+0000\n"
+"POT-Creation-Date: 2015-09-09 00:43+0000\n"
+"PO-Revision-Date: 2015-09-08 08:11+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/openstack/openstack-"
 "manuals-i18n/language/ja/)\n"
@@ -491,6 +491,15 @@ msgstr ""
 msgid "Adjust ownership and permissions on this directory and the files in it:"
 msgstr "このディレクトリーとその中のファイルの所有者と権限を適切に設定します。"
 
+msgid ""
+"Administrators can also restrict notification delivery to certain tenant "
+"groups. Users can view notifications through a web browser, without using a "
+"specific interface."
+msgstr ""
+"管理者は、通知の配信先を特定のテナントグループに制限することもできます。ユー"
+"ザーは、特定のインターフェースを使用することなく、Web ブラウザー経由で通知を"
+"表示できます。"
+
 msgid ""
 "After installing the operating system on each node for the architecture that "
 "you choose to deploy, you must configure the network interfaces. We "
@@ -3522,6 +3531,19 @@ msgstr ""
 msgid "Message queue"
 msgstr "メッセージキュー"
 
+msgid ""
+"Messages arrive in a specific format which includes: Message ID, Publisher "
+"ID, Event type, Timestamp, Priority, and Payload. See the `Notification "
+"System information <https://wiki.openstack.org/wiki/ "
+"NotificationSystem#General_Notification_Message_Format>`__ for an example "
+"message format."
+msgstr ""
+"メッセージは、メッセージ ID、発行者 ID、イベント種別、タイムスタンプ、優先"
+"度、ペイロードを含む、特定の形式で届きます。メッセージ形式の例は "
+"`Notification System information <https://wiki.openstack.org/wiki/ "
+"NotificationSystem#General_Notification_Message_Format>`__ を参照してくださ"
+"い。"
+
 msgid "Messaging queue"
 msgstr "メッセージングキュー"
 
@@ -3656,6 +3678,13 @@ msgstr "ネットワーク、NTP、OpenStack サービスの依存関係"
 msgid "Next steps"
 msgstr "次の手順"
 
+msgid ""
+"Notifications in real-time allow administrars to observe and resolve "
+"emergencies when the cloud environment experiences errors or faults."
+msgstr ""
+"リアルタイムの通知により、クラウド環境にエラーや障害が発生したときに、管理者"
+"が緊急事態に気づき、解決できるようになります。"
+
 msgid "Object ring"
 msgstr "オブジェクトリング"
 
@@ -5317,6 +5346,12 @@ msgstr ""
 ":doc:`インスタンスの起動 <launch-instance>` の章に、このボリュームをインスタ"
 "ンスに接続する方法の説明があります。"
 
+msgid ""
+"The :file:`nova.conf` file uses the nova_notification driver by defualt."
+msgstr ""
+":file:`nova.conf` ファイルは、デフォルトで nova_notification ドライバーを使用"
+"します。"
+
 msgid "The :term:`DHCP agent` provides DHCP services for virtual networks."
 msgstr ""
 ":term:`DHCP エージェント <DHCP agent>` は、仮想ネットワーク向けに DHCP サービ"
@@ -5600,6 +5635,15 @@ msgstr ""
 "数があることを期待します。:file:`/etc/sysconfig/neutron` ファイルを編集し、以"
 "下を追加します。"
 
+msgid ""
+"The Nova notification_driver creates alerts and sends system state updates "
+"to administrators and users. The notification_driver sends this information "
+"to users in a manner as close to real-time as possible."
+msgstr ""
+"Nova notification_driver は、アラートを作成し、システムの状態の更新を管理者や"
+"ユーザーに送信します。notification_driver は、この情報をできる限りリアルタイ"
+"ムに近く方法でユーザーに送信します。"
+
 msgid ""
 "The OVS service provides the underlying virtual networking framework for "
 "instances."
@@ -7150,6 +7194,17 @@ msgstr ""
 "み込みます。例えば、サービス用の RabbitMQ メッセージングキューの名前でログを"
 "変更するために、対応する設定ファイルでその値を編集できます。"
 
+msgid ""
+"While you can use a customised notification_driver, we recommend using the "
+"default settings. Using stable web hooks for events, such as creating new "
+"instances, and using custom notification drivers are not guaranteed to "
+"deliver notifications in real-time."
+msgstr ""
+"カスタマイズした notification_driver を使用できますが、デフォルトの設定を使用"
+"することを推奨します。新しいイベントの作成などのイベントの安定した Web フック"
+"を使用すること、カスタム通知ドライバーを使用することは、リアルタイムに通知を"
+"配信することを保証されません。"
+
 msgid ""
 "You are prompted for the Identity service ``admin_token`` value. The "
 "Identity Service uses this value to register the API service. When you set "
diff --git a/doc/user-guide-admin/source/locale/ja/LC_MESSAGES/user-guide-admin.po b/doc/user-guide-admin/source/locale/ja/LC_MESSAGES/user-guide-admin.po
index e3211034b6..0be45c178e 100644
--- a/doc/user-guide-admin/source/locale/ja/LC_MESSAGES/user-guide-admin.po
+++ b/doc/user-guide-admin/source/locale/ja/LC_MESSAGES/user-guide-admin.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-28 10:15+0000\n"
-"PO-Revision-Date: 2015-08-28 11:26+0000\n"
+"POT-Creation-Date: 2015-09-09 00:43+0000\n"
+"PO-Revision-Date: 2015-09-08 08:02+0000\n"
 "Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
 "Language-Team: Japanese (http://www.transifex.com/openstack/openstack-"
 "manuals-i18n/language/ja/)\n"
@@ -734,6 +734,9 @@ msgstr ""
 "以下のパラメーターを利用可能な選択肢から設定することにより、暗号化ボリューム"
 "を設定します (下表参照)。"
 
+msgid "Consider NUMA topology when booting instances"
+msgstr "インスタンス起動時の NUMA トポロジーの考慮"
+
 msgid "Content bytes allowed for each injected file."
 msgstr "各インジェクトファイルに許可されるバイト数。"