summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-12 07:40:19 +0000
committerGerrit Code Review <review@openstack.org>2017-06-12 07:40:19 +0000
commit69c1326442b4cee033625a921faae62a78f0ddd5 (patch)
tree5a062f9f5a2ccbd8af260dd9025d6a9ebe165b09
parent2cb7be482878ca2421c5c8624b2602c66ac10124 (diff)
parent9ac17bff5823e1128ac927ccc5e2c9fe342db584 (diff)
Merge "autoscaling: don't query an no more existing API"
-rw-r--r--hot/autoscaling.yaml29
1 files changed, 14 insertions, 15 deletions
diff --git a/hot/autoscaling.yaml b/hot/autoscaling.yaml
index 82616fa..3a8b3bb 100644
--- a/hot/autoscaling.yaml
+++ b/hot/autoscaling.yaml
@@ -76,7 +76,7 @@ resources:
76 key_name: {get_param: key} 76 key_name: {get_param: key}
77 network: {get_param: network} 77 network: {get_param: network}
78 pool_id: {get_resource: pool} 78 pool_id: {get_resource: pool}
79 metadata: {"metering.stack": {get_param: "OS::stack_id"}} 79 metadata: {"metering.server_group": {get_param: "OS::stack_id"}}
80 user_data: 80 user_data:
81 str_replace: 81 str_replace:
82 template: | 82 template: |
@@ -208,23 +208,22 @@ outputs:
208 description: > 208 description: >
209 This URL is the "external" URL that can be used to access the 209 This URL is the "external" URL that can be used to access the
210 Wordpress site. 210 Wordpress site.
211 ceilometer_query: 211 gnocchi_query:
212 value: 212 value:
213 str_replace: 213 str_replace:
214 template: > 214 template: >
215 ceilometer statistics -m cpu_util 215 gnocchi measures aggregation --resource-type instance
216 -q metadata.user_metadata.stack=stackval -p 600 -a avg 216 --query 'server_group="stackval"'
217 --granularity 300 --aggregation mean cpu_util
217 params: 218 params:
218 stackval: { get_param: "OS::stack_id" } 219 stackval: { get_param: "OS::stack_id" }
219 description: > 220 description: >
220 This is a Ceilometer query for statistics on the cpu_util meter 221 This is a Gnocchi query for statistics on the cpu_util measurements about
221 Samples about OS::Nova::Server instances in this stack. The -q 222 OS::Nova::Server instances in this stack. The --resource-type select the
222 parameter selects Samples according to the subject's metadata. 223 type of Gnocchi resource. The --query parameter filters resources
223 When a VM's metadata includes an item of the form metering.X=Y, 224 according to its attributes. When a VM's metadata includes an item of the
224 the corresponding Ceilometer resource has a metadata item of the 225 form metering.server_group=X, the corresponding Gnocchi resource has a
225 form user_metadata.X=Y and samples about resources so tagged can 226 attribute named server_group that can queried with 'server_group="X"' In
226 be queried with a Ceilometer query term of the form 227 this case the nested stacks give their VMs metadata that is passed as a
227 metadata.user_metadata.X=Y. In this case the nested stacks give 228 nested stack parameter, and this stack passes a metadata of the form
228 their VMs metadata that is passed as a nested stack parameter, 229 metering.server_group=X, where X is this stack's ID.
229 and this stack passes a metadata of the form metering.stack=Y,
230 where Y is this stack's ID.