kontena-cli 0.11.7 → 0.12.0

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

@@ -1,6 +1,7 @@
 module Kontena::Cli::ExternalRegistries
   class ListCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     def execute
       require_api_url

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

@@ -0,0 +1,13 @@
+module Kontena::Cli::ExternalRegistries
+  class RemoveCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "NAME", "External registry name to remove"
+
+    def execute
+      require_api_url
+      token = require_token
+      client(token).delete("external_registries/#{current_grid}/#{name}")
+    end
+  end
+end

data/lib/kontena/cli/external_registry_command.rb

@@ -1,13 +1,14 @@
 require_relative 'external_registries/add_command'
 require_relative 'external_registries/list_command'
 require_relative 'external_registries/delete_command'
-
+require_relative 'external_registries/remove_command'
 
 class Kontena::Cli::ExternalRegistryCommand < Clamp::Command
 
   subcommand "add", "Add external Docker image registry", Kontena::Cli::ExternalRegistries::AddCommand
-  subcommand "list", "List external Docker image registries", Kontena::Cli::ExternalRegistries::ListCommand
-  subcommand "delete", "Delete external Docker image registry", Kontena::Cli::ExternalRegistries::DeleteCommand
+  subcommand ["list", "ls"], "List external Docker image registries", Kontena::Cli::ExternalRegistries::ListCommand
+  subcommand ["remove", "rm"], "Remove external Docker image registry", Kontena::Cli::ExternalRegistries::RemoveCommand
+  subcommand "delete", "[DEPRECATED] Delete external Docker image registry", Kontena::Cli::ExternalRegistries::DeleteCommand
 
   def execute
   end

data/lib/kontena/cli/grid_command.rb

@@ -1,5 +1,6 @@
 require_relative 'grids/list_command'
 require_relative 'grids/create_command'
+require_relative 'grids/update_command'
 require_relative 'grids/use_command'
 require_relative 'grids/show_command'
 require_relative 'grids/logs_command'
@@ -10,11 +11,13 @@ require_relative 'grids/audit_log_command'
 require_relative 'grids/list_users_command'
 require_relative 'grids/add_user_command'
 require_relative 'grids/remove_user_command'
+require_relative 'grids/cloud_config_command'
 
 class Kontena::Cli::GridCommand < Clamp::Command
 
-  subcommand "list", "List all grids", Kontena::Cli::Grids::ListCommand
+  subcommand ["list","ls"], "List all grids", Kontena::Cli::Grids::ListCommand
   subcommand "create", "Create a new grid", Kontena::Cli::Grids::CreateCommand
+  subcommand "update", "Update grid", Kontena::Cli::Grids::UpdateCommand
   subcommand "use", "Switch to use specific grid", Kontena::Cli::Grids::UseCommand
   subcommand "show", "Show grid details", Kontena::Cli::Grids::ShowCommand
   subcommand "logs", "Show logs from grid containers", Kontena::Cli::Grids::LogsCommand
@@ -25,6 +28,7 @@ class Kontena::Cli::GridCommand < Clamp::Command
   subcommand "list-users", "List current grid users", Kontena::Cli::Grids::ListUsersCommand
   subcommand "add-user", "Add user to the current grid", Kontena::Cli::Grids::AddUserCommand
   subcommand "remove-user", "Remove user from the current grid", Kontena::Cli::Grids::RemoveUserCommand
+  subcommand "cloud-config", "Generate cloud-config", Kontena::Cli::Grids::CloudConfigCommand
 
   def execute
   end

data/lib/kontena/cli/grid_options.rb

@@ -0,0 +1,12 @@
+module Kontena
+  module Cli
+    module GridOptions
+
+      def self.included(base)
+        if base.respond_to?(:option)
+          base.option '--grid', 'GRID', 'Specify grid to use'
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Grids
   class AddUserCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     parameter "EMAIL", "Email address"

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

