redis-stat 0.1.4 → 0.2.0

data/README.md

@@ -11,7 +11,7 @@ gem install redis-stat
 ## Usage
 
 ```
-usage: redis-stat [HOST[:PORT]] [INTERVAL [COUNT]]
+usage: redis-stat [HOST[:PORT] ...] [INTERVAL [COUNT]]
 
         --csv=OUTPUT_CSV_FILE_PATH   Save the result in CSV format
     -v, --verbose                    Show more info
@@ -26,11 +26,13 @@ redis-stat
 
 redis-stat 1
 
-redis-stat localhost:6380
+redis-stat 1 10
 
 redis-stat localhost:6380 1 10
 
-redis-stat localhost:6380 1 10 --csv=/tmp/output.csv --verbose
+redis-stat localhost localhost:6380 localhost:6381 5
+
+redis-stat localhost localhost:6380 1 10 --csv=/tmp/output.csv --verbose
 ```
 
 ## Screenshot

data/lib/redis-stat.rb

@@ -5,6 +5,7 @@ require 'redis'
 require 'tabularize'
 require 'ansi'
 require 'csv'
+require 'parallelize'
 
 class RedisStat
   DEFAULT_TERM_WIDTH  = 180
@@ -12,7 +13,11 @@ class RedisStat
 
   def initialize options = {}
     @options   = RedisStat::Option::DEFAULT.merge options
-    @redis     = Redis.new(Hash[ @options.select { |k, _| [:host, :port].include? k } ])
+    @hosts     = @options[:hosts]
+    @redises   = @hosts.map { |e| 
+      host, port = e.split(':')
+      Redis.new(Hash[ {:host => host, :port => port}.select { |k, v| v } ])
+    }
     @max_count = @options[:count]
     @count     = 0
     @colors    = @options[:colors] || COLORS
@@ -25,12 +30,30 @@ class RedisStat
     csv = File.open(@options[:csv], 'w') if @options[:csv]
     update_term_size!
 
-    prev_info = nil
+
     begin
+      # Warm-up
+      @redises.each { |r| r.info }
+
       @started_at = Time.now
+      prev_info = nil
       loop do
-        info = @redis.info.insensitive
+        info = {}.insensitive
+        class << info
+          def sumf label
+            (self[label] || []).map(&:to_f).inject(:+)
+          end
+        end
+
         info[:at] = Time.now.to_f
+        @redises.pmap(@redises.length) { |redis|
+          redis.info.insensitive
+        }.each do |rinfo|
+          rinfo.each do |k, v|
+            info[k] ||= []
+            info[k] << v
+          end
+        end
 
         output info, prev_info, csv
 
@@ -98,9 +121,9 @@ private
 
     movement = nil
     if @count == 0
-      movement = 0
       output_static_info info
 
+      movement = 0
       if file
         file.puts CSV.generate_line(info_output.map { |pair|
           LABELS[pair.first] || pair.first
@@ -147,30 +170,28 @@ private
   end
 
   def output_static_info info
-    data = 
-      {
-        :redis_stat_version => RedisStat::VERSION,
-        :redis_host         => @options[:host],
-        :redis_port         => @options[:port],
-        :csv                => @options[:csv],
-      }.merge(
-        Hash[
-          [
-            :redis_version,
-            :process_id,
-            :uptime_in_seconds,
-            :uptime_in_days,
-            :gcc_version,
-            :role,
-            :connected_slaves, # FIXME: not so static
-            :aof_enabled,
-            :vm_enabled
-          ].map { |k| [k, info[k]] }
-        ]
-      ).reject { |k, v| v.nil? }.to_a
-    @os.puts Tabularize.it(data, :align => :left).map { |pair| 
-      ansi(:bold) { pair.first } + ' : ' + pair.last
-    }
+    tab = Tabularize.new(
+      :unicode => false, :align => :right,
+      :hborder => ansi(:black, :bold) { '-' },
+      :vborder => ansi(:black, :bold) { '|' },
+      :iborder => ansi(:black, :bold) { '+' }
+    )
+    tab << [nil] + @hosts.map { |h| ansi(:bold, :green) { h } }
+    tab.separator!
+    [
+      :redis_version,
+      :process_id,
+      :uptime_in_seconds,
+      :uptime_in_days,
+      :gcc_version,
+      :role,
+      :connected_slaves,
+      :aof_enabled,
+      :vm_enabled
+    ].each do |key|
+      tab << [ansi(:bold) { key }] + info[key]
+    end
+    @os.puts tab
   end
 
   def init_table info_output
@@ -179,6 +200,7 @@ private
                        :hborder => ansi(:black, :bold) { '-' },
                        :iborder => ansi(:black, :bold) { '+' },
                        :vborder => ' ',
+                       :ellipsis => ansi(:bold) { '>' },
                        :pad_left => 0,
                        :pad_right => 0,
                        :screen_width => @term_width
@@ -200,8 +222,8 @@ private
     dur = prev_info && (info[:at] - prev_info[:at])
 
     get_diff = lambda do |label|
-      if dur
-        (info[label].to_f - prev_info[label].to_f) / dur
+      if dur && dur > 0
+        (info.sumf(label) - prev_info.sumf(label)) / dur
       else
         nil
       end
@@ -214,8 +236,8 @@ private
       val = get_diff.call(key)
       [humanize_number(val), val]
     when :keys
-      val = Hash[ info.select { |k, v| k =~ /^db[0-9]+$/ } ].values.inject(0) { |sum, v| 
-        sum + Hash[ v.split(',').map { |e| e.split '=' } ]['keys'].to_i
+      val = Hash[ info.select { |k, v| k =~ /^db[0-9]+$/ } ].values.inject(0) { |sum, vs| 
+        sum + vs.map { |v| Hash[ v.split(',').map { |e| e.split '=' } ]['keys'].to_i }.inject(:+)
       }
       [humanize_number(val), val]
     when :evicted_keys_per_second, :expired_keys_per_second, :keyspace_hits_per_second,
@@ -223,11 +245,13 @@ private
       val = get_diff.call(key.to_s.gsub(/_per_second$/, '').to_sym)
       [humanize_number(val), val]
     when :total_commands_processed, :evicted_keys, :expired_keys, :keyspace_hits, :keyspace_misses
-      [humanize_number(info[key].to_i), info[key]]
+      val = info.sumf(key)
+      [humanize_number(val.to_i), val]
     when :used_memory, :used_memory_rss, :aof_current_size, :aof_base_size
-      [humanize_number(info[key].to_i, 1024, 'B'), info[key]]
+      val = info.sumf(key)
+      [humanize_number(val.to_i, 1024, 'B'), val]
     else
-      info[key]
+      format_number info.sumf(key)
     end
   end
 

data/lib/redis-stat/option.rb

@@ -3,8 +3,7 @@ require 'optparse'
 class RedisStat
 module Option
   DEFAULT = {
-    :host     => '127.0.0.1',
-    :port     => 6379,
+    :hosts    => ['127.0.0.1:6379'],
     :interval => 2,
     :count    => nil,
     :csv      => nil
@@ -15,7 +14,7 @@ module Option
 
     options = DEFAULT.dup
     opts = ::OptionParser.new { |opts|
-      opts.banner = "usage: redis-stat [HOST[:PORT]] [INTERVAL [COUNT]]"
+      opts.banner = "usage: redis-stat [HOST[:PORT] ...] [INTERVAL [COUNT]]"
       opts.separator ''
 
       opts.on('--csv=OUTPUT_CSV_FILE_PATH', 'Save the result in CSV format') do |v|
@@ -41,33 +40,13 @@ module Option
       opts.parse! argv
 
       is_number   = lambda { |str| str =~ /^([0-9]\.?[0-9]*)$|^([1-9][0-9]*)$/ }
-      set_options = lambda { |host_port, interval, count|
-        if host_port
-          host, port = host_port.split(':')
-          options[:host] = host
-          options[:port] = port.to_i if port
-        end
 
-        options[:interval] = interval.to_f if interval
-        options[:count] = count.to_i if count
-      }
+      numbers, hosts = argv.partition { |e| is_number.call e }
+      interval, count = numbers.map(&:to_f)
 
-      case argv.length
-      when 1
-        if is_number.call argv.first
-          set_options.call nil, argv.first, nil
-        else
-          set_options.call argv.first, nil, nil
-        end
-      when 2
-        if is_number.call argv.first
-          set_options.call nil, argv.first, argv.last
-        else
-          set_options.call argv.first, argv.last, nil
-        end
-      when 3
-        set_options.call *argv
-      end
+      options[:interval] = interval if interval
+      options[:count]    = count if count
+      options[:hosts]    = hosts unless hosts.empty?
 
       validate options
 
@@ -92,9 +71,19 @@ module Option
       raise ArgumentError.new("Invalid count: #{count}")
     end
 
-    port = options[:port]
-    unless port.is_a?(Fixnum) && port > 0 && port < 65536
-      raise ArgumentError.new("Invalid port: #{port}")
+    hosts = options[:hosts]
+    if hosts.empty?
+      raise ArgumentError.new("Redis host not given")
+    end
+
+    hosts.each do |host|
+      host, port = host.split(':')
+      if port
+        port = port.to_i
+        unless port > 0 && port < 65536
+          raise ArgumentError.new("Invalid port: #{port}")
+        end
+      end
     end
   end
 end

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/redis-stat.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "redis", '~> 3.0.1'
   gem.add_runtime_dependency "tabularize", '~> 0.2.4'
   gem.add_runtime_dependency "insensitive_hash", '~> 0.2.4'
+  gem.add_runtime_dependency "parallelize", '~> 0.4.0'
 
   gem.add_development_dependency 'test-unit'
 end

data/test/test_redis-stat.rb

@@ -43,8 +43,7 @@ class TestRedisStat < Test::Unit::TestCase
 
     options = RedisStat::Option.parse(%w[localhost:1000 20])
     assert_equal({
-      :host => 'localhost',
-      :port => 1000,
+      :hosts => ['localhost:1000'],
       :interval => 20,
       :count => nil,
       :csv => nil
@@ -52,8 +51,7 @@ class TestRedisStat < Test::Unit::TestCase
 
     options = RedisStat::Option.parse(%w[localhost:1000 20 30])
     assert_equal({
-      :host => 'localhost',
-      :port => 1000,
+      :hosts => ['localhost:1000'],
       :interval => 20,
       :count => 30,
       :csv => nil
@@ -61,8 +59,7 @@ class TestRedisStat < Test::Unit::TestCase
 
     options = RedisStat::Option.parse(%w[20])
     assert_equal({
-      :host => '127.0.0.1',
-      :port => 6379,
+      :hosts => ['127.0.0.1:6379'],
       :interval => 20,
       :count => nil,
       :csv => nil
@@ -70,8 +67,7 @@ class TestRedisStat < Test::Unit::TestCase
 
     options = RedisStat::Option.parse(%w[20 30])
     assert_equal({
-      :host => '127.0.0.1',
-      :port => 6379,
+      :hosts => ['127.0.0.1:6379'],
       :interval => 20,
       :count => 30,
       :csv => nil
@@ -79,8 +75,7 @@ class TestRedisStat < Test::Unit::TestCase
 
     options = RedisStat::Option.parse(%w[localhost:8888 10 --csv=/tmp/a.csv])
     assert_equal({
-      :port => 8888,
-      :host => 'localhost',
+      :hosts => ['localhost:8888'],
       :interval => 10,
       :count => nil,
       :csv => '/tmp/a.csv',
@@ -101,7 +96,7 @@ class TestRedisStat < Test::Unit::TestCase
   def test_start
     csv = '/tmp/redis-stat.csv'
     cnt = 50
-    rs = RedisStat.new :interval => 0.01, :count => cnt, :verbose => true, :csv => csv
+    rs = RedisStat.new :hosts => %w[localhost] * 5, :interval => 0.1, :count => cnt, :verbose => true, :csv => csv
     rs.start $stdout
 
     assert_equal cnt + 1, File.read(csv).lines.to_a.length

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: parallelize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement