openstack
/
heat
Code Issues Proposed changes

Repeat Ceilometer alarm actions by default 

The policy actions assume repeat_actions=true.

For the situation when cpu is high even when a new server is added.
Here we would expect yet-another server to be added but what currently
happens is the alarm will be stuck in the alarm state, but with no
further actions.

We need a default that it sane.

Closes-bug: #1242168
Related-bug: #1223347
Change-Id: I4c6a084076a0cc01ebd0d7431d3fac559161e947
This commit is contained in:
Angus Salkeld 2013-10-23 07:33:45 -10:00
parent 3e53c8ee13
commit 4dc987eff3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/heat/templates/AWS_CloudWatch_Alarm.yaml
View File

@ -69,6 +69,7 @@ Resources:
Ref: Period Ref: Period
evaluation_periods: evaluation_periods:
Ref: EvaluationPeriods Ref: EvaluationPeriods
repeat_actions: true
threshold: threshold:
Ref: Threshold Ref: Threshold
alarm_actions: alarm_actions:

11
heat/engine/resources/ceilometer/alarm.py
View File

@ -80,12 +80,11 @@ class CeilometerAlarm(resource.Resource):
}, },
'repeat_actions': { 'repeat_actions': {
'Type': 'Boolean', 'Type': 'Boolean',
'Default': 'false', 'Default': 'true',
'Description': _('True to trigger actions each time the threshold ' 'Description': _('False to trigger actions when the threshold is '
'is reached. ' 'reached AND the alarm\'s state has changed. '
'By default, actions are called when : ' 'By default, actions are called each time '
'the threshold is reached AND the alarm\'s state ' 'the threshold is reached. ')
'have changed.')
}, },
'matching_metadata': { 'matching_metadata': {
'Type': 'Map', 'Type': 'Map',