@@ -0,0 +1,41 @@
+require_relative 'common'
+
+module Kontena::Cli::Grids
+  class CloudConfigCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Common
+
+    parameter "NAME", "Grid name"
+    option "--dns", "DNS",  "DNS server", multivalued: true
+    option "--peer-interface", "IFACE", "Peer (private) network interface", default: "eth1"
+    option "--docker-bip", "BIP", "Docker bridge ip", default: "172.17.43.1/16"
+    option "--version", "VERSION", "Agent version", default: "latest"
+
+    def execute
+      require_api_url
+      token = require_token
+
+      grid = find_grid_by_name(name)
+      abort("Grid not found".colorize(:red)) unless grid
+
+      default_dns = docker_bip.split('/')[0]
+      if dns_list.size > 0
+        dns_servers = [default_dns] + dns_list
+      else
+        dns_servers = [default_dns, '8.8.8.8', '8.8.4.4']
+      end
+
+      require 'kontena/machine/cloud_config/node_generator'
+      generator = Kontena::Machine::CloudConfig::NodeGenerator.new
+      config = generator.generate(
+        master_uri: api_url,
+        grid_token: grid['token'],
+        peer_interface: peer_interface,
+        dns_servers: dns_servers,
+        docker_bip: docker_bip,
+        version: version
+      )
+      puts config
+    end
+  end
+end

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

@@ -7,18 +7,79 @@ module Kontena::Cli::Grids
       puts "#{grid['name']}:"
       puts "  uri: #{self.current_master['url'].sub('http', 'ws')}"
       puts "  token: #{grid['token']}"
-      puts "  users: #{grid['user_count']}"
-      puts "  nodes: #{grid['node_count']}"
-      puts "  services: #{grid['service_count']}"
-      puts "  containers: #{grid['container_count']}"
+      root_dir = grid['engine_root_dir']
+      nodes = client(require_token).get("grids/#{grid['name']}/nodes")
+      nodes = nodes['nodes'].select{|n| n['connected'] == true }
+      node_count = nodes.size
+      puts "  stats:"
+      puts "    nodes: #{nodes.size} of #{grid['node_count']}"
+
+      cpu_total = nodes.map{|n| n['cpus'].to_i}.inject(:+)
+      puts "    cpus: #{cpu_total || 0}"
+
+      loads = calculate_loads(nodes, node_count)
+      puts "    load: #{(loads[:'1m'] || 0.0).round(2)} #{(loads[:'5m'] || 0.0).round(2)} #{(loads[:'15m'] || 0.0).round(2)}"
+
+      mem_total = nodes.map{|n| n['mem_total'].to_i}.inject(:+)
+      mem_wired = nodes.map{|n|
+        n.dig('resource_usage', 'memory', 'active').to_f
+      }.inject(:+)
+      puts "    memory: #{to_gigabytes(mem_wired)} of #{to_gigabytes(mem_total)} GB"
+
+      total_fs = calculate_filesystem_stats(nodes)
+      puts "    filesystem: #{to_gigabytes(total_fs['used'])} of #{to_gigabytes(total_fs['total'])} GB"
+
+      puts "    users: #{grid['user_count']}"
+      puts "    services: #{grid['service_count']}"
+      puts "    containers: #{grid['container_count']}"
+      if statsd = grid.dig('stats', 'statsd')
+        puts "  exports:"
+        puts "    statsd: #{statsd['server']}:#{statsd['port']}"
+      end
     end
 
     def grids
       @grids ||= client(require_token).get('grids')
     end
 
+    # @param [Array<Hash>] nodes
+    # @param [Fixnum] node_count
+    # @return [Hash]
+    def calculate_loads(nodes, node_count)
+      loads = {:'1m' => 0.0, :'5m' => 0.0, :'15m' => 0.0}
+      return loads if node_count == 0
+
+      loads[:'1m'] = nodes.map{|n| n.dig('resource_usage', 'load', '1m').to_f }.inject(:+) / node_count
+      loads[:'5m'] = nodes.map{|n| n.dig('resource_usage', 'load', '5m').to_f }.inject(:+) / node_count
+      loads[:'15m'] = nodes.map{|n| n.dig('resource_usage', 'load', '15m').to_f }.inject(:+) / node_count
+      loads
+    end
+
+    # @param [Array<Hash>] nodes
+    # @return [Hash]
+    def calculate_filesystem_stats(nodes)
+      total_fs = {
+        'used' => 0.0,
+        'total' => 0.0
+      }
+      nodes.each do |node|
+        root_dir = node['engine_root_dir']
+        filesystems = node.dig('resource_usage', 'filesystem') || []
+        root_fs = filesystems.find{|fs| fs['name'] == root_dir}
+        total_fs['used'] += root_fs['used']
+        total_fs['total'] += root_fs['total']
+      end
+
+      total_fs
+    end
+
     def find_grid_by_name(name)
       grids['grids'].find {|grid| grid['name'] == name }
     end
+
+    def to_gigabytes(amount)
+      return 0.0 if amount.nil?
+      (amount.to_f / 1024 / 1024 / 1024).to_f.round(2)
+    end
   end
 end

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

@@ -2,9 +2,10 @@ module Kontena::Cli::Grids
   class LogsCommand < Clamp::Command
     include Kontena::Cli::Common
 
-    option ["-f", "--follow"], :flag, "Follow (tail) logs", default: false
+    option ["-t", "--tail"], :flag, "Tail (follow) logs", default: false
     option ["-s", "--search"], "SEARCH", "Search from logs"
     option "--lines", "LINES", "Number of lines to show from the end of the logs"
+    option "--since", "SINCE", "Show logs since given timestamp"
     option "--node", "NODE", "Filter by node name", multivalued: true
     option "--service", "SERVICE", "Filter by service name", multivalued: true
     option ["-c", "--container"], "CONTAINER", "Filter by container", multivalued: true
@@ -19,9 +20,9 @@ module Kontena::Cli::Grids
       query_params[:containers] = container_list.join(",") unless container_list.empty?
       query_params[:search] = search if search
       query_params[:limit] = lines if lines
+      query_params[:since] = since if since
 
-
-      if follow?
+      if tail?
         @buffer = ''
         query_params[:follow] = 1
         stream_logs(token, query_params)
@@ -34,7 +35,11 @@ module Kontena::Cli::Grids
       result = client(token).get("grids/#{current_grid}/container_logs", query_params)
       result['logs'].each do |log|
         color = color_for_container(log['name'])
-        puts "#{log['name'].colorize(color)} | #{log['data']}"
+        prefix = ""
+        prefix << "#{log['created_at']} "
+        prefix << "#{log['name']}:"
+        prefix = prefix.colorize(color)
+        puts "#{prefix} #{log['data']}"
       end
     end
 

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

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Grids
   class RemoveUserCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     parameter "EMAIL", "Email address"

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

@@ -0,0 +1,27 @@
+require_relative 'common'
+
+module Kontena::Cli::Grids
+  class UpdateCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Common
+
+    parameter "NAME", "Grid name"
+    option "--statsd-server", "STATSD_SERVER", "Statsd server address (host:port)"
+
+    def execute
+      require_api_url
+      token = require_token
+      payload = {}
+      if statsd_server
+        server, port = statsd_server.split(':')
+        payload[:stats] = {
+          statsd: {
+            server: server,
+            port: port || 8125
+          }
+        }
+      end
+      client(token).put("grids/#{name}", payload)
+    end
+  end
+end

data/lib/kontena/cli/master/use_command.rb

@@ -8,8 +8,18 @@ module Kontena::Cli::Master
       master = find_master_by_name(name)
       if !master.nil?
         self.current_master = master['name']
