renderCFN 0.0.19 → 0.0.21
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/renderCFN/autoScalingGroup.rb +9 -4
- data/lib/renderCFN/launchConfiguration.rb +1 -1
- data/lib/renderCFN/securityGroup.rb +2 -1
- data/lib/renderCFN/sqs.rb +4 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c6693db335786e922069d35646bd4b776a9f4f77
|
4
|
+
data.tar.gz: f09586f0850fc9d1034dfb557f0ff008822d5415
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: af4339048de08f846a75b4586a8bcfae68a7c342c7865d10dd85face417b57ad3eb364e003675b76ae7fc01bf2b25a51629305dbbe95f7d1f65db4ce79e1540a
|
7
|
+
data.tar.gz: 5168eb1ed904f42ec05c76ec6056ebe8dbc8f0794641b998d625ff618c34ff37802e81223635116636e674f709ac5fe063f62a30e605f75a76bb2c2eb3e4fd76
|
@@ -53,6 +53,13 @@ module RenderCFN
|
|
53
53
|
end
|
54
54
|
|
55
55
|
def addCpuScaling( args)
|
56
|
+
|
57
|
+
cpuMetrics = {'ExtendedStatistic' => args['cpuPercentile'] || 'p90'}
|
58
|
+
|
59
|
+
if args['cpuMetric'] == 'Average' then
|
60
|
+
cpuMetrics = {'Statistic' => 'Average'}
|
61
|
+
end
|
62
|
+
|
56
63
|
stuff = {
|
57
64
|
"#{@name}ScaleUP" => {
|
58
65
|
'Type' => 'AWS::AutoScaling::ScalingPolicy',
|
@@ -82,12 +89,11 @@ module RenderCFN
|
|
82
89
|
'MetricName' => 'CPUUtilization',
|
83
90
|
'Namespace' => 'AWS/EC2',
|
84
91
|
'Period' => 60,
|
85
|
-
'Statistic' => 'Average',
|
86
92
|
'Threshold' => args[:cpuUP],
|
87
93
|
'AlarmActions' => [
|
88
94
|
'Ref' => "#{@name}ScaleUP"
|
89
95
|
]
|
90
|
-
}
|
96
|
+
}.merge!(cpuMetrics)
|
91
97
|
},
|
92
98
|
"#{@name}AlarmDOWN" => {
|
93
99
|
'Type' => 'AWS::CloudWatch::Alarm',
|
@@ -97,12 +103,11 @@ module RenderCFN
|
|
97
103
|
'MetricName' => 'CPUUtilization',
|
98
104
|
'Namespace' => 'AWS/EC2',
|
99
105
|
'Period' => 60,
|
100
|
-
'Statistic' => 'Average',
|
101
106
|
'Threshold' => args[:cpuDOWN],
|
102
107
|
'AlarmActions' => [
|
103
108
|
'Ref' => "#{@name}ScaleDOWN"
|
104
109
|
]
|
105
|
-
}
|
110
|
+
}.merge!(cpuMetrics)
|
106
111
|
}
|
107
112
|
}
|
108
113
|
@awsObject.merge!( stuff)
|
data/lib/renderCFN/sqs.rb
CHANGED
@@ -21,8 +21,10 @@ module RenderCFN
|
|
21
21
|
end
|
22
22
|
|
23
23
|
def redrivePolicy( queueTarget, maxRecvCount)
|
24
|
-
@awsObject[@title]['Properties']['
|
25
|
-
|
24
|
+
@awsObject[@title]['Properties']['RedrivePolicy'] = {
|
25
|
+
'deadLetterTargetArn' => queueTarget,
|
26
|
+
'maxReceiveCount' => maxRecvCount
|
27
|
+
}
|
26
28
|
end
|
27
29
|
|
28
30
|
end
|