awsborn 0.8.0 → 0.8.1

data/README.mdown

@@ -77,16 +77,16 @@ equally well be added as options to the specific servers.
 
 ### Defining a cluster
 
-The `cluster` method accepts three commands, `domain`, `load_balancer` and `server`.  `domain` is
-optional and is just a way to avoid repetition in the `server` commands.  `load_balancer` is also optional and take a name and a hash. `server`
-takes a name (which can be used as a key in the cluster, e.g. `log_servers[:log_a]`)
+The `cluster` method accepts three commands, `domain`, `load_balancer` and `server`.
+`domain` is optional and is just a way to avoid repetition in the `server` commands.
+`load_balancer` is also optional and take a name and a hash. `server` takes a name
+(which can be used as a key in the cluster, e.g. `log_servers[:log_a]`)
 and a hash:
 
 Mandatory keys for server:
 
-* `:zone` -- the availability zone for the server.  One of `:us_east_1a`, `:us_east_1b`,
-  `:us_east_1c`, `:us_east_1d`, `:us_west_1a`, `:us_west_1b`, `:eu_west_1a`, `:eu_west_1b`,
-  `:ap-southeast-1a`, `:ap-southeast-1b`.
+* `:zone` -- the availability zone for the server.  Expressed as symbols, e.g.
+  `:us_east_1d`, `:us_west_1a`, `:eu_west_1c`, `:ap-southeast-1a`, `:ap-northeast-1b`.
 * `:disk` -- a hash of `device => volume-id`.  Awsborn uses the disks to tell if a server
   is running or not (see *Launching a cluster*).  `volume-id` can also be an array
   `[volume-id, :format]`, in which case `the_server.format_disk_on_device?(device)`
@@ -108,25 +108,39 @@ Keys that override server type settings:
 
 Mandatory keys for load_balancer:
 
-* `:region` -- the region covered by the load balancer. One of `:us_east_1`, `:us_west_1`, `:eu_west_1`, `:ap_southeast_1`
+* `:region` -- the region covered by the load balancer. One of `:us_east_1`, `:us_west_1`,
+  `:eu_west_1`, `:ap_southeast_1`, `:ap_northeast_1`
 
 Optional keys for load_balancer:
 
-* `:only` -- A list of server names to which the load balancer is
-	restricted
-* `:except` -- A list of servers that the load balancer should ignore
-* `:listerners` -- A list of listeners definitions for the load
-	balancer. For instance: `{ :protocol => :http, :load_balancer_port => 80,  :instance_port => 80 }`
-* `:sticky_cookies` -- A list of sticky cookies policies that the load balancer
-	should take care of. There are three kinds of available policies: `:disabled`, `:app_generated` (the cookie is generated by the app) or `:lb_generated` (the cookie is generated by the load balancer).
+* `:only` -- a list of server names to which the load balancer is
+	restricted.
+* `:except` -- a list of servers that the load balancer should ignore.
+* `:health_check` -- a hash containing full or partial health check
+  configuration. Health check can contain `:healthy_threshold`,
+  `:unhealthy_threshold`, `:target`, `:timeout` and `:interval`
+* `:listeners` -- a list of listener definitions for the load balancer. For instance:
+    `{ :protocol => :http, :load_balancer_port => 80,  :instance_port => 80 }`
+* `:sticky_cookies` -- a list of ports/cookie policies that the load balancer
+	should take care of. There are three kinds of available policies:
+	`:disabled`,
+	`:app_generated` (the cookie is generated by the app) or
+	`:lb_generated` (the cookie is generated by the load balancer).
 
 Example:
 
     cluster "test" do
-      domain 'yourdimain.net'
+      domain 'yourdomain.net'
       load_balancer 'test-balancer',
         :region => :eu_west_1,
         :only => [:cluster_test_1, :cluster_test_2],
