kontena-cli 1.0.6 → 1.1.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 617ed6269bb5d4ebdfa64661b2c5d57513cb05f3
-  data.tar.gz: 6d9483d2d5d8b7994ebffcc19adcb3505a1c9b0f
+  metadata.gz: 3fa4fdfff0c1b90c0954ec7e31f8f916c8636f16
+  data.tar.gz: 62e78df6ba2b65b1bfcaacde2290d81719d93e82
 SHA512:
-  metadata.gz: 78b0b49d108cc919d604b46f83389bb17bd075d8693940f247f853073d2f422c30afeb32c065f1df06637204dca010c185165e58da03fc733587ef9d8a3bcd13
-  data.tar.gz: 5d11bfbb81dc4c39fbb42f94f3d1f7b21ed455ab5d05cebfde7a9bd917d1ce894e6d4684688ea5d7ebfecc01e1f0554aa43312167822d968f611b694b6c450c9
+  metadata.gz: e2fb585c59f687236071ec28640e487f32e4b4a1426ef9152249bcdd0651dfb96d0250b1ec91df171e9c0c1b650c257c9bb0e9f2039d8fda9b5a553ddda9c55f
+  data.tar.gz: 7408e60150cbd48e54549a490af795bb6688af0e01c9969f2f53a20fb8b59417228b3d1fc798e877377a39d28540c9ba8c614a99be110ae86bc74bf07c60716a

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.4
+FROM alpine:3.5
 MAINTAINER Kontena, Inc. <info@kontena.io>
 
 ADD https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 /usr/local/bin/docker

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.1.0.pre1

data/bin/kontena

@@ -12,7 +12,7 @@ require 'kontena_cli'
 STDOUT.sync = true
 
 begin
-  Kontena::PluginManager.instance.load_plugins
+  Kontena::PluginManager.instance.init
   Kontena::MainCommand.run
 rescue Excon::Errors::SocketError => exc
   if exc.message.include?('Unable to verify certificate')
@@ -27,6 +27,9 @@ rescue Kontena::Errors::StandardError => exc
   raise exc if ENV['DEBUG']
   puts " [#{Kontena.pastel.red('error')}] #{exc.message}"
   abort
+rescue Errno::EPIPE
+  # If user is piping the command outputs to some other command that might exit before CLI has outputted everything
+  abort
 rescue => exc
   raise exc if ENV['DEBUG']
   $stderr.puts " [#{Kontena.pastel.red('error')}] #{exc.message}"

data/kontena-cli.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency "excon", "~> 0.49.0"
-  spec.add_runtime_dependency "tty-prompt", "~> 0.7.1"
+  spec.add_runtime_dependency "tty-prompt", "~> 0.10"
   spec.add_runtime_dependency "clamp", "~> 1.1.0"
   spec.add_runtime_dependency "ruby_dig", "~> 0.0.2"
   spec.add_runtime_dependency "launchy", "~> 2.4.3"

data/lib/kontena/callback.rb

@@ -44,7 +44,7 @@ class Kontena::Callback
           if klass.instance_methods.include?(state)
             cb = klass.new(obj)
             if cb.send(state).kind_of?(FalseClass)
-              ENV["DEBUG"] && puts("Execution aborted by #{klass}")
+              ENV["DEBUG"] && STDERR.puts("Execution aborted by #{klass}")
               exit 1
             end
           end

data/lib/kontena/callbacks/master/01_clear_current_master_after_terminate.rb

@@ -10,7 +10,7 @@ module Kontena
         return unless command.exit_code == 0
         return unless config.current_master
 
-        ENV["DEBUG"] && puts("Removing current master from config")
+        ENV["DEBUG"] && STDERR.puts("Removing current master from config")
         config.servers.delete_at(config.find_server_index(config.current_master.name))
         config.current_server = nil
         config.write

data/lib/kontena/callbacks/master/deploy/50_authenticate_after_deploy.rb

@@ -8,8 +8,8 @@ module Kontena
       matches_commands 'master create'
 
       def after
-        ENV["DEBUG"] && puts("Command result: #{command.result.inspect}")
-        ENV["DEBUG"] && puts("Command exit code: #{command.exit_code.inspect}")
+        ENV["DEBUG"] && STDERR.puts("Command result: #{command.result.inspect}")
+        ENV["DEBUG"] && STDERR.puts("Command exit code: #{command.exit_code.inspect}")
         return unless command.exit_code == 0
         return unless command.result.kind_of?(Hash)
         return unless command.result.has_key?(:public_ip)
@@ -35,11 +35,11 @@ module Kontena
 
         # Figure out if HTTPS works, if not, try HTTP
         begin
-          ENV["DEBUG"] && puts("Trying to request / from #{new_master.url}")
+          ENV["DEBUG"] && STDERR.puts("Trying to request / from #{new_master.url}")
           client = Kontena::Client.new(new_master.url, nil, ignore_ssl_errors: true)
           client.get('/')
         rescue
-          ENV["DEBUG"] && puts("HTTPS test failed: #{$!} #{$!.message}")
+          ENV["DEBUG"] && STDERR.puts("HTTPS test failed: #{$!} #{$!.message}")
           unless retried
             new_master.url = "http://#{command.result[:public_ip]}"
             retried = true
@@ -51,7 +51,7 @@ module Kontena
         require 'shellwords'
         cmd = "master login --no-login-info --skip-grid-auto-select --verbose --name #{command.result[:name].shellescape} --code #{command.result[:code].shellescape} #{new_master.url.shellescape}"
         Retriable.retriable do
-          ENV["DEBUG"] && puts("Running: #{cmd}")
+          ENV["DEBUG"] && STDERR.puts("Running: #{cmd}")
           Kontena.run(cmd)
         end
       end

data/lib/kontena/callbacks/master/deploy/55_create_initial_grid_after_deploy.rb

@@ -12,7 +12,7 @@ module Kontena
         return unless config.current_master.name == command.result[:name]
 
         cmd = "grid create --silent test"
-        ENV["DEBUG"] && puts("Running: #{cmd}")
+        ENV["DEBUG"] && STDERR.puts("Running: #{cmd}")
         Retriable.retriable do
           Kontena.run(cmd)
         end

data/lib/kontena/callbacks/master/deploy/56_set_server_provider_after_deploy.rb

@@ -0,0 +1,25 @@
+module Kontena
+  module Callbacks
+    class SetServerProviderAfterDeploy < Kontena::Callback
+
+      include Kontena::Cli::Common
+
+      matches_commands 'master create'
+
+      def after
+        return unless command.exit_code == 0
+        return unless config.current_master
+        return unless config.current_master.name == command.result[:name]
+        return unless command.result[:provider]
+
+        require 'shellwords'
+
+        cmd = ['master', 'config', 'set', "server.provider=#{command.result[:provider]}"]
+        spinner "Setting Master configuration server.provider to '#{command.result[:provider]}'" do
+          Kontena.run(cmd.shelljoin)
+        end
+      end
+    end
+  end
+end
+

data/lib/kontena/callbacks/master/deploy/70_invite_self_after_deploy.rb

@@ -40,7 +40,7 @@ module Kontena
         end
 
         return nil unless invite_response
-        ENV["DEBUG"] && puts("Got invite code: #{invite_response['invite_code']}")
+        ENV["DEBUG"] && STDERR.puts("Got invite code: #{invite_response['invite_code']}")
 
         role_status = nil
 

data/lib/kontena/cli/common.rb

@@ -12,7 +12,7 @@ module Kontena
 
       def logger
         return @logger if @logger
-        @logger = Logger.new(STDOUT)
+        @logger = Logger.new(ENV["DEBUG"] ? STDERR : STDOUT)
         @logger.level = ENV["DEBUG"].nil? ? Logger::INFO : Logger::DEBUG
         @logger.progname = 'COMMON'
         @logger
@@ -129,10 +129,10 @@ module Kontena
         return unless server.token.refresh_token
         return if server.token.expired?
         client = Kontena::Client.new(server.url, server.token)
-        ENV["DEBUG"] && puts("Trying to invalidate refresh token on #{server.name}")
+        logger.debug "Trying to invalidate refresh token on #{server.name}"
         client.refresh_token
       rescue
-        ENV["DEBUG"] && puts("Refreshing failed: #{$!} : #{$!.message}")
+        logger.debug "Refreshing failed: #{$!} : #{$!.message}"
       end
 
       def require_current_master

data/lib/kontena/cli/config.rb

@@ -26,7 +26,7 @@ module Kontena
 
       def initialize
         super
-        @logger = Logger.new(STDOUT)
+        @logger = Logger.new(ENV["DEBUG"] ? STDERR : STDOUT)
         @logger.level = ENV["DEBUG"].nil? ? Logger::INFO : Logger::DEBUG
         @logger.progname = 'CONFIG'
         load_settings_from_env || load_settings_from_config_file