-        puts "Using master: #{master['name'].cyan}"
-        puts "URL: #{master['url'].cyan}"
+        puts "Using master: #{master['name'].cyan} (#{master['url']})"
+        puts "Using grid: #{current_grid.cyan}" if current_grid
+        grids = client(require_token).get('grids')['grids']
+        if grids.size > 1
+          puts ""
+          puts "You have access to following grids and can switch between them using 'kontena grid use <name>'"
+          puts ""
+          grids.each do |grid|
+            puts "  * #{grid['name']}"
+          end
+          puts ""
+        end
       else
         abort "Could not resolve master by name [#{name}]. For a list of known masters please run: kontena master list".colorize(:red)
       end

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

@@ -0,0 +1,26 @@
+require_relative '../../common'
+
+module Kontena::Cli::Master::Users
+  class AddRoleCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "ROLE", "Role name"
+    parameter "USER ...", "List of users"
+
+    def execute
+      require_api_url
+      token = require_token
+      data = { role: role }
+
+      user_list.each do |email|
+        begin
+          response = client(token).post("users/#{email}/roles", data)
+          puts "Added role #{role} to #{email}"
+        rescue => exc
+          puts "Failed to add role #{role} to #{email}".colorize(:red)
+          puts exc.message
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require_relative '../../common'
+
+module Kontena::Cli::Master::Users
+  class InviteCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "EMAIL ...", "List of emails"
+
+    def execute
+      require_api_url
+      token = require_token
+      email_list.each do |email|
+        begin
+          data = { email: email }
+          response = client(token).post('users', data)
+          puts "Invitation send to #{email}"
+        rescue
+          puts "Failed to invite #{email}".colorize(:red)
+          puts exc.message
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require_relative '../../common'
+
+module Kontena::Cli::Master::Users
+  class ListCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    def execute
+      require_api_url
+      token = require_token
+      response = client(token).get('users')
+
+      response['users'].each do |user|
+        roles = user['roles'].map{|r| r['name']}
+        puts "#{user['email']} - #{roles.join(', ')}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require_relative '../../common'
+
+module Kontena::Cli::Master::Users
+  class RemoveRoleCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "ROLE", "Role name"
+    parameter "USER ...", "List of users"
+
+
+    def execute
+      require_api_url
+      token = require_token
+
+      user_list.each do |email|
+        begin
+          response = client(token).delete("users/#{email}/roles/#{role}")
+          puts "Removed role #{role} from #{email}" if response
+        rescue => exc
+          puts "Failed to remove role #{role} from #{email}".colorize(:red)
+          puts exc.message
+        end
+      end
+    end
+  end
+end

data/lib/kontena/cli/master/users_command.rb

@@ -0,0 +1,14 @@
+module Kontena::Cli::Master
+
+  require_relative 'users/add_role_command'
+  require_relative 'users/invite_command'
+  require_relative 'users/list_command'
+  require_relative 'users/remove_role_command'
+
+  class UsersCommand < Clamp::Command
+    subcommand "invite", "Invite user to Kontena Master", Users::InviteCommand
+    subcommand ["list", "ls"], "List users", Users::ListCommand
+    subcommand "add-role", "Add role to user", Users::AddRoleCommand
+    subcommand "remove-role", "Remove role from user", Users::RemoveRoleCommand
+  end
+end

data/lib/kontena/cli/master_command.rb

@@ -4,6 +4,7 @@ require_relative 'master/digital_ocean_command'
 require_relative 'master/azure_command'
 require_relative 'master/use_command'
 require_relative 'master/list_command'
+require_relative 'master/users_command'
 
 class Kontena::Cli::MasterCommand < Clamp::Command
 
@@ -13,7 +14,7 @@ class Kontena::Cli::MasterCommand < Clamp::Command
   subcommand "azure", "Azure specific commands", Kontena::Cli::Master::AzureCommand
   subcommand ["list", "ls"], "List masters where client has logged in", Kontena::Cli::Master::ListCommand
   subcommand "use", "Switch to use selected master", Kontena::Cli::Master::UseCommand
-
+  subcommand "users", "Users specific commands", Kontena::Cli::Master::UsersCommand
   def execute
   end
 end