+        :health_check => {
+          :target => 'HTTP:80/index.html',
+          :timeout => 6,
+          :interval => 31,
+          :unhealthy_threshold => 3,
+          :healthy_threshold => 9
+        },
         :listeners => [
           { :protocol => :http, :load_balancer_port => 80,  :instance_port => 80},
           { :protocol => :tcp,  :load_balancer_port => 443, :instance_port => 443}
@@ -311,6 +325,14 @@ Other rake tasks include:
 
 ## Changes
 
+### New in 0.8.1
+
+* Specify health_check for load balancers.
+
+### New in 0.8.0
+
+* Server cluster can have load balancers.
+
 ### New in 0.7.0
 
 * Allow several security groups per server.

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.summary = %Q{Awsborn defines servers as instances with a certain disk volume, which makes it easy to restart missing servers.}
     gem.email = "david@icehouse.se"
     gem.homepage = "http://github.com/icehouse/awsborn"
-    gem.authors = ["David Vrensk"]
+    gem.authors = ["David Vrensk", "Jean-Louis Giordano"]
     gem.add_dependency "right_aws", ">= 2.1.0"
     gem.add_dependency "json_pure", ">= 1.2.3"
     gem.add_dependency "rake"

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/awsborn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{awsborn}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["David Vrensk"]
-  s.date = %q{2011-08-11}
+  s.authors = ["David Vrensk", "Jean-Louis Giordano"]
+  s.date = %q{2011-08-16}
   s.description = %q{Awsborn lets you define and launch a server cluster on Amazon EC2.}
   s.email = %q{david@icehouse.se}
   s.extra_rdoc_files = [

data/lib/awsborn/aws_constants.rb

@@ -3,8 +3,8 @@ module Awsborn
 
     AVAILABILITY_ZONES = %w[
       us-east-1a us-east-1b us-east-1c us-east-1d
-      us-west-1a us-west-1b
-      eu-west-1a eu-west-1b
+      us-west-1a us-west-1b us-west-1c
+      eu-west-1a eu-west-1b eu-west-1c
       ap-southeast-1a ap-southeast-1b
       ap-northeast-1a ap-northeast-1b
     ]
@@ -15,14 +15,14 @@ module Awsborn
     SYMBOL_CONSTANT_MAP = (AVAILABILITY_ZONES + INSTANCE_TYPES).inject({}) { |memo,str| memo[str.tr('-.','_').to_sym] = str; memo }
 
     def endpoint_for_zone_and_service (zone, service)
-      region = zone_to_awz_region(zone)
+      region = zone_to_aws_region(zone)
       case service
       when :ec2 then "https://#{region}.ec2.amazonaws.com"
       when :elb then "https://#{region}.elasticloadbalancing.amazonaws.com"
       end
     end
 
-    def zone_to_awz_region (zone)
+    def zone_to_aws_region (zone)
       region = zone.to_s.sub(/[a-z]$/,'').tr('_','-')
       raise UnknownConstantError, "Unknown region: #{region} for zone: #{zone}" unless REGIONS.include? region
       region
@@ -50,7 +50,7 @@ module Awsborn
       type.to_s.tr('.','_').to_sym
     end
 
-    def awz_constant (symbol)
+    def aws_constant (symbol)
       SYMBOL_CONSTANT_MAP[symbol] || raise(UnknownConstantError, "Unknown constant: #{symbol}")
     end
   end

data/lib/awsborn/elb.rb

@@ -23,7 +23,7 @@ module Awsborn
     end
 
     def initialize (zone)
-      @region = zone_to_awz_region(zone)
+      @region = zone_to_aws_region(zone)
       @endpoint = endpoint_for_zone_and_service(@region, :elb)
     end
 
@@ -112,6 +112,15 @@ module Awsborn
       connection.disable_availability_zones_for_load_balancer(balancer_name, *zones)
     end
 
+    def configure_health_check (balancer_name, health_check)
+      logger.debug "Setting health check on load balancer #{balancer_name}"
+      connection.configure_health_check(balancer_name, health_check)
+    end
+
+    def health_status (balancer_name)
+      connection.describe_instance_health(balancer_name, *instances(balancer_name))
+    end
+
     protected
 
     def existing_app_cookie_policies (balancer_name)

data/lib/awsborn/load_balancer.rb

@@ -2,17 +2,24 @@ module Awsborn
   class LoadBalancer
 
     include Awsborn::AwsConstants
-    attr_accessor :name, :only, :except, :region, :listeners, :sticky_cookies
+    attr_accessor :name, :only, :except, :region, :listeners, :sticky_cookies, :health_check_config
 
     DEFAULT_LISTENERS = [ { :protocol => :http, :load_balancer_port => 80, :instance_port => 80} ]
+    DEFAULT_HEALTH_CONFIG = {
+      :healthy_threshold => 10,
+      :unhealthy_threshold => 2,
+      :target => "TCP:80",
+      :timeout => 5,
+      :interval => 30
+    }
     def initialize (name, options={})
       @name = name
       @only   = options[:only] || []
       @except = options[:except] || []
-      @region = zone_to_awz_region(options[:region])
+      @region = zone_to_aws_region(options[:region])
       @listeners = options[:listeners] || DEFAULT_LISTENERS
       @sticky_cookies = options[:sticky_cookies] || []
-      launch unless running?
+      @health_check_config = DEFAULT_HEALTH_CONFIG.merge(options[:health_check] || {})
     end
 
     def elb
@@ -57,6 +64,9 @@ module Awsborn
       elb.create_load_balancer(@name)
     end
 
+    def health_status
+      elb.health_status(@name)
+    end
 
     def update_listeners
       elb.set_load_balancer_listeners(@name, @listeners)
@@ -80,7 +90,13 @@ module Awsborn
       end
     end
 
+    def update_health_config
+      elb.configure_health_check(@name, @health_check_config)
+    end
+
     def update_with (new_servers)
+      launch unless running?
+
       servers_to_be_balanced = new_servers
       servers_to_be_balanced =
         servers_to_be_balanced.select{|s| @only.include?(s.name)}    unless @only.empty?
@@ -92,6 +108,7 @@ module Awsborn
 
       update_listeners
       update_sticky_cookies
+      update_health_config
 
       self.description
     end

data/spec/aws_constants_spec.rb

@@ -15,19 +15,19 @@ describe Awsborn::AwsConstants do
     end
   end
 
-  describe "zone_to_awz_region" do
+  describe "zone_to_aws_region" do
     it "accepts a zone symbol and returns its region" do
-      zone_to_awz_region(:eu_west_1a).should == 'eu-west-1'
+      zone_to_aws_region(:eu_west_1a).should == 'eu-west-1'
     end
     it "accepts an aws zone symbol and returns its region" do
-      zone_to_awz_region('eu-west-1a').should == 'eu-west-1'
+      zone_to_aws_region('eu-west-1a').should == 'eu-west-1'
     end
     it "raise an error if no region found" do
-      expect{zone_to_awz_region('santa-northpole-2b')}.to raise_error(Awsborn::UnknownConstantError)
+      expect{zone_to_aws_region('santa-northpole-2b')}.to raise_error(Awsborn::UnknownConstantError)
     end
     it "returns a region even when a region is given" do
-      zone_to_awz_region('eu-west-1').should == 'eu-west-1'
-      zone_to_awz_region(:eu_west_1).should == 'eu-west-1'
+      zone_to_aws_region('eu-west-1').should == 'eu-west-1'
+      zone_to_aws_region(:eu_west_1).should == 'eu-west-1'
     end
   end
 
@@ -67,15 +67,15 @@ describe Awsborn::AwsConstants do
     end
   end
 
-  describe "awz_constant" do
+  describe "aws_constant" do
     it "should look up an availability zone" do
-      awz_constant(:eu_west_1a).should == "eu-west-1a"
+      aws_constant(:eu_west_1a).should == "eu-west-1a"
     end
     it "should look up an instance type" do
-      awz_constant(:m1_large).should == "m1.large"
+      aws_constant(:m1_large).should == "m1.large"
     end
     it "should raise an error if the symbol is unknown" do
-      expect{awz_constant(:unknown_constant)}.to raise_error(Awsborn::UnknownConstantError)
+      expect{aws_constant(:unknown_constant)}.to raise_error(Awsborn::UnknownConstantError)
     end
   end
 

data/spec/elb_spec.rb

@@ -251,6 +251,21 @@ describe Awsborn::Elb do
         @elb.disable_zones('some-name', ['eu-west-1a', 'eu-west-1b'])
       end
     end
+
+    describe "configure_health_check" do
+      it "forwards to ElbInterface" do
+        @mock_interface.should_receive(:configure_health_check).with('some-name', 'health-check-config')
+        @elb.configure_health_check('some-name', 'health-check-config')
+      end
+    end
+
+    describe "health_status" do
+      it "returns the health status of each instance of the load balancer" do
+        @mock_interface.should_receive(:describe_load_balancers).with('some-name').and_return([{:instances => 'instances'}])
+        @mock_interface.should_receive(:describe_instance_health).with('some-name', 'instances').and_return("health_status")
+        @elb.health_status('some-name')
+      end
+    end
   end
 end
 

data/spec/load_balancer_spec.rb

@@ -5,9 +5,23 @@ describe Awsborn::LoadBalancer do
     @mocked_elb = mock(:elb,
                        :running? => false,
                        :remove_all_cookie_policies => true,
-                       :create_load_balancer => {})
+                       :create_load_balancer => {},
+                       :instances => [],
+                       :zones => [],
+                       :register_instances => true,
+                       :enable_zones => true,
+                       :set_load_balancer_listeners => true,
+                       :describe_load_balancer => "description",
+                      :configure_health_check => true)
     @listener_fixture = [ { :protocol => :tcp, :load_balancer_port => 123, :instance_port => 123} ]
     @cookies_fixture = [ { :ports => [123], :policy => :disabled } ]
+    @health_check_fixture = {
+      :healthy_threshold => 9,
+      :unhealthy_threshold => 3,
+      :target => "TCP:433",
+      :timeout => 6,
+      :interval => 31
+    }
     Awsborn::Elb.stub!(:new).and_return(@mocked_elb)
   end
   describe "initialize" do
@@ -15,22 +29,6 @@ describe Awsborn::LoadBalancer do
       expect { Awsborn::LoadBalancer.new('some-name') }.to raise_error
       expect { Awsborn::LoadBalancer.new('some-name', :region => :blabla) }.to raise_error
     end
-    it "launches the load balancer if not running" do
-      @mocked_elb.should_receive(:running?).with('some-name').and_return(false)
-      @mocked_elb.should_receive(:create_load_balancer).with('some-name').and_return(nil)
-      @balancer = Awsborn::LoadBalancer.new(
-        'some-name',
-        :region => :eu_west_1
-      )
-    end
-    it "does not launch the load balancer if running" do
-      @mocked_elb.should_receive(:running?).with('some-name').and_return(true)
-      @mocked_elb.should_not_receive(:create_load_balancer)
-      @balancer = Awsborn::LoadBalancer.new(
-        'some-name',
-        :region => :eu_west_1
-      )
-    end
     describe "sets all attributes properly" do
       subject do
         @balancer = Awsborn::LoadBalancer.new(
@@ -39,7 +37,8 @@ describe Awsborn::LoadBalancer do
           :only => [:server1, :server2],
           :except => [:server2],
           :listeners => @listener_fixture,
-          :sticky_cookies => @cookies_fixture
+          :sticky_cookies => @cookies_fixture,
+          :health_check => @health_check_fixture
         )
       end
       its(:name)           { should == 'some-name' }
@@ -48,6 +47,7 @@ describe Awsborn::LoadBalancer do
       its(:except)         { should == [:server2] }
       its(:listeners)      { should == @listener_fixture }
       its(:sticky_cookies) { should == @cookies_fixture }
+      its(:health_check_config) { should == @health_check_fixture }
     end
     describe "sets proper default values" do
       subject do
@@ -60,6 +60,19 @@ describe Awsborn::LoadBalancer do
       its(:except)         { should == [] }
       its(:listeners)      { should == Awsborn::LoadBalancer::DEFAULT_LISTENERS }
       its(:sticky_cookies) { should == [] }
+      its(:health_check_config) { should == Awsborn::LoadBalancer::DEFAULT_HEALTH_CONFIG }
+    end
+    it "accepts partial health config" do
+      balancer = Awsborn::LoadBalancer.new(
+        'some-name',
+        :region => :eu_west_1,
+        :health_check => { :target => 'HTTP:80/test.html' }
+      )
+      balancer.health_check_config[:target].should == 'HTTP:80/test.html'
+      [:healthy_threshold, :unhealthy_threshold, :timeout, :interval].each do |other_attribute|
+        balancer.health_check_config[other_attribute].should ==
+          Awsborn::LoadBalancer::DEFAULT_HEALTH_CONFIG[other_attribute]
+      end
     end
   end
 
@@ -180,6 +193,27 @@ describe Awsborn::LoadBalancer do
     end
   end
 
+  describe "health_status" do
+    it "delegates to elb" do
+      @mocked_elb.should_receive(:health_status).with('some-name').and_return('health_status')
+      @balancer = Awsborn::LoadBalancer.new(
+        'some-name',
+        :region => :eu_west_1
+      ).health_status.should == 'health_status'
+    end
+  end
+
+  describe "update_health_config" do
+    it "delegates to elb" do
+      @mocked_elb.should_receive(:configure_health_check).with('some-name', @health_check_fixture)
+      @balancer = Awsborn::LoadBalancer.new(
+        'some-name',
+        :region => :eu_west_1,
+        :health_check => @health_check_fixture
+      ).update_health_config
+    end
+  end
+
   describe "update_listeners" do
     it "delegates to elb" do
       @mocked_elb.should_receive('set_load_balancer_listeners').with('some-name', @listener_fixture)
@@ -254,11 +288,22 @@ describe Awsborn::LoadBalancer do
         mock(:server1, :name => :server2, :instance_id => 'i-00000002', :zone => :eu_west_1b)
       ]
     end
