diff options
| author | Swann Croiset <swann.croiset@bull.net> | 2013-11-04 15:37:18 +0100 |
|---|---|---|
| committer | Swann Croiset <swann.croiset@bull.net> | 2013-11-05 10:59:22 +0100 |
| commit | 7cbca520a3a4bfb182b2690bf740846c44adf40e (patch) | |
| tree | 305bf77956eab290ab7e61451b544a9e3f644201 /cfn | |
| parent | 5e195dd156a32362ce9bae8c7110c86b5bbf7a15 (diff) | |
| download | heat-templates-7cbca520a3a4bfb182b2690bf740846c44adf40e.tar.gz | |
Fixes of the alarm creation for the auto scaling example
s/counter/meter
s/group_name/groupname
use the 'Ref' of the ASG for the matching metadata
Change-Id: I2f55571e991dd90e7f1047bfda581052c31d3770
Diffstat (limited to 'cfn')
| -rw-r--r-- | cfn/F17/AutoScalingCeilometer.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cfn/F17/AutoScalingCeilometer.yaml b/cfn/F17/AutoScalingCeilometer.yaml index 3dfb8bd..495caf9 100644 --- a/cfn/F17/AutoScalingCeilometer.yaml +++ b/cfn/F17/AutoScalingCeilometer.yaml @@ -62,27 +62,27 @@ Resources: Type: OS::Metering::Alarm Properties: description: Scale-up if the average CPU > 50% for 1 minute - counter_name: cpu_util + meter_name: cpu_util statistic: avg period: '60' evaluation_periods: '1' threshold: '50' alarm_actions: - {"Fn::GetAtt": [WebServerScaleUpPolicy, AlarmUrl]} - matching_metadata: {'metadata.user_metadata.server_group': 'WebServerGroup'} + matching_metadata: {'metadata.user_metadata.groupname': {Ref: 'WebServerGroup'}} comparison_operator: gt CPUAlarmLow: Type: OS::Metering::Alarm Properties: description: Scale-down if the average CPU < 15% for 1 minute - counter_name: cpu_util + meter_name: cpu_util statistic: avg period: '60' evaluation_periods: '1' threshold: '15' alarm_actions: - {"Fn::GetAtt": [WebServerScaleDownPolicy, AlarmUrl]} - matching_metadata: {'metadata.user_metadata.server_group': 'WebServerGroup'} + matching_metadata: {'metadata.user_metadata.groupname': {Ref: 'WebServerGroup'}} comparison_operator: lt ElasticLoadBalancer: Type: AWS::ElasticLoadBalancing::LoadBalancer |