vpsadmin-client 3.0.0.master.20220809.pre.0.4bb004b0 → 3.0.0.master.20221118.pre.0.ac358990

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b441c7f4575b1c83f0b44e030e487f5a21314f28044379aa020bb65437315764
-  data.tar.gz: 83a6e16dfb20baf6188f09ec4d92e3887c957e0bbd884b4143d95a49f958f86a
+  metadata.gz: c96e4a445e58d056aa30c081314b6e073862d629f508a74543a7db53078118f4
+  data.tar.gz: bca5be7e91d7f0d2325f73412dc12c10ea7708691fe8c8b45159584aad2b7193
 SHA512:
-  metadata.gz: a421f897c7a466b86914ecc77db3f077175b25118ae198e059f8a3c2213002d46e652734588da5f21401ec19b6d34ddd1f577d6244cc3de8631aae79267e0442
-  data.tar.gz: 16fd9d780cf499e8af47cb9dd21592ea01e6ac76717883a3d88cfe0f108d1c579396bd4b08450e5e2a1c5ea6d5aeca5cf6f23bba47a27e27a9c566f2fcd102e0
+  metadata.gz: fb1306cd663e600794415114e4e1bae334011cf8d0d323ae1b11422d4bcbada5a30a6d62790d6f50a768248a4a18b50617d7e1b43fbb0cf87ec1dfd621edae42
+  data.tar.gz: 97f984970bb433168d35fe3466adbb9abecdbc56829da668d7f3bcb7c8526a1bc6c8b1923f5c8247e584a0532dd40d4bdd4d9e454f2f16a2a8b1c95e8210ba0f

data/lib/vpsadmin/cli/commands/{ip_traffic_top.rb → network_top.rb}

@@ -1,15 +1,15 @@
 require 'curses'
 
 module VpsAdmin::CLI::Commands
-  class IpTrafficTop < BackupDataset
+  class NetworkTop < HaveAPI::CLI::Command
     include Curses
 
     REFRESH_RATE = 10
-    FILTERS = %i(limit ip_address ip_version environment location network ip_range node vps)
+    FILTERS = %i(limit user environment location node vps network_interface)
 
-    cmd :ip_traffic, :top
+    cmd :network, :top
     args ''