-    it "sets new instances, sets new zones, updates listeners and updates sticky cookies" do
+    it "launches the load balancer if not running" do
+      @mocked_elb.should_receive(:running?).with('some-name').and_return(false)
+      @mocked_elb.should_receive(:create_load_balancer).with('some-name').and_return(nil)
+      @balancer.update_with(@new_servers)
+    end
+    it "does not launch the load balancer if running" do
+      @mocked_elb.should_receive(:running?).with('some-name').and_return(true)
+      @mocked_elb.should_not_receive(:create_load_balancer)
+      @balancer.update_with(@new_servers)
+    end
+    it "sets instances and new zones and updates listeners, sticky cookies and health config" do
       @balancer.should_receive(:instances=).with(['i-00000001', 'i-00000002'])
       @balancer.should_receive(:zones=).with(['eu-west-1a', 'eu-west-1b'])
       @balancer.should_receive(:update_listeners)
       @balancer.should_receive(:update_sticky_cookies)
+      @balancer.should_receive(:update_health_config)
       @balancer.should_receive(:description).and_return('description')
       @balancer.update_with(@new_servers).should == 'description'
     end
@@ -269,6 +314,7 @@ describe Awsborn::LoadBalancer do
       @balancer.should_receive(:zones=).with(['eu-west-1a'])
       @balancer.should_receive(:update_listeners)
       @balancer.should_receive(:update_sticky_cookies)
