diff --git a/doc/common/tables/ceilometer-database.xml b/doc/common/tables/ceilometer-database.xml
index 2cd5cbbd12..a0d3639086 100644
--- a/doc/common/tables/ceilometer-database.xml
+++ b/doc/common/tables/ceilometer-database.xml
@@ -28,6 +28,10 @@
         <td><option>alarm_connection</option> = <replaceable>None</replaceable></td>
         <td>(StrOpt) The connection string used to connect to the alarm database. (if unset, connection is used)</td>
       </tr>
+      <tr>
+        <td><option>alarm_history_time_to_live</option> = <replaceable>-1</replaceable></td>
+        <td>(IntOpt) Number of seconds that alarm histories are kept in the database for (&lt;= 0 means forever).</td>
+      </tr>
       <tr>
         <td><option>backend</option> = <replaceable>sqlalchemy</replaceable></td>
         <td>(StrOpt) The back end to use for the database.</td>
diff --git a/doc/common/tables/ceilometer-policy.xml b/doc/common/tables/ceilometer-policy.xml
new file mode 100644
index 0000000000..04fa460128
--- /dev/null
+++ b/doc/common/tables/ceilometer-policy.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<para xmlns="http://docbook.org/ns/docbook" version="5.0">
+  <!-- Warning: Do not edit this file. It is automatically
+     generated and your changes will be overwritten.
+     The tool to do so lives in openstack-doc-tools repository. -->
+  <table rules="all" xml:id="config_table_ceilometer_policy">
+    <caption>Description of policy configuration options</caption>
+    <col width="50%"/>
+    <col width="50%"/>
+    <thead>
+      <tr>
+        <th>Configuration option = Default value</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th colspan="2">[oslo_policy]</th>
+      </tr>
+      <tr>
+        <td><option>policy_default_rule</option> = <replaceable>default</replaceable></td>
+        <td>(StrOpt) Default rule. Enforced when a requested rule is not found.</td>
+      </tr>
+      <tr>
+        <td><option>policy_dirs</option> = <replaceable>['policy.d']</replaceable></td>
+        <td>(MultiStrOpt) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched.  Missing or empty directories are ignored.</td>
+      </tr>
+      <tr>
+        <td><option>policy_file</option> = <replaceable>policy.json</replaceable></td>
+        <td>(StrOpt) The JSON file that defines policies.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>
diff --git a/doc/common/tables/ceilometer-rgw.xml b/doc/common/tables/ceilometer-rgw.xml
new file mode 100644
index 0000000000..3238b6bc1f
--- /dev/null
+++ b/doc/common/tables/ceilometer-rgw.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<para xmlns="http://docbook.org/ns/docbook" version="5.0">
+  <!-- Warning: Do not edit this file. It is automatically
+     generated and your changes will be overwritten.
+     The tool to do so lives in openstack-doc-tools repository. -->
+  <table rules="all" xml:id="config_table_ceilometer_rgw">
+    <caption>Description of Rados gateway configuration options</caption>
+    <col width="50%"/>
+    <col width="50%"/>
+    <thead>
+      <tr>
+        <th>Configuration option = Default value</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th colspan="2">[rgw_admin_credentials]</th>
+      </tr>
+      <tr>
+        <td><option>access_key</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) Access key for Radosgw Admin.</td>
+      </tr>
+      <tr>
+        <td><option>secret_key</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) Secret key for Radosgw Admin.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>
diff --git a/doc/common/tables/ceilometer-service_types.xml b/doc/common/tables/ceilometer-service_types.xml
index ba07cf8534..4dd92a4bc6 100644
--- a/doc/common/tables/ceilometer-service_types.xml
+++ b/doc/common/tables/ceilometer-service_types.xml
@@ -33,6 +33,10 @@
         <td><option>nova</option> = <replaceable>compute</replaceable></td>
         <td>(StrOpt) Nova service type.</td>
       </tr>
+      <tr>
+        <td><option>radosgw</option> = <replaceable>object-store</replaceable></td>
+        <td>(StrOpt) Radosgw service type.</td>
+      </tr>
       <tr>
         <td><option>swift</option> = <replaceable>object-store</replaceable></td>
         <td>(StrOpt) Swift service type.</td>
diff --git a/doc/config-reference/ch_telemetryconfigure.xml b/doc/config-reference/ch_telemetryconfigure.xml
index 29eb1edce2..4b82e61c15 100644
--- a/doc/config-reference/ch_telemetryconfigure.xml
+++ b/doc/config-reference/ch_telemetryconfigure.xml
@@ -34,9 +34,11 @@
     <xi:include href="../common/tables/ceilometer-logging.xml"/>
     <xi:include href="../common/tables/ceilometer-magnetodb.xml"/>
     <xi:include href="../common/tables/ceilometer-notification.xml"/>
+    <xi:include href="../common/tables/ceilometer-policy.xml"/>
     <xi:include href="../common/tables/ceilometer-qpid.xml"/>
     <xi:include href="../common/tables/ceilometer-rabbitmq.xml"/>
     <xi:include href="../common/tables/ceilometer-redis.xml"/>
+    <xi:include href="../common/tables/ceilometer-rgw.xml"/>
     <xi:include href="../common/tables/ceilometer-rootwrap.xml"/>
     <xi:include href="../common/tables/ceilometer-rpc.xml"/>
     <xi:include href="../common/tables/ceilometer-service_types.xml"/>
diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
index bdb487ca4a..401a8b2295 100644
--- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
+++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
@@ -99,6 +99,7 @@ coordination/backend_url common
 coordination/check_watchers common
 coordination/heartbeat common
 database/alarm_connection database
+database/alarm_history_time_to_live database
 database/backend database
 database/connection database
 database/connection_debug database
@@ -236,12 +237,17 @@ oslo_messaging_rabbit/rabbit_use_ssl rabbitmq
 oslo_messaging_rabbit/rabbit_userid rabbitmq
 oslo_messaging_rabbit/rabbit_virtual_host rabbitmq
 oslo_messaging_rabbit/rpc_conn_pool_size rabbitmq
+oslo_policy/policy_default_rule policy
+oslo_policy/policy_dirs policy
+oslo_policy/policy_file policy
 polling/partitioning_group_prefix common
 publisher/telemetry_secret rpc
 publisher_notifier/event_topic rpc
 publisher_notifier/metering_topic rpc
 publisher_notifier/telemetry_driver rpc
 publisher_rpc/metering_topic rpc
+rgw_admin_credentials/access_key rgw
+rgw_admin_credentials/secret_key rgw
 service_credentials/insecure auth
 service_credentials/os_auth_url auth
 service_credentials/os_cacert auth
@@ -255,6 +261,7 @@ service_types/glance service_types
 service_types/kwapi service_types
 service_types/neutron service_types
 service_types/nova service_types
+service_types/radosgw service_types
 service_types/swift service_types
 vmware/api_retry_count vmware
 vmware/host_ip vmware
diff --git a/tools/autogenerate-config-flagmappings/ceilometer.headers b/tools/autogenerate-config-flagmappings/ceilometer.headers
index 32fccf8bd9..70ee61c900 100644
--- a/tools/autogenerate-config-flagmappings/ceilometer.headers
+++ b/tools/autogenerate-config-flagmappings/ceilometer.headers
@@ -7,5 +7,6 @@ exchange exchange
 inspector inspector
 magnetodb MagnetoDB
 notification notification
+rgw Rados gateway
 service_types service types
 zaqar Zaqar