poolparty 1.4.4 → 1.4.5

data/README.rdoc

@@ -21,7 +21,9 @@ For instance, to start a basic cloud, let's write one:
     cloud "app" do
       instances 2..10
       using :ec2
-      autscale
+      autoscale do      
+        trigger :lower_threshold => 0.3, :upper_threshold => 1.0, :measure => :cpu
+      end
       security_group do
         authorize :from_port => 22, :to_port => 22
       end

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 4
-:patch: 4
+:patch: 5
 :major: 1
 :build: 

data/examples/simple.rb

@@ -8,7 +8,9 @@ pool "poolparty" do
   cloud "simple" do
     instances 1..3
     using :ec2
-    autoscale
+    autoscale do      
+      trigger :lower_threshold => 0.3, :upper_threshold => 1.0, :measure => :cpu
+    end
     image_id "ami-ccf615a5" #alestic jaunty
     availability_zones ['us-east-1b']
     #TODO: accept array of hashes defining security group rules

data/lib/cloud_providers/ec2/ec2.rb

@@ -87,7 +87,8 @@ module CloudProviders
       puts "  minimum_instances: #{minimum_instances}"
       puts "  maximum_instances: #{maximum_instances}"
       puts "  security_groups: #{security_group_names.join(", ")}"
-      puts "  running on keypair: #{keypair}"
+      puts "  using keypair: #{keypair}"
+      puts "  user: #{user}\n"
             
       security_groups.each do |sg|
         sg.run
@@ -98,19 +99,19 @@ module CloudProviders
           puts "    load balancer: #{lb.name}"
           lb.run
         end
-      end     
-      if autoscalers.empty?
+      end
+      
+      if autoscalers.empty? # not using autoscaling
         puts "---- live, running instances (#{nodes.size}) ----"
         if nodes.size < minimum_instances
           expansion_count = minimum_instances - nodes.size
-          puts "-----> expanding the cloud because the minimum_instances is not satisified: #{expansion_count}"
+          puts "-----> expanding the cloud because the #{expansion_count} minimum_instances is not satisified: "
           expand_by(expansion_count)
         elsif nodes.size > maximum_instances
           contraction_count = nodes.size - maximum_instances
-          puts "-----> contracting the cloud because the instances count exceeds the maximum_instances by #{contraction_count}"
+          puts "-----> contracting the cloud because the instances count exceeds the #{maximum_instances} maximum_instances by #{contraction_count}"
           contract_by(contraction_count)
         end
-        
         progress_bar_until("Waiting for the instances to be launched") do
           reset!
           running_nodes = nodes.select {|n| n.running? }
@@ -170,12 +171,12 @@ module CloudProviders
       progress_bar_until("Waiting for node to launch...") do
         wait_for_node(e)
       end
-      all_nodes.select {|n| n.instance_id == e.instance_id }.first
+      all_nodes.detect {|n| n.instance_id == e.instance_id }
     end
     
     def wait_for_node(instance)
       reset!
-      inst = all_nodes.select {|n| n.instance_id == instance.instance_id }.first
+      inst = all_nodes.detect {|n| n.instance_id == instance.instance_id }
       inst.running?
     end
     

data/lib/cloud_providers/ec2/helpers/elastic_auto_scaler.rb

@@ -21,12 +21,18 @@ module CloudProviders
           puts "Deleting old launch configuration: #{old_launch_configuration_name}"
           as.delete_launch_configuration(:launch_configuration_name => old_launch_configuration_name)
         end
-        
+      end
+      
+      triggers.each do |trigger|
+        trigger.run
       end
     end
     
     # First, change the min_count to 
     def teardown
+      triggers.each do |trigger|
+        trigger.teardown
+      end
       if autoscaling_groups.select {|n| n.name == name }.empty?
         puts "Cloud #{cloud.name} autoscaling group does not exist"
       else
@@ -292,7 +298,16 @@ module CloudProviders
       describe_autoscaling_groups.DescribeAutoScalingGroupsResult.AutoScalingGroups.member
     end
     
+    def trigger(*trigger_hashes)
+      trigger_hashes.each do |hsh, blk|
+        triggers << ElasticTrigger.new(name, hsh.merge(:cloud => cloud), &blk)
+      end
+    end
+    
     private
+    def triggers
+      @triggers ||= []
+    end
     def reset!
       @old_auto_scaling_group_name = 
         @new_auto_scaling_group_name = 
@@ -301,4 +316,112 @@ module CloudProviders
       cloud.reset!
     end
   end
