renderCFN 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb51400eae437365d41159c12b2807ad27bdaf08
-  data.tar.gz: f6e531baf41efa4a632ffa71d2ddc5bc5e336fe6
+  metadata.gz: c6693db335786e922069d35646bd4b776a9f4f77
+  data.tar.gz: f09586f0850fc9d1034dfb557f0ff008822d5415
 SHA512:
-  metadata.gz: e98b75ca7775b1b7411ac30ebbd6155fe2326a22edb1cac745ea0b2d6dd6bfc250c4f1620494965040cd324458a99e849d3efd49182e107d5a1e97805c6f844c
-  data.tar.gz: efa1d35b6bd0c14f852ba98741ad701266c3d8741864a1b92cc4017a0df792487868743f44be2de0550e0a377e5a4fb73d06f30abc7560efad5545cd6e878fac
+  metadata.gz: af4339048de08f846a75b4586a8bcfae68a7c342c7865d10dd85face417b57ad3eb364e003675b76ae7fc01bf2b25a51629305dbbe95f7d1f65db4ce79e1540a
+  data.tar.gz: 5168eb1ed904f42ec05c76ec6056ebe8dbc8f0794641b998d625ff618c34ff37802e81223635116636e674f709ac5fe063f62a30e605f75a76bb2c2eb3e4fd76

data/lib/renderCFN/autoScalingGroup.rb

@@ -53,6 +53,13 @@ module RenderCFN
       end
 
       def addCpuScaling( args)
+
+        cpuMetrics = {'ExtendedStatistic' => args['cpuPercentile'] || 'p90'}
+
+        if args['cpuMetric'] == 'Average' then
+          cpuMetrics = {'Statistic' => 'Average'}
+        end
+
         stuff = {
           "#{@name}ScaleUP" => {
             'Type' => 'AWS::AutoScaling::ScalingPolicy',
@@ -82,12 +89,11 @@ module RenderCFN
               'MetricName' => 'CPUUtilization',
               'Namespace' => 'AWS/EC2',
               'Period' => 60,
-              'Statistic' => 'Average',
               'Threshold' => args[:cpuUP],
               'AlarmActions' => [
                 'Ref' => "#{@name}ScaleUP"
                 ]
-              }
+              }.merge!(cpuMetrics)
             },
           "#{@name}AlarmDOWN" => {
             'Type' => 'AWS::CloudWatch::Alarm',
@@ -97,12 +103,11 @@ module RenderCFN
               'MetricName' => 'CPUUtilization',
               'Namespace' => 'AWS/EC2',
               'Period' => 60,
-              'Statistic' => 'Average',
               'Threshold' => args[:cpuDOWN],
               'AlarmActions' => [
                 'Ref' => "#{@name}ScaleDOWN"
                 ]
-              }
+              }.merge!(cpuMetrics)
             }
           }
       @awsObject.merge!( stuff)

data/lib/renderCFN/launchConfiguration.rb

@@ -47,7 +47,7 @@ module RenderCFN
       ebs = Hash.new
       ebs['DeleteOnTermination'] = true
       ebs['Encrypted'] = false
-      ebs['VolumeSize'] = volumeSize
+      ebs['VolumeSize'] = volumeSize.to_s
       ebs['VolumeType'] = volumeType
       
       if iops

data/lib/renderCFN/securityGroup.rb

@@ -17,7 +17,8 @@ module RenderCFN
         }
       end
 
-      def addPort( protocol, ip, from, to)
+      def addPort( protocol, ip, from, to=from)
+
         entry = { 'IpProtocol' => protocol,
                 'CidrIp' => ip,
                 'FromPort' => from,

data/lib/renderCFN/sqs.rb

@@ -21,8 +21,10 @@ module RenderCFN
       end
 
       def redrivePolicy( queueTarget, maxRecvCount)
-        @awsObject[@title]['Properties']['deadLetterTargetArn'] = queueTarget
-        @awsObject[@title]['Properties']['maxReceiveCount'] = maxRecvCount
+        @awsObject[@title]['Properties']['RedrivePolicy'] = {
+          'deadLetterTargetArn' => queueTarget,
+          'maxReceiveCount' => maxRecvCount
+        }
       end
   
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renderCFN
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.21
 platform: ruby
 authors:
 - Brian J. Schrock