mirror of
https://github.com/fog/fog-aws.git
synced 2022-11-09 13:50:52 -05:00
Merge pull request #245 from evertrue/evertrue/eherot/cloudwatch_parser_array_output
Parse CloudWatch alarm actions as arrays instead of strings
This commit is contained in:
commit
9f55006e9e
1 changed files with 46 additions and 14 deletions
|
@ -9,22 +9,46 @@ module Fog
|
|||
end
|
||||
|
||||
def reset_metric_alarms
|
||||
@metric_alarms = {'Dimensions' => []}
|
||||
@metric_alarms = {
|
||||
'Dimensions' => [],
|
||||
'AlarmActions' => [],
|
||||
'OKActions' => [],
|
||||
'InsufficientDataActions' => []
|
||||
}
|
||||
end
|
||||
|
||||
def reset_dimension
|
||||
@dimension = {}
|
||||
end
|
||||
|
||||
def reset_alarm_actions
|
||||
@alarm_actions = {}
|
||||
end
|
||||
|
||||
def reset_ok_actions
|
||||
@ok_actions = {}
|
||||
end
|
||||
|
||||
def reset_insufficient_data_actions
|
||||
@insufficient_data_actions = {}
|
||||
end
|
||||
|
||||
def start_element(name, attrs = [])
|
||||
super
|
||||
case name
|
||||
when 'Dimensions'
|
||||
@in_dimensions = true
|
||||
when 'AlarmActions'
|
||||
@in_alarm_actions = true
|
||||
when 'OKActions'
|
||||
@in_ok_actions = true
|
||||
when 'InsufficientDataActions'
|
||||
@in_insufficient_data_actions = true
|
||||
when 'member'
|
||||
if @in_dimensions
|
||||
reset_dimension
|
||||
end
|
||||
reset_dimension if @in_dimensions
|
||||
reset_alarm_actions if @in_alarm_actions
|
||||
reset_ok_actions if @in_ok_actions
|
||||
reset_insufficient_data_actions if @in_insufficient_data_actions
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -38,8 +62,12 @@ module Fog
|
|||
@metric_alarms[name] = value.to_i
|
||||
when 'Threshold'
|
||||
@metric_alarms[name] = value.to_f
|
||||
when 'AlarmActions', 'OKActions', 'InsufficientDataActions'
|
||||
@metric_alarms[name] = value.to_s.strip
|
||||
when 'AlarmActions'
|
||||
@in_alarm_actions = false
|
||||
when 'OKActions'
|
||||
@in_ok_actions = false
|
||||
when 'InsufficientDataActions'
|
||||
@in_insufficient_data_actions = false
|
||||
when 'AlarmName', 'Namespace', 'MetricName', 'AlarmDescription', 'AlarmArn', 'Unit',
|
||||
'StateValue', 'Statistic', 'ComparisonOperator', 'StateReason', 'ActionsEnabled'
|
||||
@metric_alarms[name] = value
|
||||
|
@ -52,15 +80,19 @@ module Fog
|
|||
when 'NextToken'
|
||||
@response['ResponseMetadata'][name] = value
|
||||
when 'member'
|
||||
if !@in_dimensions
|
||||
if @metric_alarms.key?('AlarmName')
|
||||
@response['DescribeAlarmsResult']['MetricAlarms'] << @metric_alarms
|
||||
reset_metric_alarms
|
||||
elsif @response['DescribeAlarmsResult']['MetricAlarms'].last != nil
|
||||
@response['DescribeAlarmsResult']['MetricAlarms'].last.merge!( @metric_alarms)
|
||||
end
|
||||
else
|
||||
if @in_dimensions
|
||||
@metric_alarms['Dimensions'] << @dimension
|
||||
elsif @in_alarm_actions
|
||||
@metric_alarms['AlarmActions'] << value.to_s.strip
|
||||
elsif @in_ok_actions
|
||||
@metric_alarms['OKActions'] << value.to_s.strip
|
||||
elsif @in_insufficient_data_actions
|
||||
@metric_alarms['InsufficientDataActions'] << value.to_s.strip
|
||||
elsif @metric_alarms.key?('AlarmName')
|
||||
@response['DescribeAlarmsResult']['MetricAlarms'] << @metric_alarms
|
||||
reset_metric_alarms
|
||||
elsif @response['DescribeAlarmsResult']['MetricAlarms'].last != nil
|
||||
@response['DescribeAlarmsResult']['MetricAlarms'].last.merge!( @metric_alarms)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue