kontena-cli 0.14.7 → 0.15.0.rc1

data/lib/kontena/cli/services/list_command.rb

@@ -12,8 +12,8 @@ module Kontena::Cli::Services
 
       grids = client(token).get("grids/#{current_grid}/services")
       services = grids['services'].sort_by{|s| s['updated_at'] }.reverse
-      titles = ['NAME', 'INSTANCES', 'STATEFUL', 'STATE', 'EXPOSED PORTS']
-      puts "%-60s %-10s %-8s %-10s %-50s" % titles
+      titles = ['NAME', 'INSTANCES', 'STATEFUL', 'STATE', 'HEALTH', 'EXPOSED PORTS']
+      puts "%-60s %-10s %-8s %-10s %-10s %-50s" % titles
       services.each do |service|
         stateful = service['stateful'] ? 'yes' : 'no'
         running = service['instances']['running']
@@ -22,14 +22,28 @@ module Kontena::Cli::Services
         ports = service['ports'].map{|p|
           "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"
         }.join(", ")
+        health = 'unknown'
+        if service['health_status']
+          icon = "■"
+          healthy = service.dig('health_status', 'healthy')
+          total = service.dig('health_status', 'total')
+          color = :green
+          if healthy == 0
+            color = :red
+          elsif healthy > 0 && healthy < total
+            color = :yellow
+          end
+          health = "■".colorize(color)
+        end 
         vars = [
           service['name'],
           instances,
           stateful,
           service['state'],
+          health,
           ports
         ]
-        puts "%-60.60s %-10.10s %-8s %-10s %-50s" % vars
+        puts "%-60.60s %-10.10s %-8s %-10s %-10s %-50s" % vars
       end
     end
   end

data/lib/kontena/cli/services/logs_command.rb

@@ -15,26 +15,71 @@ module Kontena::Cli::Services
     def execute
       require_api_url
       token = require_token
-      last_id = nil
-      loop do
-        query_params = []
-        query_params << "limit=#{lines}"
-        query_params << "from=#{last_id}" unless last_id.nil?
-        query_params << "since=#{since}" if !since.nil? && last_id.nil?
-        query_params << "container=#{name}-#{instance}" if instance
-
-        result = client(token).get("services/#{current_grid}/#{name}/container_logs?#{query_params.join('&')}")
-        result['logs'].each do |log|
-          color = color_for_container(log['name'])
-          instance_number = log['name'].match(/^.+-(\d+)$/)[1]
-          name = instance_number.nil? ? log['name'] : instance_number
-          prefix = "#{log['created_at']} [#{name}]:".colorize(color)
-          puts "#{prefix} #{log['data']}"
-          last_id = log['id']
+      
+
+      query_params = {}
+      query_params[:limit] = lines if lines
+      query_params[:since] = since if since
+      query_params[:container] = "#{name}-#{instance}" if instance
+
+      if tail?
+        @buffer = ''
+        query_params[:follow] = 1
+        stream_logs(token, query_params)
+      else
+        list_logs(token, query_params)
+      end
+
+    end
+
+    def render_log_line(log)
+      color = color_for_container(log['name'])
+      instance_number = log['name'].match(/^.+-(\d+)$/)[1]
+      name = instance_number.nil? ? log['name'] : instance_number
+      prefix = "#{log['created_at']} [#{name}]:".colorize(color)
+      puts "#{prefix} #{log['data']}"
+    end
+
+    def list_logs(token, query_params)
+      result = client(token).get("services/#{current_grid}/#{name}/container_logs", query_params)
+      result['logs'].each do |log|
+        render_log_line(log)
+      end
+    end
+
+    def stream_logs(token, query_params)
+      streamer = lambda do |chunk, remaining_bytes, total_bytes|
+        begin
+          unless @buffer.empty?
+            chunk = @buffer + chunk
+          end
+          unless chunk.empty?
+            log = JSON.parse(chunk)
+          end
+          @buffer = ''
+        rescue => exc
+          @buffer << chunk
+        end
+        if log
+          @last_seen = log['id']
+          render_log_line(log)
+        end
+      end
+
+      begin
+        query_params[:follow] = true
+        if @last_seen
+          query_params[:from] = @last_seen
+        end
+        result = client(token).get_stream(
+          "services/#{current_grid}/#{name}/container_logs", streamer, query_params
+        )
+      rescue => exc
+        if exc.cause.is_a?(EOFError) # Excon wraps the EOFerror into SockerError
+          retry
         end
-        break unless tail?
-        sleep(2)
       end
+
     end
 
     def color_for_container(container_id)

data/lib/kontena/cli/services/services_helper.rb

@@ -46,6 +46,7 @@ module Kontena
           puts "#{service['id']}:"
           puts "  status: #{service['state'] }"
           puts "  image: #{service['image']}"
+          puts "  revision: #{service['revision']}"
           puts "  stateful: #{service['stateful'] == true ? 'yes' : 'no' }"
           puts "  scaling: #{service['container_count'] }"
           puts "  strategy: #{service['strategy']}"
@@ -170,11 +171,28 @@ module Kontena
             puts "  pid: #{service['pid']}"
           end
 
+          if service['health_check']
+            puts "  health check:"
+            puts "    protocol: #{service['health_check']['protocol']}"
+            puts "    uri: #{service['health_check']['uri']}" if service['health_check']['protocol'] == 'http'
+            puts "    port: #{service['health_check']['port']}"
+            puts "    timeout: #{service['health_check']['timeout']}"
+            puts "    interval: #{service['health_check']['interval']}"
+            puts "    initial_delay: #{service['health_check']['initial_delay']}"
+          end
+          
+          if service['health_status']
+            puts "  health status:"
+            puts "    healthy: #{service['health_status']['healthy']}"
+            puts "    total: #{service['health_status']['total']}"
+          end
+
           puts "  instances:"
           result = client(token).get("services/#{parse_service_id(service_id)}/containers")
           result['containers'].each do |container|
             puts "    #{container['name']}:"
             puts "      rev: #{container['deploy_rev']}"
+            puts "      service_rev: #{container['service_rev']}"
             puts "      node: #{container['node']['name'] rescue 'unknown'}"
             puts "      dns: #{container['name']}.#{grid}.kontena.local"
             puts "      ip: #{container['overlay_cidr'].to_s.split('/')[0]}"
@@ -251,14 +269,20 @@ module Kontena
         # @return [Array<Hash>]
         def parse_ports(port_options)
           port_options.map{|p|
-            node_port, container_port, protocol = p.split(':')
+            port, protocol = p.split('/')
+            protocol ||= 'tcp'
+            port_elements = port.split(':')
+            container_port = port_elements[-1]
+            node_port = port_elements[-2]
+            ip = port_elements[-3] || '0.0.0.0'
             if node_port.nil? || container_port.nil?
               raise ArgumentError.new("Invalid port value #{p}")
             end
             {
-                container_port: container_port,
-                node_port: node_port,
-                protocol: protocol || 'tcp'
+              ip: ip,
+              container_port: container_port,
+              node_port: node_port,
+              protocol: protocol 
             }
           }
         end
@@ -356,6 +380,25 @@ module Kontena
             'TB' => 1000 * 1000 * 1000 * 1000 * 1000
           }.each_pair { |e, s| return "#{(int.to_i / (s / 1000))}#{e}" if int < s }
         end
+
+        def parse_build_args(args)
+          build_args = {}
+          if args.kind_of?(Array)
+            args.each do |arg|
+              key, val = arg.split('=')
+              build_args[key] = val
+            end
+          elsif args.kind_of?(Hash)
+            build_args = build_args.merge(args)
+            build_args.each do |k, v|
+              if v.nil?
+                build_args[k] = ENV[k.to_s] # follow docker compose functionality here
+              end
+            end
+          end
+
+          build_args
+        end
       end
     end
   end

data/lib/kontena/cli/services/update_command.rb

@@ -31,6 +31,12 @@ module Kontena::Cli::Services
     option "--deploy-interval", "TIME", "Auto-deploy with given interval (format: <number><unit>, where unit = min, h, d)"
     option "--pid", "PID", "Pid namespace to use"
     option "--secret", "SECRET", "Import secret from Vault (format: <secret>:<name>:<type>)", multivalued: true
+    option "--health-check-uri", "HEALTH CHECK URI", "URI path for HTTP health check"
+    option "--health-check-timeout", "HEALTH CHECK TIMEOUT", "Timeout for HTTP health check"
+    option "--health-check-interval", "HEALTH CHECK INTERVAL", "Interval for HTTP health check"
+    option "--health-check-initial-delay", "HEALTH CHECK INITIAL DELAY", "Initial for HTTP health check"
+    option "--health-check-port", "HEALTH CHECK PORT", "Port for HTTP health check"
+    option "--health-check-protocol", "HEALTH CHECK PROTOCOL", "Protocol of health check"
 
     def execute
       require_api_url
@@ -70,6 +76,16 @@ module Kontena::Cli::Services
       if deploy_interval
         data[:deploy_opts][:interval] = parse_relative_time(deploy_interval)
       end
+      if health_check_port
+        data[:health_check] = { 
+          protocol: health_check_protocol,
+          uri: health_check_uri, 
+          port: health_check_port, 
+          timeout: health_check_timeout, 
+          interval: health_check_interval,
+          initial_delay: health_check_initial_delay
+        }
+      end
       data.delete(:deploy_opts) if data[:deploy_opts].empty?
       data[:pid] = pid if pid
       data

data/lib/kontena/cli/stack_command.rb

@@ -0,0 +1,20 @@
+require_relative 'stacks/create_command'
+require_relative 'stacks/remove_command'
+require_relative 'stacks/deploy_command'
+require_relative 'stacks/update_command'
+require_relative 'stacks/list_command'
+require_relative 'stacks/show_command'
+
+class Kontena::Cli::StackCommand < Clamp::Command
+
+  subcommand "create", "Create stack", Kontena::Cli::Stacks::CreateCommand
+  subcommand ["ls", "list"], "List stacks", Kontena::Cli::Stacks::ListCommand
+  subcommand "show", "Show stack details", Kontena::Cli::Stacks::ShowCommand
+  subcommand "update", "Update stack", Kontena::Cli::Stacks::UpdateCommand
+  subcommand "deploy", "Deploy Kontena stack", Kontena::Cli::Stacks::DeployCommand
+  subcommand ["remove","rm"], "Remove stack", Kontena::Cli::Stacks::RemoveCommand
+  
+  def execute
+
+  end
+end

data/lib/kontena/cli/stacks/common.rb

@@ -0,0 +1,39 @@
+require_relative '../apps/yaml/reader'
+
+module Kontena::Cli::Stacks
+  module Common
+    include Kontena::Cli::Apps::Common
+
+    def service_prefix
+      @service_prefix ||= project_name_from_yaml(filename)
+    end
+
+    def stack_from_yaml(filename)
+      set_env_variables(service_prefix, current_grid)
+      outcome = read_yaml(filename)
+      if outcome[:version] != '2'
+        STDERR.puts "Stack supported only in v2 YAML! Aborting.".colorize(:red)
+        abort
+      end
+      if outcome[:name].nil?
+        STDERR.puts "Stack MUST have name in YAML! Aborting.".colorize(:red)
+        abort
+      end
+      hint_on_validation_notifications(outcome[:notifications]) if outcome[:notifications].size > 0
+      abort_on_validation_errors(outcome[:errors]) if outcome[:errors].size > 0
+      kontena_services = generate_services(outcome[:services], outcome[:version])
+      # services now as hash, needs to be array in stacks API
+      services = []
+      kontena_services.each do |name, service|
+        service['name'] = prefixed_name(name)
+        services << service
+      end
+      stack = {
+        'name' => outcome[:name],
+        'services' => services
+      }
+      stack
+    end
+
+  end
+end

data/lib/kontena/cli/stacks/create_command.rb

@@ -0,0 +1,27 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class CreateCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Common
+
+    option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena stack file', attribute_name: :filename, default: 'kontena.yml'
+
+    def execute
+      require_api_url
+      require_token
+      require_config_file(filename)
+      @stack = stack_from_yaml(filename)
+
+      create_stack
+    end
+
+    private
+
+    def create_stack
+      client(token).post("stacks/#{current_grid}", @stack)
+    end
+
+  end
+end

data/lib/kontena/cli/stacks/deploy_command.rb

@@ -0,0 +1,26 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class DeployCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Common
+
+    parameter "NAME", "Stack name"
+
+    def execute
+      require_api_url
+      require_token
+
+      deploy_stack(name)
+    end
+
+    private
+
+
+    def deploy_stack
+      client(token).post("stacks/#{current_grid}/#{name}/deploy", {})
+    end
+
+  end
+end

data/lib/kontena/cli/stacks/list_command.rb

@@ -0,0 +1,38 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class ListCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Common
+
+    COLUMNS = "%-30s %-10s %-10s".freeze
+
+    def execute
+      require_api_url
+      require_token
+
+      list_stacks
+    end
+
+    private
+
+    def list_stacks
+      response = client(token).get("stacks/#{current_grid}")
+      
+      titles = ['NAME', 'SERVICES', 'STATE']
+      puts COLUMNS % titles
+
+      response['stacks'].each do |stack|
+        vars = [
+          stack['name'],
+          stack['grid_services'].size,
+          stack['state']
+        ]
+
+        puts COLUMNS % vars
+      end
+    end
+
+  end
+end

data/lib/kontena/cli/stacks/remove_command.rb

@@ -0,0 +1,26 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class RemoveCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Common
+
+    parameter "NAME", "Service name"
+
+    def execute
+      require_api_url
+      require_token
+
+      remove_stack(name)
+    end
+
+    private
+
+
+    def remove_stack(name)
+      client(token).delete("stacks/#{current_grid}/#{name}")
+    end
+
+  end
+end

data/lib/kontena/cli/stacks/show_command.rb

@@ -0,0 +1,38 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class ShowCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Common
+
+    parameter "NAME", "Service name"
+
+    def execute
+      require_api_url
+      require_token
+      
+      show_stack(name)
+      
+    end
+
+    private
+
+    def show_stack(name)
+      stack = client(token).get("stacks/#{current_grid}/#{name}")
+
+      puts stack
+
+      puts "#{stack['id']}:"
+      puts "  state: #{stack['state']}"
+      puts "  created_at: #{stack['created_at']}"
+      puts "  updated_at: #{stack['updated_at']}"
+      puts "  version: #{stack['version']}"
+      puts "  services:"
+      stack['grid_services'].each do |service|
+        puts "    id: #{service['id']}"
+      end
+    end
+
+  end
+end