-    desc 'Live IP traffic monitor'
+    desc 'Live network traffic monitor'
 
     def options(opts)
       @opts = {
@@ -24,24 +24,8 @@ module VpsAdmin::CLI::Commands
         @opts[:limit] = v
       end
 
-      opts.on('--ip-address ADDR', 'ADDR or ID of IP addresses to monitor') do |v|
-        id = ip_address_id(v)
-
-        if id
-          @opts[:ip_address] = id
-
-        else
-          warn "IP address '#{v}' not found"
-          exit(1)
-        end
-      end
-
-      opts.on('--ip-version VER', [4, 6], 'Filter IP addresses by version') do |v|
-        @opts[:ip_version] = v
-      end
-
-      (FILTERS - %i(limit ip_address ip_version)).each do |f|
-        opts.on("--#{f.to_s.gsub(/_/, '-')} ID", Integer, "Filter IP addresses by #{f}") do |v|
+      (FILTERS - %i(limit)).each do |f|
+        opts.on("--#{f.to_s.gsub(/_/, '-')} ID", Integer, "Filter network interfaces by #{f}") do |v|
           @opts[f] = v
         end
       end
@@ -49,12 +33,13 @@ module VpsAdmin::CLI::Commands
 
     def exec(args)
       if @global_opts[:list_output]
-        exclude = %i(id ip_address user updated_at delta)
+        exclude = %i(id network_interface updated_at delta)
 
-        @api.ip_traffic_monitor.actions[:index].params.each_key do |name|
+        @api.network_interface_monitor.actions[:index].params.each_key do |name|
           next if exclude.include?(name)
           puts name
         end
+
         exit
       end
 
@@ -113,9 +98,8 @@ module VpsAdmin::CLI::Commands
     def set_global_opts
       if @global_opts[:output]
         @params = @global_opts[:output].split(',').map(&:to_sym)
-
       else
-        @params = %i(bytes_in bytes_out bytes)
+        @params = %i(bytes bytes_in bytes_out packets packets_in packets_out)
       end
 
       if @global_opts[:sort]
@@ -158,7 +142,7 @@ module VpsAdmin::CLI::Commands
       params =  {
         limit: limit > 0 ? limit : 25,
         order: "#{@sort_desc ? '-' : ''}#{@sort_param}",
-        meta: {includes: 'ip_address__network_interface'}
+        meta: {includes: 'network_interface'},
       }
 
       FILTERS.each do |f|
@@ -167,7 +151,7 @@ module VpsAdmin::CLI::Commands
         params[f] = @opts[f]
       end
 
-      @data = @api.ip_traffic_monitor.list(params)
+      @data = @api.network_interface_monitor.list(params)
     end
 
     def render(t, refresh)
@@ -177,7 +161,7 @@ module VpsAdmin::CLI::Commands
       end
 
       setpos(0, 0)
-      addstr("#{File.basename($0)} ip_traffic top - #{t.strftime('%H:%M:%S')}, ")
+      addstr("#{File.basename($0)} network top - #{t.strftime('%H:%M:%S')}, ")
       addstr("next update at #{(t + REFRESH_RATE).strftime('%H:%M:%S')}")
 
       attron(color_pair(1))
@@ -202,12 +186,12 @@ module VpsAdmin::CLI::Commands
 
     def header
       unless @header
-        fmt = (['%-30s', '%6s'] + @columns.map { |c| "%#{c[:width]}s" }).join(' ')
+        fmt = (['%8s', '%-15s'] + @columns.map { |c| "%#{c[:width]}s" }).join(' ')
 
         @header = sprintf(
           fmt,
-          'IP Address',
           'VPS',
+          'Interface',
           *@columns.map { |c| c[:title] },
         )
 
@@ -219,22 +203,22 @@ module VpsAdmin::CLI::Commands
 
     def print_row(data)
       addstr(sprintf(
-        '%-30s %6s',
-        data.ip_address.addr,
-        data.ip_address.network_interface.vps_id
+        '%8s %-15s',
+        data.network_interface.vps_id,
+        data.network_interface.name,
       ))
 
       @columns.each do |c|
         p = c[:name]
 
         attron(A_BOLD) if p == @sort_param
-        addstr(sprintf(" %#{c[:width]}s", unitize(data.send(p), data.delta)))
+        addstr(sprintf(" %#{c[:width]}s", unitize_param(p, data.send(p), data.delta)))
         attroff(A_BOLD) if p == @sort_param
       end
     end
 
     def stats
-      fields = %i(packets bytes public_bytes private_bytes)
+      fields = %i(bytes packets)
       stats = {}
       delta_sum = 0
 
@@ -263,32 +247,30 @@ module VpsAdmin::CLI::Commands
       setpos(lines-5, 0)
       addstr('─' * cols)
 
-      fmt = '%10s %10s %10s %14s %14s'
+      fmt = '%10s %10s %10s'
       unit = @opts[:unit].to_s.capitalize
 
       setpos(lines-4, 0)
       addstr(sprintf(
         fmt,
         '',
-        'Packets/s',
         "#{unit}/s",
-        "Public#{unit}/s",
-        "Private#{unit}/s"
+        'Packets/s',
       ))
 
       setpos(lines-3, 0)
-      addstr(sprintf(fmt, 'In', *fields.map { |f| unitize(stats[:"#{f}_in"], avg_delta) }))
+      addstr(sprintf(fmt, 'In', *fields.map { |f| unitize_param(f, stats[:"#{f}_in"], avg_delta) }))
 
       setpos(lines-2, 0)
-      addstr(sprintf(fmt, 'Out', *fields.map { |f| unitize(stats[:"#{f}_out"], avg_delta) }))
+      addstr(sprintf(fmt, 'Out', *fields.map { |f| unitize_param(f, stats[:"#{f}_out"], avg_delta) }))
 
       setpos(lines-1, 0)
       attron(A_BOLD)
-      addstr(sprintf(fmt, 'Total', *fields.map { |f| unitize(stats[:"#{f}_in"] + stats[:"#{f}_out"], avg_delta) }))
+      addstr(sprintf(fmt, 'Total', *fields.map { |f| unitize_param(f, stats[:"#{f}_in"] + stats[:"#{f}_out"], avg_delta) }))
       attroff(A_BOLD)
     end
 
-    def unitize(n, delta)
+    def unitize_bytes(n, delta)
       if @opts[:unit] == :bytes
         per_s = n / delta.to_f
       else
@@ -296,7 +278,7 @@ module VpsAdmin::CLI::Commands
       end
 
       bits = 39
-      units = %i(T G M K)
+      units = %w(T G M k)
 
       units.each do |u|
         threshold = 2 << bits
@@ -309,6 +291,31 @@ module VpsAdmin::CLI::Commands
       per_s.round(2).to_s
     end
 
+    def unitize_number(n, delta)
+      per_s = n / delta.to_f
+      threshold = 1_000_000_000_000
+      units = %w(T G M k)
+
+      units.each do |u|
+        return "#{(per_s / threshold).round(2)}#{u}" if per_s >= threshold
+
+        threshold /= 1000
+      end
+
+      per_s.round(2).to_s
+    end
+
+    def unitize_param(param, n, delta)
+      case param
+      when :bytes, :bytes_in, :bytes_out
+        unitize_bytes(n, delta)
+      when :packets, :packets_in, :packets_out
+        unitize_number(n, delta)
+      else
+        fail "unknown param to unitize: #{param.inspect}"
+      end
+    end
+
     def sort_next(n)
       cur_i = @params.index(@sort_param)
       next_i = cur_i + n

data/lib/vpsadmin/cli.rb

@@ -22,4 +22,4 @@ require 'vpsadmin/cli/commands/snapshot_download'
 require 'vpsadmin/cli/commands/snapshot_send'
 require 'vpsadmin/cli/commands/backup_dataset'
 require 'vpsadmin/cli/commands/backup_vps'
-require 'vpsadmin/cli/commands/ip_traffic_top'
+require 'vpsadmin/cli/commands/network_top'

data/lib/vpsadmin/client/version.rb

@@ -1,5 +1,5 @@
 module VpsAdmin
   module Client
-    VERSION = '3.0.0.master.20220809-0.4bb004b0'
+    VERSION = '3.0.0.master.20221118-0.ac358990'
   end
 end

data/vpsadmin-client.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
-  spec.add_runtime_dependency 'haveapi-client', '~> 0.15.1'
+  spec.add_runtime_dependency 'haveapi-client', '~> 0.16.1'
   spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'curses'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vpsadmin-client
 version: !ruby/object:Gem::Version
-  version: 3.0.0.master.20220809.pre.0.4bb004b0
+  version: 3.0.0.master.20221118.pre.0.ac358990
 platform: ruby
 authors:
 - Jakub Skokan
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ files:
 - lib/vpsadmin/cli/commands/backup_dataset.rb
 - lib/vpsadmin/cli/commands/backup_vps.rb
 - lib/vpsadmin/cli/commands/base_download.rb
-- lib/vpsadmin/cli/commands/ip_traffic_top.rb
+- lib/vpsadmin/cli/commands/network_top.rb
 - lib/vpsadmin/cli/commands/snapshot_download.rb
 - lib/vpsadmin/cli/commands/snapshot_send.rb
 - lib/vpsadmin/cli/commands/vps_migrate_many.rb