data/lib/kontena/cli/grid_command.rb

@@ -11,6 +11,7 @@ require_relative 'grids/audit_log_command'
 require_relative 'grids/user_command'
 require_relative 'grids/cloud_config_command'
 require_relative 'grids/trusted_subnet_command'
+require_relative 'grids/health_command'
 
 class Kontena::Cli::GridCommand < Kontena::Command
 
@@ -27,6 +28,7 @@ class Kontena::Cli::GridCommand < Kontena::Command
   subcommand "user", "User specific commands", Kontena::Cli::Grids::UserCommand
   subcommand "cloud-config", "Generate cloud-config", Kontena::Cli::Grids::CloudConfigCommand
   subcommand "trusted-subnet", "Trusted subnet related commands", Kontena::Cli::Grids::TrustedSubnetCommand
+  subcommand "health", "Check grid health", Kontena::Cli::Grids::HealthCommand
 
   def execute
   end

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

@@ -7,6 +7,7 @@ module Kontena::Cli::Grids
       host = ENV['KONTENA_URL'] || self.current_master['url']
       puts "#{grid['name']}:"
       puts "  uri: #{host.sub('http', 'ws')}"
+      puts "  initial_size: #{grid['initial_size']}"
       root_dir = grid['engine_root_dir']
       nodes = client(require_token).get("grids/#{grid['name']}/nodes")
       nodes = nodes['nodes'].select{|n| n['connected'] == true }
@@ -92,5 +93,16 @@ module Kontena::Cli::Grids
       return 0.0 if amount.nil?
       (amount.to_f / 1024 / 1024 / 1024).to_f.round(2)
     end
+
+    # @return [Hash] /v1/grids/:grid JSON { ... }
+    def get_grid(name = nil)
+      if name
+        client(require_token).get("grids/#{name}")
+      elsif current_grid
+        client(require_token).get("grids/#{current_grid}")
+      else
+        exit_with_error "No grid given or selected"
+      end
+    end
   end
 end

data/lib/kontena/cli/grids/health_command.rb

@@ -0,0 +1,69 @@
+require_relative 'common'
+require "kontena/cli/helpers/health_helper"
+
+module Kontena::Cli::Grids
+  class HealthCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::Helpers::HealthHelper
+    include Common
+
+    parameter "[NAME]", "Grid name"
+
+    def execute
+      require_api_url
+
+      grid = get_grid(name)
+      grid_nodes = client(require_token).get("grids/#{grid['name']}/nodes")
+
+      return show_grid_health(grid, grid_nodes['nodes'])
+    end
+
+    # Validate grid/nodes configuration for grid operation
+    #
+    # @return [Boolean] false if unhealthy
+    def show_grid_health(grid, nodes)
+      initial_size = grid['initial_size']
+      minimum_size = grid['initial_size'] / 2 + 1 # a majority is required for etcd quorum
+
+      grid_health = grid_health(grid, nodes)
+      initial_nodes = nodes.select{|node| node['initial_member']}
+      online_nodes = initial_nodes.select{|node| node['connected']}
+
+      # configuration and status
+      if initial_nodes.length == 0
+        puts "#{health_icon :error} Grid does not have any initial nodes, and requires at least #{minimum_size} of #{initial_size} initial nodes for operation"
+      elsif online_nodes.empty?
+        puts "#{health_icon :error} Grid does not have any initial nodes online, and requires at least #{minimum_size} of #{initial_size} initial nodes for operation"
+      elsif initial_nodes.length < minimum_size
+        puts "#{health_icon :error} Grid only has #{initial_nodes.length} initial nodes, and requires at least #{minimum_size} of #{initial_size} initial nodes for operation"
+      elsif online_nodes.length < minimum_size
+        puts "#{health_icon :error} Grid only has #{online_nodes.length} initial nodes online, and requires at least #{minimum_size} of #{initial_size} initial nodes for operation"
+      elsif initial_nodes.length < initial_size
+        puts "#{health_icon :warning} Grid only has #{initial_nodes.length} initial nodes of #{initial_size} required for high-availability"
+      elsif online_nodes.length < initial_size
+        puts "#{health_icon :warning} Grid only has #{online_nodes.length} initial nodes online of #{initial_size} required for high-availability"
+      elsif initial_nodes.length == 2
+        puts "#{health_icon :warning} Grid only has #{initial_nodes.length} initial nodes, and is not high-availability"
+      elsif initial_nodes.length == 1
+        puts "#{health_icon :warning} Grid only has #{initial_nodes.length} initial node, and is not high-availability"
+      else
+        puts "#{health_icon :ok} Grid has all #{online_nodes.length} of #{initial_size} initial nodes online"
+      end
+
+      nodes.each do |node|
+        node_health = node_health(node, grid_health)
+
+        if node['connected']
+
+        elsif node['initial_member']
+          puts "#{health_icon grid_health} Initial node #{node['name']} is offline"
+        else
+          puts "#{health_icon node_health} Grid node #{node['name']} is offline"
+        end
+      end
+
+      # operational if we have etcd quorum
+      return online_nodes.length >= minimum_size
+    end
+  end
+end

data/lib/kontena/cli/helpers/health_helper.rb

@@ -0,0 +1,53 @@
+module Kontena::Cli::Helpers
+  module HealthHelper
+    def health_icon(health)
+      case health
+      when nil
+        " "
+      when :ok
+        pastel.green('⊛')
+      when :warning
+        pastel.yellow('⊙')
+      when :error
+        pastel.red('⊗')
+      when :offline
+        pastel.dark('⊝')
+      else
+        fail "Invalid health=#{health}"
+      end
+    end
+
+    # Validate grid nodes configuration and status
+    #
+    # @param grid [Hash] get(/grids/:grid) => { ... }
+    # @param nodes [Array<Hash>] get(/grids/:grid/nodes)[nodes] => [ { ... } ]
+    # @return [Symbol] health
+    def grid_health(grid, nodes)
+      initial = grid['initial_size']
+      minimum = grid['initial_size'] / 2 + 1 # a majority is required for etcd quorum
+
+      online = nodes.select{|node| node['initial_member'] && node['connected']}
+
+      if online.length < minimum
+        return :error
+      elsif online.length < initial
+        return :warning
+      else
+        return :ok
+      end
+    end
+
+    # Validate grid node status based on the grid health
+    #
+    # @param node [Hash] GET /nodes/:grid/:node
+    # @param grid_health [Symbol] @see #grid_health
+    # @return [Symbol] health
+    def node_health(node, grid_health)
+      if node['initial_member']
+        return node['connected'] ? grid_health : :offline
+      else
+        return node['connected'] ? :ok : :offline
+      end
+    end
+  end
+end

data/lib/kontena/cli/localhost_web_server.rb

@@ -39,7 +39,7 @@ module Kontena
     #
     # @return [Hash] query_params
     def serve_one
-      ENV["DEBUG"] && puts("Waiting for connection on port #{port}..")
+      ENV["DEBUG"] && STDERR.puts("Waiting for connection on port #{port}..")
       socket = server.accept
 
       content = socket.recvfrom(2048).first.split(/(?:\r)?\n/)
@@ -56,7 +56,7 @@ module Kontena
 
       body = content.join("\n")
 
-      ENV["DEBUG"] && puts("Got request: \"#{request.inspect}\n  Headers: #{headers.inspect}\n  Body: #{body}\"")
+      ENV["DEBUG"] && STDERR.puts("Got request: \"#{request.inspect}\n  Headers: #{headers.inspect}\n  Body: #{body}\"")
 
       get_request = request[/GET (\/cb.+?) HTTP/, 1]
       if get_request
@@ -81,7 +81,7 @@ module Kontena
         socket.close
         server.close
         uri = URI.parse("http://localhost#{get_request}")
-        ENV["DEBUG"] && puts("  * Parsing params: \"#{uri.query}\"")
+        ENV["DEBUG"] && STDERR.puts("  * Parsing params: \"#{uri.query}\"")
         params = {}
         URI.decode_www_form(uri.query).each do |key, value|
           if value.to_s == ''

data/lib/kontena/cli/master/users/invite_command.rb

@@ -43,7 +43,7 @@ module Kontena::Cli::Master::Users
           end
         rescue
           STDERR.puts "Failed to invite #{email}".colorize(:red)
-          ENV["DEBUG"] && puts("#{$!} - #{$!.message} -- #{$!.backtrace}")
+          ENV["DEBUG"] && STDERR.puts("#{$!} - #{$!.message} -- #{$!.backtrace}")
         end
       end
     end

data/lib/kontena/cli/node_command.rb

@@ -4,6 +4,7 @@ require_relative 'nodes/show_command'
 require_relative 'nodes/update_command'
 require_relative 'nodes/ssh_command'
 require_relative 'nodes/label_command'
+require_relative 'nodes/health_command'
 
 class Kontena::Cli::NodeCommand < Kontena::Command
 
@@ -13,6 +14,7 @@ class Kontena::Cli::NodeCommand < Kontena::Command
   subcommand "update", "Update node", Kontena::Cli::Nodes::UpdateCommand
   subcommand ["remove","rm"], "Remove node", Kontena::Cli::Nodes::RemoveCommand
   subcommand "label", "Node label specific commands", Kontena::Cli::Nodes::LabelCommand
+  subcommand "health", "Check node health", Kontena::Cli::Nodes::HealthCommand
 
   def execute
   end

data/lib/kontena/cli/nodes/health_command.rb

@@ -0,0 +1,32 @@
+require_relative '../helpers/health_helper'
+
+module Kontena::Cli::Nodes
+  class HealthCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Kontena::Cli::Helpers::HealthHelper
+
+    parameter "NODE_ID", "Node id"
+
+    def execute
+      require_api_url
+      require_current_grid
+      token = require_token
+
+      node = client(token).get("nodes/#{current_grid}/#{node_id}")
+
+      return show_node_health(node)
+    end
+
+    # @return [Boolean] true if healthy
+    def show_node_health(node)
+      if node['connected']
+        puts "#{health_icon(:ok)} Node is online"
+        return true
+      else
+        puts "#{health_icon(:offline)} Node is offline"
+        return false
+      end
+    end
+  end
+end

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

@@ -1,46 +1,60 @@
+require_relative '../helpers/health_helper'
+
 module Kontena::Cli::Nodes
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::Helpers::HealthHelper
 
     option ["--all"], :flag, "List nodes for all grids", default: false
 
+    def node_initial(node, grid)
+      if node['initial_member']
+        return "#{node['node_number']} / #{grid['initial_size']}"
+      else
+        return "-"
+      end
+    end
+
+    def node_labels(node)
+      (node['labels'] || ['-']).join(",")
+    end
+
+    def show_grid_nodes(grid, nodes, multi: false)
+      grid_health = grid_health(grid, nodes)
+
+      nodes = nodes.sort_by{|n| n['node_number'] }
+      nodes.each do |node|
+        puts [
+          "%s" % health_icon(node_health(node, grid_health)),
+          "%-70.70s" % [multi ? "#{grid['name']}/#{node['name']}" : node['name']],
+          "%-10s" % node['agent_version'],
+          "%-10s" % (node['connected'] ? "online" : "offline"),
+          "%-10s" % node_initial(node, grid),
+          "%s" % [node_labels(node)],
+        ].join ' '
+      end
+    end
+
     def execute
       require_api_url
       require_current_grid
       token = require_token
 
+      puts "%s %-70s %-10s %-10s %-10s %-s" % [health_icon(nil), "Name", "Version", "Status", "Initial", "Labels"]
+
       if all?
         grids = client(token).get("grids")
-        puts "%-70s %-10s %-40s" % [ 'Name', 'Status', 'Labels']
-
         grids['grids'].each do |grid|
-          nodes = client(token).get("grids/#{grid['name']}/nodes")
-          nodes['nodes'].each do |node|
-            if node['connected']
-              status = 'online'
-            else
-              status = 'offline'
-            end
-            puts "%-70.70s %-10s %-40s" % [
-              "#{grid['name']}/#{node['name']}",
-              status,
-              (node['labels'] || ['-']).join(",")
-            ]
-          end
+          nodes = client(require_token).get("grids/#{grid['id']}/nodes")['nodes']
+
+          show_grid_nodes(grid, nodes, multi: true)
         end
       else
-        nodes = client(token).get("grids/#{current_grid}/nodes")
-        puts "%-70s %-10s %-10s %-40s" % ['Name', 'Status', 'Initial', 'Labels']
-        nodes = nodes['nodes'].sort_by{|n| n['node_number'] }
-        nodes.each do |node|
-          puts "%-70.70s %-10s %-10s %-40s" % [
-            node['name'],
-            node['connected'] ? 'online' : 'offline',
-            node['initial_member'] ? 'yes' : 'no',
-            (node['labels'] || ['-']).join(",")
-          ]
-        end
+        grid = client(token).get("grids/#{current_grid}")
+        nodes = client(require_token).get("grids/#{current_grid}/nodes")['nodes']
+
+        show_grid_nodes(grid, nodes)
       end
     end
   end