hako 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c78bf9739661a4f8020dadce5cd49efd68092f0
-  data.tar.gz: 731b2f7faec9a00225048cbbcfa3c3223326d15b
+  metadata.gz: ee95e37d80652b4fab57fff012c2b40e0b8ee5d2
+  data.tar.gz: 30ddde0b682e1dc63d1119c1de91c7bb2dc3dacf
 SHA512:
-  metadata.gz: e7725a47c69273f2604a0039ec74a0a5d4d4a2c785642287689b6cec0ba58dc9ab790d1c659372de27fd1e34f18a878486b1abd5adb37e70ba4ec954683f893e
-  data.tar.gz: 511a77047f7c97c91114ab1dfad3b90828c1cdaf991c3476cf92eafc344197767b4109873b34ef8913e0e43c6c92e54d2657fcf85db4f978fa5af3ded2563a05
+  metadata.gz: 59d03d5f2422b3fb21dcc20db36cc850a49ac6fab2af338b94db6946a6a0b01fa8d2ffdb2252a7e8b12be245de4899e391182d082d07a54d4e43ed150f8e2e6a
+  data.tar.gz: d8cc1d44728b3c9a64287a9e82d6633fb24bca4ff3a638a1b540251d5df02d05dd3c4be0849c4d8c5ac0bfce6be5a5d5a06b54c95abcde33dc162a6af435bb92

data/examples/hello-autoscaling.yml

@@ -0,0 +1,56 @@
+scheduler:
+  type: ecs
+  region: ap-northeast-1
+  cluster: eagletmt
+  desired_count: 2
+  role: ecsServiceRole
+  elb:
+    listeners:
+      - load_balancer_port: 80
+        protocol: HTTP
+    subnets:
+      - subnet-XXXXXXXX
+      - subnet-YYYYYYYY
+    security_groups:
+      - sg-ZZZZZZZZ
+  autoscaling:
+    role_arn: arn:aws:iam::012345678901:role/ecsAutoscaleRole
+    min_capacity: 1
+    max_capacity: 4
+    policies:
+      # Add one task when ecs-scaling-out-hello-autoscaling-service is in alarm state
+      - alarms: [ecs-scaling-out-hello-autoscaling-service]
+        cooldown: 300
+        adjustment_type: ChangeInCapacity
+        scaling_adjustment: 1
+        metric_interval_lower_bound: 0
+        metric_aggregation_type: Average
+      # Remove one task when ecs-scaling-in-hello-autoscaling-service is in alarm state
+      - alarms: [ecs-scaling-in-hello-autoscaling-service]
+        cooldown: 300
+        adjustment_type: ChangeInCapacity
+        scaling_adjustment: 1
+        metric_interval_upper_bound: 0
+        metric_aggregation_type: Average
+app:
+  image: ryotarai/hello-sinatra
+  memory: 128
+  cpu: 256
+  port: 3000
+  env:
+    $providers:
+      - type: file
+        path: hello.env
+    PORT: 3000
+    MESSAGE: '#{username}-san'
+additional_containers:
+  front:
+    image_tag: hako-nginx
+    memory: 32
+    cpu: 32
+scripts:
+  - <<: !include front.yml
+    locations:
+      /:
+        allow_only_from:
+          - 10.0.0.0/24

data/examples/hello.yml

@@ -3,7 +3,7 @@ scheduler:
   region: ap-northeast-1
   cluster: eagletmt
   desired_count: 2
-  task_role_arn: HelloRole
+  task_role_arn: arn:aws:iam::012345678901:role/HelloRole
 app:
   image: ryotarai/hello-sinatra
   memory: 128

data/lib/hako/schedulers/ecs.rb

@@ -4,6 +4,7 @@ require 'hako'
 require 'hako/scheduler'
 require 'hako/schedulers/ecs_definition_comparator'
 require 'hako/schedulers/ecs_elb'
+require 'hako/schedulers/ecs_autoscaling'
 
 module Hako
   module Schedulers
@@ -21,6 +22,9 @@ module Hako
         @role = options.fetch('role', nil)
         @task_role_arn = options.fetch('task_role_arn', nil)
         @ecs_elb_options = options.fetch('elb', nil)
+        if options.key?('autoscaling')
+          @autoscaling = EcsAutoscaling.new(options.fetch('autoscaling'), dry_run: @dry_run)
+        end
         @started_at = nil
         @container_instance_arn = nil
       end
@@ -39,6 +43,9 @@ module Hako
           definitions.each do |d|
             Hako.logger.info "Add container #{d}"
           end
+          if @autoscaling
+            @autoscaling.apply(Aws::ECS::Types::Service.new(cluster_arn: @cluster, service_name: @app_id))
+          end
         else
           task_definition = register_task_definition(definitions)
           if task_definition == :noop
@@ -50,8 +57,14 @@ module Hako
           service = create_or_update_service(task_definition.task_definition_arn, front_port)
           if service == :noop
             Hako.logger.info "Service isn't changed"
+            if @autoscaling
+              @autoscaling.apply(describe_service)
+            end
           else
             Hako.logger.info "Updated service: #{service.service_arn}"
+            if @autoscaling
+              @autoscaling.apply(service)
+            end
             wait_for_ready(service)
           end
           Hako.logger.info 'Deployment completed'
@@ -532,6 +545,10 @@ module Hako
             desired_count: @desired_count,
             task_definition: task_definition_arn,
           }
+          if @autoscaling
+            # Keep current desired_count if autoscaling is enabled
+            params[:desired_count] = service.desired_count
+          end
           if service_changed?(service, params)
             ecs_client.update_service(params).service
           else

