chopshop-logreader 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4643ced8d7e2c59fbf952f664830b153535e759faec0808a0929fa468e6a527
-  data.tar.gz: b3297dd87e662429b8a7fb8eb8319572d58bddc08dedb8bfc182732b1816bb64
+  metadata.gz: aa1d6a0266d4f7ee6fe20dd3a0d0e5042e1f587f5d276ba11a514b811742ff1c
+  data.tar.gz: d90185bece540bbce81b47e31a8346ad976f17ed54688d0234c26a3f277c62bf
 SHA512:
-  metadata.gz: 6914d2d72ed31d866a8db404d3593e5a8440f4982df84b88a8d012828b2b08d74987337b1f31a97153facff046a6bb3cee4d58af9822bc145556628ca983c127
-  data.tar.gz: 29f0107c67bc1360c89c5f60ea56919b99daa5bc71b1269a694a11b37d74cb2d5be28bef2304251d6776ab8aee6387e150c0b16fd74c19ff1a6491d8258cade6
+  metadata.gz: 3bd32954bfc925ff2194b51ea5704764152b248134a5e228b30973d5f7c2991fb8cccf540db357193fe76508a2ba03cb54dc271223cf1a4946ed2fc035614045
+  data.tar.gz: a993a805d2f281005b75b64cbc94deae2fc1401ec19d29a5f08370e6f426cc28c13664349050c21703b6394afefd34d21a286b33b2939537afd5ca01bdc6bf36

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chopshop-logreader (0.2.2)
+    chopshop-logreader (0.2.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/chopshop/logreader/executor.rb

@@ -27,20 +27,25 @@ module Chopshop
         profile = options.profile || ENV["AWS_PROFILE"] || ENV["PROFILE"]
         tenant = options.tenant || ENV["DEFAULT_TENANT"]
         region = options.region || ENV["AWS_REGION"] || "us-east-1"
+        container = options.container
 
-        container = nil
-        service = ARGV[0]
+        service = nil
+        service_name = ARGV[0]
         `rally-kubectl -a #{region} -e #{profile} -t #{tenant}`
-        puts "looking for valid container"
-        while !container
-          containers = `kubectl get pods --namespace #{options.namespace} | grep #{service}`
-          container = containers.split("\n").map {|line| line.split(" ") }.each do |line|
+        puts "looking for valid service container"
+        while !service
+          services = `kubectl get pods --namespace #{options.namespace} | grep #{service_name}`
+          service = services.split("\n").map {|line| line.split(" ") }.each do |line|
             match_data = REGEX.match(line[4])
             line[5] = TIME_CALCULATOR[match_data.captures[1].downcase] * match_data.captures[0].to_i + TIME_CALCULATOR[match_data.captures[3].downcase] * match_data.captures[2].to_i
           end.select{|line| line[2] == options.status }.sort_by {|line| line[5] }.first
 
-          if container
-            exec "kubectl logs --follow=#{options.follow} --tail=#{options.lines} --namespace connect #{container[0]}"
+          if service
+            if container
+              exec "kubectl logs --follow=#{options.follow} --tail=#{options.lines} --namespace connect --container=#{container} #{service[0]}"
+            else
+              exec "kubectl logs --follow=#{options.follow} --tail=#{options.lines} --namespace connect #{service[0]}"
+            end
           end
 
           print "."

data/lib/chopshop/logreader/parser.rb

@@ -8,16 +8,17 @@ module Chopshop
         options = OpenStruct.new(
           follow: true, # follow output from log file
           lines: -1, # whole file always,
-          status: "Running", # look for a currently running container
+          status: "Running", # look for a currently running service
           namespace: "connect",
           tenant: nil,
           profile: nil,
-          region: nil
+          region: nil,
+          container: nil
         )
 
 
         OptionParser.new do |opts|
-          opts.banner = "Usage: ruby log-reader.rb SERVICE [options]"
+          opts.banner = "Usage: chopshop-logreader SERVICE [options]"
 
           opts.on("-f [FOLLOW]", "--follow [FOLLOW]", "boolean true/false on whether to follow output from the file. default: true", TrueClass) do |follow|
             options[:follow] = follow
@@ -27,11 +28,11 @@ module Chopshop
             options[:lines] = lines
           end
 
-          opts.on("-s [STATUS]", "--status [STATUS]", "valid values: Completed|Running|Error. will only look for containers with the given status. default: Running", String) do |status|
+          opts.on("-s [STATUS]", "--status [STATUS]", "valid values: Completed|Running|Error. will only look for services/jobs with the given status. default: Running", String) do |status|
             options[:status] = status
           end
 
-          opts.on("-n [NAMESPACE]", "--namespace [NAMESPACE]", "sets the kubernetes namespace to look for containers in. default: connect", String) do |status|
+          opts.on("-n [NAMESPACE]", "--namespace [NAMESPACE]", "sets the kubernetes namespace to look for service/job in. default: connect", String) do |status|
             options[:status] = status
           end
 
@@ -43,7 +44,11 @@ module Chopshop
             options[:region] = region
           end
 
-          opts.on("-t [TENANT]", "--tenant [TENANT]", "sets the kubernetes tenant to look for containers in. default: nil.  You must provide this value or set the ENV VAR DEFAULT_TENANT'", String) do |tenant|
+          opts.on("-c [CONTAINER]", "--container [CONTAINER]", "sets the kubernetes tenant to look for containers in. default: nil. Often not needed", String) do |container|
+            options[:container] = container
+          end
+
+          opts.on("-t [TENANT]", "--tenant [TENANT]", "sets the kubernetes tenant to look for the service/job in. default: nil.  You must provide this value or set the ENV VAR DEFAULT_TENANT'", String) do |tenant|
             options[:tenant] = tenant
           end
 

data/lib/chopshop/logreader/version.rb

@@ -1,5 +1,5 @@
 module Chopshop
   module Logreader
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chopshop-logreader
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Travis Perdue