aws_pocketknife 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db1bec7416632cbd8cd54bf6af1adc7209fd49d7
-  data.tar.gz: 249ea4be3391a5500cada3d825c47fe26b04910d
+  metadata.gz: f8f43490b239504548b877428246e8085070b819
+  data.tar.gz: 13e6837ec6e9c17bf4731d169c18c71c55acf779
 SHA512:
-  metadata.gz: db5068777a8776af1c501b6c3682f47fdc75248c64ce39f2f96d48855820ab90bb3b28dfcf8608d15c62fcb2e5061207ca49ce9b74da9880cf00fe15c2465756
-  data.tar.gz: af50ff9246c1557772e439fb715ae6e52174626246ed3c68509f949f12746e5faa7b82eb5ba83af237886f6b6121b9903fbc49718442719cdf7564ea1837c291
+  metadata.gz: b5af1f1c2c9b19f79b4df3022a1cb3ce91b8e38e223a65901fa889173f1482e100794d47b35e8030637672eee27dc851369af148b50a5c708a82a52e73d3f569
+  data.tar.gz: f0c6c4b76d964b8f2bbba09141cc1ed19f7b7d034d4269de8e21dbf09c1370358b68cc35dead5fa857605d0c4fc1b127bfd2dbff9783a5f82dc38ee1b22c88c9

data/aws_pocketknife.gemspec

@@ -26,6 +26,7 @@ different accounts in a web browser. The only way would be to use diffente brows
   spec.add_dependency 'aws-sdk-core', '~> 2.1'
   spec.add_dependency 'retryable', '~> 2.0'
   spec.add_dependency "rake", "~> 10.0"
+  spec.add_dependency "colorize", "= 0.8.1"
   spec.add_dependency "erubis", "= 2.7.0"
   spec.add_dependency "pretty_table", "= 0.1.0"
   spec.add_dependency "awesome_print", "= 1.6.1"

data/lib/aws_pocketknife/cli/ecs.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "colorize"
 require "aws_pocketknife"
 
 module AwsPocketknife
@@ -81,20 +82,61 @@ module AwsPocketknife
         AwsPocketknife::Ecs.nice_print(object: resp.to_h)
       end
 
-      desc "list_instances for CLUSTER_NAME", "list instances for a given cluster"
+      # container instance
+      desc "drain_instances CLUSTER_NAME, CONTAINERS", "drains containers associated to the ecs cluster. CONTAINERS can a be a string delimited list"
+      def drain_instances(cluster, names)
+        resp = AwsPocketknife::Ecs.drain_instances cluster: cluster, names: names
+        puts ""
+        puts "Response: "
+        puts ""
+        AwsPocketknife::Ecs.nice_print(object: resp.to_a)
+      end
+
+      # container instance
+      desc "list_instance_tasks CLUSTER_NAME, CONTAINER_NAME", "list tasks running in container (instance)"
+      def list_instance_tasks(cluster, name)
+        resp = AwsPocketknife::Ecs.list_container_tasks cluster: cluster, container_name: name
+        headers = ["name", "started_at", "stopped_at", "last_status", "task"]
+        data = []
+        if resp.nil?
+          puts "No tasks found"
+        else
+          resp.tasks.each do |task|
+            data << [task.task_definition_arn.split('/')[1], task.started_at, task.stopped_at, task.last_status, task.task_arn.split('/')[1]]            
+          end
+          AwsPocketknife::Ecs.pretty_table(headers: headers, data: data)
+        end
+      end
+
+      desc "list_instances CLUSTER_NAME", "list instances for a given cluster"
       def list_instances(cluster)
         instances = AwsPocketknife::Ecs.list_container_instances cluster: cluster
-        headers = ["name", "ec2_instance_id", "pending_tasks_count","running_tasks_count", 
-        "status"]
+        headers = ["name", "ec2_instance_id", "agent_connected",
+                  "pending_tasks_count","running_tasks_count", "status",
+                  "cpu (units)", "mem (MiB)"
+                ]
         data = []
         if instances.nil?
           puts "No instances found"
         else
           instances.each do |instance|
             info = instance[:info]
-            data << [instance[:name], info.ec2_instance_id, info.pending_tasks_count,
-                    info.running_tasks_count, info.status
-            ]
+            # tasks = instance[:tasks]
+            # task_list = []
+            # unless tasks.empty?
+            #   tasks.tasks.each do |t|
+            #     task_list << t.task_definition_arn.split('/')[1]
+            #   end
+            # end
+            cpu_total = info.registered_resources[0].integer_value
+            mem_total = info.registered_resources[1].integer_value
+            cpu_available = info.remaining_resources[0].integer_value
+            mem_available = info.remaining_resources[1].integer_value
+            connected = info.agent_connected
+            data << [instance[:name], info.ec2_instance_id, connected,
+              info.pending_tasks_count, info.running_tasks_count, info.status,
+              "#{cpu_available} / #{cpu_total}", "#{mem_available} / #{mem_total}"
+            ]            
           end
           AwsPocketknife::Ecs.pretty_table(headers: headers, data: data)
         end

data/lib/aws_pocketknife/ecs.rb

@@ -23,6 +23,18 @@ module AwsPocketknife
 
       Logging = Common::Logging.logger
 
+      # container instance
+
+      # set a list of instances to draining. instances is a comma delimited string
+
+      def drain_instances(cluster: '', names: '')
+        ecs_client.update_container_instances_state({
+          cluster: cluster,
+          container_instances: names.split(';'), # required
+          status: "DRAINING", # required, accepts ACTIVE, DRAINING
+        })
+      end
+
       def describe_container_instances(cluster: '', container: '')
         ecs_client.describe_container_instances({cluster: cluster, container_instances: [container]}).container_instances.first
       end
@@ -47,14 +59,23 @@ module AwsPocketknife
 
         responses.each do |container|
           container_map = {}
+          task_list = []
           container_map[:name] = container.split('/')[1]
           info = describe_container_instances cluster: cluster, container: container
           container_map[:info] = info
+          #container_map[:tasks] = list_container_tasks(cluster: cluster, container_name: container_map[:name])
           containers_list << container_map
         end
         return containers_list
       end
 
+      # list tasks in container instance
+      def list_container_tasks(cluster: '', container_name: '')
+        tasks_list = []
+        tasks = list_tasks cluster: cluster, container_instance: container_name
+        describe_tasks(cluster: cluster, tasks: tasks)
+      end
+
       # clusters
 
       def describe_clusters(name: '')
@@ -154,6 +175,24 @@ module AwsPocketknife
         return resp.task_definition.container_definitions.first
       end
 
+      def list_tasks cluster: '', container_instance: ''
+        ecs_client.list_tasks({
+          cluster: cluster, 
+          container_instance: container_instance, 
+        }).task_arns
+      end
+
+      def describe_tasks cluster: '', tasks: []
+        if tasks.empty?
+          return []
+        else
+          return ecs_client.describe_tasks({
+            cluster: cluster,
+            tasks: tasks, 
+          })
+        end
+      end
+
       # helpers
 
       def get_services(next_token: "", max_results: 100, cluster: '')

data/lib/aws_pocketknife/version.rb

@@ -1,3 +1,3 @@
 module AwsPocketknife
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_pocketknife
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Gustavo Soares Souza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-21 00:00:00.000000000 Z
+date: 2017-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement