kontena-cli 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e969537b351069b7a4fcb5c64cfa116c87300f5d
-  data.tar.gz: 13e84eb262c9f12338d9b2f0f1ed46882ba30a39
+  metadata.gz: 70b337e81cf3345b89451a5c86ac5fdd5de1389d
+  data.tar.gz: a18d8b80661384607d290267e5729a473c816a07
 SHA512:
-  metadata.gz: 42ed8afb2c22070a405c20e6696a40ed43bc88a90c407c824901a68528c821979b4e9d9232ce5863dcf912425d5927074f73cff3e398cb5d47b969789812a979
-  data.tar.gz: 9cf027136624b48923300814179b41187abafa9c6b4c68eaf8ff758aa2dde5640ae7e08c33353f46fc2e203242f70489d121952c31ceb13a9af679a5ada16235
+  metadata.gz: b9cc3f93437193fee63ae85aefbd44270044ebb70825a0eb1c7ca0c29c92f62589264b5f46ada6855f2b1116b508798a5b835964d02f481d9096ed2738674934
+  data.tar.gz: c151d8c9756635dcd2ed09e02365441ef78ef96b175c43b7cd8002bdcb16c38f5197a0e40c6fd7f33b5ca934ca84e7a44407e23b8400cba4b65419d95996efec

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.10.0

data/bin/kontena

@@ -66,8 +66,9 @@ begin
   MainCommand.run
 rescue Excon::Errors::SocketError => exc
   if exc.message.include?('Unable to verify certificate')
-    puts "The server uses a certificate signed by an unknown authority.".colorize(:red)
-    puts "Protip: you can bypass the certificate check by setting #{'SSL_IGNORE_ERRORS=true'.colorize(:yellow)} env variable, but any data you send to the server could be intercepted by others."
+    $stderr.puts "The server uses a certificate signed by an unknown authority.".colorize(:red)
+    $stderr.puts "You can trust this server by copying server CA pem file to: #{"~/.kontena/certs/<hostname>.pem".colorize(:light_black)}"
+    $stderr.puts "Protip: you can bypass the certificate check by setting #{'SSL_IGNORE_ERRORS=true'.colorize(:yellow)} env variable, but any data you send to the server could be intercepted by others."
     exit(1)
   else
     abort(exc.message)

data/lib/kontena/cli/app_command.rb

@@ -6,6 +6,8 @@ require_relative 'apps/stop_command'
 require_relative 'apps/remove_command'
 require_relative 'apps/list_command'
 require_relative 'apps/logs_command'
+require_relative 'apps/monitor_command'
+require_relative 'apps/show_command'
 
 class Kontena::Cli::AppCommand < Clamp::Command
 
@@ -14,9 +16,11 @@ class Kontena::Cli::AppCommand < Clamp::Command
   subcommand "deploy", "Deploy Kontena services", Kontena::Cli::Apps::DeployCommand
   subcommand "start", "Start services", Kontena::Cli::Apps::StartCommand
   subcommand "stop", "Stop services", Kontena::Cli::Apps::StopCommand
-  subcommand ["remove","rm"], "Remove services", Kontena::Cli::Apps::RemoveCommand
+  subcommand "show", "Show service details", Kontena::Cli::Apps::ShowCommand
   subcommand ["ps", "list"], "List services", Kontena::Cli::Apps::ListCommand
   subcommand ["logs"], "Show service logs", Kontena::Cli::Apps::LogsCommand
+  subcommand "monitor", "Monitor services", Kontena::Cli::Apps::MonitorCommand
+  subcommand ["remove","rm"], "Remove services", Kontena::Cli::Apps::RemoveCommand
   def execute
   end
-end
+end

data/lib/kontena/cli/apps/build_command.rb

@@ -1,4 +1,3 @@
-require 'yaml'
 require_relative 'common'
 require_relative 'docker_helper'
 

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

@@ -1,3 +1,4 @@
+require 'yaml'
 require_relative '../services/services_helper'
 
 module Kontena::Cli::Apps

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

@@ -38,13 +38,10 @@ module Kontena::Cli::Apps
 
     def deploy_services(queue)
       queue.each do |service|
-        puts "deploying #{service['id'].colorize(:cyan)}"
-        data = {}
-        if service['deploy']
-          data[:strategy] = service['deploy']['strategy'] if service['deploy']['strategy']
-          data[:wait_for_port] = service['deploy']['wait_for_port'] if service['deploy']['wait_for_port']
-        end
-        deploy_service(token, service['id'].split('/').last, data)
+        name = service['id'].split('/').last
+        short_name = name.sub("#{service_prefix}-", "")
+        puts "deploying #{short_name.colorize(:cyan)}"
+        deploy_service(token, name, {})
       end
     end
 
@@ -57,7 +54,6 @@ module Kontena::Cli::Apps
         parse_links(options['links']).each_with_index do |linked_service, index|
           # change prefixed service name also to links options
           options['links'][index] = "#{prefixed_name(linked_service[:name])}:#{linked_service[:alias]}"
-
           create_or_update_service(linked_service[:name], services[linked_service[:name]]) unless in_deploy_queue?(linked_service[:name])
         end
       end
@@ -71,9 +67,6 @@ module Kontena::Cli::Apps
         service = create(name, options)
       end
 
-      # add deploy options to service
-      service['deploy'] = options['deploy']
-
       deploy_queue.push service
     end
 
@@ -82,17 +75,17 @@ module Kontena::Cli::Apps
     end
 
     def create(name, options)
-      name = prefixed_name(name)
       puts "creating #{name.colorize(:cyan)}"
+      name = prefixed_name(name)
       data = {name: name}
       data.merge!(parse_data(options))
       create_service(token, current_grid, data)
     end
 
     def update(id, options)
+      puts "updating #{id.colorize(:cyan)}"
       id = prefixed_name(id)
       data = parse_data(options)
-      puts "updating #{id.colorize(:cyan)}"
       update_service(token, id, data)
     end
 
@@ -150,6 +143,17 @@ module Kontena::Cli::Apps
       data[:log_driver] = options['log_driver'] if options['log_driver']
       data[:log_opts] = options['log_opt'] if options['log_opt'] && !options['log_opt'].empty?
 
+      deploy_opts = options['deploy'] || {}
+      data[:strategy] = deploy_opts['strategy'] if deploy_opts['strategy']
+      deploy = {}
+      deploy[:wait_for_port] = deploy_opts['wait_for_port'] if deploy_opts.has_key?('wait_for_port')
+      deploy[:min_health] = deploy_opts['min_health'] if deploy_opts.has_key?('min_health')
+      unless deploy.empty?
+        data[:deploy_opts] = deploy
+      end
+
+      data[:hooks] = options['hooks'] || {}
+
       data
     end
 

data/lib/kontena/cli/apps/init_command.rb

@@ -1,4 +1,3 @@
-require 'yaml'
 require 'securerandom'
 require_relative 'common'
 require_relative 'dockerfile_generator'
@@ -93,4 +92,4 @@ module Kontena::Cli::Apps
     end
 
   end
-end
+end

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

@@ -1,4 +1,3 @@
-require 'yaml'
 require_relative 'common'
 
 module Kontena::Cli::Apps
@@ -27,16 +26,25 @@ module Kontena::Cli::Apps
     end
 
     def show_services(services)
-      puts "%-30.30s %-50.50s %-15s %-10.10s %-15.20s %-50s" % ['NAME', 'IMAGE', 'INSTANCES', 'STATEFUL', 'STATE', 'PORTS']
+      titles = ['NAME', 'IMAGE', 'INSTANCES', 'STATEFUL', 'STATE', 'PORTS']
+      puts "%-30.30s %-50.50s %-15s %-10.10s %-15.20s %-50s" % titles
 
       services.each do |service_name, opts|
         service = get_service(token, prefixed_name(service_name)) rescue false
         if service
+          name = service['name'].sub("#{@service_prefix}-", '')
           state = service['stateful'] ? 'yes' : 'no'
-
-          ports = service['ports'].map{|p| "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"}.join(", ")
-          puts "%-30.30s %-50.50s %-15.10s %-10.10s %-15.20s %-50s" % [service['name'], service['image'], service['container_count'], state, service['state'], ports]
+          ports = service['ports'].map{|p|
+            "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"
+          }.join(", ")
+          running = service['instances']['running']
+          desired = service['container_count']
+          instances = "#{running} / #{desired}"
+          vars = [name, service['image'], instances, state, service['state'], ports]
+        else
+          vars = [service_name, '-', '-', '-', '-', '-']
         end
+        puts "%-30.30s %-50.50s %-15.10s %-10.10s %-15.20s %-50s" % vars
       end
     end
   end

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

@@ -1,4 +1,3 @@
-require 'yaml'
 require_relative 'common'
 
 module Kontena::Cli::Apps
@@ -8,8 +7,9 @@ module Kontena::Cli::Apps
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
     option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
-
-    parameter "[SERVICE] ...", "Services to start"
+    option ["-s", "--search"], "SEARCH", "Search from logs"
+    option ["-t", "--follow"], :flag, "Follow (tail) logs", default: false
+    parameter "[SERVICE] ...", "Show only specified service logs"
 
     attr_reader :services, :service_prefix
 
@@ -27,16 +27,25 @@ module Kontena::Cli::Apps
     end
 
     def show_logs(services)
-      logs = []
-      services.each do |service_name, opts|
-        service = get_service(token, prefixed_name(service_name)) rescue false
-        result = client(token).get("services/#{service['id']}/container_logs")
-        logs = logs + result['logs']
-      end
-      logs.sort!{|x,y| DateTime.parse(x['created_at']) <=> DateTime.parse(y['created_at'])}
-      logs.each do |log|
-        color = color_for_container(log['name'])
-        puts "#{log['name'].colorize(color)} | #{log['data']}"
+      last_id = nil
+      loop do
+        query_params = []
+        query_params << "from=#{last_id}" unless last_id.nil?
+        query_params << "search=#{search}" if search
+        logs = []
+        services.each do |service_name, opts|
+          service = get_service(token, prefixed_name(service_name)) rescue false
+          result = client(token).get("services/#{service['id']}/container_logs?#{query_params.join('&')}") if service
+          logs = logs + result['logs']
+        end
+        logs.sort!{|x,y| DateTime.parse(x['created_at']) <=> DateTime.parse(y['created_at'])}
+        logs.each do |log|
+          color = color_for_container(log['name'])
+          puts "#{log['name'].colorize(color)} | #{log['data']}"
+          last_id = log['id']
+        end
+        break unless follow?
+        sleep(2)
       end
     end
 

data/lib/kontena/cli/apps/monitor_command.rb

@@ -0,0 +1,91 @@
+require_relative 'common'
+
+module Kontena::Cli::Apps
+  class MonitorCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Common
+
+    option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
+    option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
+
+    parameter "[SERVICE] ...", "Services to start"
+
+    attr_reader :services, :service_prefix
+
+    def execute
+      require_config_file(filename)
+
+      @service_prefix = project_name || current_dir
+      @services = load_services(filename, service_list, service_prefix)
+      if services.size > 0
+        show_monitor(services)
+      elsif !service_list.empty?
+        puts "No such service: #{service_list.join(', ')}".colorize(:red)
+      end
+    end
+
+    def show_monitor(services)
+      require_api_url
+      token = require_token
+      loop do
+        nodes = {}
+        services.each do |name, data|
+          service = prefixed_name(name)
+          result = client(token).get("services/#{current_grid}/#{service}/containers") rescue nil
+          if result
+            services[name]['instances'] = result['containers'].size
+            result['containers'].each do |container|
+              container['service'] = name
+              nodes[container['node']['name']] ||= []
+              nodes[container['node']['name']] << container
+            end
+          end
+        end
+        clear_terminal
+        puts "services:"
+        services.each do |name, data|
+          color = color_for_service(name)
+          puts "  #{"■".colorize(color)} #{name} (#{data['instances']} instances)"
+        end
+        puts "nodes:"
+        node_names = nodes.keys.sort
+        node_names.each do |name|
+          containers = nodes[name]
+          puts "  #{name} (#{containers.size} instances)"
+          print "  "
+          containers.each do |container|
+            icon = "■"
+            if container['status'] != 'running'
+              icon = "□"
+            end
+            color = color_for_service(container['service'])
+            print icon.colorize(color)
+          end
+          puts ''
+        end
+        sleep 1
+      end
+    end
+
+    def color_for_service(service)
+      color_maps[service] = colors.shift unless color_maps[service]
+      color_maps[service].to_sym
+    end
+
+    def color_maps
+      @color_maps ||= {}
+    end
+
+    def colors
+      if(@colors.nil? || @colors.size == 0)
+        @colors = [:green, :magenta, :yellow, :cyan, :red,
+                   :light_green, :light_yellow, :ligh_magenta, :light_cyan, :light_red]
+      end
+      @colors
+    end
+
+    def clear_terminal
+      print "\e[H\e[2J"
+    end
+  end
+end

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

@@ -1,4 +1,3 @@
-require 'yaml'
 require_relative 'common'
 
 module Kontena::Cli::Apps
@@ -19,7 +18,6 @@ module Kontena::Cli::Apps
       require_config_file(filename)
 
       @service_prefix = project_name || current_dir
-      #Dir.chdir(File.dirname(filename))
       @services = load_services(filename, service_list, service_prefix)
       if services.size > 0
         remove_services(services)

data/lib/kontena/cli/apps/scale_command.rb

@@ -0,0 +1,32 @@
+require_relative 'common'
+
+module Kontena::Cli::Apps
+  class ScaleCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Common
+
+    option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
+    option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
+
+    parameter "SERVICE", "Service to show"
+    parameter "INSTANCES", "Scales service to given number of instances"
+
+    attr_reader :services, :service_prefix
+
+    def execute
+      require_config_file(filename)
+      @service_prefix = project_name || current_dir
+      yml_service = load_services(filename, [service], service_prefix)
+      if yml_service[service]
+        options = yml_service[service]
+        abort("Service has already instances defined in #{filename}. Please update #{filename} and deploy service instead") if options['instances']
+        @service_prefix = project_name || current_dir
+        scale_service(require_token, prefixed_name(service), instances)
+      else
+        abort("Service not found")
+      end
+    end
+
+
+  end
+end

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

@@ -0,0 +1,22 @@
+require_relative 'common'
+
+module Kontena::Cli::Apps
+  class ShowCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Common
+
+    option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
+    option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
+
+    parameter "SERVICE", "Service to show"
+
+    attr_reader :services, :service_prefix
+
+    def execute
+      require_config_file(filename)
+
+      @service_prefix = project_name || current_dir
+      show_service(require_token, prefixed_name(service))
+    end
+  end
+end

data/lib/kontena/cli/apps/start_command.rb

@@ -1,4 +1,3 @@
-require 'yaml'
 require_relative 'common'
 
 module Kontena::Cli::Apps

data/lib/kontena/cli/apps/stop_command.rb

@@ -1,4 +1,3 @@
-require 'yaml'
 require_relative 'common'
 
 module Kontena::Cli::Apps

data/lib/kontena/cli/common.rb

@@ -1,4 +1,5 @@
 require 'colorize'
+require 'uri'
 
 module Kontena
   module Cli
@@ -52,9 +53,20 @@ module Kontena
         unless url
           raise ArgumentError.new("It seem's that you are not logged into Kontena master, please login with: kontena login")
         end
+        ensure_custom_ssl_ca(url)
         url
       end
 
+      def ensure_custom_ssl_ca(url)
+        return if Excon.defaults[:ssl_ca_file]
+
+        uri = URI::parse(url)
+        cert_file = File.join(Dir.home, "/.kontena/certs/#{uri.host}.pem")
+        if File.exist?(cert_file)
+          Excon.defaults[:ssl_ca_file] = cert_file
+        end
+      end
+
       def current_grid=(grid)
         settings['server']['grid'] = grid['id']
         save_settings

data/lib/kontena/cli/containers/inspect_command.rb

@@ -8,9 +8,14 @@ module Kontena::Cli::Containers
       require_api_url
       token = require_token
 
-      service_name = container_id.match(/(.+)-(\d+)/)[1]
-      result = client(token).get("containers/#{current_grid}/#{service_name}/#{container_id}/inspect")
-      puts JSON.pretty_generate(result)
+      match = container_id.match(/(.+)-(\d+)/)
+      if match
+        service_name = match[1]
+        result = client(token).get("containers/#{current_grid}/#{service_name}/#{container_id}/inspect")
+        puts JSON.pretty_generate(result)
+      else
+        abort("Cannot resolve container service")
+      end
     end
   end
 end