data/lib/hako/schedulers/ecs_autoscaling.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+require 'hako'
+require 'hako/error'
+
+module Hako
+  module Schedulers
+    class EcsAutoscaling
+      def initialize(options, dry_run:)
+        @dry_run = dry_run
+        @role_arn = required_option(options, 'role_arn')
+        @min_capacity = required_option(options, 'min_capacity')
+        @max_capacity = required_option(options, 'max_capacity')
+        @policies = required_option(options, 'policies').map { |r| Policy.new(r) }
+      end
+
+      PUT_METRIC_ALARM_OPTIONS = %i[
+        alarm_name alarm_description actions_enabled ok_actions alarm_actions
+        insufficient_data_actions metric_name namespace statistic dimensions
+        period unit evaluation_periods threshold comparison_operator
+      ].freeze
+
+      # @param [Aws::ECS::Types::Service] service
+      # @return [nil]
+      def apply(service)
+        resource_id = "service/#{service.cluster_arn.slice(%r{[^/]+\z}, 0)}/#{service.service_name}"
+        service_namespace = 'ecs'
+        scalable_dimension = 'ecs:service:DesiredCount'
+
+        Hako.logger.info("Registering scalable target to #{resource_id}")
+        unless @dry_run
+          autoscaling_client.register_scalable_target(
+            service_namespace: service_namespace,
+            resource_id: resource_id,
+            scalable_dimension: scalable_dimension,
+            min_capacity: @min_capacity,
+            max_capacity: @max_capacity,
+            role_arn: @role_arn,
+          )
+        end
+        @policies.each do |policy|
+          Hako.logger.info("Configuring scaling policy #{policy.name}")
+          if @dry_run
+            policy.alarms.each do |alarm_name|
+              Hako.logger.info("Configuring #{alarm_name}'s alarm_action")
+            end
+          else
+            policy_arn = autoscaling_client.put_scaling_policy(
+              policy_name: policy.name,
+              service_namespace: service_namespace,
+              resource_id: resource_id,
+              scalable_dimension: scalable_dimension,
+              policy_type: 'StepScaling',
+              step_scaling_policy_configuration: {
+                adjustment_type: policy.adjustment_type,
+                step_adjustments: [
+                  {
+                    scaling_adjustment: policy.scaling_adjustment,
+                    metric_interval_lower_bound: policy.metric_interval_lower_bound,
+                    metric_interval_upper_bound: policy.metric_interval_upper_bound,
+                  },
+                ],
+                cooldown: policy.cooldown,
+                metric_aggregation_type: policy.metric_aggregation_type,
+              },
+            ).policy_arn
+
+            alarms = cw_client.describe_alarms(alarm_names: policy.alarms).flat_map(&:metric_alarms).map { |a| [a.alarm_name, a] }.to_h
+            policy.alarms.each do |alarm_name|
+              alarm = alarms.fetch(alarm_name) { raise Error.new("Alarm #{alarm_name} does not exist") }
+              Hako.logger.info("Updating #{alarm_name}'s alarm_actions from #{alarm.alarm_actions} to #{[policy_arn]}")
+              params = PUT_METRIC_ALARM_OPTIONS.map { |key| [key, alarm.public_send(key)] }.to_h
+              params[:alarm_actions] = [policy_arn]
+              cw_client.put_metric_alarm(params)
+            end
+          end
+        end
+        nil
+      end
+
+      private
+
+      # @param [Hash] options
+      # @param [String] key
+      # @return [Object]
+      def required_option(options, key)
+        options.fetch(key) { raise Error.new("scheduler.autoscaling.#{key} must be set") }
+      end
+
+      # @return [Aws::ApplicationAutoScaling]
+      def autoscaling_client
+        @autoscaling_client ||= Aws::ApplicationAutoScaling::Client.new
+      end
+
+      # @return [Aws::CloudWatch::Client]
+      def cw_client
+        @cw_client ||= Aws::CloudWatch::Client.new
+      end
+
+      class Policy
+        attr_reader :alarms, :cooldown, :adjustment_type, :scaling_adjustment, :metric_interval_lower_bound, :metric_interval_upper_bound, :metric_aggregation_type
+
+        # @param [Hash] options
+        def initialize(options)
+          @alarms = required_option(options, 'alarms')
+          @cooldown = required_option(options, 'cooldown')
+          @adjustment_type = required_option(options, 'adjustment_type')
+          @scaling_adjustment = required_option(options, 'scaling_adjustment')
+          @metric_interval_lower_bound = options.fetch('metric_interval_lower_bound', nil)
+          @metric_interval_upper_bound = options.fetch('metric_interval_upper_bound', nil)
+          @metric_aggregation_type = required_option(options, 'metric_aggregation_type')
+        end
+
+        # @return [String]
+        def name
+          alarms.join('-and-')
+        end
+
+        private
+
+        # @param [Hash] options
+        # @param [String] key
+        # @return [Object]
+        def required_option(options, key)
+          options.fetch(key) { raise Error.new("scheduler.autoscaling.policies.#{key} must be set") }
+        end
+      end
+    end
+  end
+end

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.16.0'
+  VERSION = '0.17.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -114,6 +114,7 @@ files:
 - bin/console
 - bin/setup
 - examples/front.yml
+- examples/hello-autoscaling.yml
 - examples/hello-lb.yml
 - examples/hello.env
 - examples/hello.yml
@@ -135,6 +136,7 @@ files:
 - lib/hako/scheduler.rb
 - lib/hako/schedulers.rb
 - lib/hako/schedulers/ecs.rb
+- lib/hako/schedulers/ecs_autoscaling.rb
 - lib/hako/schedulers/ecs_definition_comparator.rb
 - lib/hako/schedulers/ecs_elb.rb
 - lib/hako/script.rb