knuckle_cluster 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a3ddc54ca48b30d78d88c8e92e90232b52ac23a
-  data.tar.gz: 4d18251585f3cf240aa526e366bc69ed4f5f7133
+  metadata.gz: e6f39b842c827055e0c0966f03fff7a4e201b023
+  data.tar.gz: 299b8fc8dcf5e90f111686faf98adadd4b078535
 SHA512:
-  metadata.gz: af26f21868f728a336f9e8ffb4d031ff8506e2332ba741d1f9bfb3c34a19f5681fe50a6e701036597e30dfe6c5ce9b3895098883211cb95d265ac40863eb7d34
-  data.tar.gz: ae7c93d80043b3730507c4850f9184ed0ccc5ae9bf944e855d68969f2b23abfe3915371e1a815e90a95720af449ab22ada3d841f8ef17620663eda7df8fe938e
+  metadata.gz: 9a238237ac947360cd94e17600dd0904dab91a298d850cdd63d8156c817015351786d67147319561671d8a8454c19b75289e551b6666d34a1571f087b889e1a5
+  data.tar.gz: 4a93477e310c70decc1e510d0b899731599a621f38d493bc5da45b0e358951780de9bcd3920deaf999cceeecb568122604748ede1f6dcacaf13d5f0c8a73952e

data/README.md

@@ -69,6 +69,9 @@ platform:
       local_port: 54321
       remote_host: postgres-db.yourcompany.com
       remote_port: 5432
+  hide:
+    container: some_container_regex_i_dont_care_about
+    task: some_task_regex_i_dont_care_about
 ```
 
 You can also use inheritance to simplify the inclusion of multiple similar targets:
@@ -209,6 +212,7 @@ ssh_username | The username to conncet. Will default to `ec2-user`
 sudo | true or false - will sudo the `docker` command on the target machine. Usually not needed unless the user is not a part of the `docker` group.
 aws_vault_profile | If you use the `aws-vault` tool to manage your AWS credentials, you can specify a profile here that will be automatically used to connect to this cluster.
 profile | Another profile to inherit settings from. Settings from lower profiles can be overridden in higher ones.
+hide | allows you to specify a regex for either `task` or `container` to omit these from being shown
 
 ## Spot Fleets
 If you wish to see what instances are running within a spot fleet, KnuckleCluster can do that too!.  In your config, use `spot_request_id` instead of `cluster_name`.  Note that the `containers` command will not work when invoking (use `agents` instead).

data/lib/knuckle_cluster.rb

@@ -30,7 +30,8 @@ module KnuckleCluster
         sudo: false,
         aws_vault_profile: nil,
         shortcuts: {},
-        tunnels: {})
+        tunnels: {},
+        hide: {})
       @cluster_name      = cluster_name
       @spot_request_id   = spot_request_id
       @asg_name          = asg_name
@@ -42,6 +43,7 @@ module KnuckleCluster
       @aws_vault_profile = aws_vault_profile
       @shortcuts         = shortcuts
       @tunnels           = tunnels
+      @hide              = hide
 
       if @cluster_name.nil? && @spot_request_id.nil? && @asg_name.nil?
         raise "Must specify either cluster_name, spot_request_id or asg name"
@@ -205,6 +207,7 @@ module KnuckleCluster
           EcsAgentRegistry.new(
             aws_client_config: aws_client_config,
             cluster_name:      cluster_name,
+            hide:              @hide,
           )
         elsif @spot_request_id
           SpotRequestInstanceRegistry.new(

data/lib/knuckle_cluster/ecs_agent_registry.rb

@@ -7,9 +7,10 @@ module KnuckleCluster
   class EcsAgentRegistry
     extend Forwardable
 
-    def initialize(aws_client_config:, cluster_name:)
+    def initialize(aws_client_config:, cluster_name:, hide: {})
       @aws_client_config = aws_client_config
-      @cluster_name = cluster_name
+      @cluster_name      = cluster_name
+      @hide              = hide
     end
 
     def agents
@@ -72,6 +73,7 @@ module KnuckleCluster
         ecs_client:     ecs_client,
         cluster_name:   cluster_name,
         agent_registry: self,
+        hide:           @hide,
       )
     end
 

data/lib/knuckle_cluster/task_registry.rb

@@ -3,14 +3,15 @@ require 'knuckle_cluster/container'
 
 module KnuckleCluster
   class TaskRegistry
-    def initialize(ecs_client:, cluster_name:, agent_registry:)
-      @ecs_client = ecs_client
-      @cluster_name = cluster_name
+    def initialize(ecs_client:, cluster_name:, agent_registry:, hide: {})
+      @ecs_client     = ecs_client
+      @cluster_name   = cluster_name
       @agent_registry = agent_registry
+      @hide           = hide
     end
 
     def tasks
-      @tasks ||= load_tasks
+      @tasks ||= load_tasks.compact
     end
 
     def containers
@@ -41,15 +42,28 @@ module KnuckleCluster
       ecs_client.describe_tasks(tasks: task_ids, cluster: cluster_name).tasks.flat_map do |task|
         agent = agent_registry.find_by(container_instance_arn: task.container_instance_arn)
 
+        task_name = task.task_definition_arn[/.*\/(.*):\d/,1]
+
+        if @hide[:task]
+          regex = Regexp.new(@hide[:task])
+          next if regex.match(task_name)
+        end
+
+        # next if task_name.include? 'datadog'
         Task.new(
           arn:                    task.task_arn,
           container_instance_arn: task.container_instance_arn,
           agent:                  agent,
           definition:             task.task_definition_arn[/.*\/(.*):.*/,1],
-          name:                   task.task_definition_arn[/.*\/(.*):\d/,1],
+          name:                   task_name,
           task_registry:          self,
         ).tap do |new_task|
           task.containers.each do |container|
+            if @hide[:container]
+              regex = Regexp.new(@hide[:container])
+              next if regex.match(container.name)
+            end
+
             index += 1
 
             all_containers << Container.new(

data/lib/knuckle_cluster/version.rb

@@ -1,3 +1,3 @@
 module KnuckleCluster
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knuckle_cluster
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Envato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler