From cc5fc44b0e39326ab253cf07e13a8c8f51e39538 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Fri, 24 Apr 2015 16:39:48 +0200 Subject: [PATCH] config-ref: ceilometer tables update Closes Bug: #1448209 Change-Id: I21976f046a34e4174436494162c87cb21a58a156 --- doc/common/tables/ceilometer-database.xml | 4 +++ doc/common/tables/ceilometer-policy.xml | 34 +++++++++++++++++++ doc/common/tables/ceilometer-rgw.xml | 30 ++++++++++++++++ .../tables/ceilometer-service_types.xml | 4 +++ .../ch_telemetryconfigure.xml | 2 ++ .../ceilometer.flagmappings | 7 ++++ .../ceilometer.headers | 1 + 7 files changed, 82 insertions(+) create mode 100644 doc/common/tables/ceilometer-policy.xml create mode 100644 doc/common/tables/ceilometer-rgw.xml 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 @@ = None (StrOpt) The connection string used to connect to the alarm database. (if unset, connection is used) + + = -1 + (IntOpt) Number of seconds that alarm histories are kept in the database for (<= 0 means forever). + = sqlalchemy (StrOpt) The back end to use for the database. 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of policy configuration options
Configuration option = Default valueDescription
[oslo_policy]
= default(StrOpt) Default rule. Enforced when a requested rule is not found.
= ['policy.d'](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.
= policy.json(StrOpt) The JSON file that defines policies.
+ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of Rados gateway configuration options
Configuration option = Default valueDescription
[rgw_admin_credentials]
= None(StrOpt) Access key for Radosgw Admin.
= None(StrOpt) Secret key for Radosgw Admin.
+ 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 @@ = compute (StrOpt) Nova service type. + + = object-store + (StrOpt) Radosgw service type. + = object-store (StrOpt) Swift service type. 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 @@ + + 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