+  class ElasticTrigger < Ec2Helper
+    default_options(
+      :measure => :cpu,
+      :period => 60,
+      :statistic => :average,
+      :unit => "Seconds",
+      :lower_threshold => 20,
+      :upper_threshold => 60,
+      :trigger_name => "CpuTrigger",
+      :lower_breach_scale_increment => -1,
+      :upper_breach_scale_increment => 1,
+      :breach_duration => 120
+    )
+    
+    def measure_names
+      {:cpu => "CPUUtilization"}
+    end
+    
+    def statistic_names
+      {:min => "Minimum", :max => "Maximum", :average => "Average", :sum => "Sum"}
+    end
+        
+    def run
+      if autoscaling_triggers.empty?
+        create_autoscaling_trigger!
+      else
+        t = autoscaling_triggers.map do |hsh|
+          diff(hsh)
+        end.flatten
+        unless t.empty?
+          puts "Creating or updating trigger: #{trigger_name}"
+          create_autoscaling_trigger!
+        end
+      end
+    end
+    
+    def teardown
+      autoscaling_triggers.each do |trigger|
+        puts "Deleting trigger: #{trigger[:trigger_name]}"
+        as.delete_trigger(:trigger_name => trigger[:trigger_name], :autoscaling_group_name => name)
+      end
+    end
+    
+    def diff(hsh={})
+      [ :measure_name, 
+        :period, 
+        :statistic, 
+        :lower_threshold, 
+        :lower_breach_scale_increment, 
+        :upper_threshold, 
+        :upper_breach_scale_increment,
+        :unit,
+        :trigger_name].reject do |k|
+        hsh[k].to_s.capitalize == self.send(k).to_s.capitalize
+      end
+    end
+    
+    private
+    
+    def autoscaling_triggers
+      begin
+        as.describe_triggers(:autoscaling_group_name => name).DescribeTriggersResult.Triggers.member.map do |trigger|
+          {
+            :trigger_name => trigger["TriggerName"],
+            :statistic => trigger["Statistic"],
+            :status => trigger["Status"],
+            :lower_threshold => trigger["LowerThreshold"],
+            :created_time => trigger["CreatedTime"],
+            :measure_name => trigger["MeasureName"],
+            :upper_threshold => trigger["UpperThreshold"],
+            :lower_breach_scale_increment => trigger["LowerBreachScaleIncrement"],
+            :period => trigger["Period"],
+            :upper_breach_scale_increment => trigger["UpperBreachScaleIncrement"],
+            :breach_duration => trigger["BreachDuration"],
+            :dimensions => trigger["Dimensions"],
+            :unit => trigger["Unit"],
+            :autoscaling_group_name => trigger["AutoScalingGroupName"]
+          }
+        end
+      rescue Exception => e
+        []
+      end
+    end
+    def create_autoscaling_trigger!
+      as.create_or_updated_scaling_trigger(
+        :autoscaling_group_name => name,
+        :dimensions => {:name => "AutoScalingGroupName", :value => name},
+        :measure_name => measure_name,
+        :period => "#{period}",
+        :trigger_name => trigger_name,
+        :statistic => (statistic_names[statistic] || statistic),
+        :unit => unit,
+        :breach_duration => breach_duration,
+        :lower_threshold => "#{lower_threshold}",
+        :lower_breach_scale_increment => "#{lower_breach_scale_increment}",
+        :upper_threshold => "#{upper_threshold}",
+        :upper_breach_scale_increment => "#{upper_breach_scale_increment}"
+      )
+    end
+    
+    def measure_name
+      measure_names[measure] || measure
+    end
+    
+    def trigger_name
+      "#{(measure_names[measure] || measure)}-#{name}" || name
+    end
+  end
 end

data/lib/cloud_providers/remote_instance.rb

@@ -54,7 +54,7 @@ module CloudProviders
     
     def run_chef!
       ssh([
-        "/var/lib/gems/1.8/bin/chef-solo -j /etc/chef/dna.json -c /etc/chef/solo.rb"
+        "chef-solo -j /etc/chef/dna.json -c /etc/chef/solo.rb"
       ])
     end
         

data/vendor/gems/amazon-ec2/lib/AWS/Autoscaling/autoscaling.rb

@@ -112,7 +112,7 @@ module AWS
           params["Dimensions.member.1.Name"] = options[:dimensions][:name]
           params["Dimensions.member.1.Value"] = options[:dimensions][:value]
         else
-          raise ArgumentError, "Dimensionss must be either an array or a hash"
+          raise ArgumentError, "Dimensions must be either an array or a hash"
         end
         params['MeasureName'] = options[:measure_name]
         params['Statistic'] = options[:statistic]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors: 
 - Ari Lerner