+      @balancer.should_receive(:update_health_config)
       @balancer.should_receive(:description).and_return('description')
       @balancer.update_with(@new_servers).should == 'description'
     end
@@ -279,6 +325,7 @@ describe Awsborn::LoadBalancer do
       @balancer.should_receive(:zones=).with(['eu-west-1b'])
       @balancer.should_receive(:update_listeners)
       @balancer.should_receive(:update_sticky_cookies)
+      @balancer.should_receive(:update_health_config)
       @balancer.should_receive(:description).and_return('description')
       @balancer.update_with(@new_servers).should == 'description'
     end

data/spec/server_spec.rb

@@ -17,15 +17,15 @@ describe Awsborn::Server do
     @server = SampleServer.new :sample, :zone => :eu_west_1a, :disk => {:sdf => "vol-aaaaaaaa"}
   end
 
-  describe "awz_constant" do
+  describe "aws_constant" do
     it "should look up an availability zone" do
-      @server.awz_constant(:eu_west_1a).should == "eu-west-1a"
+      @server.aws_constant(:eu_west_1a).should == "eu-west-1a"
     end
     it "should look up an instance type" do
-      @server.awz_constant(:m1_large).should == "m1.large"
+      @server.aws_constant(:m1_large).should == "m1.large"
     end
     it "should raise an error if the symbol is unknown" do
-      expect{@server.awz_constant(:unknown_constant)}.to raise_error(Awsborn::UnknownConstantError)
+      expect{@server.aws_constant(:unknown_constant)}.to raise_error(Awsborn::UnknownConstantError)
     end
   end
 

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: awsborn
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - David Vrensk
+- Jean-Louis Giordano
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 +02:00
+date: 2011-08-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency